diff --git a/JSONStream/JSONStream.d.ts b/JSONStream/JSONStream.d.ts
index 029e5b8e9c..a3481906b3 100644
--- a/JSONStream/JSONStream.d.ts
+++ b/JSONStream/JSONStream.d.ts
@@ -5,18 +5,17 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'JSONStream' {
 
-	export interface Options {
-		recurse: boolean;
-	}
 
-	export function parse(pattern: any): NodeJS.ReadWriteStream;
-	export function parse(patterns: any[]): NodeJS.ReadWriteStream;
-
-	export function stringify(): NodeJS.ReadWriteStream;
-	export function stringify(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
-
-	export function stringifyObject(): NodeJS.ReadWriteStream;
-	export function stringifyObject(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
+export interface Options {
+    recurse: boolean;
 }
+
+declare export function parse(pattern: any): NodeJS.ReadWriteStream;
+declare export function parse(patterns: any[]): NodeJS.ReadWriteStream;
+
+declare export function stringify(): NodeJS.ReadWriteStream;
+declare export function stringify(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
+
+declare export function stringifyObject(): NodeJS.ReadWriteStream;
+declare export function stringifyObject(open: string, sep: string, close: string): NodeJS.ReadWriteStream;
diff --git a/abs/abs.d.ts b/abs/abs.d.ts
index 58a5335283..b5182da9e6 100644
--- a/abs/abs.d.ts
+++ b/abs/abs.d.ts
@@ -3,12 +3,11 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "abs" {
-	/**
-	 * Compute the absolute path of an input.
-	 * @param input The input path.
-	 */
-	function Abs(input: string): string;
 
-	export default Abs;
-}
+/**
+ * Compute the absolute path of an input.
+ * @param input The input path.
+ */
+declare function Abs(input: string): string;
+
+export default Abs;
diff --git a/absolute/absolute.d.ts b/absolute/absolute.d.ts
index c0e8e9bd6e..4dc77e5fbe 100644
--- a/absolute/absolute.d.ts
+++ b/absolute/absolute.d.ts
@@ -3,11 +3,10 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "absolute" {
-	/**
-	 * Test if a path is absolute
-	 */
-	function absolute(path: string): boolean;
 
-	export default absolute;
-}
+/**
+ * Test if a path is absolute
+ */
+declare function absolute(path: string): boolean;
+
+export default absolute;
diff --git a/acl/acl.d.ts b/acl/acl.d.ts
index 06defa2449..daabcf628f 100644
--- a/acl/acl.d.ts
+++ b/acl/acl.d.ts
@@ -9,42 +9,42 @@
 /// <reference path='../redis/redis.d.ts'/>
 /// <reference path="../mongodb/mongodb-1.4.9.d.ts" />
 
-declare module "acl" {
-  import http = require('http');
-  import Promise = require("bluebird");
 
-  type strings = string|string[];
-  type Value = string|number;
-  type Values = Value|Value[];
-  type Action = () => any;
-  type Callback = (err: Error) => any;
-  type AnyCallback = (err: Error, obj: any) => any;
-  type AllowedCallback = (err: Error, allowed: boolean) => any;
-  type GetUserId = (req: http.ServerRequest, res: http.ServerResponse) => Value;
+import http = require('http');
+import Promise = require("bluebird");
 
-  interface AclStatic {
+type strings = string | string[];
+type Value = string | number;
+type Values = Value | Value[];
+type Action = () => any;
+type Callback = (err: Error) => any;
+type AnyCallback = (err: Error, obj: any) => any;
+type AllowedCallback = (err: Error, allowed: boolean) => any;
+type GetUserId = (req: http.ServerRequest, res: http.ServerResponse) => Value;
+
+interface AclStatic {
     new (backend: Backend<any>, logger: Logger, options: Option): Acl;
     new (backend: Backend<any>, logger: Logger): Acl;
     new (backend: Backend<any>): Acl;
     memoryBackend: MemoryBackendStatic;
-  }
+}
 
-  interface Logger {
-    debug: (msg: string)=>any;
-  }
+interface Logger {
+    debug: (msg: string) => any;
+}
 
-  interface Acl {
+interface Acl {
     addUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
     removeUserRoles: (userId: Value, roles: strings, cb?: Callback) => Promise<void>;
-    userRoles: (userId: Value, cb?: (err: Error, roles: string[])=>any) => Promise<string[]>;
-    roleUsers: (role: Value, cb?: (err: Error, users: Values)=>any) => Promise<any>;
-    hasRole: (userId: Value, role: string, cb?: (err: Error, isInRole: boolean)=>any) => Promise<boolean>;
+    userRoles: (userId: Value, cb?: (err: Error, roles: string[]) => any) => Promise<string[]>;
+    roleUsers: (role: Value, cb?: (err: Error, users: Values) => any) => Promise<any>;
+    hasRole: (userId: Value, role: string, cb?: (err: Error, isInRole: boolean) => any) => Promise<boolean>;
     addRoleParents: (role: string, parents: Values, cb?: Callback) => Promise<void>;
     removeRole: (role: string, cb?: Callback) => Promise<void>;
     removeResource: (resource: string, cb?: Callback) => Promise<void>;
     allow: {
-      (roles: Values, resources: strings, permissions: strings, cb?: Callback): Promise<void>;
-      (aclSets: AclSet|AclSet[]): Promise<void>;
+        (roles: Values, resources: strings, permissions: strings, cb?: Callback): Promise<void>;
+        (aclSets: AclSet | AclSet[]): Promise<void>;
     }
     removeAllow: (role: string, resources: strings, permissions: strings, cb?: Callback) => Promise<void>;
     removePermissions: (role: string, resources: strings, permissions: strings, cb?: Function) => Promise<void>;
@@ -53,41 +53,41 @@ declare module "acl" {
     areAnyRolesAllowed: (roles: strings, resource: strings, permissions: strings, cb?: AllowedCallback) => Promise<any>;
     whatResources: (roles: strings, permissions: strings, cb?: AnyCallback) => Promise<any>;
     permittedResources: (roles: strings, permissions: strings, cb?: Function) => Promise<void>;
-    middleware: (numPathComponents: number, userId: Value|GetUserId, actions: strings) => Promise<any>;
-  }
+    middleware: (numPathComponents: number, userId: Value | GetUserId, actions: strings) => Promise<any>;
+}
 
-  interface Option {
+interface Option {
     buckets?: BucketsOption;
-  }
+}
 
-  interface BucketsOption {
+interface BucketsOption {
     meta?: string;
     parents?: string;
     permissions?: string;
     resources?: string;
     roles?: string;
     users?: string;
-  }
+}
 
-  interface AclSet {
+interface AclSet {
     roles: strings;
     allows: AclAllow[];
-  }
+}
 
-  interface AclAllow {
+interface AclAllow {
     resources: strings;
     permissions: strings;
-  }
+}
 
-  interface MemoryBackend extends Backend<Action[]> { }
-  interface MemoryBackendStatic {
-    new(): MemoryBackend;
-  }
+interface MemoryBackend extends Backend<Action[]> { }
+interface MemoryBackendStatic {
+    new (): MemoryBackend;
+}
 
-  //
-  // For internal use
-  //
-  interface Backend<T> {
+//
+// For internal use
+//
+interface Backend<T> {
     begin: () => T;
     end: (transaction: T, cb?: Action) => void;
     clean: (cb?: Action) => void;
@@ -101,50 +101,49 @@ declare module "acl" {
     getAsync: Function;
     cleanAsync: Function;
     unionAsync: Function;
-  }
+}
 
-  interface Contract {
-    (args: IArguments): Contract|NoOp;
+interface Contract {
+    (args: IArguments): Contract | NoOp;
     debug: boolean;
     fulfilled: boolean;
     args: any[];
     checkedParams: string[];
-    params: (...types: string[]) => Contract|NoOp;
+    params: (...types: string[]) => Contract | NoOp;
     end: () => void;
-  }
+}
 
-  interface NoOp {
+interface NoOp {
     params: (...types: string[]) => NoOp;
     end: () => void;
-  }
-
-  // for redis backend
-  import redis = require('redis');
-
-  interface AclStatic {
-    redisBackend: RedisBackendStatic;
-  }
-
-  interface RedisBackend extends Backend<redis.RedisClient> { }
-  interface RedisBackendStatic {
-    new(redis: redis.RedisClient, prefix: string): RedisBackend;
-    new(redis: redis.RedisClient): RedisBackend;
-  }
-
-  // for mongodb backend
-  import mongo = require('mongodb');
-
-  interface AclStatic {
-    mongodbBackend: MongodbBackendStatic;
-  }
-
-  interface MongodbBackend extends Backend<Callback> { }
-  interface MongodbBackendStatic {
-    new(db: mongo.Db, prefix: string, useSingle: boolean): MongodbBackend;
-    new(db: mongo.Db, prefix: string): MongodbBackend;
-    new(db: mongo.Db): MongodbBackend;
-  }
-
-  var _: AclStatic;
-  export = _;
 }
+
+// for redis backend
+import redis = require('redis');
+
+interface AclStatic {
+    redisBackend: RedisBackendStatic;
+}
+
+interface RedisBackend extends Backend<redis.RedisClient> { }
+interface RedisBackendStatic {
+    new (redis: redis.RedisClient, prefix: string): RedisBackend;
+    new (redis: redis.RedisClient): RedisBackend;
+}
+
+// for mongodb backend
+import mongo = require('mongodb');
+
+interface AclStatic {
+    mongodbBackend: MongodbBackendStatic;
+}
+
+interface MongodbBackend extends Backend<Callback> { }
+interface MongodbBackendStatic {
+    new (db: mongo.Db, prefix: string, useSingle: boolean): MongodbBackend;
+    new (db: mongo.Db, prefix: string): MongodbBackend;
+    new (db: mongo.Db): MongodbBackend;
+}
+
+declare var _: AclStatic;
+export = _;
diff --git a/adm-zip/adm-zip.d.ts b/adm-zip/adm-zip.d.ts
index 19298149c3..06e1181694 100644
--- a/adm-zip/adm-zip.d.ts
+++ b/adm-zip/adm-zip.d.ts
@@ -5,303 +5,302 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "adm-zip" {
-    class AdmZip {
-        /**
-         * Create a new, empty archive.
-         */
-        constructor();
-        /**
-         * Read an existing archive.
-         */
-        constructor(fileName: string);
-        /**
-         * Extracts the given entry from the archive and returns the content as a
-         * Buffer object.
-         * @param entry String with the full path of the entry
-         * @return Buffer or Null in case of error
-         */
-        readFile(entry: string): Buffer;
-        /**
-         * Extracts the given entry from the archive and returns the content as a
-         * Buffer object.
-         * @param entry ZipEntry object
-         * @return Buffer or Null in case of error
-         */
-        readFile(entry: AdmZip.IZipEntry): Buffer;
-        /**
-         * Asynchronous readFile
-         * @param entry String with the full path of the entry
-         * @param callback Called with a Buffer or Null in case of error
-         */
-        readFileAsync(entry: string, callback: (data: Buffer, err: string) => any): void;
-        /**
-         * Asynchronous readFile
-         * @param entry ZipEntry object
-         * @param callback Called with a Buffer or Null in case of error
-         * @return Buffer or Null in case of error
-         */
-        readFileAsync(entry: AdmZip.IZipEntry, callback: (data: Buffer, err: string) => any): void;
-        /**
-         * Extracts the given entry from the archive and returns the content as
-         * plain text in the given encoding
-         * @param entry String with the full path of the entry
-         * @param encoding Optional. If no encoding is specified utf8 is used
-         * @return String
-         */
-        readAsText(fileName: string, encoding?: string): string;
-        /**
-         * Extracts the given entry from the archive and returns the content as
-         * plain text in the given encoding
-         * @param entry ZipEntry object
-         * @param encoding Optional. If no encoding is specified utf8 is used
-         * @return String
-         */
-        readAsText(fileName: AdmZip.IZipEntry, encoding?: string): string;
-        /**
-         * Asynchronous readAsText
-         * @param entry String with the full path of the entry
-         * @param callback Called with the resulting string.
-         * @param encoding Optional. If no encoding is specified utf8 is used
-         */
-        readAsTextAsync(fileName: string, callback: (data: string) => any, encoding?: string): void;
-        /**
-         * Asynchronous readAsText
-         * @param entry ZipEntry object
-         * @param callback Called with the resulting string.
-         * @param encoding Optional. If no encoding is specified utf8 is used
-         */
-        readAsTextAsync(fileName: AdmZip.IZipEntry, callback: (data: string) => any, encoding?: string): void;
-        /**
-         * Remove the entry from the file or the entry and all its nested directories
-         * and files if the given entry is a directory
-         * @param entry String with the full path of the entry
-         */
-        deleteFile(entry: string): void;
-        /**
-         * Remove the entry from the file or the entry and all its nested directories
-         * and files if the given entry is a directory
-         * @param entry A ZipEntry object.
-         */
-        deleteFile(entry: AdmZip.IZipEntry): void;
-        /**
-         * Adds a comment to the zip. The zip must be rewritten after
-         * adding the comment.
-         * @param comment Content of the comment.
-         */
-        addZipComment(comment: string): void;
-        /**
-         * Returns the zip comment
-         * @return The zip comment.
-         */
-        getZipComment(): string;
-        /**
-         * Adds a comment to a specified zipEntry. The zip must be rewritten after
-         * adding the comment.
-         * The comment cannot exceed 65535 characters in length.
-         * @param entry String with the full path of the entry
-         * @param comment The comment to add to the entry.
-         */
-        addZipEntryComment(entry: string, comment: string): void;
-        /**
-         * Adds a comment to a specified zipEntry. The zip must be rewritten after
-         * adding the comment.
-         * The comment cannot exceed 65535 characters in length.
-         * @param entry ZipEntry object.
-         * @param comment The comment to add to the entry.
-         */
-        addZipEntryComment(entry: AdmZip.IZipEntry, comment: string): void;
-        /**
-         * Returns the comment of the specified entry.
-         * @param entry String with the full path of the entry.
-         * @return String The comment of the specified entry.
-         */
-        getZipEntryComment(entry: string): string;
-        /**
-         * Returns the comment of the specified entry
-         * @param entry ZipEntry object.
-         * @return String The comment of the specified entry.
-         */
-        getZipEntryComment(entry: AdmZip.IZipEntry): string;
-        /**
-         * Updates the content of an existing entry inside the archive. The zip
-         * must be rewritten after updating the content
-         * @param entry String with the full path of the entry.
-         * @param content The entry's new contents.
-         */
-        updateFile(entry: string, content: Buffer): void;
-        /**
-         * Updates the content of an existing entry inside the archive. The zip
-         * must be rewritten after updating the content
-         * @param entry ZipEntry object.
-         * @param content The entry's new contents.
-         */
-        updateFile(entry: AdmZip.IZipEntry, content: Buffer): void;
-        /**
-         * Adds a file from the disk to the archive.
-         * @param localPath Path to a file on disk.
-         * @param zipPath Path to a directory in the archive. Defaults to the empty
-         *   string.
-         */
-        addLocalFile(localPath: string, zipPath?: string): void;
-        /**
-         * Adds a local directory and all its nested files and directories to the
-         * archive.
-         * @param localPath Path to a folder on disk.
-         * @param zipPath Path to a folder in the archive. Defaults to an empty
-         *   string.
-         */
-        addLocalFolder(localPath: string, zipPath?: string): void;
-        /**
-         * Allows you to create a entry (file or directory) in the zip file.
-         * If you want to create a directory the entryName must end in / and a null
-         * buffer should be provided.
-         * @param entryName Entry path
-         * @param content Content to add to the entry; must be a 0-length buffer
-         *   for a directory.
-         * @param comment Comment to add to the entry.
-         * @param attr Attribute to add to the entry.
-         */
-        addFile(entryName: string, data: Buffer, comment?: string, attr?: number): void;
-        /**
-         * Returns an array of ZipEntry objects representing the files and folders
-         * inside the archive
-         */
-        getEntries(): AdmZip.IZipEntry[];
-        /**
-         * Returns a ZipEntry object representing the file or folder specified by
-         * ``name``.
-         * @param name Name of the file or folder to retrieve.
-         * @return ZipEntry The entry corresponding to the name.
-         */
-        getEntry(name: string): AdmZip.IZipEntry;
-        /**
-         * Extracts the given entry to the given targetPath.
-         * If the entry is a directory inside the archive, the entire directory and
-         * its subdirectories will be extracted.
-         * @param entry String with the full path of the entry
-         * @param targetPath Target folder where to write the file
-         * @param maintainEntryPath If maintainEntryPath is true and the entry is
-         *   inside a folder, the entry folder will be created in targetPath as
-         *   well. Default is TRUE
-         * @param overwrite If the file already exists at the target path, the file
-         *   will be overwriten if this is true. Default is FALSE
-         *
-         * @return Boolean
-         */
-        extractEntryTo(entryPath: string, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
-        /**
-         * Extracts the given entry to the given targetPath.
-         * If the entry is a directory inside the archive, the entire directory and
-         * its subdirectories will be extracted.
-         * @param entry ZipEntry object
-         * @param targetPath Target folder where to write the file
-         * @param maintainEntryPath If maintainEntryPath is true and the entry is
-         *   inside a folder, the entry folder will be created in targetPath as
-         *   well. Default is TRUE
-         * @param overwrite If the file already exists at the target path, the file
-         *   will be overwriten if this is true. Default is FALSE
-         * @return Boolean
-         */
-        extractEntryTo(entryPath: AdmZip.IZipEntry, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
-        /**
-         * Extracts the entire archive to the given location
-         * @param targetPath Target location
-         * @param overwrite If the file already exists at the target path, the file
-         *   will be overwriten if this is true. Default is FALSE
-         */
-        extractAllTo(targetPath: string, overwrite?: boolean): void;
-        /**
-         * Extracts the entire archive to the given location
-         * @param targetPath Target location
-         * @param overwrite If the file already exists at the target path, the file
-         *   will be overwriten if this is true. Default is FALSE
-         * @param callback The callback function will be called afeter extraction
-         */
-        extractAllToAsync(targetPath: string, overwrite: boolean, callback: (error: Error) => void): void;
-        /**
-         * Writes the newly created zip file to disk at the specified location or
-         * if a zip was opened and no ``targetFileName`` is provided, it will
-         * overwrite the opened zip
-         * @param targetFileName
-         */
-        writeZip(targetPath?: string): void;
-        /**
-         * Returns the content of the entire zip file as a Buffer object
-         * @return Buffer
-         */
-        toBuffer(): Buffer;
-    }
 
-    namespace AdmZip {
-        /**
-         * The ZipEntry is more than a structure representing the entry inside the
-         * zip file. Beside the normal attributes and headers a entry can have, the
-         * class contains a reference to the part of the file where the compressed
-         * data resides and decompresses it when requested. It also compresses the
-         * data and creates the headers required to write in the zip file.
-         */
-        interface IZipEntry {
-            /**
-             * Represents the full name and path of the file
-             */
-            entryName: string;
-            rawEntryName: Buffer;
-            /**
-             * Extra data associated with this entry.
-             */
-            extra: Buffer;
-            /**
-             * Entry comment.
-             */
-            comment: string;
-            name: string;
-            /**
-             * Read-Only property that indicates the type of the entry.
-             */
-            isDirectory: boolean;
-            /**
-             * Get the header associated with this ZipEntry.
-             */
-            header: Buffer;
-            /**
-             * Retrieve the compressed data for this entry. Note that this may trigger
-             * compression if any properties were modified.
-             */
-            getCompressedData(): Buffer;
-            /**
-             * Asynchronously retrieve the compressed data for this entry. Note that
-             * this may trigger compression if any properties were modified.
-             */
-            getCompressedDataAsync(callback: (data: Buffer) => void): void;
-            /**
-             * Set the (uncompressed) data to be associated with this entry.
-             */
-            setData(value: string): void;
-            /**
-             * Set the (uncompressed) data to be associated with this entry.
-             */
-            setData(value: Buffer): void;
-            /**
-             * Get the decompressed data associated with this entry.
-             */
-            getData(): Buffer;
-            /**
-             * Asynchronously get the decompressed data associated with this entry.
-             */
-            getDataAsync(callback: (data: Buffer) => void): void;
-            /**
-             * Returns the CEN Entry Header to be written to the output zip file, plus
-             * the extra data and the entry comment.
-             */
-            packHeader(): Buffer;
-            /**
-             * Returns a nicely formatted string with the most important properties of
-             * the ZipEntry.
-             */
-            toString(): string;
-        }
-    }
-
-    export = AdmZip;
+declare class AdmZip {
+    /**
+     * Create a new, empty archive.
+     */
+    constructor();
+    /**
+     * Read an existing archive.
+     */
+    constructor(fileName: string);
+    /**
+     * Extracts the given entry from the archive and returns the content as a
+     * Buffer object.
+     * @param entry String with the full path of the entry
+     * @return Buffer or Null in case of error
+     */
+    readFile(entry: string): Buffer;
+    /**
+     * Extracts the given entry from the archive and returns the content as a
+     * Buffer object.
+     * @param entry ZipEntry object
+     * @return Buffer or Null in case of error
+     */
+    readFile(entry: AdmZip.IZipEntry): Buffer;
+    /**
+     * Asynchronous readFile
+     * @param entry String with the full path of the entry
+     * @param callback Called with a Buffer or Null in case of error
+     */
+    readFileAsync(entry: string, callback: (data: Buffer, err: string) => any): void;
+    /**
+     * Asynchronous readFile
+     * @param entry ZipEntry object
+     * @param callback Called with a Buffer or Null in case of error
+     * @return Buffer or Null in case of error
+     */
+    readFileAsync(entry: AdmZip.IZipEntry, callback: (data: Buffer, err: string) => any): void;
+    /**
+     * Extracts the given entry from the archive and returns the content as
+     * plain text in the given encoding
+     * @param entry String with the full path of the entry
+     * @param encoding Optional. If no encoding is specified utf8 is used
+     * @return String
+     */
+    readAsText(fileName: string, encoding?: string): string;
+    /**
+     * Extracts the given entry from the archive and returns the content as
+     * plain text in the given encoding
+     * @param entry ZipEntry object
+     * @param encoding Optional. If no encoding is specified utf8 is used
+     * @return String
+     */
+    readAsText(fileName: AdmZip.IZipEntry, encoding?: string): string;
+    /**
+     * Asynchronous readAsText
+     * @param entry String with the full path of the entry
+     * @param callback Called with the resulting string.
+     * @param encoding Optional. If no encoding is specified utf8 is used
+     */
+    readAsTextAsync(fileName: string, callback: (data: string) => any, encoding?: string): void;
+    /**
+     * Asynchronous readAsText
+     * @param entry ZipEntry object
+     * @param callback Called with the resulting string.
+     * @param encoding Optional. If no encoding is specified utf8 is used
+     */
+    readAsTextAsync(fileName: AdmZip.IZipEntry, callback: (data: string) => any, encoding?: string): void;
+    /**
+     * Remove the entry from the file or the entry and all its nested directories
+     * and files if the given entry is a directory
+     * @param entry String with the full path of the entry
+     */
+    deleteFile(entry: string): void;
+    /**
+     * Remove the entry from the file or the entry and all its nested directories
+     * and files if the given entry is a directory
+     * @param entry A ZipEntry object.
+     */
+    deleteFile(entry: AdmZip.IZipEntry): void;
+    /**
+     * Adds a comment to the zip. The zip must be rewritten after
+     * adding the comment.
+     * @param comment Content of the comment.
+     */
+    addZipComment(comment: string): void;
+    /**
+     * Returns the zip comment
+     * @return The zip comment.
+     */
+    getZipComment(): string;
+    /**
+     * Adds a comment to a specified zipEntry. The zip must be rewritten after
+     * adding the comment.
+     * The comment cannot exceed 65535 characters in length.
+     * @param entry String with the full path of the entry
+     * @param comment The comment to add to the entry.
+     */
+    addZipEntryComment(entry: string, comment: string): void;
+    /**
+     * Adds a comment to a specified zipEntry. The zip must be rewritten after
+     * adding the comment.
+     * The comment cannot exceed 65535 characters in length.
+     * @param entry ZipEntry object.
+     * @param comment The comment to add to the entry.
+     */
+    addZipEntryComment(entry: AdmZip.IZipEntry, comment: string): void;
+    /**
+     * Returns the comment of the specified entry.
+     * @param entry String with the full path of the entry.
+     * @return String The comment of the specified entry.
+     */
+    getZipEntryComment(entry: string): string;
+    /**
+     * Returns the comment of the specified entry
+     * @param entry ZipEntry object.
+     * @return String The comment of the specified entry.
+     */
+    getZipEntryComment(entry: AdmZip.IZipEntry): string;
+    /**
+     * Updates the content of an existing entry inside the archive. The zip
+     * must be rewritten after updating the content
+     * @param entry String with the full path of the entry.
+     * @param content The entry's new contents.
+     */
+    updateFile(entry: string, content: Buffer): void;
+    /**
+     * Updates the content of an existing entry inside the archive. The zip
+     * must be rewritten after updating the content
+     * @param entry ZipEntry object.
+     * @param content The entry's new contents.
+     */
+    updateFile(entry: AdmZip.IZipEntry, content: Buffer): void;
+    /**
+     * Adds a file from the disk to the archive.
+     * @param localPath Path to a file on disk.
+     * @param zipPath Path to a directory in the archive. Defaults to the empty
+     *   string.
+     */
+    addLocalFile(localPath: string, zipPath?: string): void;
+    /**
+     * Adds a local directory and all its nested files and directories to the
+     * archive.
+     * @param localPath Path to a folder on disk.
+     * @param zipPath Path to a folder in the archive. Defaults to an empty
+     *   string.
+     */
+    addLocalFolder(localPath: string, zipPath?: string): void;
+    /**
+     * Allows you to create a entry (file or directory) in the zip file.
+     * If you want to create a directory the entryName must end in / and a null
+     * buffer should be provided.
+     * @param entryName Entry path
+     * @param content Content to add to the entry; must be a 0-length buffer
+     *   for a directory.
+     * @param comment Comment to add to the entry.
+     * @param attr Attribute to add to the entry.
+     */
+    addFile(entryName: string, data: Buffer, comment?: string, attr?: number): void;
+    /**
+     * Returns an array of ZipEntry objects representing the files and folders
+     * inside the archive
+     */
+    getEntries(): AdmZip.IZipEntry[];
+    /**
+     * Returns a ZipEntry object representing the file or folder specified by
+     * ``name``.
+     * @param name Name of the file or folder to retrieve.
+     * @return ZipEntry The entry corresponding to the name.
+     */
+    getEntry(name: string): AdmZip.IZipEntry;
+    /**
+     * Extracts the given entry to the given targetPath.
+     * If the entry is a directory inside the archive, the entire directory and
+     * its subdirectories will be extracted.
+     * @param entry String with the full path of the entry
+     * @param targetPath Target folder where to write the file
+     * @param maintainEntryPath If maintainEntryPath is true and the entry is
+     *   inside a folder, the entry folder will be created in targetPath as
+     *   well. Default is TRUE
+     * @param overwrite If the file already exists at the target path, the file
+     *   will be overwriten if this is true. Default is FALSE
+     *
+     * @return Boolean
+     */
+    extractEntryTo(entryPath: string, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
+    /**
+     * Extracts the given entry to the given targetPath.
+     * If the entry is a directory inside the archive, the entire directory and
+     * its subdirectories will be extracted.
+     * @param entry ZipEntry object
+     * @param targetPath Target folder where to write the file
+     * @param maintainEntryPath If maintainEntryPath is true and the entry is
+     *   inside a folder, the entry folder will be created in targetPath as
+     *   well. Default is TRUE
+     * @param overwrite If the file already exists at the target path, the file
+     *   will be overwriten if this is true. Default is FALSE
+     * @return Boolean
+     */
+    extractEntryTo(entryPath: AdmZip.IZipEntry, targetPath: string, maintainEntryPath?: boolean, overwrite?: boolean): boolean;
+    /**
+     * Extracts the entire archive to the given location
+     * @param targetPath Target location
+     * @param overwrite If the file already exists at the target path, the file
+     *   will be overwriten if this is true. Default is FALSE
+     */
+    extractAllTo(targetPath: string, overwrite?: boolean): void;
+    /**
+     * Extracts the entire archive to the given location
+     * @param targetPath Target location
+     * @param overwrite If the file already exists at the target path, the file
+     *   will be overwriten if this is true. Default is FALSE
+     * @param callback The callback function will be called afeter extraction
+     */
+    extractAllToAsync(targetPath: string, overwrite: boolean, callback: (error: Error) => void): void;
+    /**
+     * Writes the newly created zip file to disk at the specified location or
+     * if a zip was opened and no ``targetFileName`` is provided, it will
+     * overwrite the opened zip
+     * @param targetFileName
+     */
+    writeZip(targetPath?: string): void;
+    /**
+     * Returns the content of the entire zip file as a Buffer object
+     * @return Buffer
+     */
+    toBuffer(): Buffer;
 }
+
+declare namespace AdmZip {
+    /**
+     * The ZipEntry is more than a structure representing the entry inside the
+     * zip file. Beside the normal attributes and headers a entry can have, the
+     * class contains a reference to the part of the file where the compressed
+     * data resides and decompresses it when requested. It also compresses the
+     * data and creates the headers required to write in the zip file.
+     */
+    interface IZipEntry {
+        /**
+         * Represents the full name and path of the file
+         */
+        entryName: string;
+        rawEntryName: Buffer;
+        /**
+         * Extra data associated with this entry.
+         */
+        extra: Buffer;
+        /**
+         * Entry comment.
+         */
+        comment: string;
+        name: string;
+        /**
+         * Read-Only property that indicates the type of the entry.
+         */
+        isDirectory: boolean;
+        /**
+         * Get the header associated with this ZipEntry.
+         */
+        header: Buffer;
+        /**
+         * Retrieve the compressed data for this entry. Note that this may trigger
+         * compression if any properties were modified.
+         */
+        getCompressedData(): Buffer;
+        /**
+         * Asynchronously retrieve the compressed data for this entry. Note that
+         * this may trigger compression if any properties were modified.
+         */
+        getCompressedDataAsync(callback: (data: Buffer) => void): void;
+        /**
+         * Set the (uncompressed) data to be associated with this entry.
+         */
+        setData(value: string): void;
+        /**
+         * Set the (uncompressed) data to be associated with this entry.
+         */
+        setData(value: Buffer): void;
+        /**
+         * Get the decompressed data associated with this entry.
+         */
+        getData(): Buffer;
+        /**
+         * Asynchronously get the decompressed data associated with this entry.
+         */
+        getDataAsync(callback: (data: Buffer) => void): void;
+        /**
+         * Returns the CEN Entry Header to be written to the output zip file, plus
+         * the extra data and the entry comment.
+         */
+        packHeader(): Buffer;
+        /**
+         * Returns a nicely formatted string with the most important properties of
+         * the ZipEntry.
+         */
+        toString(): string;
+    }
+}
+
+export = AdmZip;
diff --git a/agenda/agenda.d.ts b/agenda/agenda.d.ts
index 011676bc86..b6e2dc08d1 100644
--- a/agenda/agenda.d.ts
+++ b/agenda/agenda.d.ts
@@ -6,438 +6,437 @@
 /// <reference path='../node/node.d.ts' />
 /// <reference path='../mongodb/mongodb.d.ts' />
 
-declare module "agenda" {
 
-    import {EventEmitter} from "events";
-    import {Db, Collection, ObjectID} from "mongodb";
 
-    interface Callback {
-        (err?: Error): void;
-    }
+import {EventEmitter} from "events";
+import {Db, Collection, ObjectID} from "mongodb";
 
-    interface ResultCallback<T> {
-        (err?: Error, result?: T): void;
-    }
-
-    /**
-     * Agenda Configuration.
-     */
-    interface AgendaConfiguration {
-
-        /**
-         * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
-         */
-        processEvery?: string | number;
-
-        /**
-         * Takes a number which specifies the default number of a specific job that can be running at any given moment.
-         * By default it is 5.
-         */
-        defaultConcurrency?: number;
-
-        /**
-         * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
-         * is 20.
-         */
-        maxConcurrency?: number;
-
-        /**
-         * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
-         * By default it is 0 for no max.
-         */
-        defaultLockLimit?: number;
-
-        /**
-         * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
-         * 0 for no max.
-         */
-        lockLimit?: number;
-
-        /**
-         * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
-         * can be overridden by specifying the lockLifetime option to a defined job.
-         */
-        defaultLockLifetime?: number;
-
-        /**
-         * Specifies that Agenda should be initialized using and existing MongoDB connection.
-         */
-        mongo?: {
-            /**
-             * The MongoDB database connection to use.
-             */
-            db: Db;
-
-            /**
-             * The name of the collection to use.
-             */
-            collection?: string;
-        }
-
-        /**
-         * Specifies that Agenda should connect to MongoDB.
-         */
-        db?: {
-            /**
-             * The connection URL.
-             */
-            address: string;
-
-            /**
-             * The name of the collection to use.
-             */
-            collection?: string;
-
-            /**
-             * Connection options to pass to MongoDB.
-             */
-            options?: any;
-        }
-    }
-
-    /**
-     * The database record associated with a job.
-     */
-    interface JobAttributes {
-        /**
-         * The record identity.
-         */
-        _id: ObjectID;
-
-        /**
-         * The name of the job.
-         */
-        name: string;
-
-        /**
-         * The type of the job (single|normal).
-         */
-        type: string;
-
-        /**
-         * The job details.
-         */
-        data: { [name: string]: any };
-
-        /**
-         * The priority of the job.
-         */
-        priority: number;
-
-        /**
-         * How often the job is repeated using a human-readable or cron format.
-         */
-        repeatInterval: string | number;
-
-        /**
-         * The timezone that conforms to [moment-timezone](http://momentjs.com/timezone/).
-         */
-        repeatTimezone: string;
-
-        /**
-         * Date/time the job was las modified.
-         */
-        lastModifiedBy: string;
-
-        /**
-         * Date/time the job will run next.
-         */
-        nextRunAt: Date;
-
-        /**
-         * Date/time the job was locked.
-         */
-        lockedAt: Date;
-
-        /**
-         * Date/time the job was last run.
-         */
-        lastRunAt: Date;
-
-        /**
-         * Date/time the job last finished running.
-         */
-        lastFinishedAt: Date;
-
-        /**
-         * The reason the job failed.
-         */
-        failReason: string;
-
-        /**
-         * The number of times the job has failed.
-         */
-        failCount: number;
-
-        /**
-         * The date/time the job last failed.
-         */
-        failedAt: Date;
-    }
-
-    /**
-     * A scheduled job.
-     */
-    interface Job {
-
-        /**
-         * The database record associated with the job.
-         */
-        attrs: JobAttributes;
-
-        /**
-         * Specifies an interval on which the job should repeat.
-         * @param interval A human-readable format String, a cron format String, or a Number.
-         * @param options An optional argument that can include a timezone field. The timezone should be a string as
-         * accepted by moment-timezone and is considered when using an interval in the cron string format.
-         */
-        repeatEvery(interval: string | number, options?: { timezone?: string }): Job
-
-        /**
-         * Specifies a time when the job should repeat. [Possible values](https://github.com/matthewmueller/date#examples).
-         * @param time
-         */
-        repeatAt(time: string): Job
-
-        /**
-         * Disables the job.
-         */
-        disable(): Job;
-
-        /**
-         * Enables the job.
-         */
-        enable(): Job;
-
-        /**
-         * Ensure that only one instance of this job exists with the specified properties
-         * @param value The properties associated with the job that must be unqiue.
-         * @param opts
-         */
-        unique(value: any, opts?: { insertOnly?: boolean }): Job;
-
-        /**
-         * Specifies the next time at which the job should run.
-         * @param time The next time at which the job should run.
-         */
-        schedule(time: string | Date): Job;
-
-        /**
-         * Specifies the priority weighting of the job.
-         * @param value The priority of the job (lowest|low|normal|high|highest|number).
-         */
-        priority(value: string | number): Job;
-
-        /**
-         * Sets job.attrs.failedAt to now, and sets job.attrs.failReason to reason.
-         * @param reason A message or Error object that indicates why the job failed.
-         */
-        fail(reason: string | Error): Job;
-
-        /**
-         * Runs the given job and calls callback(err, job) upon completion. Normally you never need to call this manually
-         * @param cb Called when the job is completed.
-         */
-        run(cb?: ResultCallback<Job>): Job;
-
-        /**
-         * Returns true if the job is running; otherwise, returns false.
-         */
-        isRunning(): boolean;
-
-        /**
-         * Saves the job into the database.
-         * @param cb  Called when the job is saved.
-         */
-        save(cb?: ResultCallback<Job>): Job;
-
-        /**
-         * Removes the job from the database and cancels the job.
-         * @param cb Called after the job has beeb removed from the database.
-         */
-        remove(cb?: Callback): void;
-
-        /**
-         * Resets the lock on the job. Useful to indicate that the job hasn't timed out when you have very long running
-         * jobs.
-         * @param cb Called after the job has been saved to the database.
-         */
-        touch(cb?: Callback): void;
-    }
-
-    interface JobOptions {
-
-        /**
-         * Maximum number of that job that can be running at once (per instance of agenda)
-         */
-        concurrency?: number;
-
-        /**
-         * Maximum number of that job that can be locked at once (per instance of agenda)
-         */
-        lockLimit?: number;
-
-        /**
-         * Interval in ms of how long the job stays locked for (see multiple job processors for more info). A job will
-         * automatically unlock if done() is called.
-         */
-        lockLifetime?: number;
-
-        /**
-         * (lowest|low|normal|high|highest|number) specifies the priority of the job. Higher priority jobs will run
-         * first.
-         */
-        priority?: string | number;
-    }
-
-    class Agenda extends EventEmitter {
-
-        /**
-         * Constructs a new Agenda object.
-         * @param config Optional configuration to initialize the Agenda.
-         * @param cb Optional callback called with the MongoDB colleciton.
-         */
-        constructor(config?: AgendaConfiguration, cb?: ResultCallback<Collection>);
-
-        /**
-         * Connect to the specified MongoDB server and database.
-         */
-        database(url: string, collection?: string, options?: any, cb?: ResultCallback<Collection>): Agenda;
-
-        /**
-         * Initialize agenda with an existing MongoDB connection.
-         */
-        mongo(db: Db, collection?: string, cb?: ResultCallback<Collection>): Agenda;
-
-        /**
-         * Sets the agenda name.
-         */
-        name(value: string): Agenda;
-
-        /**
-         * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
-         */
-        processEvery(interval: string | number): Agenda;
-
-        /**
-         * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
-         * is 20.
-         * @param value The value to set.
-         */
-        maxConcurrency(value: number): Agenda;
-
-        /**
-         * Takes a number which specifies the default number of a specific job that can be running at any given moment.
-         * By default it is 5.
-         * @param value The value to set.
-         */
-        defaultConcurrency(value: number): Agenda;
-
-        /**
-         * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
-         * 0 for no max.
-         * @param value The value to set.
-         */
-        lockLimit(value: number): Agenda;
-
-        /**
-         * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
-         * By default it is 0 for no max.
-         * @param value The value to set.
-         */
-        defaultLockLimit(value: number): Agenda;
-
-        /**
-         * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
-         * can be overridden by specifying the lockLifetime option to a defined job.
-         * @param value The value to set.
-         */
-        defaultLockLifetime(value: number): Agenda;
-
-        /**
-         * Returns an instance of a jobName with data. This does NOT save the job in the database. See below to learn
-         * how to manually work with jobs.
-         * @param name The name of the job.
-         * @param data Data to associated with the job.
-         */
-        create(name: string, data?: any): Job;
-
-        /**
-         * Find all Jobs matching `query` and pass same back in cb().
-         * @param query
-         * @param cb
-         */
-        jobs(query: any, cb: ResultCallback<Job[]>): void;
-
-        /**
-         * Removes all jobs in the database without defined behaviors. Useful if you change a definition name and want
-         * to remove old jobs.
-         * @param cb Called with the number of jobs removed.
-         */
-        purge(cb?: ResultCallback<number>): void;
-
-        /**
-         * Defines a job with the name of jobName. When a job of job name gets run, it will be passed to fn(job, done).
-         * To maintain asynchronous behavior, you must call done() when you are processing the job. If your function is
-         * synchronous, you may omit done from the signature.
-         * @param name The name of the jobs.
-         * @param options The options for the job.
-         * @param handler The handler to execute.
-         */
-        define(name: string, handler: (job?: Job, done?: (err?: Error) => void) => void): void;
-        define(name: string, options: JobOptions, handler: (job?: Job, done?: (err?: Error) => void) => void): void;
-
-        /**
-         * Runs job name at the given interval. Optionally, data and options can be passed in.
-         * @param interval Can be a human-readable format String, a cron format String, or a Number.
-         * @param names The name or names of the job(s) to run.
-         * @param data An optional argument that will be passed to the processing function under job.attrs.data.
-         * @param options An optional argument that will be passed to job.repeatEvery.
-         * @param cb An optional callback function which will be called when the job has been persisted in the database.
-         */
-        every(interval: number | string, names: string, data?: any, options?: any, cb?: ResultCallback<Job>): Job;
-        every(interval: number | string, names: string[], data?: any, options?: any, cb?: ResultCallback<Job[]>): Job[];
-
-        /**
-         * Schedules a job to run name once at a given time.
-         * @param when A Date or a String such as tomorrow at 5pm.
-         * @param names The name or names of the job(s) to run.
-         * @param data An optional argument that will be passed to the processing function under job.attrs.data.
-         * @param cb An optional callback function which will be called when the job has been persisted in the database.
-         */
-        schedule(when: Date | string, names: string, data?: any, cb?: ResultCallback<Job>): Job;
-        schedule(when: Date | string, names: string[], data?: any, cb?: ResultCallback<Job[]>): Job[];
-
-        /**
-         * Schedules a job to run name once immediately.
-         * @param name The name of the job to run.
-         * @param data An optional argument that will be passed to the processing function under job.attrs.data.
-         * @param cb An optional callback function which will be called when the job has been persisted in the database.
-         */
-        now(name: string, data?: any, cb?: ResultCallback<Job>): Job;
-
-        /**
-         * Cancels any jobs matching the passed mongodb-native query, and removes them from the database.
-         * @param query Mongodb native query.
-         * @param cb Called with the number of jobs removed.
-         */
-        cancel(query: any, cb?: ResultCallback<number>): void;
-
-        /**
-         * Starts the job queue processing, checking processEvery time to see if there are new jobs.
-         */
-        start(): void;
-
-        /**
-         * Stops the job queue processing. Unlocks currently running jobs.
-         * @param cb Called after the job processing queue shuts down and unlocks all jobs.
-         */
-        stop(cb: Callback): void;
-    }
-
-    namespace Agenda {
-
-    }
-
-    export = Agenda;
+interface Callback {
+    (err?: Error): void;
 }
+
+interface ResultCallback<T> {
+    (err?: Error, result?: T): void;
+}
+
+/**
+ * Agenda Configuration.
+ */
+interface AgendaConfiguration {
+
+    /**
+     * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
+     */
+    processEvery?: string | number;
+
+    /**
+     * Takes a number which specifies the default number of a specific job that can be running at any given moment.
+     * By default it is 5.
+     */
+    defaultConcurrency?: number;
+
+    /**
+     * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
+     * is 20.
+     */
+    maxConcurrency?: number;
+
+    /**
+     * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
+     * By default it is 0 for no max.
+     */
+    defaultLockLimit?: number;
+
+    /**
+     * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
+     * 0 for no max.
+     */
+    lockLimit?: number;
+
+    /**
+     * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
+     * can be overridden by specifying the lockLifetime option to a defined job.
+     */
+    defaultLockLifetime?: number;
+
+    /**
+     * Specifies that Agenda should be initialized using and existing MongoDB connection.
+     */
+    mongo?: {
+        /**
+         * The MongoDB database connection to use.
+         */
+        db: Db;
+
+        /**
+         * The name of the collection to use.
+         */
+        collection?: string;
+    }
+
+    /**
+     * Specifies that Agenda should connect to MongoDB.
+     */
+    db?: {
+        /**
+         * The connection URL.
+         */
+        address: string;
+
+        /**
+         * The name of the collection to use.
+         */
+        collection?: string;
+
+        /**
+         * Connection options to pass to MongoDB.
+         */
+        options?: any;
+    }
+}
+
+/**
+ * The database record associated with a job.
+ */
+interface JobAttributes {
+    /**
+     * The record identity.
+     */
+    _id: ObjectID;
+
+    /**
+     * The name of the job.
+     */
+    name: string;
+
+    /**
+     * The type of the job (single|normal).
+     */
+    type: string;
+
+    /**
+     * The job details.
+     */
+    data: { [name: string]: any };
+
+    /**
+     * The priority of the job.
+     */
+    priority: number;
+
+    /**
+     * How often the job is repeated using a human-readable or cron format.
+     */
+    repeatInterval: string | number;
+
+    /**
+     * The timezone that conforms to [moment-timezone](http://momentjs.com/timezone/).
+     */
+    repeatTimezone: string;
+
+    /**
+     * Date/time the job was las modified.
+     */
+    lastModifiedBy: string;
+
+    /**
+     * Date/time the job will run next.
+     */
+    nextRunAt: Date;
+
+    /**
+     * Date/time the job was locked.
+     */
+    lockedAt: Date;
+
+    /**
+     * Date/time the job was last run.
+     */
+    lastRunAt: Date;
+
+    /**
+     * Date/time the job last finished running.
+     */
+    lastFinishedAt: Date;
+
+    /**
+     * The reason the job failed.
+     */
+    failReason: string;
+
+    /**
+     * The number of times the job has failed.
+     */
+    failCount: number;
+
+    /**
+     * The date/time the job last failed.
+     */
+    failedAt: Date;
+}
+
+/**
+ * A scheduled job.
+ */
+interface Job {
+
+    /**
+     * The database record associated with the job.
+     */
+    attrs: JobAttributes;
+
+    /**
+     * Specifies an interval on which the job should repeat.
+     * @param interval A human-readable format String, a cron format String, or a Number.
+     * @param options An optional argument that can include a timezone field. The timezone should be a string as
+     * accepted by moment-timezone and is considered when using an interval in the cron string format.
+     */
+    repeatEvery(interval: string | number, options?: { timezone?: string }): Job
+
+    /**
+     * Specifies a time when the job should repeat. [Possible values](https://github.com/matthewmueller/date#examples).
+     * @param time
+     */
+    repeatAt(time: string): Job
+
+    /**
+     * Disables the job.
+     */
+    disable(): Job;
+
+    /**
+     * Enables the job.
+     */
+    enable(): Job;
+
+    /**
+     * Ensure that only one instance of this job exists with the specified properties
+     * @param value The properties associated with the job that must be unqiue.
+     * @param opts
+     */
+    unique(value: any, opts?: { insertOnly?: boolean }): Job;
+
+    /**
+     * Specifies the next time at which the job should run.
+     * @param time The next time at which the job should run.
+     */
+    schedule(time: string | Date): Job;
+
+    /**
+     * Specifies the priority weighting of the job.
+     * @param value The priority of the job (lowest|low|normal|high|highest|number).
+     */
+    priority(value: string | number): Job;
+
+    /**
+     * Sets job.attrs.failedAt to now, and sets job.attrs.failReason to reason.
+     * @param reason A message or Error object that indicates why the job failed.
+     */
+    fail(reason: string | Error): Job;
+
+    /**
+     * Runs the given job and calls callback(err, job) upon completion. Normally you never need to call this manually
+     * @param cb Called when the job is completed.
+     */
+    run(cb?: ResultCallback<Job>): Job;
+
+    /**
+     * Returns true if the job is running; otherwise, returns false.
+     */
+    isRunning(): boolean;
+
+    /**
+     * Saves the job into the database.
+     * @param cb  Called when the job is saved.
+     */
+    save(cb?: ResultCallback<Job>): Job;
+
+    /**
+     * Removes the job from the database and cancels the job.
+     * @param cb Called after the job has beeb removed from the database.
+     */
+    remove(cb?: Callback): void;
+
+    /**
+     * Resets the lock on the job. Useful to indicate that the job hasn't timed out when you have very long running
+     * jobs.
+     * @param cb Called after the job has been saved to the database.
+     */
+    touch(cb?: Callback): void;
+}
+
+interface JobOptions {
+
+    /**
+     * Maximum number of that job that can be running at once (per instance of agenda)
+     */
+    concurrency?: number;
+
+    /**
+     * Maximum number of that job that can be locked at once (per instance of agenda)
+     */
+    lockLimit?: number;
+
+    /**
+     * Interval in ms of how long the job stays locked for (see multiple job processors for more info). A job will
+     * automatically unlock if done() is called.
+     */
+    lockLifetime?: number;
+
+    /**
+     * (lowest|low|normal|high|highest|number) specifies the priority of the job. Higher priority jobs will run
+     * first.
+     */
+    priority?: string | number;
+}
+
+declare class Agenda extends EventEmitter {
+
+    /**
+     * Constructs a new Agenda object.
+     * @param config Optional configuration to initialize the Agenda.
+     * @param cb Optional callback called with the MongoDB colleciton.
+     */
+    constructor(config?: AgendaConfiguration, cb?: ResultCallback<Collection>);
+
+    /**
+     * Connect to the specified MongoDB server and database.
+     */
+    database(url: string, collection?: string, options?: any, cb?: ResultCallback<Collection>): Agenda;
+
+    /**
+     * Initialize agenda with an existing MongoDB connection.
+     */
+    mongo(db: Db, collection?: string, cb?: ResultCallback<Collection>): Agenda;
+
+    /**
+     * Sets the agenda name.
+     */
+    name(value: string): Agenda;
+
+    /**
+     * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
+     */
+    processEvery(interval: string | number): Agenda;
+
+    /**
+     * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
+     * is 20.
+     * @param value The value to set.
+     */
+    maxConcurrency(value: number): Agenda;
+
+    /**
+     * Takes a number which specifies the default number of a specific job that can be running at any given moment.
+     * By default it is 5.
+     * @param value The value to set.
+     */
+    defaultConcurrency(value: number): Agenda;
+
+    /**
+     * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
+     * 0 for no max.
+     * @param value The value to set.
+     */
+    lockLimit(value: number): Agenda;
+
+    /**
+     * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
+     * By default it is 0 for no max.
+     * @param value The value to set.
+     */
+    defaultLockLimit(value: number): Agenda;
+
+    /**
+     * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
+     * can be overridden by specifying the lockLifetime option to a defined job.
+     * @param value The value to set.
+     */
+    defaultLockLifetime(value: number): Agenda;
+
+    /**
+     * Returns an instance of a jobName with data. This does NOT save the job in the database. See below to learn
+     * how to manually work with jobs.
+     * @param name The name of the job.
+     * @param data Data to associated with the job.
+     */
+    create(name: string, data?: any): Job;
+
+    /**
+     * Find all Jobs matching `query` and pass same back in cb().
+     * @param query
+     * @param cb
+     */
+    jobs(query: any, cb: ResultCallback<Job[]>): void;
+
+    /**
+     * Removes all jobs in the database without defined behaviors. Useful if you change a definition name and want
+     * to remove old jobs.
+     * @param cb Called with the number of jobs removed.
+     */
+    purge(cb?: ResultCallback<number>): void;
+
+    /**
+     * Defines a job with the name of jobName. When a job of job name gets run, it will be passed to fn(job, done).
+     * To maintain asynchronous behavior, you must call done() when you are processing the job. If your function is
+     * synchronous, you may omit done from the signature.
+     * @param name The name of the jobs.
+     * @param options The options for the job.
+     * @param handler The handler to execute.
+     */
+    define(name: string, handler: (job?: Job, done?: (err?: Error) => void) => void): void;
+    define(name: string, options: JobOptions, handler: (job?: Job, done?: (err?: Error) => void) => void): void;
+
+    /**
+     * Runs job name at the given interval. Optionally, data and options can be passed in.
+     * @param interval Can be a human-readable format String, a cron format String, or a Number.
+     * @param names The name or names of the job(s) to run.
+     * @param data An optional argument that will be passed to the processing function under job.attrs.data.
+     * @param options An optional argument that will be passed to job.repeatEvery.
+     * @param cb An optional callback function which will be called when the job has been persisted in the database.
+     */
+    every(interval: number | string, names: string, data?: any, options?: any, cb?: ResultCallback<Job>): Job;
+    every(interval: number | string, names: string[], data?: any, options?: any, cb?: ResultCallback<Job[]>): Job[];
+
+    /**
+     * Schedules a job to run name once at a given time.
+     * @param when A Date or a String such as tomorrow at 5pm.
+     * @param names The name or names of the job(s) to run.
+     * @param data An optional argument that will be passed to the processing function under job.attrs.data.
+     * @param cb An optional callback function which will be called when the job has been persisted in the database.
+     */
+    schedule(when: Date | string, names: string, data?: any, cb?: ResultCallback<Job>): Job;
+    schedule(when: Date | string, names: string[], data?: any, cb?: ResultCallback<Job[]>): Job[];
+
+    /**
+     * Schedules a job to run name once immediately.
+     * @param name The name of the job to run.
+     * @param data An optional argument that will be passed to the processing function under job.attrs.data.
+     * @param cb An optional callback function which will be called when the job has been persisted in the database.
+     */
+    now(name: string, data?: any, cb?: ResultCallback<Job>): Job;
+
+    /**
+     * Cancels any jobs matching the passed mongodb-native query, and removes them from the database.
+     * @param query Mongodb native query.
+     * @param cb Called with the number of jobs removed.
+     */
+    cancel(query: any, cb?: ResultCallback<number>): void;
+
+    /**
+     * Starts the job queue processing, checking processEvery time to see if there are new jobs.
+     */
+    start(): void;
+
+    /**
+     * Stops the job queue processing. Unlocks currently running jobs.
+     * @param cb Called after the job processing queue shuts down and unlocks all jobs.
+     */
+    stop(cb: Callback): void;
+}
+
+declare namespace Agenda {
+
+}
+
+export = Agenda;
diff --git a/amazon-product-api/amazon-product-api.d.ts b/amazon-product-api/amazon-product-api.d.ts
index f7ccf905e5..9b5604ff5b 100644
--- a/amazon-product-api/amazon-product-api.d.ts
+++ b/amazon-product-api/amazon-product-api.d.ts
@@ -3,23 +3,22 @@
 // Definitions by: Matti Lehtinen <https://github.com/MattiLehtinen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "amazon-product-api" {
 
-    interface ICredentials {
-        awsId: string,
-        awsSecret: string,
-        awsTag: string
-    }
 
-    interface IAmazonProductQueryCallback {
-        (err: string, results: Object[]): void;
-    }
-
-    interface IAmazonProductClient {
-        itemSearch(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
-        itemLookup(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
-        browseNodeLookup(query: any, callback?: IAmazonProductQueryCallback) : Promise<Object[]>;
-    }
-
-    export function createClient(credentials:ICredentials) : IAmazonProductClient;
+interface ICredentials {
+    awsId: string,
+    awsSecret: string,
+    awsTag: string
 }
+
+interface IAmazonProductQueryCallback {
+    (err: string, results: Object[]): void;
+}
+
+interface IAmazonProductClient {
+    itemSearch(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+    itemLookup(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+    browseNodeLookup(query: any, callback?: IAmazonProductQueryCallback): Promise<Object[]>;
+}
+
+declare export function createClient(credentials: ICredentials): IAmazonProductClient;
diff --git a/amqp-rpc/amqp-rpc.d.ts b/amqp-rpc/amqp-rpc.d.ts
index b2eee1d2ca..49760498f0 100644
--- a/amqp-rpc/amqp-rpc.d.ts
+++ b/amqp-rpc/amqp-rpc.d.ts
@@ -5,60 +5,60 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "amqp-rpc" {
 
-  export interface Options {
+
+export interface Options {
     connection?: any;
     url?: string;
     exchangeInstance?: any;
     exchange?: string;
     exchange_options?: {
-      exclusive?: boolean;
-      autoDelete?: boolean;
+        exclusive?: boolean;
+        autoDelete?: boolean;
     };
     ipml_options?: {
-      defaultExchangeName?: string;
+        defaultExchangeName?: string;
     }
     conn_options?: any;
-  }
+}
 
-  export interface CallOptions {
+export interface CallOptions {
     correlationId?: string;
     autoDeleteCallback?: any;
-  }
+}
 
-  export interface HandlerOptions {
+export interface HandlerOptions {
     queueName?: string;
     durable?: boolean;
     exclusive?: boolean;
     autoDelete?: boolean;
-  }
+}
 
-  export interface BroadcastOptions {
+export interface BroadcastOptions {
     ttl?: number;
     onResponse?: any;
     context?: any;
     onComplete?: any;
-  }
+}
 
-  export interface CommandInfo {
+export interface CommandInfo {
     cmd?: string;
     exchange?: string;
     contentType?: string;
     size?: number;
-  }
+}
 
-  export interface Callback {
+export interface Callback {
     (...args: any[]): void;
-  }
+}
 
-  export interface CallbackWithError {
+export interface CallbackWithError {
     (err: any, ...args: any[]): void;
-  }
+}
 
-  export function factory(opt?: Options): amqpRPC;
+declare export function factory(opt?: Options): amqpRPC;
 
-  export class amqpRPC {
+declare export class amqpRPC {
     constructor(opt?: Options);
     generateQueueName(type: string): string;
     disconnect(): void;
@@ -68,5 +68,4 @@ declare module "amqp-rpc" {
     callBroadcast<T>(cmd: string, params: T, options?: BroadcastOptions): void;
     onBroadcast<T>(cmd: string, cb?: (params?: T, cb?: CallbackWithError) => void, context?: any, options?: any): boolean;
     offBroadcast(cmd: string): boolean;
-  }
 }
diff --git a/ansi-styles/ansi-styles.d.ts b/ansi-styles/ansi-styles.d.ts
index e5c01c6a5a..2d853a0c49 100644
--- a/ansi-styles/ansi-styles.d.ts
+++ b/ansi-styles/ansi-styles.d.ts
@@ -4,39 +4,37 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare module "ansi-styles"
-{
-    export interface EscapeCodePair {
-        open: string;
-        close: string;
-    }
 
-    export var reset: EscapeCodePair;
+export interface EscapeCodePair {
+    open: string;
+    close: string;
+}
 
-    export var bold: EscapeCodePair;
-    export var dim: EscapeCodePair;
-    export var italic: EscapeCodePair;
-    export var underline: EscapeCodePair;
-    export var inverse: EscapeCodePair;
-    export var hidden: EscapeCodePair;
-    export var strikethrough: EscapeCodePair;
+declare export var reset: EscapeCodePair;
 
-    export var black: EscapeCodePair;
-    export var red: EscapeCodePair;
-    export var green: EscapeCodePair;
-    export var yellow: EscapeCodePair;
-    export var blue: EscapeCodePair;
-    export var magenta: EscapeCodePair;
-    export var cyan: EscapeCodePair;
-    export var white: EscapeCodePair;
-    export var gray: EscapeCodePair;
+declare export var bold: EscapeCodePair;
+declare export var dim: EscapeCodePair;
+declare export var italic: EscapeCodePair;
+declare export var underline: EscapeCodePair;
+declare export var inverse: EscapeCodePair;
+declare export var hidden: EscapeCodePair;
+declare export var strikethrough: EscapeCodePair;
 
-    export var bgBlack: EscapeCodePair;
-    export var bgRed: EscapeCodePair;
-    export var bgGreen: EscapeCodePair;
-    export var bgYellow: EscapeCodePair;
-    export var bgBlue: EscapeCodePair;
-    export var bgMagenta: EscapeCodePair;
-    export var bgCyan: EscapeCodePair;
-    export var bgWhite: EscapeCodePair;
-}
\ No newline at end of file
+declare export var black: EscapeCodePair;
+declare export var red: EscapeCodePair;
+declare export var green: EscapeCodePair;
+declare export var yellow: EscapeCodePair;
+declare export var blue: EscapeCodePair;
+declare export var magenta: EscapeCodePair;
+declare export var cyan: EscapeCodePair;
+declare export var white: EscapeCodePair;
+declare export var gray: EscapeCodePair;
+
+declare export var bgBlack: EscapeCodePair;
+declare export var bgRed: EscapeCodePair;
+declare export var bgGreen: EscapeCodePair;
+declare export var bgYellow: EscapeCodePair;
+declare export var bgBlue: EscapeCodePair;
+declare export var bgMagenta: EscapeCodePair;
+declare export var bgCyan: EscapeCodePair;
+declare export var bgWhite: EscapeCodePair;
diff --git a/ansicolors/ansicolors.d.ts b/ansicolors/ansicolors.d.ts
index 2bbfcafc6e..6750283895 100644
--- a/ansicolors/ansicolors.d.ts
+++ b/ansicolors/ansicolors.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: rogierschouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "ansicolors" {
-	var colors: {[index: string]: (s: string) => string;};
-	export = colors;
-}
+
+declare var colors: { [index: string]: (s: string) => string; };
+export = colors;
diff --git a/any-db-transaction/any-db-transaction.d.ts b/any-db-transaction/any-db-transaction.d.ts
index 675f18e9cc..0a94e7a634 100644
--- a/any-db-transaction/any-db-transaction.d.ts
+++ b/any-db-transaction/any-db-transaction.d.ts
@@ -6,89 +6,85 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../any-db/any-db.d.ts" />
 
-declare module "any-db-transaction" {
-    import anyDB = require("any-db");
 
-	namespace begin {
-		/**
-		 * Transaction objects are are simple wrappers around a Connection that also implement the Queryable API,
-		 * but guarantee that all queries take place within a single database transaction or not at all. Note that
-		 * begin also understands how to acquire (and release) a connection from a ConnectionPool as well, so you
-		 * can simply pass a pool to it: var tx = begin(pool)
-		 *
-		 * By default, any queries that error during a transaction will cause an automatic rollback. If a query has
-		 * no callback, the transaction will also handle (and re-emit) 'error' events for the Query instance.
-		 * This enables handling errors for an entire transaction in a single place.
-		 *
-		 * Transactions may also be nested by passing a Transaction to begin and these nested transactions can
-		 * safely error and rollback without rolling back their parent transaction
-		 *
-		 * Transaction events:
-		 * 'query', query - emitted immediately after .query is called on a connection via tx.query. The argument is a query object.
-		 * 'commit:start' - Emitted when .commit() is called.
-		 * 'commit:complete' - Emitted after the transaction has committed.
-		 * 'rollback:start' - Emitted when .rollback() is called.
-		 * 'rollback:complete' - Emitted after the transaction has rolled back.
-		 * 'close' - Emitted after rollback or commit completes.
-		 * 'error', err - Emitted under three conditions:
-		 * There was an error acquiring a connection.
-		 * Any query performed in this transaction emits an error that would otherwise go unhandled.
-		 * Any of query, begin, commit, or rollback are called after the connection has already been committed or rolled back.
-		 * Note that the 'error' event may be emitted multiple times! depending on the callback you are registering, you way want to wrap it using [once][].
-		 */
-		interface Transaction extends anyDB.Queryable {
+import anyDB = require("any-db");
 
-			/**
-			 * Issue a COMMIT (or RELEASE ... in the case of nested transactions) statement to the database.
-			 * If a continuation is provided it will be called (possibly with an error) after the COMMIT
-			 * statement completes. The transaction object itself will be unusable after calling commit().
-			 */
-			commit(callback?: (error: Error) => void): void;
+declare namespace begin {
+    /**
+     * Transaction objects are are simple wrappers around a Connection that also implement the Queryable API,
+     * but guarantee that all queries take place within a single database transaction or not at all. Note that
+     * begin also understands how to acquire (and release) a connection from a ConnectionPool as well, so you
+     * can simply pass a pool to it: var tx = begin(pool)
+     *
+     * By default, any queries that error during a transaction will cause an automatic rollback. If a query has
+     * no callback, the transaction will also handle (and re-emit) 'error' events for the Query instance.
+     * This enables handling errors for an entire transaction in a single place.
+     *
+     * Transactions may also be nested by passing a Transaction to begin and these nested transactions can
+     * safely error and rollback without rolling back their parent transaction
+     *
+     * Transaction events:
+     * 'query', query - emitted immediately after .query is called on a connection via tx.query. The argument is a query object.
+     * 'commit:start' - Emitted when .commit() is called.
+     * 'commit:complete' - Emitted after the transaction has committed.
+     * 'rollback:start' - Emitted when .rollback() is called.
+     * 'rollback:complete' - Emitted after the transaction has rolled back.
+     * 'close' - Emitted after rollback or commit completes.
+     * 'error', err - Emitted under three conditions:
+     * There was an error acquiring a connection.
+     * Any query performed in this transaction emits an error that would otherwise go unhandled.
+     * Any of query, begin, commit, or rollback are called after the connection has already been committed or rolled back.
+     * Note that the 'error' event may be emitted multiple times! depending on the callback you are registering, you way want to wrap it using [once][].
+     */
+    interface Transaction extends anyDB.Queryable {
 
-			/**
-			 * The same as Transaction.commit but issues a ROLLBACK. Again, the transaction will be unusable after calling this method.
-			 */
-			rollback(callback?: (error: Error) => void): void;
-		}
+        /**
+         * Issue a COMMIT (or RELEASE ... in the case of nested transactions) statement to the database.
+         * If a continuation is provided it will be called (possibly with an error) after the COMMIT
+         * statement completes. The transaction object itself will be unusable after calling commit().
+         */
+        commit(callback?: (error: Error) => void): void;
 
-		interface TransactionOptions {
-			/**
-			 * Adapter name e.g. 'mysql'
-			 */
-			adapter?: anyDB.Adapter;
-			/**
-			 * SQL statement for beginning a transaction, default 'BEGIN'
-			 */
-			begin?: string;
-			/**
-			 * SQL statement for committing a transaction, default 'COMMIT'
-			 */
-			commit?: string;
-			/**
-			 * SQL statement for rolling back a transaction, default 'ROLLBACK'
-			 */
-			rollback?: string;
-			/**
-			 * Callback for transaction
-			 */
-			callback?: (error: Error, transaction: Transaction) => void;
-			/**
-			 * Rollback automatically on error, default true
-			 */
-			autoRollback?: boolean;
-		}
-	}
+        /**
+         * The same as Transaction.commit but issues a ROLLBACK. Again, the transaction will be unusable after calling this method.
+         */
+        rollback(callback?: (error: Error) => void): void;
+    }
 
-	/**
-	 * Start a transaction
-	 */
-	function begin(q: anyDB.Queryable, options?: begin.TransactionOptions, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
-	function begin(q: anyDB.Queryable, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
-	function begin(q: anyDB.Queryable, beginStatement?: string, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
-	function begin(q: anyDB.Queryable, options?: begin.TransactionOptions, beginStatement?: string, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
-
-	export = begin;
+    interface TransactionOptions {
+        /**
+         * Adapter name e.g. 'mysql'
+         */
+        adapter?: anyDB.Adapter;
+        /**
+         * SQL statement for beginning a transaction, default 'BEGIN'
+         */
+        begin?: string;
+        /**
+         * SQL statement for committing a transaction, default 'COMMIT'
+         */
+        commit?: string;
+        /**
+         * SQL statement for rolling back a transaction, default 'ROLLBACK'
+         */
+        rollback?: string;
+        /**
+         * Callback for transaction
+         */
+        callback?: (error: Error, transaction: Transaction) => void;
+        /**
+         * Rollback automatically on error, default true
+         */
+        autoRollback?: boolean;
+    }
 }
 
+/**
+ * Start a transaction
+ */
+declare function begin(q: anyDB.Queryable, options?: begin.TransactionOptions, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
+declare function begin(q: anyDB.Queryable, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
+declare function begin(q: anyDB.Queryable, beginStatement?: string, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
+declare function begin(q: anyDB.Queryable, options?: begin.TransactionOptions, beginStatement?: string, callback?: (error: Error, transaction: begin.Transaction) => void): begin.Transaction;
 
-
+export = begin;
diff --git a/any-db/any-db.d.ts b/any-db/any-db.d.ts
index 8a64b6f323..5d6f665f57 100644
--- a/any-db/any-db.d.ts
+++ b/any-db/any-db.d.ts
@@ -5,299 +5,297 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "any-db" {
-    import events = require("events");
-	import stream = require("stream");
 
-	export interface ConnectOpts {
-		adapter: string;
-	}
-
-	export interface Adapter {
-		name: string;
-		/**
-		 * Create a new connection object. In common usage, config will be created by parse-db-url and passed to the adapter by any-db.
-		 * If a continuation is given, it must be called, either with an error or the established connection.
-		 */
-		createConnection(opts: ConnectOpts, callback?: (error: Error, result: Connection) => void): Connection;
-
-		/**
-		 * Create a Query that may eventually be executed later on by a Connection. While this function is rarely needed by user code,
-		 * it makes it possible for ConnectionPool.query and Transaction.query to fulfill the Queryable.query contract
-		 * by synchronously returning a Query stream
-		 */
-		createQuery(text: string, params?: any[], callback?: (error: Error, result: ResultSet) => void): Query;
-		createQuery(query: Query): Query;
-	}
-	/**
-	 * Other properties are driver specific
-	 */
-	export interface Field {
-		name: string;
-	}
-
-	/**
-	 * ResultSet objects are just plain data that collect results of a query when a continuation
-	 * is provided to Queryable.query. The lastInsertId is optional, and currently supported by
-	 * sqlite3 and mysql but not postgres, because it is not supported by Postgres itself.
-	 */
-	export interface ResultSet {
-		/**
-		 * Affected rows. Note e.g. for INSERT queries the rows property is not filled even
-		 * though rowCount is non-zero.
-		 */
-		rowCount: number;
-		/**
-		 * Result rows
-		 */
-		rows: any[];
-		/**
-		 * Result field descriptions
-		 */
-		fields: Field[];
-
-		/**
-		 * Not supported by all drivers.
-		 */
-		fieldCount?: number;
-		/**
-		 * Not supported by all drivers.
-		 */
-		lastInsertId?: any;
-		/**
-		 * Not supported by all drivers.
-		 */
-		affectedRows?: number;
-		/**
-		 * Not supported by all drivers.
-		 */
-		changedRows?: number;
-	}
-
-	/**
-	 * Query objects are returned by the Queryable.query method, available on connections,
-	 * pools, and transactions. Queries are instances of Readable, and as such can be piped
-	 * through transforms and support backpressure for more efficient memory-usage on very
-	 * large results sets. (Note: at this time the sqlite3 driver does not support backpressure)
-	 *
-	 * Internally, Query instances are created by a database Adapter and may have more methods,
-	 * properties, and events than are described here. Consult the documentation for your
-	 * specific adapter to find out about any extensions.
-	 *
-	 * Events:
-	 *
-	 * Error event
-	 * The 'error' event is emitted at most once per query. Note that this event will be
-	 * emitted for errors even if a callback was provided, the callback will
-	 * simply be subscribed to the 'error' event.
-	 * One argument is passed to event listeners:
-	 * error - the error object.
-	 *
-	 * Fields event
-	 * A 'fields' event is emmitted before any 'data' events.
-	 * One argument is passed to event listeners:
-	 * fields - an array of [Field][ResultSet] objects.
-	 *
-	 * The following events are part of the stream.Readable interface which is implemented by Query:
-	 *
-	 * Data event
-	 * A 'data' event is emitted for each row in the query result set.
-	 * One argument is passed to event listeners:
-	 * row contains the contents of a single row in the query result
-	 *
-	 * Close event
-	 * A 'close' event is emitted when the query completes.
-	 * No arguments are passed to event listeners.
-	 *
-	 * End event
-	 * An 'end' event is emitted after all query results have been consumed.
-	 * No arguments are passed to event listeners.
-	 */
-	export interface Query extends stream.Readable {
-		/**
-		 * The SQL query as a string. If you are using MySQL this will contain
-		 * interpolated values after the query has been enqueued by a connection.
-		 */
-		text: string;
-
-		/**
-		 * The array of parameter values.
-		 */
-		values: any[];
-
-		/**
-		 * The callback (if any) that was provided to Queryable.query. Note that
-		 * Query objects must not use a closed over reference to their callback,
-		 * as other any-db libraries may rely on modifying the callback property
-		 * of a Query they did not create.
-		 */
-		callback: (error: Error, results: ResultSet) => void;
-	}
-
-	/**
-	 * Events:
-	 * The 'query' event is emitted immediately before a query is executed. One argument is passed to event handlers:
-	 * - query:	a Query object
-	 */
-	export interface Queryable extends events.EventEmitter {
-		/**
-		 * The Adapter instance that will be used by this Queryable for creating Query instances and/or connections.
-		 */
-		adapter:  Adapter;
-
-		/**
-		 * Execute a SQL statement using bound parameters (if they are provided) and return a Query object
-		 * that is a Readable stream of the resulting rows. If a Continuation<ResultSet> is provided the rows
-		 * returned by the database will be aggregated into a [ResultSet][] which will be passed to the
-		 * continuation after the query has completed.
-		 * The second form is not needed for normal use, but must be implemented by adapters to work correctly
-		 * with ConnectionPool and Transaction. See Adapter.createQuery for more details.
-		 */
-		query(text: string, params?: any[], callback?: (error: Error, results: ResultSet) => void): Query
-
-		/**
-		 * The second form is not needed for normal use, but must be implemented by adapters to work correctly
-		 * with ConnectionPool and Transaction. See Adapter.createQuery for more details.
-		 */
-		// query(query: Query): Query;
-	}
-
-	/**
-	 * Connection objects are obtained using createConnection from Any-DB or ConnectionPool.acquire,
-	 * both of which delegate to the createConnection implementation of the specified adapter.
-	 * While all Connection objects implement the Queryable interface, the implementations in
-	 * each adapter may add additional methods or emit additional events. If you need to access a
-	 * feature of your database that is not  described here (such as Postgres' server-side prepared
-	 * statements), consult the documentation for your adapter.
-	 *
-	 * Events:
-	 * Error event
-	 * The 'error' event is emitted when there is a connection-level error.
-	 * No arguments are passed to event listeners.
-	 *
-	 * Open event
-	 * The 'open' event is emitted when the connection has been established and is ready to query.
-	 * No arguments are passed to event listeners.
-	 *
-	 * Close event
-	 * The 'close' event is emitted when the connection has been closed.
-	 * No arguments are passed to event listeners.
-	 */
-	export interface Connection extends Queryable {
-		/**
-		 * Close the database connection. If a continuation is provided it
-		 * will be called after the connection has closed.
-		 */
-		end(callback?: (error: Error) => void): void;
-	}
-
-	export interface ConnectionStatic {
-		new(): Connection;
-
-		name: string;
-		createConnection(): void;
-		createPool(): void;
-	}
-
-	/**
-	 * ConnectionPool events
-	 * 'acquire' - emitted whenever pool.acquire is called
-	 * 'release' - emitted whenever pool.release is called
-	 * 'query', query - emitted immediately after .query is called on a
-	 * 		connection via pool.query. The argument is a Query object.
-	 * 'close' - emitted when the connection pool has closed all of it
-	 * 		connections after a call to close().
-	 */
-	export interface ConnectionPool extends Queryable {
-		/**
-		 * Implements Queryable.query by automatically acquiring a connection
-		 * and releasing it when the query completes.
-		 */
-		query(text: string, params?: any[], callback?: (error: Error, results: ResultSet) => void): Query;
-
-		/**
-		 * Remove a connection from the pool. If you use this method you must
-		 * return the connection back to the pool using ConnectionPool.release
-		 */
-		acquire(callback: (error: Error, result: Connection) => void): void;
-
-		/**
-		 * Return a connection to the pool. This should only be called with connections
-		 * you've manually acquired. You must not continue to use the connection after releasing it.
-		 */
-		release(connection: Connection): void;
-
-		/**
-		 * Stop giving out new connections, and close all existing database connections as they
-		 * are returned to the pool.
-		 */
-		close(callback?: (error: Error) => void): void;
-	}
-
-	/**
-	 * A PoolConfig is generally a plain object with any of the following properties (they are all optional):
-	 */
-	export interface PoolConfig {
-		/**
-		 * min (default 0) The minimum number of connections to keep open in the pool.
-		 */
-		min?: number;
-		/**
-		 * max (default 10) The maximum number of connections to keep open in the pool.
-		 * When this limit is reached further requests for connections will queue waiting
-		 * for an existing connection to be released back into the pool.
-		 */
-		max?: number;
-		/**
-		 * (default 30000) The maximum amount of time a connection can sit idle in the pool before being reaped
-		 */
-		idleTimeout?: number;
-		/**
-		 *  (default 1000) How frequently the pool should check for connections that are old enough to be reaped.
-		 */
-		reapInterval?: number;
-		/**
-		 * (default true) When this is true, the pool will reap connections that
-		 * have been idle for more than idleTimeout milliseconds.
-		 */
-		refreshIdle?: boolean;
-		/**
-		 * Called immediately after a connection is first established. Use this to do one-time setup of new connections.
-		 * The supplied Connection will not be added to the pool until you pass it to the done continuation.
-		 */
-		onConnect?: (connection: Connection, ready: (error: Error, result: Connection) => void) => void;
-		/**
-		 * Called each time a connection is returned to the pool. Use this to restore a connection to
-		 * it's original state (e.g. rollback transactions, set the database session vars). If reset
-		 * fails to call the done continuation the connection will be lost in limbo.
-		 */
-		reset?: (connection: Connection, done: (error: Error) => void) => void;
-		/**
-		 * (default function (err) { return true }) - Called when an error is encountered
-		 * by pool.query or emitted by an idle connection. If shouldDestroyConnection(error)
-		 * is truthy the connection will be destroyed, otherwise it will be reset.
-		 */
-		shouldDestroyConnection?: (error: Error) => boolean;
-	}
-
-	/**
-	 * Create a database connection.
-	 * @param url	String of the form adapter://user:password@host/database
-	 * @param callback
-	 * @returns	Connection object.
-	 */
-	export function createConnection(url: string, callback?: (error: Error, connection: Connection) => void): Connection;
-
-	/**
-	 * Create a database connection.
-	 * @param opts	Object with adapter name and any properties that the given adapter requires
-	 * @param callback
-	 * @returns	Connection object.
-	 */
-	export function createConnection(opts: ConnectOpts, callback?: (error: Error, connection: Connection) => void): Connection;
-
-
-	export function createPool(url: string, config: PoolConfig): ConnectionPool;
-	export function createPool(opts: ConnectOpts, config: PoolConfig): ConnectionPool;
+import events = require("events");
+import stream = require("stream");
 
+export interface ConnectOpts {
+    adapter: string;
 }
+
+export interface Adapter {
+    name: string;
+    /**
+     * Create a new connection object. In common usage, config will be created by parse-db-url and passed to the adapter by any-db.
+     * If a continuation is given, it must be called, either with an error or the established connection.
+     */
+    createConnection(opts: ConnectOpts, callback?: (error: Error, result: Connection) => void): Connection;
+
+    /**
+     * Create a Query that may eventually be executed later on by a Connection. While this function is rarely needed by user code,
+     * it makes it possible for ConnectionPool.query and Transaction.query to fulfill the Queryable.query contract
+     * by synchronously returning a Query stream
+     */
+    createQuery(text: string, params?: any[], callback?: (error: Error, result: ResultSet) => void): Query;
+    createQuery(query: Query): Query;
+}
+/**
+ * Other properties are driver specific
+ */
+export interface Field {
+    name: string;
+}
+
+/**
+ * ResultSet objects are just plain data that collect results of a query when a continuation
+ * is provided to Queryable.query. The lastInsertId is optional, and currently supported by
+ * sqlite3 and mysql but not postgres, because it is not supported by Postgres itself.
+ */
+export interface ResultSet {
+    /**
+     * Affected rows. Note e.g. for INSERT queries the rows property is not filled even
+     * though rowCount is non-zero.
+     */
+    rowCount: number;
+    /**
+     * Result rows
+     */
+    rows: any[];
+    /**
+     * Result field descriptions
+     */
+    fields: Field[];
+
+    /**
+     * Not supported by all drivers.
+     */
+    fieldCount?: number;
+    /**
+     * Not supported by all drivers.
+     */
+    lastInsertId?: any;
+    /**
+     * Not supported by all drivers.
+     */
+    affectedRows?: number;
+    /**
+     * Not supported by all drivers.
+     */
+    changedRows?: number;
+}
+
+/**
+ * Query objects are returned by the Queryable.query method, available on connections,
+ * pools, and transactions. Queries are instances of Readable, and as such can be piped
+ * through transforms and support backpressure for more efficient memory-usage on very
+ * large results sets. (Note: at this time the sqlite3 driver does not support backpressure)
+ *
+ * Internally, Query instances are created by a database Adapter and may have more methods,
+ * properties, and events than are described here. Consult the documentation for your
+ * specific adapter to find out about any extensions.
+ *
+ * Events:
+ *
+ * Error event
+ * The 'error' event is emitted at most once per query. Note that this event will be
+ * emitted for errors even if a callback was provided, the callback will
+ * simply be subscribed to the 'error' event.
+ * One argument is passed to event listeners:
+ * error - the error object.
+ *
+ * Fields event
+ * A 'fields' event is emmitted before any 'data' events.
+ * One argument is passed to event listeners:
+ * fields - an array of [Field][ResultSet] objects.
+ *
+ * The following events are part of the stream.Readable interface which is implemented by Query:
+ *
+ * Data event
+ * A 'data' event is emitted for each row in the query result set.
+ * One argument is passed to event listeners:
+ * row contains the contents of a single row in the query result
+ *
+ * Close event
+ * A 'close' event is emitted when the query completes.
+ * No arguments are passed to event listeners.
+ *
+ * End event
+ * An 'end' event is emitted after all query results have been consumed.
+ * No arguments are passed to event listeners.
+ */
+export interface Query extends stream.Readable {
+    /**
+     * The SQL query as a string. If you are using MySQL this will contain
+     * interpolated values after the query has been enqueued by a connection.
+     */
+    text: string;
+
+    /**
+     * The array of parameter values.
+     */
+    values: any[];
+
+    /**
+     * The callback (if any) that was provided to Queryable.query. Note that
+     * Query objects must not use a closed over reference to their callback,
+     * as other any-db libraries may rely on modifying the callback property
+     * of a Query they did not create.
+     */
+    callback: (error: Error, results: ResultSet) => void;
+}
+
+/**
+ * Events:
+ * The 'query' event is emitted immediately before a query is executed. One argument is passed to event handlers:
+ * - query:	a Query object
+ */
+export interface Queryable extends events.EventEmitter {
+    /**
+     * The Adapter instance that will be used by this Queryable for creating Query instances and/or connections.
+     */
+    adapter: Adapter;
+
+    /**
+     * Execute a SQL statement using bound parameters (if they are provided) and return a Query object
+     * that is a Readable stream of the resulting rows. If a Continuation<ResultSet> is provided the rows
+     * returned by the database will be aggregated into a [ResultSet][] which will be passed to the
+     * continuation after the query has completed.
+     * The second form is not needed for normal use, but must be implemented by adapters to work correctly
+     * with ConnectionPool and Transaction. See Adapter.createQuery for more details.
+     */
+    query(text: string, params?: any[], callback?: (error: Error, results: ResultSet) => void): Query
+
+    /**
+     * The second form is not needed for normal use, but must be implemented by adapters to work correctly
+     * with ConnectionPool and Transaction. See Adapter.createQuery for more details.
+     */
+    // query(query: Query): Query;
+}
+
+/**
+ * Connection objects are obtained using createConnection from Any-DB or ConnectionPool.acquire,
+ * both of which delegate to the createConnection implementation of the specified adapter.
+ * While all Connection objects implement the Queryable interface, the implementations in
+ * each adapter may add additional methods or emit additional events. If you need to access a
+ * feature of your database that is not  described here (such as Postgres' server-side prepared
+ * statements), consult the documentation for your adapter.
+ *
+ * Events:
+ * Error event
+ * The 'error' event is emitted when there is a connection-level error.
+ * No arguments are passed to event listeners.
+ *
+ * Open event
+ * The 'open' event is emitted when the connection has been established and is ready to query.
+ * No arguments are passed to event listeners.
+ *
+ * Close event
+ * The 'close' event is emitted when the connection has been closed.
+ * No arguments are passed to event listeners.
+ */
+export interface Connection extends Queryable {
+    /**
+     * Close the database connection. If a continuation is provided it
+     * will be called after the connection has closed.
+     */
+    end(callback?: (error: Error) => void): void;
+}
+
+export interface ConnectionStatic {
+    new (): Connection;
+
+    name: string;
+    createConnection(): void;
+    createPool(): void;
+}
+
+/**
+ * ConnectionPool events
+ * 'acquire' - emitted whenever pool.acquire is called
+ * 'release' - emitted whenever pool.release is called
+ * 'query', query - emitted immediately after .query is called on a
+ * 		connection via pool.query. The argument is a Query object.
+ * 'close' - emitted when the connection pool has closed all of it
+ * 		connections after a call to close().
+ */
+export interface ConnectionPool extends Queryable {
+    /**
+     * Implements Queryable.query by automatically acquiring a connection
+     * and releasing it when the query completes.
+     */
+    query(text: string, params?: any[], callback?: (error: Error, results: ResultSet) => void): Query;
+
+    /**
+     * Remove a connection from the pool. If you use this method you must
+     * return the connection back to the pool using ConnectionPool.release
+     */
+    acquire(callback: (error: Error, result: Connection) => void): void;
+
+    /**
+     * Return a connection to the pool. This should only be called with connections
+     * you've manually acquired. You must not continue to use the connection after releasing it.
+     */
+    release(connection: Connection): void;
+
+    /**
+     * Stop giving out new connections, and close all existing database connections as they
+     * are returned to the pool.
+     */
+    close(callback?: (error: Error) => void): void;
+}
+
+/**
+ * A PoolConfig is generally a plain object with any of the following properties (they are all optional):
+ */
+export interface PoolConfig {
+    /**
+     * min (default 0) The minimum number of connections to keep open in the pool.
+     */
+    min?: number;
+    /**
+     * max (default 10) The maximum number of connections to keep open in the pool.
+     * When this limit is reached further requests for connections will queue waiting
+     * for an existing connection to be released back into the pool.
+     */
+    max?: number;
+    /**
+     * (default 30000) The maximum amount of time a connection can sit idle in the pool before being reaped
+     */
+    idleTimeout?: number;
+    /**
+     *  (default 1000) How frequently the pool should check for connections that are old enough to be reaped.
+     */
+    reapInterval?: number;
+    /**
+     * (default true) When this is true, the pool will reap connections that
+     * have been idle for more than idleTimeout milliseconds.
+     */
+    refreshIdle?: boolean;
+    /**
+     * Called immediately after a connection is first established. Use this to do one-time setup of new connections.
+     * The supplied Connection will not be added to the pool until you pass it to the done continuation.
+     */
+    onConnect?: (connection: Connection, ready: (error: Error, result: Connection) => void) => void;
+    /**
+     * Called each time a connection is returned to the pool. Use this to restore a connection to
+     * it's original state (e.g. rollback transactions, set the database session vars). If reset
+     * fails to call the done continuation the connection will be lost in limbo.
+     */
+    reset?: (connection: Connection, done: (error: Error) => void) => void;
+    /**
+     * (default function (err) { return true }) - Called when an error is encountered
+     * by pool.query or emitted by an idle connection. If shouldDestroyConnection(error)
+     * is truthy the connection will be destroyed, otherwise it will be reset.
+     */
+    shouldDestroyConnection?: (error: Error) => boolean;
+}
+
+/**
+ * Create a database connection.
+ * @param url	String of the form adapter://user:password@host/database
+ * @param callback
+ * @returns	Connection object.
+ */
+declare export function createConnection(url: string, callback?: (error: Error, connection: Connection) => void): Connection;
+
+/**
+ * Create a database connection.
+ * @param opts	Object with adapter name and any properties that the given adapter requires
+ * @param callback
+ * @returns	Connection object.
+ */
+declare export function createConnection(opts: ConnectOpts, callback?: (error: Error, connection: Connection) => void): Connection;
+
+
+declare export function createPool(url: string, config: PoolConfig): ConnectionPool;
+declare export function createPool(opts: ConnectOpts, config: PoolConfig): ConnectionPool;
diff --git a/anydb-sql-migrations/anydb-sql-migrations.d.ts b/anydb-sql-migrations/anydb-sql-migrations.d.ts
index 9ab421c3ac..a6f3f36be0 100644
--- a/anydb-sql-migrations/anydb-sql-migrations.d.ts
+++ b/anydb-sql-migrations/anydb-sql-migrations.d.ts
@@ -6,29 +6,28 @@
 /// <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path="../anydb-sql/anydb-sql.d.ts" />
 
-declare module "anydb-sql-migrations" {
-    import Promise = require('bluebird');
-    import { Column, Table, Transaction, AnydbSql } from 'anydb-sql';
-    export interface Migration {
-        version: string;
-    }
-    export interface MigrationsTable extends Table<Migration> {
-        version: Column<string>;
-    }
-    export interface MigFn {
-        (tx: Transaction): Promise<any>;
-    }
-    export interface MigrationTask {
-        up: MigFn;
-        down: MigFn;
-        name: string;
-    }
-    export function create(db: AnydbSql, tasks: any): {
-        run: () => Promise<any>;
-        migrateTo: (target?: string) => Promise<any>;
-        check: (f: (m: {
-            type: string;
-            items: MigrationTask[];
-        }) => any) => Promise<any>;
-    };
-}
\ No newline at end of file
+
+import Promise = require('bluebird');
+import { Column, Table, Transaction, AnydbSql } from 'anydb-sql';
+export interface Migration {
+    version: string;
+}
+export interface MigrationsTable extends Table<Migration> {
+    version: Column<string>;
+}
+export interface MigFn {
+    (tx: Transaction): Promise<any>;
+}
+export interface MigrationTask {
+    up: MigFn;
+    down: MigFn;
+    name: string;
+}
+declare export function create(db: AnydbSql, tasks: any): {
+    run: () => Promise<any>;
+    migrateTo: (target?: string) => Promise<any>;
+    check: (f: (m: {
+        type: string;
+        items: MigrationTask[];
+    }) => any) => Promise<any>;
+};
diff --git a/anydb-sql/anydb-sql.d.ts b/anydb-sql/anydb-sql.d.ts
index 6b5f0b2cd6..367ade6ff9 100644
--- a/anydb-sql/anydb-sql.d.ts
+++ b/anydb-sql/anydb-sql.d.ts
@@ -3,188 +3,191 @@
 // Definitions by: Gorgi Kosev <https://github.com/spion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "anydb-sql" {
-    interface AnyDBPool extends anydbSQL.DatabaseConnection {
-        query:(text:string, values:any[], callback:(err:Error, result:any)=>void)=>void
-        begin:()=>anydbSQL.Transaction
-        close:(err:Error)=>void
-    }
 
-    interface Dictionary<T> { [key:string]:T; }
-
-    namespace anydbSQL {
-        export interface OrderByValueNode {}
-        export interface ColumnDefinition {
-            primaryKey?:boolean;
-            dataType?:string;
-            references?: {table:string; column: string}
-            notNull?:boolean
-        }
-
-        export interface TableDefinition {
-            name:string
-            columns:Dictionary<ColumnDefinition>
-            has?:Dictionary<{from:string; many?:boolean}>
-        }
-
-
-        export interface QueryLike {
-            query:string;
-            values: any[]
-            text:string
-        }
-        export interface DatabaseConnection {
-            queryAsync<T>(query:string, ...params:any[]):Promise<{rowCount:number;rows:T[]}>
-            queryAsync<T>(query:QueryLike):Promise<{rowCount:number;rows:T[]}>
-        }
-
-        export interface Transaction extends DatabaseConnection {
-            rollback():void
-            commitAsync():Promise<void>
-        }
-
-        export interface SubQuery<T> {
-            select(node:Column<T>):SubQuery<T>
-            where(...nodes:any[]):SubQuery<T>
-            from(table:TableNode):SubQuery<T>
-            group(...nodes:any[]):SubQuery<T>
-            order(criteria:OrderByValueNode):SubQuery<T>
-            notExists(subQuery:SubQuery<any>):SubQuery<T>
-        }
-
-        interface Executable<T> {
-            get():Promise<T>
-            getWithin(tx:DatabaseConnection):Promise<T>
-            exec():Promise<void>
-            all():Promise<T[]>
-            execWithin(tx:DatabaseConnection):Promise<void>
-            allWithin(tx:DatabaseConnection):Promise<T[]>
-            toQuery():QueryLike;
-        }
-
-        interface Queryable<T> {
-            where(...nodes:any[]):Query<T>
-            delete():ModifyingQuery
-            select<U>(...nodes:any[]):Query<U>
-            selectDeep<U>(table: Table<T>): Query<T>
-            selectDeep<U>(...nodesOrTables:any[]):Query<U>
-        }
-
-        export interface Query<T> extends Executable<T>, Queryable<T> {
-            from(table:TableNode):Query<T>
-            update(o:Dictionary<any>):ModifyingQuery
-            update(o:{}):ModifyingQuery
-            group(...nodes:any[]):Query<T>
-            order(...criteria:OrderByValueNode[]):Query<T>
-            limit(l:number):Query<T>
-            offset(o:number):Query<T>
-        }
-
-        export interface ModifyingQuery extends Executable<void> {
-            returning<U>(...nodes:any[]):Query<U>
-            where(...nodes:any[]):ModifyingQuery
-        }
-
-        export interface TableNode {
-            join(table:TableNode):JoinTableNode
-            leftJoin(table:TableNode):JoinTableNode
-        }
-
-        export interface JoinTableNode extends TableNode {
-            on(filter:BinaryNode):TableNode
-            on(filter:string):TableNode
-        }
-
-        interface CreateQuery extends Executable<void> {
-            ifNotExists():Executable<void>
-        }
-        interface DropQuery extends Executable<void> {
-            ifExists():Executable<void>
-        }
-        export interface Table<T> extends TableNode, Queryable<T> {
-            create():CreateQuery
-            drop():DropQuery
-            as(name:string):Table<T>
-            update(o:any):ModifyingQuery
-            insert(row:T):ModifyingQuery
-            insert(rows:T[]):ModifyingQuery
-            select():Query<T>
-            select<U>(...nodes:any[]):Query<U>
-            from<U>(table:TableNode):Query<U>
-            star():Column<any>
-            subQuery<U>():SubQuery<U>
-            eventEmitter:{emit:(type:string, ...args:any[])=>void
-                          on:(eventName:string, handler:Function)=>void}
-            columns:Column<any>[]
-            sql: SQL;
-            alter():AlterQuery<T>
-        }
-        export interface AlterQuery<T> extends Executable<void> {
-            addColumn(column:Column<any>): AlterQuery<T>;
-            addColumn(name: string, options:string): AlterQuery<T>;
-            dropColumn(column: Column<any>): AlterQuery<T>;
-            renameColumn(column: Column<any>, newColumn: Column<any>):AlterQuery<T>;
-            renameColumn(column: Column<any>, newName: string):AlterQuery<T>;
-            renameColumn(name: string, newName: string):AlterQuery<T>;
-            rename(newName: string): AlterQuery<T>
-        }
-
-        export interface SQL {
-            functions: {
-                LOWER(c:Column<string>):Column<string>
-            }
-        }
-
-        export interface BinaryNode {
-            and(node:BinaryNode):BinaryNode
-            or(node:BinaryNode):BinaryNode
-        }
-
-        export interface Column<T> {
-            in(arr:T[]):BinaryNode
-            in(subQuery:SubQuery<T>):BinaryNode
-            notIn(arr:T[]):BinaryNode
-            equals(node:any):BinaryNode
-            notEquals(node:any):BinaryNode
-            gte(node:any):BinaryNode
-            lte(node:any):BinaryNode
-            gt(node:any):BinaryNode
-            lt(node:any):BinaryNode
-            like(str:string):BinaryNode
-            multiply:{
-                (node:Column<T>):Column<T>
-                (n:number):Column<number>
-            }
-            isNull():BinaryNode
-            isNotNull():BinaryNode
-            sum():Column<number>
-            count():Column<number>
-            count(name:string):Column<number>
-            distinct():Column<T>
-            as(name:string):Column<T>
-            ascending:OrderByValueNode
-            descending:OrderByValueNode
-            asc:OrderByValueNode
-            desc:OrderByValueNode
-        }
-
-        export interface AnydbSql extends DatabaseConnection {
-            define<T>(map:TableDefinition):Table<T>;
-            transaction<T>(fn:(tx:Transaction)=>Promise<T>):Promise<T>
-            allOf(...tables:Table<any>[]):any
-            models:Dictionary<Table<any>>
-            functions:{LOWER:(name:Column<string>)=>Column<string>
-                       RTRIM:(name:Column<string>)=>Column<string>}
-            makeFunction(name:string):Function
-            begin():Transaction
-            open():void;
-            close():void;
-            getPool():AnyDBPool;
-            dialect():string;
-        }
-    }
-
-    function anydbSQL(config:Object):anydbSQL.AnydbSql;
-
-    export = anydbSQL;
+interface AnyDBPool extends anydbSQL.DatabaseConnection {
+    query: (text: string, values: any[], callback: (err: Error, result: any) => void) => void
+    begin: () => anydbSQL.Transaction
+    close: (err: Error) => void
 }
+
+interface Dictionary<T> { [key: string]: T; }
+
+declare namespace anydbSQL {
+    export interface OrderByValueNode { }
+    export interface ColumnDefinition {
+        primaryKey?: boolean;
+        dataType?: string;
+        references?: { table: string; column: string }
+        notNull?: boolean
+    }
+
+    export interface TableDefinition {
+        name: string
+        columns: Dictionary<ColumnDefinition>
+        has?: Dictionary<{ from: string; many?: boolean }>
+    }
+
+
+    export interface QueryLike {
+        query: string;
+        values: any[]
+        text: string
+    }
+    export interface DatabaseConnection {
+        queryAsync<T>(query: string, ...params: any[]): Promise<{ rowCount: number; rows: T[] }>
+        queryAsync<T>(query: QueryLike): Promise<{ rowCount: number; rows: T[] }>
+    }
+
+    export interface Transaction extends DatabaseConnection {
+        rollback(): void
+        commitAsync(): Promise<void>
+    }
+
+    export interface SubQuery<T> {
+        select(node: Column<T>): SubQuery<T>
+        where(...nodes: any[]): SubQuery<T>
+        from(table: TableNode): SubQuery<T>
+        group(...nodes: any[]): SubQuery<T>
+        order(criteria: OrderByValueNode): SubQuery<T>
+        notExists(subQuery: SubQuery<any>): SubQuery<T>
+    }
+
+    interface Executable<T> {
+        get(): Promise<T>
+        getWithin(tx: DatabaseConnection): Promise<T>
+        exec(): Promise<void>
+        all(): Promise<T[]>
+        execWithin(tx: DatabaseConnection): Promise<void>
+        allWithin(tx: DatabaseConnection): Promise<T[]>
+        toQuery(): QueryLike;
+    }
+
+    interface Queryable<T> {
+        where(...nodes: any[]): Query<T>
+        delete(): ModifyingQuery
+        select<U>(...nodes: any[]): Query<U>
+        selectDeep<U>(table: Table<T>): Query<T>
+        selectDeep<U>(...nodesOrTables: any[]): Query<U>
+    }
+
+    export interface Query<T> extends Executable<T>, Queryable<T> {
+        from(table: TableNode): Query<T>
+        update(o: Dictionary<any>): ModifyingQuery
+        update(o: {}): ModifyingQuery
+        group(...nodes: any[]): Query<T>
+        order(...criteria: OrderByValueNode[]): Query<T>
+        limit(l: number): Query<T>
+        offset(o: number): Query<T>
+    }
+
+    export interface ModifyingQuery extends Executable<void> {
+        returning<U>(...nodes: any[]): Query<U>
+        where(...nodes: any[]): ModifyingQuery
+    }
+
+    export interface TableNode {
+        join(table: TableNode): JoinTableNode
+        leftJoin(table: TableNode): JoinTableNode
+    }
+
+    export interface JoinTableNode extends TableNode {
+        on(filter: BinaryNode): TableNode
+        on(filter: string): TableNode
+    }
+
+    interface CreateQuery extends Executable<void> {
+        ifNotExists(): Executable<void>
+    }
+    interface DropQuery extends Executable<void> {
+        ifExists(): Executable<void>
+    }
+    export interface Table<T> extends TableNode, Queryable<T> {
+        create(): CreateQuery
+        drop(): DropQuery
+        as(name: string): Table<T>
+        update(o: any): ModifyingQuery
+        insert(row: T): ModifyingQuery
+        insert(rows: T[]): ModifyingQuery
+        select(): Query<T>
+        select<U>(...nodes: any[]): Query<U>
+        from<U>(table: TableNode): Query<U>
+        star(): Column<any>
+        subQuery<U>(): SubQuery<U>
+        eventEmitter: {
+            emit: (type: string, ...args: any[]) => void
+            on: (eventName: string, handler: Function) => void
+        }
+        columns: Column<any>[]
+        sql: SQL;
+        alter(): AlterQuery<T>
+    }
+    export interface AlterQuery<T> extends Executable<void> {
+        addColumn(column: Column<any>): AlterQuery<T>;
+        addColumn(name: string, options: string): AlterQuery<T>;
+        dropColumn(column: Column<any>): AlterQuery<T>;
+        renameColumn(column: Column<any>, newColumn: Column<any>): AlterQuery<T>;
+        renameColumn(column: Column<any>, newName: string): AlterQuery<T>;
+        renameColumn(name: string, newName: string): AlterQuery<T>;
+        rename(newName: string): AlterQuery<T>
+    }
+
+    export interface SQL {
+        functions: {
+            LOWER(c: Column<string>): Column<string>
+        }
+    }
+
+    export interface BinaryNode {
+        and(node: BinaryNode): BinaryNode
+        or(node: BinaryNode): BinaryNode
+    }
+
+    export interface Column<T> {
+        in(arr: T[]): BinaryNode
+        in(subQuery: SubQuery<T>): BinaryNode
+        notIn(arr: T[]): BinaryNode
+        equals(node: any): BinaryNode
+        notEquals(node: any): BinaryNode
+        gte(node: any): BinaryNode
+        lte(node: any): BinaryNode
+        gt(node: any): BinaryNode
+        lt(node: any): BinaryNode
+        like(str: string): BinaryNode
+        multiply: {
+            (node: Column<T>): Column<T>
+            (n: number): Column<number>
+        }
+        isNull(): BinaryNode
+        isNotNull(): BinaryNode
+        sum(): Column<number>
+        count(): Column<number>
+        count(name: string): Column<number>
+        distinct(): Column<T>
+        as(name: string): Column<T>
+        ascending: OrderByValueNode
+        descending: OrderByValueNode
+        asc: OrderByValueNode
+        desc: OrderByValueNode
+    }
+
+    export interface AnydbSql extends DatabaseConnection {
+        define<T>(map: TableDefinition): Table<T>;
+        transaction<T>(fn: (tx: Transaction) => Promise<T>): Promise<T>
+        allOf(...tables: Table<any>[]): any
+        models: Dictionary<Table<any>>
+        functions: {
+            LOWER: (name: Column<string>) => Column<string>
+            RTRIM: (name: Column<string>) => Column<string>
+        }
+        makeFunction(name: string): Function
+        begin(): Transaction
+        open(): void;
+        close(): void;
+        getPool(): AnyDBPool;
+        dialect(): string;
+    }
+}
+
+declare function anydbSQL(config: Object): anydbSQL.AnydbSql;
+
+export = anydbSQL;
diff --git a/api-error-handler/api-error-handler.d.ts b/api-error-handler/api-error-handler.d.ts
index 96fbb16b29..eceae9bb4b 100644
--- a/api-error-handler/api-error-handler.d.ts
+++ b/api-error-handler/api-error-handler.d.ts
@@ -5,26 +5,25 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module 'api-error-handler' {
-    import * as express from 'express';
 
-    namespace apiErrorHandler {
+import * as express from 'express';
 
-      // Body response: the JSON returned by api-error-handler
-      // See https://github.com/expressjs/api-error-handler/blob/1.0.0/index.js
-      interface Response {
-          status: number;
-          stack?: string;
-          message: string;
+declare namespace apiErrorHandler {
 
-          // Client errors
-          code?: any;
-          name?: string;
-          type?: any;
-      }
+    // Body response: the JSON returned by api-error-handler
+    // See https://github.com/expressjs/api-error-handler/blob/1.0.0/index.js
+    interface Response {
+        status: number;
+        stack?: string;
+        message: string;
+
+        // Client errors
+        code?: any;
+        name?: string;
+        type?: any;
     }
-
-    function apiErrorHandler(options?: any): express.ErrorRequestHandler;
-
-    export = apiErrorHandler;
 }
+
+declare function apiErrorHandler(options?: any): express.ErrorRequestHandler;
+
+export = apiErrorHandler;
diff --git a/apn/apn.d.ts b/apn/apn.d.ts
index cf11b13c0e..2c4d39d81b 100644
--- a/apn/apn.d.ts
+++ b/apn/apn.d.ts
@@ -4,361 +4,360 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 ///<reference path="../node/node.d.ts"/>
-declare module "apn" {
-	import events = require("events");
-	import net = require("net");
-	export interface ConnectionOptions {
-		/**
-		 * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
-		 */
-		cert?:string|Buffer;
-		/**
-		 * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
-		 */
-		key?:string|Buffer;
-		/**
-		 * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
-		 */
-		ca?:(string|Buffer)[];
-		/**
-		 * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will always be used instead of certificate and key above.
-		 */
-		pfx?:string|Buffer;
-		/**
-		 * The passphrase for the connection key, if required
-		 */
-		passphrase?:string;
-		/**
-		 * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
-		 */
-		production?:boolean;
-		/**
-		 * Enable when you are using a VoIP certificate to enable paylods up to 4096 bytes.
-		 */
-		voip?:boolean;
-		/**
-		 * Gateway port (Defaults to: `2195`)
-		 */
-		port?:number;
-		/**
-		 * Reject Unauthorized property to be passed through to tls.connect() (Defaults to `true`)
-		 */
-		rejectUnauthorized?:boolean;
-		/**
-		 * Number of notifications to cache for error purposes (See "Handling Errors" below, (Defaults to: `1000`)
-		 */
-		cacheLength?:number;
-		/**
-		 * Whether the cache should grow in response to messages being lost after errors. (Will still emit a 'cacheTooSmall' event) (Defaults to: `true`)
-		 */
-		autoAdjustCache?:boolean;
-		/**
-		 * The maximum number of connections to create for sending messages. (Defaults to: `1`)
-		 */
-		maxConnections?:number;
-		/**
-		 * The duration of time the module should wait, in milliseconds, when trying to establish a connection to Apple before failing. 0 = Disabled. {Defaults to: `10000`}
-		 */
-		connectTimeout?:number;
-		/**
-		 * The duration the socket should stay alive with no activity in milliseconds. 0 = Disabled. (Defaults to: `3600000` - 1h)
-		 */
-		connectionTimeout?:number;
-		/**
-		 * The maximum number of connection failures that will be tolerated before `apn` will "terminate". (Defaults to: 10)
-		 */
-		connectionRetryLimit?:number;
-		/**
-		 * Whether to buffer notifications and resend them after failure. (Defaults to: `true`)
-		 */
-		buffersNotifications?:number;
-		/**
-		 * Whether to aggresively empty the notification buffer while connected - if set to true node-apn may enter a tight loop under heavy load while delivering notifications. (Defaults to: `false`)
-		 */
-		fastMode?:boolean;
-	}
-	export class Connection extends events.EventEmitter {
-		constructor(options:ConnectionOptions);
-		/**
-		 * This is the business end of the module. Create a `Notification` object and pass it in, along with a single recipient or an array of them and node-apn will take care of the rest, delivering the notification to each recipient.
-		 * 
-		 * A "recipient" is either a `Device` object, a `String`, or a `Buffer` containing the device token. `Device` objects are used internally and will be created if necessary. Where applicable, all events will return a `Device` regardless of the type passed to this method.
-		 */
-		pushNotification(notification:Notification, recipient:Device|string|Buffer|(Device|string|Buffer)[]):void;
-		/**
-		 * Used to manually adjust the "cacheLength" property in the options. This is ideal if you choose to use the `cacheTooSmall` event to tweak your environment. It is safe for increasing and reducing cache size.
-		 */
-		setCacheLength(newLength:number):void;
-		/**
-		 * Indicate to node-apn that when the queue of pending notifications is fully drained that it should close all open connections. This will mean that if there are no other pending resources (open sockets, running timers, etc.) the application will terminate. If notifications are pushed after the connection has completely shutdown a new connection will be established and, if applicable, `shutdown` will need to be called again.
-		 */
-		shutdown():void;
-		/**
-		 * Emitted when an error occurs during initialisation of the module, usually due to a problem with the keys and certificates.
-		 */
-		on(event: "error", listener: (error:Error) => void):this;
-		/**
-		 * Emitted when the connection socket experiences an error. This may be useful for debugging but no action should be necessary.
-		 */
-		on(event: "socketError", listener: (error:Error) => void):this;
-		/**
-		 * Emitted when a notification has been sent to Apple - not a guarantee that it has been accepted by Apple, an error relating to it may occur later on. A notification may also be "transmitted" several times if a preceding notification caused an error requiring retransmission.
-		 */
-		on(event: "transmitted", listener: (notification:Notification, decive:Device) => void):this;
-		/**
-		 * Emitted when all pending notifications have been transmitted to Apple and the pending queue is empty. This may be called more than once if a notification error occurs and notifications must be re-sent.
-		 */
-		on(event: "completed", listener: () => void):this;
-		/**
-		 * Emitted when Apple returns a notification as invalid but the notification has already been expunged from the cache - usually due to high throughput and indicates that notifications will be getting lost. The parameter is an estimate of how many notifications have been lost. You should experiment with increasing the cache size or enabling ```autoAdjustCache``` if you see this frequently.
-		 * 
-		 * **Note**: With ```autoAdjustCache``` enabled this event will still be emitted when an adjustment is triggered.
-		 */
-		on(event: "cacheTooSmall", listener: (sizeDifference:number) => void):this;
-		/**
-		 * Emitted when a connection to Apple is successfully established. The parameter indicates the number of open connections. No action is required as the connection is managed internally.
-		 */
-		on(event: "connected", listener: (openSockets:net.Socket[]) => void):this;
-		/**
-		 * Emitted when the connection to Apple has been closed, this could be for numerous reasons, for example an error has occurred or the connection has timed out. The parameter is the same as for `connected` and again, no action is required.
-		 */
-		on(event: "disconnected", listener: (openSockets:net.Socket[]) => void):this;
-		/**
-		 * Emitted when the connectionTimeout option has been specified and no activity has occurred on a socket for a specified duration. The socket will be closed immediately after this event and a `disconnected` event will also be emitted.
-		 */
-		on(event: "timeout", listener: () => void):this;
-		/**
-		 * Emitted when a message has been received from Apple stating that a notification was invalid or if an internal error occurred before that notification could be pushed to Apple. If the notification is still in the cache it will be passed as the second argument, otherwise null. Where possible the associated `Device` object will be passed as a third parameter, however in cases where the token supplied to the module cannot be parsed into a `Buffer` the supplied value will be returned.
 
-		 * Error codes smaller than 512 correspond to those returned by Apple as per their [docs][errors]. Other errors are applicable to `node-apn` itself. Definitions can be found in `lib/errors.js`.
-		 */
-		on(event: "transmissionError", listener: (errorCode:number, notification:Notification, device:Device|Buffer) => void):this;
-		on(event: string, listener: Function):this;
-	}
-	export interface NotificationAlertOptions {
-		title?:string;
-		body:string;
-		"title-loc-key"?:string;
-		"title-loc-args"?:string[];
-		"action-loc-key"?:string;
-		"loc-key"?:string;
-		"loc-args"?:string[];
-		"launch-image"?:string;
-	}
-	export class Notification {
-		/**
-		 * The maximum number of retries which should be performed when sending a notification if an error occurs. A value of 0 will only allow one attempt at sending (0 retries). Set to -1 to disable (default).
-		 */
-		public retryLimit:number;
-		/**
-		 * The UNIX timestamp representing when the notification should expire. This does not contribute to the 2048 byte payload size limit. An expiry of 0 indicates that the notification expires immediately.
-		 */
-		public expiry:number;
-		/**
-		 * From Apple's Documentation, Provide one of the following values:
-		 * 
-		 * - 10 - The push message is sent immediately. (Default)
-		 *   > The push notification must trigger an alert, sound, or badge on the device. It is an error use this priority for a push that contains only the content-available key.
-		 * - 5 - The push message is sent at a time that conserves power on the device receiving it.
-		 */
-		public priority:number;
-		/**
-		 * The encoding to use when transmitting the notification to APNS, defaults to `utf8`. `utf16le` is also possible but as each character is represented by a minimum of 2 bytes, will at least halve the possible payload size. If in doubt leave as default.
-		 */
-		public encoding:string;
-		/**
-		 * This object represents the root JSON object that you can add custom information for your application to. The properties below will only be added to the payload (under `aps`) when the notification is prepared for sending.
-		 */
-		public payload:any;
-		/**
-		 * The value to specify for `payload.aps.badge`
-		 */
-		public badge:number;
-		/**
-		 * The value to specify for `payload.aps.sound`
-		 */
-		public sound:string;
-		/**
-		 * The value to specify for `payload.aps.alert` can be either a `String` or an `Object` as outlined by the payload documentation.
-		 */
-		public alert:string|NotificationAlertOptions;
-		/**
-		 * Setting this to true will specify "content-available" in the payload when it is compiled.
-		 */
-		public newsstandAvailable:boolean;
-		/**
-		 * Setting this to true will specify "content-available" in the payload when it is compiled.
-		 */
-		public contentAvailable:boolean;
-		/**
-		 * The value to specify for the `mdm` field where applicable.
-		 */
-		public mdm:string|Object;
-		/**
-		 * The value to specify for `payload.aps['url-args']`. This used for Safari Push NOtifications and should be an array of values in accordance with the Web Payload Documentation.
-		 */
-		public urlArgs:string[];
-		/**
-		 * When this parameter is set and `notification#trim()` is called it will attempt to truncate the string at the nearest space.
-		 */
-		public truncateAtWordEnd:boolean;
-		/**
-		 * You can optionally pass in an object representing the payload, or configure properties on the returned object.
-		 */
-		constructor(payload?:any);
-		/**
-		 * Set the `aps.alert` text body. This will use the most space-efficient means.
-		 */
-		setAlertText(alertText:string):Notification;
-		/**
-		 * Set the `title` property of the `aps.alert` object - used with Safari Push Notifications
-		 */
-		setAlertTitle(alertTitle:string):Notification;
-		/**
-		 * Set the `action` property of the `aps.alert` object - used with Safari Push Notifications
-		 */
-		setAlertAction(alertAction:string):Notification;
-		/**
-		 * Set the `action-loc-key` property of the `aps.alert` object.
-		 */
-		setActionLocKey(key:string):Notification;
-		/**
-		 * Set the `loc-key` property of the `aps.alert` object.
-		 */
-		setLocKey(key:string):Notification;
-		/**
-		 * Set the `loc-args` property of the `aps.alert` object.
-		 */
-		setLocArgs(args:string[]):Notification;
-		/**
-		 * Set the `launch-image` property of the `aps.alert` object.
-		 */
-		setLaunchImage(image:string):Notification;
-		/**
-		 * Set the `mdm` property on the payload.
-		 */
-		setMDM(mdm:string|Object):Notification;
-		/**
-		 * Set the `content-available` property of the `aps` object.
-		 */
-		setNewsstandAvailable(available:boolean):Notification;
-		/**
-		 * Set the `content-available` property of the `aps` object.
-		 */
-		setContentAvailable(available:boolean):Notification;
-		/**
-		 * Set the `url-args` property of the `aps` object.
-		 */
-		setUrlArgs(urlArgs:string[]):Notification;
-		/**
-		 * Attempt to automatically trim the notification alert text body to meet the payload size limit of 2048 bytes.
-		 */
-		trim():number;
-	}
-	export class Device {
-		public token:Buffer;
-		/**
-		 * `deviceToken` can be a `Buffer` or a `String` containing a "hex" representation of the token. Throws an error if the deviceToken supplied is invalid.
-		 */
-		constructor(deviceToken:string|Buffer);
-	}
-	
-	export interface FeedbackOptions {
-		/**
-		 * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
-		 */
-		cert?:string|Buffer;
-		/**
-		 * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
-		 */
-		key?:string|Buffer;
-		/**
-		 * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
-		 */
-		ca?:(string|Buffer)[];
-		/**
-		 * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will be used instead of certificate and key above.
-		 */
-		pfx?:string|Buffer;
-		/**
-		 * The passphrase for the connection key, if required
-		 */
-		passphrase?:string;
-		/**
-		 * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
-		 */
-		production?:boolean;
-		/**
-		 * Feedback server port (Defaults to: `2196`)
-		 */
-		port?:number;
-		/**
-		 * Sets the behaviour for triggering the `feedback` event. When `true` the event will be triggered once per connection with an array of timestamp and device token tuples. Otherwise a `feedback` event will be emitted once per token received. (Defaults to: true)
-		 */
-		batchFeedback?:boolean;
-		/**
-		 * The maximum number of tokens to pass when emitting the event - a value of 0 will cause all tokens to be passed after connection is reset. After this number of tokens are received the `feedback` event will be emitted. (Only applies when `batchFeedback` is enabled)
-		 */
-		batchSize?:number;
-		/**
-		 * How often to automatically poll the feedback service. Set to `0` to disable. (Defaults to: `3600`)
-		 */
-		interval?:number;
-	}
-	export interface FeedbackData {
-		time:number;
-		device:Device;
-	}
-	/**
-	 * Connection to the Apple Push Notification Feedback Service and if `interval` isn't disabled automatically begins polling the service. Many of the options are the same as `apn.Connection()`
-	 */
-	export class Feedback {
-		constructor(options:FeedbackOptions);
-		/**
-		 * Trigger a query of the feedback service. If `interval` is non-zero then this method will be called automatically.
-		 */
-		start():void;
-		/**
-		 * You can cancel the interval by calling `feedback.cancel()`. If you do not wish to have the service automatically queried then set `interval` to 0 and use `feedback.start()` to manually invoke it one time.
-		 */
-		cancel():void;
-		/**
-		 * Emitted when an error occurs initialising the module. Usually caused by failing to load the certificates.
-		 */
-		on(event: "error", listener: (error:Error) => void):Feedback;
-		/**
-		 * Emitted when an error occurs receiving or processing the feedback and in the case of a socket error occurring. These errors are usually informational and node-apn will automatically recover.
-		 */
-		on(event: "feedbackError", listener: (error:Error) => void):Feedback;
-		/**
-		 * Emitted when data has been received from the feedback service, typically once per connection. `feedbackData` is an array of objects, each containing the `time` returned by the server (epoch time) and the `device` a `Buffer` containing the device token.
-		 */
-		on(event: "feedback", listener: (feedbackData:FeedbackData[]) => void):Feedback;
-		on(event: string, listener: Function):Feedback;
-	}
-	
-	export enum Errors {
-		"noErrorsEncountered"= 0,
-		"processingError"= 1,
-		"missingDeviceToken"= 2,
-		"missingTopic"= 3,
-		"missingPayload"= 4,
-		"invalidTokenSize"= 5,
-		"invalidTopicSize"= 6,
-		"invalidPayloadSize"= 7,
-		"invalidToken"= 8,
-		"apnsShutdown"= 10,
-		"none"= 255,
-		"retryLimitExceeded"= 512,
-		"moduleInitialisationFailed"= 513,
-		"connectionRetryLimitExceeded"= 514, // When a connection is unable to be established. Usually because of a network / SSL error this will be emitted
-		"connectionTerminated"= 515
-	}
-	
-	//Lowercase aliases
-	export {Connection as connection};
-	export {Device as device};
-	export {Errors as error};
-	export {Feedback as feedback};
-	export {Notification as notification};
+import events = require("events");
+import net = require("net");
+export interface ConnectionOptions {
+    /**
+     * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
+     */
+    cert?: string | Buffer;
+    /**
+     * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
+     */
+    key?: string | Buffer;
+    /**
+     * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
+     */
+    ca?: (string | Buffer)[];
+    /**
+     * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will always be used instead of certificate and key above.
+     */
+    pfx?: string | Buffer;
+    /**
+     * The passphrase for the connection key, if required
+     */
+    passphrase?: string;
+    /**
+     * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
+     */
+    production?: boolean;
+    /**
+     * Enable when you are using a VoIP certificate to enable paylods up to 4096 bytes.
+     */
+    voip?: boolean;
+    /**
+     * Gateway port (Defaults to: `2195`)
+     */
+    port?: number;
+    /**
+     * Reject Unauthorized property to be passed through to tls.connect() (Defaults to `true`)
+     */
+    rejectUnauthorized?: boolean;
+    /**
+     * Number of notifications to cache for error purposes (See "Handling Errors" below, (Defaults to: `1000`)
+     */
+    cacheLength?: number;
+    /**
+     * Whether the cache should grow in response to messages being lost after errors. (Will still emit a 'cacheTooSmall' event) (Defaults to: `true`)
+     */
+    autoAdjustCache?: boolean;
+    /**
+     * The maximum number of connections to create for sending messages. (Defaults to: `1`)
+     */
+    maxConnections?: number;
+    /**
+     * The duration of time the module should wait, in milliseconds, when trying to establish a connection to Apple before failing. 0 = Disabled. {Defaults to: `10000`}
+     */
+    connectTimeout?: number;
+    /**
+     * The duration the socket should stay alive with no activity in milliseconds. 0 = Disabled. (Defaults to: `3600000` - 1h)
+     */
+    connectionTimeout?: number;
+    /**
+     * The maximum number of connection failures that will be tolerated before `apn` will "terminate". (Defaults to: 10)
+     */
+    connectionRetryLimit?: number;
+    /**
+     * Whether to buffer notifications and resend them after failure. (Defaults to: `true`)
+     */
+    buffersNotifications?: number;
+    /**
+     * Whether to aggresively empty the notification buffer while connected - if set to true node-apn may enter a tight loop under heavy load while delivering notifications. (Defaults to: `false`)
+     */
+    fastMode?: boolean;
 }
+declare export class Connection extends events.EventEmitter {
+    constructor(options: ConnectionOptions);
+    /**
+     * This is the business end of the module. Create a `Notification` object and pass it in, along with a single recipient or an array of them and node-apn will take care of the rest, delivering the notification to each recipient.
+     * 
+     * A "recipient" is either a `Device` object, a `String`, or a `Buffer` containing the device token. `Device` objects are used internally and will be created if necessary. Where applicable, all events will return a `Device` regardless of the type passed to this method.
+     */
+    pushNotification(notification: Notification, recipient: Device | string | Buffer | (Device | string | Buffer)[]): void;
+    /**
+     * Used to manually adjust the "cacheLength" property in the options. This is ideal if you choose to use the `cacheTooSmall` event to tweak your environment. It is safe for increasing and reducing cache size.
+     */
+    setCacheLength(newLength: number): void;
+    /**
+     * Indicate to node-apn that when the queue of pending notifications is fully drained that it should close all open connections. This will mean that if there are no other pending resources (open sockets, running timers, etc.) the application will terminate. If notifications are pushed after the connection has completely shutdown a new connection will be established and, if applicable, `shutdown` will need to be called again.
+     */
+    shutdown(): void;
+    /**
+     * Emitted when an error occurs during initialisation of the module, usually due to a problem with the keys and certificates.
+     */
+    on(event: "error", listener: (error: Error) => void): this;
+    /**
+     * Emitted when the connection socket experiences an error. This may be useful for debugging but no action should be necessary.
+     */
+    on(event: "socketError", listener: (error: Error) => void): this;
+    /**
+     * Emitted when a notification has been sent to Apple - not a guarantee that it has been accepted by Apple, an error relating to it may occur later on. A notification may also be "transmitted" several times if a preceding notification caused an error requiring retransmission.
+     */
+    on(event: "transmitted", listener: (notification: Notification, decive: Device) => void): this;
+    /**
+     * Emitted when all pending notifications have been transmitted to Apple and the pending queue is empty. This may be called more than once if a notification error occurs and notifications must be re-sent.
+     */
+    on(event: "completed", listener: () => void): this;
+    /**
+     * Emitted when Apple returns a notification as invalid but the notification has already been expunged from the cache - usually due to high throughput and indicates that notifications will be getting lost. The parameter is an estimate of how many notifications have been lost. You should experiment with increasing the cache size or enabling ```autoAdjustCache``` if you see this frequently.
+     * 
+     * **Note**: With ```autoAdjustCache``` enabled this event will still be emitted when an adjustment is triggered.
+     */
+    on(event: "cacheTooSmall", listener: (sizeDifference: number) => void): this;
+    /**
+     * Emitted when a connection to Apple is successfully established. The parameter indicates the number of open connections. No action is required as the connection is managed internally.
+     */
+    on(event: "connected", listener: (openSockets: net.Socket[]) => void): this;
+    /**
+     * Emitted when the connection to Apple has been closed, this could be for numerous reasons, for example an error has occurred or the connection has timed out. The parameter is the same as for `connected` and again, no action is required.
+     */
+    on(event: "disconnected", listener: (openSockets: net.Socket[]) => void): this;
+    /**
+     * Emitted when the connectionTimeout option has been specified and no activity has occurred on a socket for a specified duration. The socket will be closed immediately after this event and a `disconnected` event will also be emitted.
+     */
+    on(event: "timeout", listener: () => void): this;
+    /**
+     * Emitted when a message has been received from Apple stating that a notification was invalid or if an internal error occurred before that notification could be pushed to Apple. If the notification is still in the cache it will be passed as the second argument, otherwise null. Where possible the associated `Device` object will be passed as a third parameter, however in cases where the token supplied to the module cannot be parsed into a `Buffer` the supplied value will be returned.
+
+     * Error codes smaller than 512 correspond to those returned by Apple as per their [docs][errors]. Other errors are applicable to `node-apn` itself. Definitions can be found in `lib/errors.js`.
+     */
+    on(event: "transmissionError", listener: (errorCode: number, notification: Notification, device: Device | Buffer) => void): this;
+    on(event: string, listener: Function): this;
+}
+export interface NotificationAlertOptions {
+    title?: string;
+    body: string;
+    "title-loc-key"?: string;
+    "title-loc-args"?: string[];
+    "action-loc-key"?: string;
+    "loc-key"?: string;
+    "loc-args"?: string[];
+    "launch-image"?: string;
+}
+declare export class Notification {
+    /**
+     * The maximum number of retries which should be performed when sending a notification if an error occurs. A value of 0 will only allow one attempt at sending (0 retries). Set to -1 to disable (default).
+     */
+    public retryLimit: number;
+    /**
+     * The UNIX timestamp representing when the notification should expire. This does not contribute to the 2048 byte payload size limit. An expiry of 0 indicates that the notification expires immediately.
+     */
+    public expiry: number;
+    /**
+     * From Apple's Documentation, Provide one of the following values:
+     * 
+     * - 10 - The push message is sent immediately. (Default)
+     *   > The push notification must trigger an alert, sound, or badge on the device. It is an error use this priority for a push that contains only the content-available key.
+     * - 5 - The push message is sent at a time that conserves power on the device receiving it.
+     */
+    public priority: number;
+    /**
+     * The encoding to use when transmitting the notification to APNS, defaults to `utf8`. `utf16le` is also possible but as each character is represented by a minimum of 2 bytes, will at least halve the possible payload size. If in doubt leave as default.
+     */
+    public encoding: string;
+    /**
+     * This object represents the root JSON object that you can add custom information for your application to. The properties below will only be added to the payload (under `aps`) when the notification is prepared for sending.
+     */
+    public payload: any;
+    /**
+     * The value to specify for `payload.aps.badge`
+     */
+    public badge: number;
+    /**
+     * The value to specify for `payload.aps.sound`
+     */
+    public sound: string;
+    /**
+     * The value to specify for `payload.aps.alert` can be either a `String` or an `Object` as outlined by the payload documentation.
+     */
+    public alert: string | NotificationAlertOptions;
+    /**
+     * Setting this to true will specify "content-available" in the payload when it is compiled.
+     */
+    public newsstandAvailable: boolean;
+    /**
+     * Setting this to true will specify "content-available" in the payload when it is compiled.
+     */
+    public contentAvailable: boolean;
+    /**
+     * The value to specify for the `mdm` field where applicable.
+     */
+    public mdm: string | Object;
+    /**
+     * The value to specify for `payload.aps['url-args']`. This used for Safari Push NOtifications and should be an array of values in accordance with the Web Payload Documentation.
+     */
+    public urlArgs: string[];
+    /**
+     * When this parameter is set and `notification#trim()` is called it will attempt to truncate the string at the nearest space.
+     */
+    public truncateAtWordEnd: boolean;
+    /**
+     * You can optionally pass in an object representing the payload, or configure properties on the returned object.
+     */
+    constructor(payload?: any);
+    /**
+     * Set the `aps.alert` text body. This will use the most space-efficient means.
+     */
+    setAlertText(alertText: string): Notification;
+    /**
+     * Set the `title` property of the `aps.alert` object - used with Safari Push Notifications
+     */
+    setAlertTitle(alertTitle: string): Notification;
+    /**
+     * Set the `action` property of the `aps.alert` object - used with Safari Push Notifications
+     */
+    setAlertAction(alertAction: string): Notification;
+    /**
+     * Set the `action-loc-key` property of the `aps.alert` object.
+     */
+    setActionLocKey(key: string): Notification;
+    /**
+     * Set the `loc-key` property of the `aps.alert` object.
+     */
+    setLocKey(key: string): Notification;
+    /**
+     * Set the `loc-args` property of the `aps.alert` object.
+     */
+    setLocArgs(args: string[]): Notification;
+    /**
+     * Set the `launch-image` property of the `aps.alert` object.
+     */
+    setLaunchImage(image: string): Notification;
+    /**
+     * Set the `mdm` property on the payload.
+     */
+    setMDM(mdm: string | Object): Notification;
+    /**
+     * Set the `content-available` property of the `aps` object.
+     */
+    setNewsstandAvailable(available: boolean): Notification;
+    /**
+     * Set the `content-available` property of the `aps` object.
+     */
+    setContentAvailable(available: boolean): Notification;
+    /**
+     * Set the `url-args` property of the `aps` object.
+     */
+    setUrlArgs(urlArgs: string[]): Notification;
+    /**
+     * Attempt to automatically trim the notification alert text body to meet the payload size limit of 2048 bytes.
+     */
+    trim(): number;
+}
+declare export class Device {
+    public token: Buffer;
+    /**
+     * `deviceToken` can be a `Buffer` or a `String` containing a "hex" representation of the token. Throws an error if the deviceToken supplied is invalid.
+     */
+    constructor(deviceToken: string | Buffer);
+}
+
+export interface FeedbackOptions {
+    /**
+     * The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. (Defaults to: `cert.pem`)
+     */
+    cert?: string | Buffer;
+    /**
+     * The filename of the connection key to load from disk, or a Buffer/String containing the key data. (Defaults to: `key.pem`)
+     */
+    key?: string | Buffer;
+    /**
+     * An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048).
+     */
+    ca?: (string | Buffer)[];
+    /**
+     * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will be used instead of certificate and key above.
+     */
+    pfx?: string | Buffer;
+    /**
+     * The passphrase for the connection key, if required
+     */
+    passphrase?: string;
+    /**
+     * Specifies which environment to connect to: Production (if true) or Sandbox - The hostname will be set automatically. (Defaults to NODE_ENV == "production", i.e. false unless the NODE_ENV environment variable is set accordingly)
+     */
+    production?: boolean;
+    /**
+     * Feedback server port (Defaults to: `2196`)
+     */
+    port?: number;
+    /**
+     * Sets the behaviour for triggering the `feedback` event. When `true` the event will be triggered once per connection with an array of timestamp and device token tuples. Otherwise a `feedback` event will be emitted once per token received. (Defaults to: true)
+     */
+    batchFeedback?: boolean;
+    /**
+     * The maximum number of tokens to pass when emitting the event - a value of 0 will cause all tokens to be passed after connection is reset. After this number of tokens are received the `feedback` event will be emitted. (Only applies when `batchFeedback` is enabled)
+     */
+    batchSize?: number;
+    /**
+     * How often to automatically poll the feedback service. Set to `0` to disable. (Defaults to: `3600`)
+     */
+    interval?: number;
+}
+export interface FeedbackData {
+    time: number;
+    device: Device;
+}
+/**
+ * Connection to the Apple Push Notification Feedback Service and if `interval` isn't disabled automatically begins polling the service. Many of the options are the same as `apn.Connection()`
+ */
+declare export class Feedback {
+    constructor(options: FeedbackOptions);
+    /**
+     * Trigger a query of the feedback service. If `interval` is non-zero then this method will be called automatically.
+     */
+    start(): void;
+    /**
+     * You can cancel the interval by calling `feedback.cancel()`. If you do not wish to have the service automatically queried then set `interval` to 0 and use `feedback.start()` to manually invoke it one time.
+     */
+    cancel(): void;
+    /**
+     * Emitted when an error occurs initialising the module. Usually caused by failing to load the certificates.
+     */
+    on(event: "error", listener: (error: Error) => void): Feedback;
+    /**
+     * Emitted when an error occurs receiving or processing the feedback and in the case of a socket error occurring. These errors are usually informational and node-apn will automatically recover.
+     */
+    on(event: "feedbackError", listener: (error: Error) => void): Feedback;
+    /**
+     * Emitted when data has been received from the feedback service, typically once per connection. `feedbackData` is an array of objects, each containing the `time` returned by the server (epoch time) and the `device` a `Buffer` containing the device token.
+     */
+    on(event: "feedback", listener: (feedbackData: FeedbackData[]) => void): Feedback;
+    on(event: string, listener: Function): Feedback;
+}
+
+declare export enum Errors {
+    "noErrorsEncountered" = 0,
+    "processingError" = 1,
+    "missingDeviceToken" = 2,
+    "missingTopic" = 3,
+    "missingPayload" = 4,
+    "invalidTokenSize" = 5,
+    "invalidTopicSize" = 6,
+    "invalidPayloadSize" = 7,
+    "invalidToken" = 8,
+    "apnsShutdown" = 10,
+    "none" = 255,
+    "retryLimitExceeded" = 512,
+    "moduleInitialisationFailed" = 513,
+    "connectionRetryLimitExceeded" = 514, // When a connection is unable to be established. Usually because of a network / SSL error this will be emitted
+    "connectionTerminated" = 515
+}
+
+//Lowercase aliases
+export {Connection as connection};
+export {Device as device};
+export {Errors as error};
+export {Feedback as feedback};
+export {Notification as notification};
diff --git a/archiver/archiver.d.ts b/archiver/archiver.d.ts
index d5133555a4..3a864d8822 100644
--- a/archiver/archiver.d.ts
+++ b/archiver/archiver.d.ts
@@ -14,29 +14,28 @@
  =============================================== */
 
 /// <reference path="../node/node.d.ts" />
-declare module "archiver" {
-    import * as FS from 'fs';
-    import * as STREAM from 'stream';
-    
-    interface nameInterface {
-        name?: string;
-    }
-        
-    interface Archiver extends STREAM.Transform {
-        pipe(writeStream: FS.WriteStream): void;
-        append(readStream: FS.ReadStream, name: nameInterface): void;
-        finalize(): void;
-    }
-    
-    interface Options {
-        
-    }
-    
-    function archiver(format: string, options?: Options): Archiver;
-    
-    namespace archiver {
-        function create(format: string, options?: Options): Archiver;
-    }
-    
-    export = archiver;
+
+import * as FS from 'fs';
+import * as STREAM from 'stream';
+
+interface nameInterface {
+    name?: string;
 }
+
+interface Archiver extends STREAM.Transform {
+    pipe(writeStream: FS.WriteStream): void;
+    append(readStream: FS.ReadStream, name: nameInterface): void;
+    finalize(): void;
+}
+
+interface Options {
+
+}
+
+declare function archiver(format: string, options?: Options): Archiver;
+
+declare namespace archiver {
+    function create(format: string, options?: Options): Archiver;
+}
+
+export = archiver;
diff --git a/archy/archy.d.ts b/archy/archy.d.ts
index f4e13ef8a9..82b101236c 100644
--- a/archy/archy.d.ts
+++ b/archy/archy.d.ts
@@ -3,19 +3,18 @@
 // Definitions by: vvakame <https://github.com/vvakame/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "archy" {
-    function archy(obj: archy.Data, prefix?: string, opts?: archy.Options): string;
-    function archy(obj: string, prefix?: string, opts?: archy.Options): string;
 
-    namespace archy {
-        interface Data {
-            label: string;
-            nodes?: (Data | string)[];
-        }
-        interface Options {
-            unicode?: boolean;
-        }
+declare function archy(obj: archy.Data, prefix?: string, opts?: archy.Options): string;
+declare function archy(obj: string, prefix?: string, opts?: archy.Options): string;
+
+declare namespace archy {
+    interface Data {
+        label: string;
+        nodes?: (Data | string)[];
+    }
+    interface Options {
+        unicode?: boolean;
     }
-
-    export = archy;
 }
+
+export = archy;
diff --git a/argparse/argparse.d.ts b/argparse/argparse.d.ts
index 886fef8cc9..7847c962bc 100644
--- a/argparse/argparse.d.ts
+++ b/argparse/argparse.d.ts
@@ -3,88 +3,87 @@
 // Definitions by: Andrew Schurman <http://github.com/arcticwaters>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "argparse" {
-	export class ArgumentParser extends ArgumentGroup {
-		constructor(options? : ArgumentParserOptions);
 
-		addSubparsers(options? : SubparserOptions) : SubParser;
-		parseArgs(args? : string[], ns? : Namespace|Object) : any;
-		printUsage() : void;
-		printHelp() : void;
-		formatUsage() : string;
-		formatHelp() : string;
-		parseKnownArgs(args? : string[], ns? : Namespace|Object) : any[];
-		convertArgLineToArg(argLine : string) : string[];
-		exit(status : number, message : string) : void;
-		error(err : string|Error) : void;
-	}
-	
-	interface Namespace {}
-	
-	class SubParser {
-		addParser(name : string, options? : SubArgumentParserOptions) : ArgumentParser;
-	}
-	
-	class ArgumentGroup {
-		addArgument(args : string[], options? : ArgumentOptions) : void;
-		addArgumentGroup(options? : ArgumentGroupOptions) : ArgumentGroup;
-		addMutuallyExclusiveGroup(options? : {required : boolean}) : ArgumentGroup;
-		setDefaults(options? : {}) : void;
-		getDefault(dest : string) : any;
-	}
-	
-	interface SubparserOptions {
-		title? : string;
-		description? : string;
-		prog? : string;
-		parserClass? : {new() : any};
-		action? : string;
-		dest? : string;
-		help? : string;
-		metavar? : string;
-	}
-	
-	interface SubArgumentParserOptions extends ArgumentParserOptions {
-		aliases? : string[];
-		help? : string;
-	}
-	
-	interface ArgumentParserOptions {
-		description? : string;
-		epilog? : string;
-		addHelp? : boolean;
-		argumentDefault? : any;
-		parents? : ArgumentParser[];
-		prefixChars? : string;
-		formatterClass? : {new() : HelpFormatter|ArgumentDefaultsHelpFormatter|RawDescriptionHelpFormatter|RawTextHelpFormatter};
-		prog? : string;
-		usage? : string;
-		version? : string;
-	}
-	
-	interface ArgumentGroupOptions {
-		prefixChars? : string;
-		argumentDefault? : any;
-		title? : string;
-		description? : string;
-	}
+declare export class ArgumentParser extends ArgumentGroup {
+    constructor(options?: ArgumentParserOptions);
 
-	export class HelpFormatter {} 	
-	export class ArgumentDefaultsHelpFormatter {}
-	export class RawDescriptionHelpFormatter {}
-	export class RawTextHelpFormatter {}
-
-	interface ArgumentOptions {
-		action? : string;
-		optionStrings? : string[];
-		dest? : string;
-		nargs? : string|number;
-		constant? : any;
-		defaultValue? : any;
-		type? : string|Function;
-		choices? : string|string[];
-		required? : boolean;
-		help? : string;
-		metavar? : string;
-	}
+    addSubparsers(options?: SubparserOptions): SubParser;
+    parseArgs(args?: string[], ns?: Namespace | Object): any;
+    printUsage(): void;
+    printHelp(): void;
+    formatUsage(): string;
+    formatHelp(): string;
+    parseKnownArgs(args?: string[], ns?: Namespace | Object): any[];
+    convertArgLineToArg(argLine: string): string[];
+    exit(status: number, message: string): void;
+    error(err: string | Error): void;
+}
+
+interface Namespace { }
+
+declare class SubParser {
+    addParser(name: string, options?: SubArgumentParserOptions): ArgumentParser;
+}
+
+declare class ArgumentGroup {
+    addArgument(args: string[], options?: ArgumentOptions): void;
+    addArgumentGroup(options?: ArgumentGroupOptions): ArgumentGroup;
+    addMutuallyExclusiveGroup(options?: { required: boolean }): ArgumentGroup;
+    setDefaults(options?: {}): void;
+    getDefault(dest: string): any;
+}
+
+interface SubparserOptions {
+    title?: string;
+    description?: string;
+    prog?: string;
+    parserClass?: { new (): any };
+    action?: string;
+    dest?: string;
+    help?: string;
+    metavar?: string;
+}
+
+interface SubArgumentParserOptions extends ArgumentParserOptions {
+    aliases?: string[];
+    help?: string;
+}
+
+interface ArgumentParserOptions {
+    description?: string;
+    epilog?: string;
+    addHelp?: boolean;
+    argumentDefault?: any;
+    parents?: ArgumentParser[];
+    prefixChars?: string;
+    formatterClass?: { new (): HelpFormatter | ArgumentDefaultsHelpFormatter | RawDescriptionHelpFormatter | RawTextHelpFormatter };
+    prog?: string;
+    usage?: string;
+    version?: string;
+}
+
+interface ArgumentGroupOptions {
+    prefixChars?: string;
+    argumentDefault?: any;
+    title?: string;
+    description?: string;
+}
+
+declare export class HelpFormatter { }
+declare export class ArgumentDefaultsHelpFormatter { }
+declare export class RawDescriptionHelpFormatter { }
+declare export class RawTextHelpFormatter { }
+
+interface ArgumentOptions {
+    action?: string;
+    optionStrings?: string[];
+    dest?: string;
+    nargs?: string | number;
+    constant?: any;
+    defaultValue?: any;
+    type?: string | Function;
+    choices?: string | string[];
+    required?: boolean;
+    help?: string;
+    metavar?: string;
 }
diff --git a/asana/asana.d.ts b/asana/asana.d.ts
index 61cb54d26f..e1a022fb6e 100644
--- a/asana/asana.d.ts
+++ b/asana/asana.d.ts
@@ -6,2471 +6,2469 @@
 /// <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path="../request/request.d.ts" />
 
-declare module "asana" {
-  import * as Promise from 'bluebird';
 
-  namespace asana {
+import * as Promise from 'bluebird';
+
+declare namespace asana {
     var Client: ClientStatic;
 
     interface ClientStatic {
-      /**
-       * Constructs a Client with instances of all the resources using the dispatcher.
-       * It also keeps a reference to the dispatcher so that way the end user can have
-       * access to it.
-       * @class
-       * @classdesc A wrapper for the Asana API which is authenticated for one user
-       * @param {Dispatcher} dispatcher The request dispatcher to use
-       * @param {Object} options        Options to configure the client
-       * @param {String} [clientId]     ID of the client, required for Oauth
-       * @param {String} [clientSecret] Secret key, for some Oauth flows
-       * @param {String} [redirectUri]  Default redirect URI for this client
-       * @param {String} [asanaBaseUrl] Base URL for Asana, for debugging
-       */
-      (dispatcher: Dispatcher, options?: ClientOptions): asana.Client;
-      /**
-       * Creates a new client.
-       * @param {Object} options Options for specifying the client, see constructor.
-       */
-      create(options?: ClientOptions): Client;
+        /**
+         * Constructs a Client with instances of all the resources using the dispatcher.
+         * It also keeps a reference to the dispatcher so that way the end user can have
+         * access to it.
+         * @class
+         * @classdesc A wrapper for the Asana API which is authenticated for one user
+         * @param {Dispatcher} dispatcher The request dispatcher to use
+         * @param {Object} options        Options to configure the client
+         * @param {String} [clientId]     ID of the client, required for Oauth
+         * @param {String} [clientSecret] Secret key, for some Oauth flows
+         * @param {String} [redirectUri]  Default redirect URI for this client
+         * @param {String} [asanaBaseUrl] Base URL for Asana, for debugging
+         */
+        (dispatcher: Dispatcher, options?: ClientOptions): asana.Client;
+        /**
+         * Creates a new client.
+         * @param {Object} options Options for specifying the client, see constructor.
+         */
+        create(options?: ClientOptions): Client;
     }
 
     /** Options to configure the client */
     interface ClientOptions extends DispatcherOptions {
-      clientId?: string|number;
-      clientSecret?: string;
-      redirectUri?: string;
-      asanaBaseUrl?: string;
+        clientId?: string | number;
+        clientSecret?: string;
+        redirectUri?: string;
+        asanaBaseUrl?: string;
     }
 
     interface Client {
-      /**
-       * Ensures the client is authorized to make requests. Kicks off the
-       * configured Oauth flow, if any.
-       *
-       * @returns {Promise<Client>} A promise that resolves to this client when
-       *     authorization is complete.
-       */
-      authorize(): Promise<Client>;
+        /**
+         * Ensures the client is authorized to make requests. Kicks off the
+         * configured Oauth flow, if any.
+         *
+         * @returns {Promise<Client>} A promise that resolves to this client when
+         *     authorization is complete.
+         */
+        authorize(): Promise<Client>;
 
-      /**
-       * Configure the Client to use a user's API Key and then authenticate
-       * through HTTP Basic Authentication. This should only be done for testing,
-       * as requests using Oauth can provide more security, higher rate limits, and
-       * more features.
-       * @param  {String} apiKey The Asana Api Key of the user
-       * @return {Client}        this
-       * @param apiKey
-       * @return
-       */
-      useBasicAuth(apiKey: string): this;
+        /**
+         * Configure the Client to use a user's API Key and then authenticate
+         * through HTTP Basic Authentication. This should only be done for testing,
+         * as requests using Oauth can provide more security, higher rate limits, and
+         * more features.
+         * @param  {String} apiKey The Asana Api Key of the user
+         * @return {Client}        this
+         * @param apiKey
+         * @return
+         */
+        useBasicAuth(apiKey: string): this;
 
-      /**
-       * Configure the client to authenticate using a Personal Access Token.
-       * @param  {String} accessToken The Personal Access Token to use for
-       * authenticating requests.
-       * @return {Client}             this
-       * @param accessToken
-       * @return
-       */
-      useAccessToken(accessToken: string): this;
+        /**
+         * Configure the client to authenticate using a Personal Access Token.
+         * @param  {String} accessToken The Personal Access Token to use for
+         * authenticating requests.
+         * @return {Client}             this
+         * @param accessToken
+         * @return
+         */
+        useAccessToken(accessToken: string): this;
 
-      /**
-       * Configure the client to authenticate via Oauth. Credentials can be
-       * supplied, or they can be obtained by running an Oauth flow.
-       * @param  {Object} options Options for Oauth. Includes any options for
-       *     the selected flow.
-       * @option {Function} [flowType]  Type of OauthFlow to use to obtain user
-       *     authorization. Defaults to autodetect based on environment.
-       * @option {Object} [credentials] Credentials to use; no flow required to
-       *     obtain authorization. This object should at a minimum contain an
-       *     `access_token` string field.
-       * @return {Client} this
-       * @param options
-       * @return
-       */
-      useOauth(options?: auth.OauthAuthenticatorOptions): this;
+        /**
+         * Configure the client to authenticate via Oauth. Credentials can be
+         * supplied, or they can be obtained by running an Oauth flow.
+         * @param  {Object} options Options for Oauth. Includes any options for
+         *     the selected flow.
+         * @option {Function} [flowType]  Type of OauthFlow to use to obtain user
+         *     authorization. Defaults to autodetect based on environment.
+         * @option {Object} [credentials] Credentials to use; no flow required to
+         *     obtain authorization. This object should at a minimum contain an
+         *     `access_token` string field.
+         * @return {Client} this
+         * @param options
+         * @return
+         */
+        useOauth(options?: auth.OauthAuthenticatorOptions): this;
 
-      /**
-       * The internal dispatcher. This is mostly used by the resources but provided
-       * for custom requests to the API or API features that have not yet been added
-       * to the client.
-       * @type {Dispatcher}
-       */
-      dispatcher: Dispatcher;
-      /**
-       * An instance of the Attachments resource.
-       * @type {Attachments}
-       */
-      attachments: resources.Attachments;
-      /**
-       * An instance of the Events resource.
-       * @type {Events}
-       */
-      events: resources.Events;
-      /**
-       * An instance of the Projects resource.
-       * @type {Projects}
-       */
-      projects: resources.Projects;
-      /**
-       * An instance of the Stories resource.
-       * @type {Stories}
-       */
-      stories: resources.Stories;
-      /**
-       * An instance of the Tags resource.
-       * @type {Tags}
-       */
-      tags: resources.Tags;
-      /**
-       * An instance of the Tasks resource.
-       * @type {Tasks}
-       */
-      tasks: resources.Tasks;
-      /**
-       * An instance of the Teams resource.
-       * @type {Teams}
-       */
-      teams: resources.Teams;
-      /**
-       * An instance of the Users resource.
-       * @type {Users}
-       */
-      users: resources.Users;
-      /**
-       * An instance of the Workspaces resource.
-       * @type {Workspaces}
-       */
-      workspaces: resources.Workspaces;
-      /**
-       * Store off Oauth info.
-       */
-      app: auth.App;
+        /**
+         * The internal dispatcher. This is mostly used by the resources but provided
+         * for custom requests to the API or API features that have not yet been added
+         * to the client.
+         * @type {Dispatcher}
+         */
+        dispatcher: Dispatcher;
+        /**
+         * An instance of the Attachments resource.
+         * @type {Attachments}
+         */
+        attachments: resources.Attachments;
+        /**
+         * An instance of the Events resource.
+         * @type {Events}
+         */
+        events: resources.Events;
+        /**
+         * An instance of the Projects resource.
+         * @type {Projects}
+         */
+        projects: resources.Projects;
+        /**
+         * An instance of the Stories resource.
+         * @type {Stories}
+         */
+        stories: resources.Stories;
+        /**
+         * An instance of the Tags resource.
+         * @type {Tags}
+         */
+        tags: resources.Tags;
+        /**
+         * An instance of the Tasks resource.
+         * @type {Tasks}
+         */
+        tasks: resources.Tasks;
+        /**
+         * An instance of the Teams resource.
+         * @type {Teams}
+         */
+        teams: resources.Teams;
+        /**
+         * An instance of the Users resource.
+         * @type {Users}
+         */
+        users: resources.Users;
+        /**
+         * An instance of the Workspaces resource.
+         * @type {Workspaces}
+         */
+        workspaces: resources.Workspaces;
+        /**
+         * Store off Oauth info.
+         */
+        app: auth.App;
     }
 
     var Dispatcher: DispatcherStatic;
 
     interface DispatcherStatic {
-      /**
-       * Creates a dispatcher which will act as a basic wrapper for making HTTP
-       * requests to the API, and handle authentication.
-       * @class
-       * @classdesc A HTTP wrapper for the Asana API
-       * @param {Object} options for default behavior of the Dispatcher
-       * @option {Authenticator} [authenticator] Object to use for authentication.
-       *     Can also be set later with `setAuthenticator`.
-       * @option {String} [retryOnRateLimit] Automatically handle `RateLimitEnforced`
-       *     errors by sleeping and retrying after the waiting period.
-       * @option {Function} [handleUnauthorized] Automatically handle
-       *     `NoAuthorization` with the callback. If the callback returns `true`
-       *     (or a promise resolving to `true), will retry the request.
-       * @option {String} [asanaBaseUrl] Base URL for Asana, for debugging
-       * @option {Number} [requestTimeout] Timeout (in milliseconds) to wait for the
-       *     request to finish.
-       */
-      new (options?: DispatcherOptions): Dispatcher;
+        /**
+         * Creates a dispatcher which will act as a basic wrapper for making HTTP
+         * requests to the API, and handle authentication.
+         * @class
+         * @classdesc A HTTP wrapper for the Asana API
+         * @param {Object} options for default behavior of the Dispatcher
+         * @option {Authenticator} [authenticator] Object to use for authentication.
+         *     Can also be set later with `setAuthenticator`.
+         * @option {String} [retryOnRateLimit] Automatically handle `RateLimitEnforced`
+         *     errors by sleeping and retrying after the waiting period.
+         * @option {Function} [handleUnauthorized] Automatically handle
+         *     `NoAuthorization` with the callback. If the callback returns `true`
+         *     (or a promise resolving to `true), will retry the request.
+         * @option {String} [asanaBaseUrl] Base URL for Asana, for debugging
+         * @option {Number} [requestTimeout] Timeout (in milliseconds) to wait for the
+         *     request to finish.
+         */
+        new (options?: DispatcherOptions): Dispatcher;
 
-      /**
-       * Default handler for requests that are considered unauthorized.
-       * Requests that the authenticator try to refresh its credentials if
-       * possible.
-       * @return {Promise<boolean>} True iff refresh was successful, false if not.
-       * @return
-       */
-      maybeReauthorize(): Promise<boolean>;
+        /**
+         * Default handler for requests that are considered unauthorized.
+         * Requests that the authenticator try to refresh its credentials if
+         * possible.
+         * @return {Promise<boolean>} True iff refresh was successful, false if not.
+         * @return
+         */
+        maybeReauthorize(): Promise<boolean>;
 
-      /**
-       * The relative API path for the current version of the Asana API.
-       * @type {String}
-       */
-      API_PATH : string;
+        /**
+         * The relative API path for the current version of the Asana API.
+         * @type {String}
+         */
+        API_PATH: string;
     }
 
     interface DispatcherOptions {
-      authenticator?: auth.Authenticator;
-      retryOnRateLimit?: boolean;
-      handleUnauthorized?: () => boolean|Promise<boolean>;
-      requestTimeout?: string;
+        authenticator?: auth.Authenticator;
+        retryOnRateLimit?: boolean;
+        handleUnauthorized?: () => boolean | Promise<boolean>;
+        requestTimeout?: string;
     }
 
     interface Dispatcher {
-      /**
-       * Creates an Asana API Url by concatenating the ROOT_URL with path provided.
-       * @param  {String} path The path
-       * @return {String}      The url
-       * @param path
-       * @return
-       */
-      url(path: string): string;
-
-      /**
-       * Configure the authentication mechanism to use.
-       * @returns {Dispatcher} this
-       * @param authenticator
-       * @return
-       */
-      setAuthenticator(authenticator: auth.Authenticator): this;
-
-      /**
-       * Ensure the dispatcher is authorized to make requests. Call this before
-       * making any API requests.
-       *
-       * @returns {Promise} Resolves when the dispatcher is authorized, rejected if
-       *     there was a problem authorizing.
-       * @return
-       */
-      authorize(): Promise<void>;
-
-      /**
-       * Dispatches a request to the Asana API. The request parameters are passed to
-       * the request module.
-       * @param  {Object}  params The params for request
-       * @param  {Object}  [dispatchOptions] Options for handling request/response
-       * @return {Promise}        The response for the request
-       * @param params
-       * @param dispatchOptions?
-       * @return
-       */
-      dispatch(params: any, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * Dispatches a GET request to the Asana API.
-       * @param  {String}  path    The path of the API
-       * @param  {Object}  [query] The query params
-       * @param  {Object}  [dispatchOptions] Options for handling the request and
-       *     response. See `dispatch`.
-       * @return {Promise}         The response for the request
-       * @param path
-       * @param query?
-       * @param dispatchOptions?
-       * @return
-       */
-      get(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * Dispatches a POST request to the Asana API.
-       * @param  {String} path The path of the API
-       * @param  {Object} data The data to be sent
-       * @param  {Object}  [dispatchOptions] Options for handling the request and
-       *     response. See `dispatch`.
-       * @return {Promise}     The response for the request
-       * @param path
-       * @param data
-       * @param dispatchOptions?
-       * @return
-       */
-      post(path: string, data: any, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * Dispatches a PUT request to the Asana API.
-       * @param  {String} path The path of the API
-       * @param  {Object} data The data to be sent
-       * @param  {Object}  [dispatchOptions] Options for handling the request and
-       *     response. See `dispatch`.
-       * @return {Promise}     The response for the request
-       * @param path
-       * @param data
-       * @param dispatchOptions?
-       * @return
-       */
-      put(path: string, data: any, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * Dispatches a DELETE request to the Asana API.
-       * @param  {String} path The path of the API
-       * @param  {Object}  [dispatchOptions] Options for handling the request and
-       *     response. See `dispatch`.
-       * @return {Promise}     The response for the request
-       * @param path
-       * @param dispatchOptions?
-       * @return
-       */
-      delete(path: string, dispatchOptions?: any): Promise<any>;
-
-      /**
-       * The base URL for Asana
-       * @type {String}
-       */
-      asanaBaseUrl : string;
-
-      /**
-       * Whether requests should be automatically retried if rate limited.
-       * @type {Boolean}
-       */
-      retryOnRateLimit : boolean;
-
-      /**
-       * Handler for unauthorized requests which may seek reauthorization.
-       * Default behavior is available if configured with an Oauth authenticator
-       * that has a refresh token, and will refresh the current access token.
-       * @type {Function}
-       */
-      handleUnauthorized : () => boolean|Promise<boolean>;
-
-      /**
-       * The amount of time in milliseconds to wait for a request to finish.
-       * @type {Number}
-       */
-      requestTimeout : number;
-    }
-
-    namespace auth {
-      var BasicAuthenticator: BasicAuthenticatorStatic;
-
-      interface BasicAuthenticatorStatic {
         /**
-         * @param apiKey
-         */
-        new (apiKey: string): BasicAuthenticator;
-      }
-
-      interface BasicAuthenticator extends Authenticator {
-        /**
-         * @param {Object} request The request to modify, for the `request` library.
-         * @return {Object} The `request` parameter, modified to include authentication
-         *     information using the stored credentials.
-         * @param request
+         * Creates an Asana API Url by concatenating the ROOT_URL with path provided.
+         * @param  {String} path The path
+         * @return {String}      The url
+         * @param path
          * @return
          */
-        authenticateRequest(request: BasicAuthenticatorRequest): BasicAuthenticatorRequest;
-      }
+        url(path: string): string;
 
-      interface BasicAuthenticatorRequest {
-        auth : {
-          username : string;
-          password : string;
-        }
-      }
-
-      var OauthAuthenticator: OauthAuthenticatorStatic;
-
-      interface OauthAuthenticatorStatic {
         /**
-         * Creates an authenticator that uses Oauth for authentication.
+         * Configure the authentication mechanism to use.
+         * @returns {Dispatcher} this
+         * @param authenticator
+         * @return
+         */
+        setAuthenticator(authenticator: auth.Authenticator): this;
+
+        /**
+         * Ensure the dispatcher is authorized to make requests. Call this before
+         * making any API requests.
          *
-         * @param {Object} options Configure the authenticator; must specify one
-         *     of `flow` or `credentials`.
-         * @option {App}           app           The app being authenticated for.
-         * @option {OauthFlow}     [flow]        The flow to use to get credentials
-         *     when needed.
-         * @option {String|Object} [credentials] Initial credentials to use. This can
-         *     be either the object returned from an access token request (which
-         *     contains the token and some other metadata) or just the `access_token`
-         *     field.
-         * @constructor
-         */
-        new (options: OauthAuthenticatorOptions): OauthAuthenticator;
-      }
-
-      interface OauthAuthenticatorOptions {
-        flowType?: auth.FlowType;
-        credentials?: Credentials|string;
-      }
-
-      interface Credentials {
-        access_token?: string;
-        refresh_token?: string;
-      }
-
-      interface OauthAuthenticator extends Authenticator {
-        /**
-         * @param {Object} request The request to modify, for the `request` library.
-         * @return {Object} The `request` parameter, modified to include authentication
-         *     information using the stored credentials.
-         * @param request
-         * @return
-         */
-        authenticateRequest(request: OauthAuthenticatorRequest): OauthAuthenticatorRequest;
-      }
-
-      interface OauthAuthenticatorRequest {
-        /**
-         * When browserify-d, the `auth` component of the `request` library
-         * doesn't work so well, so we just manually set the bearer token instead.
-         */
-        headers : {
-          Authorization : string;
-        }
-      }
-
-      /**
-       * A layer to abstract the differences between using different types of
-       * authentication (Oauth vs. Basic). The Authenticator is responsible for
-       * establishing credentials and applying them to outgoing requests.
-       * @constructor
-       */
-      interface Authenticator {
-        /**
-         * Establishes credentials.
-         *
-         * @return {Promise} Resolves when initial credentials have been
-         *     completed and `authenticateRequest` calls can expect to succeed.
-         * @return
-         */
-        establishCredentials(): Promise<void>;
-
-        /**
-         * Attempts to refresh credentials, if possible, given the current credentials.
-         *
-         * @return {Promise} Resolves to `true` if credentials have been successfully
-         *     established and `authenticateRequests` can expect to succeed, else
-         *     resolves to `false`.
-         * @return
-         */
-        refreshCredentials(): Promise<boolean>;
-      }
-
-      var App: AppStatic;
-
-      interface AppStatic {
-        /**
-         * An abstraction around an App used with Asana.
-         *
-         * @options {Object} Options to construct the app
-         * @option {String} clientId       The ID of the app
-         * @option {String} [clientSecret] The secret key, if available here
-         * @option {String} [redirectUri]  The default redirect URI
-         * @option {String} [scope]        Scope to use, supports `default` and `scim`
-         * @option {String} [asanaBaseUrl] Base URL to use for Asana, for debugging
-         * @constructor
-         */
-        new (options: AppOptions): App;
-      }
-
-      interface AppOptions extends AsanaAuthorizeUrlOptions {
-        clientId?: string|number;
-        clientSecret?: string;
-        scope?: string;
-      }
-
-      interface App {
-        /**
-         * @param {Object} options  Overrides to the app's defaults
-         * @option {String} asanaBaseUrl
-         * @option {String} redirectUri
-         * @returns {String} The URL used to authorize a user for the app.
-         * @param options
-         * @return
-         */
-        asanaAuthorizeUrl(options?: AsanaAuthorizeUrlOptions): string;
-
-        /**
-         * @param {Object} options  Overrides to the app's defaults
-         * @option {String} asanaBaseUrl
-         * @option {String} redirectUri
-         * @returns {String} The URL used to acquire an access token.
-         * @param options
-         * @return
-         */
-        asanaTokenUrl(options?: AsanaAuthorizeUrlOptions): string;
-
-        /**
-         * @param {String} code An authorization code obtained via `asanaAuthorizeUrl`.
-         * @param {Object} options  Overrides to the app's defaults
-         * @option {String} asanaBaseUrl
-         * @option {String} redirectUri
-         * @return {Promise<Object>} The token, which will include the `access_token`
-         *     used for API access, as well as a `refresh_token` which can be stored
-         *     to get a new access token without going through the flow again.
-         * @param code
-         * @param options
-         * @return
-         */
-        accessTokenFromCode(code: string, options?: AsanaAuthorizeUrlOptions): Promise<Credentials>;
-
-        /**
-         * @param {String} refreshToken A refresh token obtained via Oauth.
-         * @param {Object} options Overrides to the app's defaults
-         * @option {String} asanaBaseUrl
-         * @option {String} redirectUri
-         * @return {Promise<Object>} The token, which will include the `access_token`
-         *     used for API access.
-         * @param refreshToken
-         * @param options
-         * @return
-         */
-        accessTokenFromRefreshToken(refreshToken: string, options: AsanaAuthorizeUrlOptions): Promise<Credentials>;
-
-        scope : string;
-
-        asanaBaseUrl : string;
-      }
-
-      interface AsanaAuthorizeUrlOptions {
-        redirectUri?: string;
-        asanaBaseUrl?: string;
-      }
-
-      var OauthError: OauthErrorStatic;
-
-      interface OauthErrorStatic {
-        /**
-         * @param options {Object} A data blob parsed from a query string or JSON
-         * response from the Asana API
-         * @option {String} error The string code identifying the error.
-         * @option {String} [error_uri] A link to help and information about the error.
-         * @option {String} [error_description] A description of the error.
-         * @constructor
-         */
-        new (options: OauthErrorOptions): OauthError;
-      }
-
-      interface OauthErrorOptions {
-        error?: string;
-        error_uri?: string;
-        error_description?: string;
-      }
-
-      interface OauthError extends Error {
-      }
-
-      /**
-       * Auto-detects the type of Oauth flow to use that's appropriate to the
-       * environment.
-       *
-       * @returns {Function|null} The type of Oauth flow to use, or null if no
-       *     appropriate type could be determined.
-       * @param env
-       * @return
-       */
-      function autoDetect(env: any): Function;
-
-      var RedirectFlow: RedirectFlowStatic;
-
-      interface RedirectFlowStatic extends FlowType {
-        /**
-         * An Oauth flow that runs in the browser and requests user authorization by
-         * redirecting to an authorization page on Asana, and redirecting back with
-         * the credentials.
-         * @param {Object} options See `BaseBrowserFlow` for options.
-         * @constructor
-         */
-        new (options: any): RedirectFlow;
-      }
-
-      interface RedirectFlow extends BaseBrowserFlow {
-      }
-
-      var PopupFlow: PopupFlowStatic;
-
-      interface PopupFlowStatic extends FlowType {
-        /**
-         * An Oauth flow that runs in the browser and requests user authorization by
-         * popping up a window and prompting the user.
-         * @param {Object} options See `BaseBrowserFlow` for options.
-         * @constructor
-         */
-        new (options: any): PopupFlow;
-      }
-
-      interface PopupFlow extends BaseBrowserFlow {
-        /**
-         * @param popupWidth
-         * @param popupHeight
-         */
-        _popupParams(popupWidth: number, popupHeight: number): void;
-
-        runReceiver(): void;
-      }
-
-      var NativeFlow: NativeFlowStatic;
-
-      interface NativeFlowStatic extends FlowType {
-        /**
-         * An Oauth flow that can be run from the console or an app that does
-         * not have the ability to open and manage a browser on its own.
-         * @param {Object} options
-         * @option {App} app App to authenticate for
-         * @option {String function(String)} [instructions] Function returning the
-         *     instructions to output to the user. Passed the authorize url.
-         * @option {String function()} [prompt] String to output immediately before
-         *     waiting for a line from stdin.
-         * @constructor
-         */
-        new (options: any): NativeFlow;
-      }
-
-      interface NativeFlow extends Flow {
-        /**
-         * Run the Oauth flow, prompting the user to go to the authorization URL
-         * and enter the code it displays when finished.
-         *
-         * @return {Promise<Object>} The access token object, which will include
-         *     `access_token` and `refresh_token`.
-         */
-        run(): void;
-
-        /**
-         * @param {String} code An authorization code obtained via `asanaAuthorizeUrl`.
-         * @return {Promise<Object>} The token, which will include the `access_token`
-         *     used for API access, as well as a `refresh_token` which can be stored
-         *     to get a new access token without going through the flow again.
-         * @param code
-         */
-        accessToken(code: string): void;
-
-        /**
-         * @return {Promise} The access token, which will include a refresh token
-         *     that can be stored in the future to create a client without going
-         *     through the Oauth flow.
-         * @param url
-         * @return
-         */
-        promptForCode(url: string): any;
-      }
-
-      var ChromeExtensionFlow: ChromeExtensionFlowStatic;
-
-      interface ChromeExtensionFlowStatic extends FlowType {
-        /**
-         * An Oauth flow that runs in a Chrome browser extension and requests user
-         * authorization by opening a temporary tab to prompt the user.
-         * @param {Object} options See `BaseBrowserFlow` for options, plus the below:
-         * @options {String} [receiverPath] Full path and filename from the base
-         *     directory of the extension to the receiver page. This is an HTML file
-         *     that has been made web-accessible, and that calls the receiver method
-         *     `Asana.auth.ChromeExtensionFlow.runReceiver();`.
-         * @constructor
-         */
-        new (options: any): ChromeExtensionFlow;
-      }
-
-      interface ChromeExtensionFlow extends BaseBrowserFlow {
-        /**
-         * Runs the receiver code to send the Oauth result to the requesting tab.
-         */
-        runReceiver(): void;
-      }
-
-      var BaseBrowserFlow: BaseBrowserFlowStatic;
-
-      interface BaseBrowserFlowStatic extends FlowType {
-        /**
-         * A base class for any flow that runs in the browser. All subclasses use the
-         * "implicit grant" flow to authenticate via the browser.
-         * @param {Object} options
-         * @option {App} app The app this flow is for
-         * @option {String} [redirectUri] The URL that Asana should redirect to once
-         *     user authorization is complete. Defaults to the URL configured in
-         *     the app, and if none then the current page URL.
-         * @constructor
-         */
-        new (options: any): BaseBrowserFlow;
-      }
-
-      interface BaseBrowserFlow extends Flow {
-        /**
-         * @param {String} authUrl The URL the user should be navigated to in order
-         *     to authorize the app.
-         * @param {String} state   The unique state generated for this auth request.
-         * @return {Promise} Resolved when authorization has successfully started,
-         *     i.e. the user has been navigated to a page requesting authorization.
-         * @param authUrl
-         * @param state
-         * @return
-         */
-        startAuthorization(authUrl: string, state: string): any;
-
-        /**
-         * @return {Promise<Object>} Credentials returned from Oauth.
-         * @param state
-         */
-        finishAuthorization(state: string): void;
-
-        /**
-         * @return {String} The URL to redirect to that will receive the
-         * @return
-         */
-        receiverUrl(): string;
-
-        /**
-         * @return {String} The URL to redirect to that will receive the
-         * @return
-         */
-        asanaBaseUrl(): string;
-
-        /**
-         * @returns {String} Generate a new unique state parameter for a request.
-         * @return
-         */
-        getStateParam(): string;
-      }
-
-      interface FlowType {
-        new (options: any): Flow;
-      }
-
-      interface Flow {
-        /**
-         * @returns {String} The URL used to authorize the user for the app.
-         * @return
-         */
-        authorizeUrl(): string;
-
-        /**
-         * Run the appropriate parts of the Oauth flow, attempting to establish user
-         * authorization.
-         * @returns {Promise<Object>} A promise that resolves to the Oauth credentials.
-         */
-        run(): void;
-      }
-    }
-
-    namespace errors {
-      class AsanaError extends Error {
-        /**
-         * @param message
-         * @return
-         */
-        constructor(message: any);
-
-        code: number;
-        value: any;
-      }
-
-      class Forbidden extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-
-      class InvalidRequest extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-      class NoAuthorization extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-      class NotFound extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-      class RateLimitEnforced extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-
-      class ServerError extends AsanaError {
-        /**
-         * @param value
-         * @return
-         */
-        constructor(value: any);
-      }
-    }
-
-    namespace resources {
-      interface AttachmentsStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Attachments;
-      }
-
-      namespace Attachments {
-        interface Type extends Resource {
-          created_at: string;
-          permanent_url: string;
-          download_url: string;
-          view_url: string;
-          host: string;
-          parent: Resource;
-        }
-      }
-
-      var Attachments: AttachmentsStatic;
-
-      /**
-       * An _attachment_ object represents any file attached to a task in Asana,
-       * whether it's an uploaded file or one associated via a third-party service
-       * such as Dropbox or Google Drive.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Attachments extends Resource {
-        /**
-         * * Returns the full record for a single attachment.
-         *   * @param {Number} attachment Globally unique identifier for the attachment.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param attachment
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(attachment: number, params?: Params, dispatchOptions?: any): Promise<Attachments.Type>;
-
-        /**
-         * * Returns the compact records for all attachments on the task.
-         *   * @param {Number} task Globally unique identifier for the task.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByTask(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Attachments.Type>>;
-      }
-
-      interface EventsStatic {
-        /**
-         * @param dispatcher
-         * @return
-         */
-        new (dispatcher: Dispatcher): Events;
-      }
-
-      var Events: EventsStatic;
-
-      /**
-       * An _event_ is an object representing a change to a resource that was observed
-       * by an event subscription.
-       *
-       * In general, requesting events on a resource is faster and subject to higher
-       * rate limits than requesting the resource itself. Additionally, change events
-       * bubble up - listening to events on a project would include when stories are
-       * added to tasks in the project, even on subtasks.
-       *
-       * Establish an initial sync token by making a request with no sync token.
-       * The response will be a `412` error - the same as if the sync token had
-       * expired.
-       *
-       * Subsequent requests should always provide the sync token from the immediately
-       * preceding call.
-       *
-       * Sync tokens may not be valid if you attempt to go 'backward' in the history
-       * by requesting previous tokens, though re-requesting the current sync token
-       * is generally safe, and will always return the same results.
-       *
-       * When you receive a `412 Precondition Failed` error, it means that the
-       * sync token is either invalid or expired. If you are attempting to keep a set
-       * of data in sync, this signals you may need to re-crawl the data.
-       *
-       * Sync tokens always expire after 24 hours, but may expire sooner, depending on
-       * load on the service.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Events extends Resource { }
-
-      interface ProjectsStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Projects;
-      }
-
-      namespace Projects {
-        interface Type extends Resource {
-          created_at: string;
-          modified_at: string;
-          due_date: string;
-          current_status: Status;
-          public: boolean;
-          archived: boolean;
-          notes: string;
-          color: string;
-          workspace: Resource;
-          team: Resource;
-          members: Resource[];
-          followers: Resource[];
-        }
-
-        interface CreateParams {
-          name?: string;
-          team?: number;
-          public?: boolean;
-          due_date: string;
-          notes?: string;
-          color?: string;
-        }
-
-        interface FollowersParams {
-          followers: (number|string)[];
-        }
-
-        interface MembersParams {
-          members: (number|string)[];
-        }
-
-        interface Status {
-          color: string;
-          text: string;
-          html_text: string;
-          modified_at: string;
-          author: Resource;
-        }
-
-        interface FindAllParams extends PaginationParams {
-          team?: number;
-          archived?: boolean;
-        }
-
-        interface FindByParams extends PaginationParams {
-          archived?: boolean;
-        }
-      }
-
-      var Projects: ProjectsStatic;
-
-      /**
-       * A _project_ represents a prioritized list of tasks in Asana. It exists in a
-       * single workspace or organization and is accessible to a subset of users in
-       * that workspace or organization, depending on its permissions.
-       *
-       * Projects in organizations are shared with a single team. You cannot currently
-       * change the team of a project via the API. Non-organization workspaces do not
-       * have teams and so you should not specify the team of project in a
-       * regular workspace.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Projects extends Resource {
-        /**
-         * * Creates a new project in a workspace or team.
-         * *
-         * * Every project is required to be created in a specific workspace or
-         * * organization, and this cannot be changed once set. Note that you can use
-         * * the `workspace` parameter regardless of whether or not it is an
-         * * organization.
-         * *
-         * * If the workspace for your project _is_ an organization, you must also
-         * * supply a `team` to share the project with.
-         * *
-         * * Returns the full record of the newly created project.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.workspace The workspace or organization to create the project in.
-         *   * @param {String} [data.team] If creating in an organization, the specific team to create the
-         *   * project in.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        create(data: Projects.CreateParams & { workspace: number }, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * If the workspace for your project _is_ an organization, you must also
-         * * supply a `team` to share the project with.
-         * *
-         * * Returns the full record of the newly created project.
-         *   * @param {Number} workspace The workspace or organization to create the project in.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createInWorkspace(workspace: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Creates a project shared with the given team.
-         * *
-         * * Returns the full record of the newly created project.
-         *   * @param {Number} team The team to create the project in.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createInTeam(team: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Returns the complete project record for a single project.
-         *   * @param {Number} project The project to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param project
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(project: number, params?: Params, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * A specific, existing project can be updated by making a PUT request on the
-         * * URL for that project. Only the fields provided in the `data` block will be
-         * * updated; any unspecified fields will remain unchanged.
-         * *
-         * * When using this method, it is best to specify only those fields you wish
-         * * to change, or else you may overwrite changes made by another user since
-         * * you last retrieved the task.
-         * *
-         * * Returns the complete updated project record.
-         *   * @param {Number} project The project to update.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        update(project: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * A specific, existing project can be deleted by making a DELETE request
-         * * on the URL for that project.
-         * *
-         * * Returns an empty data record.
-         *   * @param {Number} project The project to delete.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param dispatchOptions?
-         * @return
-         */
-        delete(project: number, dispatchOptions?: any): Promise<void>;
-
-        /**
-         * * Returns the compact project records for some filtered set of projects.
-         * * Use one or more of the parameters provided to filter the projects returned.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {String} [params.workspace] The workspace or organization to filter projects on.
-         *   * @param {String} [params.team] The team to filter projects on.
-         *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
-         *   * this parameter.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params?: Projects.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
-
-        /**
-         * * Returns the compact project records for all projects in the workspace.
-         *   * @param {Number} workspace The workspace or organization to find projects in.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
-         *   * this parameter.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByWorkspace(workspace: number, params?: Projects.FindByParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
-
-        /**
-         * * Returns the compact project records for all projects in the team.
-         *   * @param {Number} team The team to find projects in.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
-         *   * this parameter.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByTeam(team: number, params?: Projects.FindByParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
-
-        /**
-         * * Returns compact records for all sections in the specified project.
-         *   * @param {Number} project The project to get sections from.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        sections(project: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Returns the compact task records for all tasks within the given project,
-         * * ordered by their priority within the project. Tasks can exist in more than one project at a time.
-         *   * @param {Number} project The project in which to search for tasks.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        tasks(project: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Adds the specified list of users as followers to the project. Followers are a subset of members, therefore if
-         * * the users are not already members of the project they will also become members as a result of this operation.
-         * * Returns the updated project record.
-         *   * @param {Number} project The project to add followers to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.followers An array of followers to add to the project.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addFollowers(project: number, data: Projects.FollowersParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Removes the specified list of users from following the project, this will not affect project membership status.
-         * * Returns the updated project record.
-         *   * @param {Number} project The project to remove followers from.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.followers An array of followers to remove from the project.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeFollowers(project: number, data: Projects.FollowersParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Adds the specified list of users as members of the project. Returns the updated project record.
-         *   * @param {Number} project The project to add members to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.members An array of members to add to the project.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addMembers(project: number, data: Projects.MembersParams, dispatchOptions?: any): Promise<Projects.Type>;
-
-        /**
-         * * Removes the specified list of members from the project. Returns the updated project record.
-         *   * @param {Number} project The project to remove members from.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.members An array of members to remove from the project.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param project
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeMembers(project: number, data: Projects.MembersParams, dispatchOptions?: any): Promise<Projects.Type>;
-      }
-
-      interface StoriesStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Stories;
-      }
-
-      namespace Stories {
-        interface ShortType extends Resource {
-          created_at: string;
-          created_by: Resource;
-          type: string;
-          text: string;
-        }
-
-        interface Type extends ShortType {
-          html_text: string;
-          source: string;
-          target: Resource;
-          hearts: Type[];
-        }
-      }
-
-      var Stories: StoriesStatic;
-
-      /**
-       * A _story_ represents an activity associated with an object in the Asana
-       * system. Stories are generated by the system whenever users take actions such
-       * as creating or assigning tasks, or moving tasks between projects. _Comments_
-       * are also a form of user-generated story.
-       *
-       * Stories are a form of history in the system, and as such they are read-only.
-       * Once generated, it is not possible to modify a story.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Stories extends Resource {
-        /**
-         * * Returns the compact records for all stories on the task.
-         *   * @param {Number} task Globally unique identifier for the task.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByTask(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Stories.Type>>;
-
-        /**
-         * * Returns the full record for a single story.
-         *   * @param {Number} story Globally unique identifier for the story.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param story
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(story: number, params?: Params, dispatchOptions?: any): Promise<Stories.Type>;
-
-        /**
-         * * Adds a comment to a task. The comment will be authored by the
-         * * currently authenticated user, and timestamped when the server receives
-         * * the request.
-         * *
-         * * Returns the full record for the new story added to the task.
-         *   * @param {Number} task Globally unique identifier for the task.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.text The plain text of the comment to add.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createOnTask(task: number, data: any, dispatchOptions?: any): Promise<ResourceList<Stories.ShortType>>;
-      }
-
-      interface TagsStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Tags;
-      }
-
-      namespace Tags {
-        interface Type extends Resource {
-          created_at: string;
-          notes: string;
-          workspace: Resource;
-          color: string;
-          followers: Resource[];
-        }
-
-        interface FindAllParams extends PaginationParams {
-          team?: number;
-          archived?: boolean;
-        }
-      }
-
-      var Tags: TagsStatic;
-
-      /**
-       * A _tag_ is a label that can be attached to any task in Asana. It exists in a
-       * single workspace or organization.
-       *
-       * Tags have some metadata associated with them, but it is possible that we will
-       * simplify them in the future so it is not encouraged to rely too heavily on it.
-       * Unlike projects, tags do not provide any ordering on the tasks they
-       * are associated with.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Tags extends Resource {
-        /**
-         * * Creates a new tag in a workspace or organization.
-         * *
-         * * Every tag is required to be created in a specific workspace or
-         * * organization, and this cannot be changed once set. Note that you can use
-         * * the `workspace` parameter regardless of whether or not it is an
-         * * organization.
-         * *
-         * * Returns the full record of the newly created tag.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.workspace The workspace or organization to create the tag in.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        create(data: Tags.Type & { workspace: string }, dispatchOptions?: any): Promise<Tags.Type>;
-
-        /**
-         * * Creates a new tag in a workspace or organization.
-         * *
-         * * Every tag is required to be created in a specific workspace or
-         * * organization, and this cannot be changed once set. Note that you can use
-         * * the `workspace` parameter regardless of whether or not it is an
-         * * organization.
-         * *
-         * * Returns the full record of the newly created tag.
-         *   * @param {Number} workspace The workspace or organization to create the tag in.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createInWorkspace(workspace: number, data: Tags.Type, dispatchOptions?: any): Promise<Tags.Type>;
-
-        /**
-         * * Returns the complete tag record for a single tag.
-         *   * @param {Number} tag The tag to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param tag
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(tag: number, params?: Params, dispatchOptions?: any): Promise<Tags.Type>;
-
-        /**
-         * * Updates the properties of a tag. Only the fields provided in the `data`
-         * * block will be updated; any unspecified fields will remain unchanged.
-         * *
-         * * When using this method, it is best to specify only those fields you wish
-         * * to change, or else you may overwrite changes made by another user since
-         * * you last retrieved the task.
-         * *
-         * * Returns the complete updated tag record.
-         *   * @param {Number} tag The tag to update.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param tag
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        update(tag: number, data: Tags.Type, dispatchOptions?: any): Promise<Tags.Type>;
-
-        /**
-         * * A specific, existing tag can be deleted by making a DELETE request
-         * * on the URL for that tag.
-         * *
-         * * Returns an empty data record.
-         *   * @param {Number} tag The tag to delete.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param tag
-         * @param dispatchOptions?
-         * @return
-         */
-        delete(tag: number, dispatchOptions?: any): Promise<void>;
-
-        /**
-         * * Returns the compact tag records for some filtered set of tags.
-         * * Use one or more of the parameters provided to filter the tags returned.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {String} [params.workspace] The workspace or organization to filter tags on.
-         *   * @param {String} [params.team] The team to filter tags on.
-         *   * @param {Boolean} [params.archived] Only return tags whose `archived` field takes on the value of
-         *   * this parameter.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params?: Tags.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
-
-        /**
-         * * Returns the compact tag records for all tags in the workspace.
-         *   * @param {Number} workspace The workspace or organization to find tags in.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByWorkspace(workspace: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
-
-        /**
-         * * Returns the compact task records for all tasks with the given tag.
-         * * Tasks can have more than one tag at a time.
-         *   * @param {Number} tag The tag to fetch tasks from.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param tag
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        getTasksWithTag(tag: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-      }
-
-      interface TasksStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Tasks;
-      }
-
-      namespace Tasks {
-        interface Type extends Resource {
-          created_at: string;
-          modified_at: string;
-          completed_at: string;
-          completed: boolean;
-          due_on: string;
-          due_at: string;
-          assignee_status: string;
-          assignee: Resource;
-          notes: string;
-          workspace: Resource;
-          num_hearts: number;
-          hearted: boolean;
-          parent: Resource;
-          tags: Resource[];
-          projects: Resource[];
-          memberships: Membership[];
-          followers: Resource[];
-        }
-
-        interface CreateParams {
-          name: string;
-          completed?: boolean;
-          hearted?: boolean;
-          notes?: string;
-        }
-
-        interface FollowersParams {
-          followers: (number|string)[];
-        }
-
-        interface AddProjectParams {
-          project: number;
-          insertBefore?: number;
-          insertAfter?: number;
-          section?: number;
-        }
-
-        interface RemoveProjectParams {
-          project: number;
-        }
-
-        interface TagParams {
-          tag: string;
-        }
-
-        interface CommentParams {
-          text: string;
-        }
-
-        interface FindAllParams extends PaginationParams {
-          assignee?: number;
-          workspace: number;
-          completed_since?: string;
-          modified_since?: string;
-        }
-      }
-
-      var Tasks: TasksStatic;
-
-      /**
-       * The _task_ is the basic object around which many operations in Asana are
-       * centered. In the Asana application, multiple tasks populate the middle pane
-       * according to some view parameters, and the set of selected tasks determines
-       * the more detailed information presented in the details pane.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Tasks extends Resource {
-        /**
-         * * Creating a new task is as easy as POSTing to the `/tasks` endpoint
-         * * with a data block containing the fields you'd like to set on the task.
-         * * Any unspecified fields will take on default values.
-         * *
-         * * Every task is required to be created in a specific workspace, and this
-         * * workspace cannot be changed once set. The workspace need not be set
-         * * explicitly if you specify a `project` or a `parent` task instead.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number} [data.workspace] The workspace to create a task in.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        create(data: Tasks.CreateParams & { workspace: string }, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Creating a new task is as easy as POSTing to the `/tasks` endpoint
-         * * with a data block containing the fields you'd like to set on the task.
-         * * Any unspecified fields will take on default values.
-         * *
-         * * Every task is required to be created in a specific workspace, and this
-         * * workspace cannot be changed once set. The workspace need not be set
-         * * explicitly if you specify a `project` or a `parent` task instead.
-         *   * @param {Number} workspace The workspace to create a task in.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        createInWorkspace(workspace: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Returns the complete task record for a single task.
-         *   * @param {Number} task The task to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(task: number, params?: Params, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * A specific, existing task can be updated by making a PUT request on the
-         * * URL for that task. Only the fields provided in the `data` block will be
-         * * updated; any unspecified fields will remain unchanged.
-         * *
-         * * When using this method, it is best to specify only those fields you wish
-         * * to change, or else you may overwrite changes made by another user since
-         * * you last retrieved the task.
-         * *
-         * * Returns the complete updated task record.
-         *   * @param {Number} task The task to update.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        update(task: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * A specific, existing task can be deleted by making a DELETE request on the
-         * * URL for that task. Deleted tasks go into the "trash" of the user making
-         * * the delete request. Tasks can be recovered from the trash within a period
-         * * of 30 days; afterward they are completely removed from the system.
-         * *
-         * * Returns an empty data record.
-         *   * @param {Number} task The task to delete.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param dispatchOptions?
-         * @return
-         */
-        delete(task: number, dispatchOptions?: any): Promise<void>;
-
-        /**
-         * * Returns the compact task records for all tasks within the given project,
-         * * ordered by their priority within the project.
-         *   * @param {Number} projectId The project in which to search for tasks.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param projectId
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByProject(projectId: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Returns the compact task records for all tasks with the given tag.
-         *   * @param {Number} tag The tag in which to search for tasks.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param tag
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByTag(tag: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Returns the compact task records for some filtered set of tasks. Use one
-         * * or more of the parameters provided to filter the tasks returned.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Number} [params.assignee] The assignee to filter tasks on.
-         *   * @param {Number} [params.workspace] The workspace or organization to filter tasks on.
-         *   * @param {Number} [params.completed_since] Only return tasks that are either incomplete or that have been
-         *   * completed since this time.
-         *   * @param {Number} [params.modified_since] Only return tasks that have been modified since the given time.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params?: Tasks.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Adds each of the specified followers to the task, if they are not already
-         * * following. Returns the complete, updated record for the affected task.
-         *   * @param {Number} task The task to add followers to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.followers An array of followers to add to the task.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addFollowers(task: number, data: Tasks.FollowersParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Removes each of the specified followers from the task if they are
-         * * following. Returns the complete, updated record for the affected task.
-         *   * @param {Number} task The task to remove followers from.
-         *   * @param {Object} data Data for the request
-         *   * @param {Array} data.followers An array of followers to remove from the task.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeFollowers(task: number, data: Tasks.FollowersParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Returns a compact representation of all of the projects the task is in.
-         *   * @param {Number} task The task to get projects on.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        projects(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
-
-        /**
-         * * Adds the task to the specified project, in the optional location
-         * * specified. If no location arguments are given, the task will be added to
-         * * the beginning of the project.
-         * *
-         * * `addProject` can also be used to reorder a task within a project that
-         * * already contains it.
-         * *
-         * * Returns an empty data block.
-         *   * @param {Number} task The task to add to a project.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number} data.project The project to add the task to.
-         *   * @param {Number} [data.insertAfter] A task in the project to insert the task after, or `null` to
-         *   * insert at the beginning of the list.
-         *   * @param {Number} [data.insertBefore] A task in the project to insert the task before, or `null` to
-         *   * insert at the end of the list.
-         *   * @param {Number} [data.section] A section in the project to insert the task into. The task will be
-         *   * inserted at the top of the section.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addProject(task: number, data: Tasks.AddProjectParams, dispatchOptions?: any): Promise<{}>;
-
-        /**
-         * * Removes the task from the specified project. The task will still exist
-         * * in the system, but it will not be in the project anymore.
-         * *
-         * * Returns an empty data block.
-         *   * @param {Number} task The task to remove from a project.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number} data.project The project to remove the task from.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeProject(task: number, data: Tasks.RemoveProjectParams, dispatchOptions?: any): Promise<{}>;
-
-        /**
-         * * Returns a compact representation of all of the tags the task has.
-         *   * @param {Number} task The task to get tags on.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        tags(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
-
-        /**
-         * * Adds a tag to a task. Returns an empty data block.
-         *   * @param {Number} task The task to add a tag to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number} data.tag The tag to add to the task.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addTag(task: number, data: Tasks.TagParams, dispatchOptions?: any): Promise<{}>;
-
-        /**
-         * * Removes a tag from the task. Returns an empty data block.
-         *   * @param {Number} task The task to remove a tag from.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.tag The tag to remove from the task.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeTag(task: number, data: Tasks.TagParams, dispatchOptions?: any): Promise<{}>;
-
-        /**
-         * * Returns a compact representation of all of the subtasks of a task.
-         *   * @param {Number} task The task to get the subtasks of.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        subtasks(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
-
-        /**
-         * * Creates a new subtask and adds it to the parent task. Returns the full record
-         * * for the newly created subtask.
-         *   * @param {Number} task The task to add a subtask to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addSubtask(task: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
-
-        /**
-         * * Returns a compact representation of all of the stories on the task.
-         *   * @param {Number} task The task containing the stories to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        stories(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Stories.Type>>;
-
-        /**
-         * * Adds a comment to a task. The comment will be authored by the
-         * * currently authenticated user, and timestamped when the server receives
-         * * the request.
-         * *
-         * * Returns the full record for the new story added to the task.
-         *   * @param {Number} task Globally unique identifier for the task.
-         *   * @param {Object} data Data for the request
-         *   * @param {String} data.text The plain text of the comment to add.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param task
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addComment(task: number, data: Tasks.CommentParams, dispatchOptions?: any): Promise<Stories.Type>;
-      }
-
-      interface TeamsStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Teams;
-      }
-
-      namespace Teams {
-        interface Type extends Resource {
-          organization: Resource;
-        }
-      }
-
-      var Teams: TeamsStatic;
-
-      /**
-       * A _team_ is used to group related projects and people together within an
-       * organization. Each project in an organization is associated with a team.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Teams extends Resource {
-        /**
-         * * Returns the full record for a single team.
-         *   * @param {Number} team Globally unique identifier for the team.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param team
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(team: number, params?: Params, dispatchOptions?: any): Promise<Teams.Type>;
-
-        /**
-         * * Returns the compact records for all teams in the organization visible to
-         * * the authorized user.
-         *   * @param {Number} organization Globally unique identifier for the workspace or organization.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param organization
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findByOrganization(organization: number, params?: Params, dispatchOptions?: any): Promise<SimpleResourceList>;
-
-        /**
-         * * Returns the compact records for all users that are members of the team.
-         *   * @param {Number} team Globally unique identifier for the team.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        users(team: number, params?: Params, dispatchOptions?: any): Promise<SimpleResourceList>;
-
-        /**
-         * * The user making this call must be a member of the team in order to add others.
-         * * The user to add must exist in the same organization as the team in order to be added.
-         * * The user to add can be referenced by their globally unique user ID or their email address.
-         * * Returns the full user record for the added user.
-         *   * @param {Number} team Globally unique identifier for the team.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addUser(team: number, data: UserParams, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * * The user to remove can be referenced by their globally unique user ID or their email address.
-         * * Removes the user from the specified team. Returns an empty data record.
-         *   * @param {Number} team Globally unique identifier for the team.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param team
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeUser(team: number, data: UserParams, dispatchOptions?: any): Promise<any>;
-      }
-
-      interface UsersStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Users;
-      }
-
-      namespace Users {
-        interface FindAllParams extends PaginationParams {
-          workspace: number;
-        }
-
-        interface Type extends Resource {
-          email: string;
-          workspaces: Resource[];
-          photo: { [key: string]: string };
-        }
-      }
-
-      var Users: UsersStatic;
-
-      /**
-       * A _user_ object represents an account in Asana that can be given access to
-       * various workspaces, projects, and tasks.
-       *
-       * Like other objects in the system, users are referred to by numerical IDs.
-       * However, the special string identifier `me` can be used anywhere
-       * a user ID is accepted, to refer to the current authenticated user.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Users extends Resource {
-        /**
-         * * Returns the full user record for the currently authenticated user.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        me(params?: Params, dispatchOptions?: any): Promise<Users.Type>;
-
-        /**
-         * * Returns the full user record for the single user with the provided ID.
-         *   * @param {Number|String} user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param user
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(user: string|number, params?: Params, dispatchOptions?: any): Promise<Users.Type>;
-
-        /**
-         * * Returns the user records for all users in the specified workspace or
-         * * organization.
-         *   * @param {Number} workspace The workspace in which to get users.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
+         * @returns {Promise} Resolves when the dispatcher is authorized, rejected if
+         *     there was a problem authorizing.
          * @return
          */
-        findByWorkspace(workspace: number, params?: Params, dispatchOptions?: any): Promise<ResourceList<Users.Type>>;
+        authorize(): Promise<void>;
 
         /**
-         * * Returns the user records for all users in all workspaces and organizations
-         * * accessible to the authenticated user. Accepts an optional workspace ID
-         * * parameter.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Number} [params.workspace] The workspace or organization to filter users on.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
+         * Dispatches a request to the Asana API. The request parameters are passed to
+         * the request module.
+         * @param  {Object}  params The params for request
+         * @param  {Object}  [dispatchOptions] Options for handling request/response
+         * @return {Promise}        The response for the request
          * @param params
          * @param dispatchOptions?
          * @return
          */
-        findAll(params: Users.FindAllParams, dispatchOptions?: any): Promise<SimpleResourceList>;
-      }
+        dispatch(params: any, dispatchOptions?: any): Promise<any>;
 
-      /**
-       * **Webhooks are currently in BETA - The information here may change.**
-       *
-       * Webhooks allow an application to be notified of changes. This is in addition
-       * to the ability to fetch those changes directly as
-       * [Events](/developers/api-reference/events) - in fact, Webhooks are just a way
-       * to receive Events via HTTP POST at the time they occur instead of polling for
-       * them. For services accessible via HTTP this is often vastly more convenient,
-       * and if events are not too frequent can be significantly more efficient.
-       *
-       * In both cases, however, changes are represented as Event objects - refer to
-       * the [Events documentation](/developers/api-reference/events) for more
-       * information on what data these events contain.
-       *
-       * **NOTE:** While Webhooks send arrays of Event objects to their target, the
-       * Event objects themselves contain *only IDs*, rather than the actual resource
-       * they are referencing. So while a normal event you receive via GET /events
-       * would look like this:
-       *
-       *     {\
-       *       "resource": {\
-       *         "id": 1337,\
-       *         "name": "My Task"\
-       *       },\
-       *       "parent": null,\
-       *       "created_at": "2013-08-21T18:20:37.972Z",\
-       *       "user": {\
-       *         "id": 1123,\
-       *         "name": "Tom Bizarro"\
-       *       },\
-       *       "action": "changed",\
-       *       "type": "task"\
-       *     }
-       *
-       * In a Webhook payload you would instead receive this:
-       *
-       *     {\
-       *       "resource": 1337,\
-       *       "parent": null,\
-       *       "created_at": "2013-08-21T18:20:37.972Z",\
-       *       "user": 1123,\
-       *       "action": "changed",\
-       *       "type": "task"\
-       *     }
-       *
-       * Webhooks themselves contain only the information necessary to deliver the
-       * events to the desired target as they are generated.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      class Webhooks extends Resource {
         /**
-         * @param dispatcher
+         * Dispatches a GET request to the Asana API.
+         * @param  {String}  path    The path of the API
+         * @param  {Object}  [query] The query params
+         * @param  {Object}  [dispatchOptions] Options for handling the request and
+         *     response. See `dispatch`.
+         * @return {Promise}         The response for the request
+         * @param path
+         * @param query?
+         * @param dispatchOptions?
+         * @return
          */
-        constructor(dispatcher: Dispatcher);
+        get(path: string, query?: any, dispatchOptions?: any): Promise<any>;
 
         /**
-         * * Establishing a webhook is a two-part process. First, a simple HTTP POST
-         * * similar to any other resource creation. Since you could have multiple
-         * * webhooks we recommend specifying a unique local id for each target.
-         * *
-         * * Next comes the confirmation handshake. When a webhook is created, we will
-         * * send a test POST to the `target` with an `X-Hook-Secret` header as
-         * * described in the
-         * * [Resthooks Security documentation](http://resthooks.org/docs/security/).
-         * * The target must respond with a `200 OK` and a matching `X-Hook-Secret`
-         * * header to confirm that this webhook subscription is indeed expected.
-         * *
-         * * If you do not acknowledge the webhook's confirmation handshake it will
-         * * fail to setup, and you will receive an error in response to your attempt
-         * * to create it. This means you need to be able to receive and complete the
-         * * webhook *while* the POST request is in-flight.
-         *   * @param {Number} resource A resource ID to subscribe to. The resource can be a task or project.
-         *   * @param {String} target The URL to receive the HTTP POST.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param resource
-         * @param target
+         * Dispatches a POST request to the Asana API.
+         * @param  {String} path The path of the API
+         * @param  {Object} data The data to be sent
+         * @param  {Object}  [dispatchOptions] Options for handling the request and
+         *     response. See `dispatch`.
+         * @return {Promise}     The response for the request
+         * @param path
          * @param data
          * @param dispatchOptions?
          * @return
          */
-        create(resource: number, target: string, data: any, dispatchOptions?: any): Promise<any>;
+        post(path: string, data: any, dispatchOptions?: any): Promise<any>;
 
         /**
-         * * Returns the compact representation of all webhooks your app has
-         * * registered for the authenticated user in the given workspace.
-         *   * @param {Number} workspace The workspace to query for webhooks in.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Number} [params.resource] Only return webhooks for the given resource.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        getAll(workspace: number, params?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * * Returns the full record for the given webhook.
-         *   * @param {String} webhook The webhook to get.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param webhook
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        getById(webhook: string, params?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * * This method permanently removes a webhook. Note that it may be possible
-         * * to receive a request that was already in flight after deleting the
-         * * webhook, but no further requests will be issued.
-         *   * @param {String} webhook The webhook to delete.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param webhook
-         * @param dispatchOptions?
-         * @return
-         */
-        deleteById(webhook: string, dispatchOptions?: any): Promise<any>;
-      }
-
-      interface WorkspacesStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Workspaces;
-      }
-
-      namespace Workspaces {
-        interface ShortType extends Resource {
-          id_organization?: boolean;
-        }
-
-        interface Type extends Resource {
-          id_organization: boolean;
-          email_domains: string[];
-        }
-
-        interface TypeaheadParams {
-          type: string;
-          query?: string;
-          count?: number;
-        }
-      }
-
-      var Workspaces: WorkspacesStatic;
-
-      /**
-       * A _workspace_ is the highest-level organizational unit in Asana. All projects
-       * and tasks have an associated workspace.
-       *
-       * An _organization_ is a special kind of workspace that represents a company.
-       * In an organization, you can group your projects into teams. You can read
-       * more about how organizations work on the Asana Guide.
-       * To tell if your workspace is an organization or not, check its
-       * `is_organization` property.
-       *
-       * Over time, we intend to migrate most workspaces into organizations and to
-       * release more organization-specific functionality. We may eventually deprecate
-       * using workspace-based APIs for organizations. Currently, and until after
-       * some reasonable grace period following any further announcements, you can
-       * still reference organizations in any `workspace` parameter.
-       * @class
-       * @param {Dispatcher} dispatcher The API dispatcher
-       */
-      interface Workspaces extends Resource {
-        /**
-         * * Returns the full workspace record for a single workspace.
-         *   * @param {Number} workspace Globally unique identifier for the workspace or organization.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The requested resource
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findById(workspace: number, params?: Params, dispatchOptions?: any): Promise<Workspaces.Type>;
-
-        /**
-         * * Returns the compact records for all workspaces visible to the authorized user.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        findAll(params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Workspaces.ShortType>>;
-
-        /**
-         * * A specific, existing workspace can be updated by making a PUT request on
-         * * the URL for that workspace. Only the fields provided in the data block
-         * * will be updated; any unspecified fields will remain unchanged.
-         * *
-         * * Currently the only field that can be modified for a workspace is its `name`.
-         * *
-         * * Returns the complete, updated workspace record.
-         *   * @param {Number} workspace The workspace to update.
-         *   * @param {Object} data Data for the request
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
+         * Dispatches a PUT request to the Asana API.
+         * @param  {String} path The path of the API
+         * @param  {Object} data The data to be sent
+         * @param  {Object}  [dispatchOptions] Options for handling the request and
+         *     response. See `dispatch`.
+         * @return {Promise}     The response for the request
+         * @param path
          * @param data
          * @param dispatchOptions?
          * @return
          */
-        update(workspace: number, data: { name?: string }, dispatchOptions?: any): Promise<Workspaces.Type>;
+        put(path: string, data: any, dispatchOptions?: any): Promise<any>;
 
         /**
-         * * Retrieves objects in the workspace based on an auto-completion/typeahead
-         * * search algorithm. This feature is meant to provide results quickly, so do
-         * * not rely on this API to provide extremely accurate search results. The
-         * * result set is limited to a single page of results with a maximum size,
-         * * so you won't be able to fetch large numbers of results.
-         *   * @param {Number} workspace The workspace to fetch objects from.
-         *   * @param {Object} [params] Parameters for the request
-         *   * @param {String} params.type The type of values the typeahead should return.
-         *   * Note that unlike in the names of endpoints, the types listed here are
-         *   * in singular form (e.g. `task`). Using multiple types is not yet supported.
-         *   * @param {String} [params.query] The string that will be used to search for relevant objects. If an
-         *   * empty string is passed in, the API will currently return an empty
-         *   * result set.
-         *   * @param {Number} [params.count] The number of results to return. The default is `20` if this
-         *   * parameter is omitted, with a minimum of `1` and a maximum of `100`.
-         *   * If there are fewer results found than requested, all will be returned.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param params?
-         * @param dispatchOptions?
-         * @return
-         */
-        typeahead(workspace: number, params?: Workspaces.TypeaheadParams, dispatchOptions?: any): Promise<SimpleResourceList>;
-
-        /**
-         * * The user can be referenced by their globally unique user ID or their email address.
-         * * Returns the full user record for the invited user.
-         *   * @param {Number} workspace The workspace or organization to invite the user to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        addUser(workspace: number, data: UserParams, dispatchOptions?: any): Promise<Users.Type>;
-
-        /**
-         * * The user making this call must be an admin in the workspace.
-         * * Returns an empty data record.
-         *   * @param {Number} workspace The workspace or organization to invite the user to.
-         *   * @param {Object} data Data for the request
-         *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
-         *   * the globally unique identifier for the user, or the keyword `me`
-         *   * to indicate the current user making the request.
-         *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
-         *   * @return {Promise} The response from the API
-         * @param workspace
-         * @param data
-         * @param dispatchOptions?
-         * @return
-         */
-        removeUser(workspace: number, data: UserParams, dispatchOptions?: any): Promise<any>;
-      }
-
-      interface ResourceStatic {
-        /**
-         * @param dispatcher
-         */
-        new (dispatcher: Dispatcher): Resource;
-
-        /**
-         * @type {number} Default number of items to get per page.
-         */
-        DEFAULT_PAGE_LIMIT: number;
-
-        /**
-         * Helper method that dispatches a GET request to the API, where the expected
-         * result is a collection.
-         * @param  {Dispatcher} dispatcher
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise<SimpleResourceList>} The Collection response for the request
-         * @param dispatcher
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         */
-        getCollection(dispatcher: any, path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Helper method for any request Promise from the Dispatcher, unwraps the `data`
-         * value from the payload.
-         * @param  {Promise} promise A promise returned from a `Dispatcher` request.
-         * @return {Promise}         The `data` portion of the response payload.
-         * @param promise
-         * @return
-         */
-        unwrap(promise: any): Promise<any>;
-      }
-
-      var Resource: ResourceStatic;
-
-      /**
-       * Base class for a resource accessible via the API. Uses a `Dispatcher` to
-       * access the resources.
-       * @param {Dispatcher} dispatcher
-       * @constructor
-       */
-      interface Resource {
-        /**
-         * Dispatches a GET request to the API, where the expected result is a
-         * single resource.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchGet(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Dispatches a GET request to the API, where the expected result is a
-         * collection.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchGetCollection(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Dispatches a POST request to the API, where the expected response is a
-         * single resource.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchPost(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Dispatches a POST request to the API, where the expected response is a
-         * single resource.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [query] The query params
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
-         * @param path
-         * @param query?
-         * @param dispatchOptions?
-         * @return
-         */
-        dispatchPut(path: string, query?: any, dispatchOptions?: any): Promise<any>;
-
-        /**
-         * Dispatches a DELETE request to the API. The expected response is an
-         * empty resource.
-         * @param  {String}     path    The path of the API
-         * @param  {Object}     [dispatchOptions] Options for handling the request and
-         *     response. See `Dispatcher.dispatch`.
-         * @return {Promise}            The response for the request
+         * Dispatches a DELETE request to the Asana API.
+         * @param  {String} path The path of the API
+         * @param  {Object}  [dispatchOptions] Options for handling the request and
+         *     response. See `dispatch`.
+         * @return {Promise}     The response for the request
          * @param path
          * @param dispatchOptions?
          * @return
          */
-        dispatchDelete(path: string, dispatchOptions?: any): Promise<any>;
-      }
+        delete(path: string, dispatchOptions?: any): Promise<any>;
 
-      interface ResourceList<T extends Resource> {
-        data: T[];
-        _response: {
-          data: T[];
-          next_page?: NextPage;
-        };
-        _dispatcher: {
-          authenticator: {
-            apiKey: string;
-          };
-          asanaBaseUrl: string;
-          retryOnRateLimit: boolean;
-          requestTimeout: number;
-          _cachedVersionInfo: VersionInfo;
+        /**
+         * The base URL for Asana
+         * @type {String}
+         */
+        asanaBaseUrl: string;
+
+        /**
+         * Whether requests should be automatically retried if rate limited.
+         * @type {Boolean}
+         */
+        retryOnRateLimit: boolean;
+
+        /**
+         * Handler for unauthorized requests which may seek reauthorization.
+         * Default behavior is available if configured with an Oauth authenticator
+         * that has a refresh token, and will refresh the current access token.
+         * @type {Function}
+         */
+        handleUnauthorized: () => boolean | Promise<boolean>;
+
+        /**
+         * The amount of time in milliseconds to wait for a request to finish.
+         * @type {Number}
+         */
+        requestTimeout: number;
+    }
+
+    namespace auth {
+        var BasicAuthenticator: BasicAuthenticatorStatic;
+
+        interface BasicAuthenticatorStatic {
+            /**
+             * @param apiKey
+             */
+            new (apiKey: string): BasicAuthenticator;
         }
-      }
 
-      type SimpleResourceList = ResourceList<Resource>;
+        interface BasicAuthenticator extends Authenticator {
+            /**
+             * @param {Object} request The request to modify, for the `request` library.
+             * @return {Object} The `request` parameter, modified to include authentication
+             *     information using the stored credentials.
+             * @param request
+             * @return
+             */
+            authenticateRequest(request: BasicAuthenticatorRequest): BasicAuthenticatorRequest;
+        }
 
-      interface NextPage {
-        offset: string;
-        uri: string;
-        path: string;
-      }
+        interface BasicAuthenticatorRequest {
+            auth: {
+                username: string;
+                password: string;
+            }
+        }
 
-      interface VersionInfo {
-        version: string;
-        language: string;
-        language_version: string;
-        os: string;
-        os_version: string;
-      }
+        var OauthAuthenticator: OauthAuthenticatorStatic;
 
-      interface Resource {
-        id: number;
-        name: string;
-      }
+        interface OauthAuthenticatorStatic {
+            /**
+             * Creates an authenticator that uses Oauth for authentication.
+             *
+             * @param {Object} options Configure the authenticator; must specify one
+             *     of `flow` or `credentials`.
+             * @option {App}           app           The app being authenticated for.
+             * @option {OauthFlow}     [flow]        The flow to use to get credentials
+             *     when needed.
+             * @option {String|Object} [credentials] Initial credentials to use. This can
+             *     be either the object returned from an access token request (which
+             *     contains the token and some other metadata) or just the `access_token`
+             *     field.
+             * @constructor
+             */
+            new (options: OauthAuthenticatorOptions): OauthAuthenticator;
+        }
 
-      interface PaginationParams extends Params {
-        limit?: number;
-        offset?: string;
-      }
+        interface OauthAuthenticatorOptions {
+            flowType?: auth.FlowType;
+            credentials?: Credentials | string;
+        }
 
-      interface Params {
-        opt_fields?: string;
-        opt_expand?: string;
-      }
+        interface Credentials {
+            access_token?: string;
+            refresh_token?: string;
+        }
 
-      interface UserParams {
-        user: string|number;
-      }
+        interface OauthAuthenticator extends Authenticator {
+            /**
+             * @param {Object} request The request to modify, for the `request` library.
+             * @return {Object} The `request` parameter, modified to include authentication
+             *     information using the stored credentials.
+             * @param request
+             * @return
+             */
+            authenticateRequest(request: OauthAuthenticatorRequest): OauthAuthenticatorRequest;
+        }
 
-      interface Membership {
-        project: Resource;
-        section: Resource;
-      }
+        interface OauthAuthenticatorRequest {
+            /**
+             * When browserify-d, the `auth` component of the `request` library
+             * doesn't work so well, so we just manually set the bearer token instead.
+             */
+            headers: {
+                Authorization: string;
+            }
+        }
+
+        /**
+         * A layer to abstract the differences between using different types of
+         * authentication (Oauth vs. Basic). The Authenticator is responsible for
+         * establishing credentials and applying them to outgoing requests.
+         * @constructor
+         */
+        interface Authenticator {
+            /**
+             * Establishes credentials.
+             *
+             * @return {Promise} Resolves when initial credentials have been
+             *     completed and `authenticateRequest` calls can expect to succeed.
+             * @return
+             */
+            establishCredentials(): Promise<void>;
+
+            /**
+             * Attempts to refresh credentials, if possible, given the current credentials.
+             *
+             * @return {Promise} Resolves to `true` if credentials have been successfully
+             *     established and `authenticateRequests` can expect to succeed, else
+             *     resolves to `false`.
+             * @return
+             */
+            refreshCredentials(): Promise<boolean>;
+        }
+
+        var App: AppStatic;
+
+        interface AppStatic {
+            /**
+             * An abstraction around an App used with Asana.
+             *
+             * @options {Object} Options to construct the app
+             * @option {String} clientId       The ID of the app
+             * @option {String} [clientSecret] The secret key, if available here
+             * @option {String} [redirectUri]  The default redirect URI
+             * @option {String} [scope]        Scope to use, supports `default` and `scim`
+             * @option {String} [asanaBaseUrl] Base URL to use for Asana, for debugging
+             * @constructor
+             */
+            new (options: AppOptions): App;
+        }
+
+        interface AppOptions extends AsanaAuthorizeUrlOptions {
+            clientId?: string | number;
+            clientSecret?: string;
+            scope?: string;
+        }
+
+        interface App {
+            /**
+             * @param {Object} options  Overrides to the app's defaults
+             * @option {String} asanaBaseUrl
+             * @option {String} redirectUri
+             * @returns {String} The URL used to authorize a user for the app.
+             * @param options
+             * @return
+             */
+            asanaAuthorizeUrl(options?: AsanaAuthorizeUrlOptions): string;
+
+            /**
+             * @param {Object} options  Overrides to the app's defaults
+             * @option {String} asanaBaseUrl
+             * @option {String} redirectUri
+             * @returns {String} The URL used to acquire an access token.
+             * @param options
+             * @return
+             */
+            asanaTokenUrl(options?: AsanaAuthorizeUrlOptions): string;
+
+            /**
+             * @param {String} code An authorization code obtained via `asanaAuthorizeUrl`.
+             * @param {Object} options  Overrides to the app's defaults
+             * @option {String} asanaBaseUrl
+             * @option {String} redirectUri
+             * @return {Promise<Object>} The token, which will include the `access_token`
+             *     used for API access, as well as a `refresh_token` which can be stored
+             *     to get a new access token without going through the flow again.
+             * @param code
+             * @param options
+             * @return
+             */
+            accessTokenFromCode(code: string, options?: AsanaAuthorizeUrlOptions): Promise<Credentials>;
+
+            /**
+             * @param {String} refreshToken A refresh token obtained via Oauth.
+             * @param {Object} options Overrides to the app's defaults
+             * @option {String} asanaBaseUrl
+             * @option {String} redirectUri
+             * @return {Promise<Object>} The token, which will include the `access_token`
+             *     used for API access.
+             * @param refreshToken
+             * @param options
+             * @return
+             */
+            accessTokenFromRefreshToken(refreshToken: string, options: AsanaAuthorizeUrlOptions): Promise<Credentials>;
+
+            scope: string;
+
+            asanaBaseUrl: string;
+        }
+
+        interface AsanaAuthorizeUrlOptions {
+            redirectUri?: string;
+            asanaBaseUrl?: string;
+        }
+
+        var OauthError: OauthErrorStatic;
+
+        interface OauthErrorStatic {
+            /**
+             * @param options {Object} A data blob parsed from a query string or JSON
+             * response from the Asana API
+             * @option {String} error The string code identifying the error.
+             * @option {String} [error_uri] A link to help and information about the error.
+             * @option {String} [error_description] A description of the error.
+             * @constructor
+             */
+            new (options: OauthErrorOptions): OauthError;
+        }
+
+        interface OauthErrorOptions {
+            error?: string;
+            error_uri?: string;
+            error_description?: string;
+        }
+
+        interface OauthError extends Error {
+        }
+
+        /**
+         * Auto-detects the type of Oauth flow to use that's appropriate to the
+         * environment.
+         *
+         * @returns {Function|null} The type of Oauth flow to use, or null if no
+         *     appropriate type could be determined.
+         * @param env
+         * @return
+         */
+        function autoDetect(env: any): Function;
+
+        var RedirectFlow: RedirectFlowStatic;
+
+        interface RedirectFlowStatic extends FlowType {
+            /**
+             * An Oauth flow that runs in the browser and requests user authorization by
+             * redirecting to an authorization page on Asana, and redirecting back with
+             * the credentials.
+             * @param {Object} options See `BaseBrowserFlow` for options.
+             * @constructor
+             */
+            new (options: any): RedirectFlow;
+        }
+
+        interface RedirectFlow extends BaseBrowserFlow {
+        }
+
+        var PopupFlow: PopupFlowStatic;
+
+        interface PopupFlowStatic extends FlowType {
+            /**
+             * An Oauth flow that runs in the browser and requests user authorization by
+             * popping up a window and prompting the user.
+             * @param {Object} options See `BaseBrowserFlow` for options.
+             * @constructor
+             */
+            new (options: any): PopupFlow;
+        }
+
+        interface PopupFlow extends BaseBrowserFlow {
+            /**
+             * @param popupWidth
+             * @param popupHeight
+             */
+            _popupParams(popupWidth: number, popupHeight: number): void;
+
+            runReceiver(): void;
+        }
+
+        var NativeFlow: NativeFlowStatic;
+
+        interface NativeFlowStatic extends FlowType {
+            /**
+             * An Oauth flow that can be run from the console or an app that does
+             * not have the ability to open and manage a browser on its own.
+             * @param {Object} options
+             * @option {App} app App to authenticate for
+             * @option {String function(String)} [instructions] Function returning the
+             *     instructions to output to the user. Passed the authorize url.
+             * @option {String function()} [prompt] String to output immediately before
+             *     waiting for a line from stdin.
+             * @constructor
+             */
+            new (options: any): NativeFlow;
+        }
+
+        interface NativeFlow extends Flow {
+            /**
+             * Run the Oauth flow, prompting the user to go to the authorization URL
+             * and enter the code it displays when finished.
+             *
+             * @return {Promise<Object>} The access token object, which will include
+             *     `access_token` and `refresh_token`.
+             */
+            run(): void;
+
+            /**
+             * @param {String} code An authorization code obtained via `asanaAuthorizeUrl`.
+             * @return {Promise<Object>} The token, which will include the `access_token`
+             *     used for API access, as well as a `refresh_token` which can be stored
+             *     to get a new access token without going through the flow again.
+             * @param code
+             */
+            accessToken(code: string): void;
+
+            /**
+             * @return {Promise} The access token, which will include a refresh token
+             *     that can be stored in the future to create a client without going
+             *     through the Oauth flow.
+             * @param url
+             * @return
+             */
+            promptForCode(url: string): any;
+        }
+
+        var ChromeExtensionFlow: ChromeExtensionFlowStatic;
+
+        interface ChromeExtensionFlowStatic extends FlowType {
+            /**
+             * An Oauth flow that runs in a Chrome browser extension and requests user
+             * authorization by opening a temporary tab to prompt the user.
+             * @param {Object} options See `BaseBrowserFlow` for options, plus the below:
+             * @options {String} [receiverPath] Full path and filename from the base
+             *     directory of the extension to the receiver page. This is an HTML file
+             *     that has been made web-accessible, and that calls the receiver method
+             *     `Asana.auth.ChromeExtensionFlow.runReceiver();`.
+             * @constructor
+             */
+            new (options: any): ChromeExtensionFlow;
+        }
+
+        interface ChromeExtensionFlow extends BaseBrowserFlow {
+            /**
+             * Runs the receiver code to send the Oauth result to the requesting tab.
+             */
+            runReceiver(): void;
+        }
+
+        var BaseBrowserFlow: BaseBrowserFlowStatic;
+
+        interface BaseBrowserFlowStatic extends FlowType {
+            /**
+             * A base class for any flow that runs in the browser. All subclasses use the
+             * "implicit grant" flow to authenticate via the browser.
+             * @param {Object} options
+             * @option {App} app The app this flow is for
+             * @option {String} [redirectUri] The URL that Asana should redirect to once
+             *     user authorization is complete. Defaults to the URL configured in
+             *     the app, and if none then the current page URL.
+             * @constructor
+             */
+            new (options: any): BaseBrowserFlow;
+        }
+
+        interface BaseBrowserFlow extends Flow {
+            /**
+             * @param {String} authUrl The URL the user should be navigated to in order
+             *     to authorize the app.
+             * @param {String} state   The unique state generated for this auth request.
+             * @return {Promise} Resolved when authorization has successfully started,
+             *     i.e. the user has been navigated to a page requesting authorization.
+             * @param authUrl
+             * @param state
+             * @return
+             */
+            startAuthorization(authUrl: string, state: string): any;
+
+            /**
+             * @return {Promise<Object>} Credentials returned from Oauth.
+             * @param state
+             */
+            finishAuthorization(state: string): void;
+
+            /**
+             * @return {String} The URL to redirect to that will receive the
+             * @return
+             */
+            receiverUrl(): string;
+
+            /**
+             * @return {String} The URL to redirect to that will receive the
+             * @return
+             */
+            asanaBaseUrl(): string;
+
+            /**
+             * @returns {String} Generate a new unique state parameter for a request.
+             * @return
+             */
+            getStateParam(): string;
+        }
+
+        interface FlowType {
+            new (options: any): Flow;
+        }
+
+        interface Flow {
+            /**
+             * @returns {String} The URL used to authorize the user for the app.
+             * @return
+             */
+            authorizeUrl(): string;
+
+            /**
+             * Run the appropriate parts of the Oauth flow, attempting to establish user
+             * authorization.
+             * @returns {Promise<Object>} A promise that resolves to the Oauth credentials.
+             */
+            run(): void;
+        }
+    }
+
+    namespace errors {
+        class AsanaError extends Error {
+            /**
+             * @param message
+             * @return
+             */
+            constructor(message: any);
+
+            code: number;
+            value: any;
+        }
+
+        class Forbidden extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+
+        class InvalidRequest extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+        class NoAuthorization extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+        class NotFound extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+        class RateLimitEnforced extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+
+        class ServerError extends AsanaError {
+            /**
+             * @param value
+             * @return
+             */
+            constructor(value: any);
+        }
+    }
+
+    namespace resources {
+        interface AttachmentsStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Attachments;
+        }
+
+        namespace Attachments {
+            interface Type extends Resource {
+                created_at: string;
+                permanent_url: string;
+                download_url: string;
+                view_url: string;
+                host: string;
+                parent: Resource;
+            }
+        }
+
+        var Attachments: AttachmentsStatic;
+
+        /**
+         * An _attachment_ object represents any file attached to a task in Asana,
+         * whether it's an uploaded file or one associated via a third-party service
+         * such as Dropbox or Google Drive.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Attachments extends Resource {
+            /**
+             * * Returns the full record for a single attachment.
+             *   * @param {Number} attachment Globally unique identifier for the attachment.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param attachment
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(attachment: number, params?: Params, dispatchOptions?: any): Promise<Attachments.Type>;
+
+            /**
+             * * Returns the compact records for all attachments on the task.
+             *   * @param {Number} task Globally unique identifier for the task.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByTask(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Attachments.Type>>;
+        }
+
+        interface EventsStatic {
+            /**
+             * @param dispatcher
+             * @return
+             */
+            new (dispatcher: Dispatcher): Events;
+        }
+
+        var Events: EventsStatic;
+
+        /**
+         * An _event_ is an object representing a change to a resource that was observed
+         * by an event subscription.
+         *
+         * In general, requesting events on a resource is faster and subject to higher
+         * rate limits than requesting the resource itself. Additionally, change events
+         * bubble up - listening to events on a project would include when stories are
+         * added to tasks in the project, even on subtasks.
+         *
+         * Establish an initial sync token by making a request with no sync token.
+         * The response will be a `412` error - the same as if the sync token had
+         * expired.
+         *
+         * Subsequent requests should always provide the sync token from the immediately
+         * preceding call.
+         *
+         * Sync tokens may not be valid if you attempt to go 'backward' in the history
+         * by requesting previous tokens, though re-requesting the current sync token
+         * is generally safe, and will always return the same results.
+         *
+         * When you receive a `412 Precondition Failed` error, it means that the
+         * sync token is either invalid or expired. If you are attempting to keep a set
+         * of data in sync, this signals you may need to re-crawl the data.
+         *
+         * Sync tokens always expire after 24 hours, but may expire sooner, depending on
+         * load on the service.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Events extends Resource { }
+
+        interface ProjectsStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Projects;
+        }
+
+        namespace Projects {
+            interface Type extends Resource {
+                created_at: string;
+                modified_at: string;
+                due_date: string;
+                current_status: Status;
+                public: boolean;
+                archived: boolean;
+                notes: string;
+                color: string;
+                workspace: Resource;
+                team: Resource;
+                members: Resource[];
+                followers: Resource[];
+            }
+
+            interface CreateParams {
+                name?: string;
+                team?: number;
+                public?: boolean;
+                due_date: string;
+                notes?: string;
+                color?: string;
+            }
+
+            interface FollowersParams {
+                followers: (number | string)[];
+            }
+
+            interface MembersParams {
+                members: (number | string)[];
+            }
+
+            interface Status {
+                color: string;
+                text: string;
+                html_text: string;
+                modified_at: string;
+                author: Resource;
+            }
+
+            interface FindAllParams extends PaginationParams {
+                team?: number;
+                archived?: boolean;
+            }
+
+            interface FindByParams extends PaginationParams {
+                archived?: boolean;
+            }
+        }
+
+        var Projects: ProjectsStatic;
+
+        /**
+         * A _project_ represents a prioritized list of tasks in Asana. It exists in a
+         * single workspace or organization and is accessible to a subset of users in
+         * that workspace or organization, depending on its permissions.
+         *
+         * Projects in organizations are shared with a single team. You cannot currently
+         * change the team of a project via the API. Non-organization workspaces do not
+         * have teams and so you should not specify the team of project in a
+         * regular workspace.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Projects extends Resource {
+            /**
+             * * Creates a new project in a workspace or team.
+             * *
+             * * Every project is required to be created in a specific workspace or
+             * * organization, and this cannot be changed once set. Note that you can use
+             * * the `workspace` parameter regardless of whether or not it is an
+             * * organization.
+             * *
+             * * If the workspace for your project _is_ an organization, you must also
+             * * supply a `team` to share the project with.
+             * *
+             * * Returns the full record of the newly created project.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.workspace The workspace or organization to create the project in.
+             *   * @param {String} [data.team] If creating in an organization, the specific team to create the
+             *   * project in.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            create(data: Projects.CreateParams & { workspace: number }, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * If the workspace for your project _is_ an organization, you must also
+             * * supply a `team` to share the project with.
+             * *
+             * * Returns the full record of the newly created project.
+             *   * @param {Number} workspace The workspace or organization to create the project in.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createInWorkspace(workspace: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Creates a project shared with the given team.
+             * *
+             * * Returns the full record of the newly created project.
+             *   * @param {Number} team The team to create the project in.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createInTeam(team: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Returns the complete project record for a single project.
+             *   * @param {Number} project The project to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param project
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(project: number, params?: Params, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * A specific, existing project can be updated by making a PUT request on the
+             * * URL for that project. Only the fields provided in the `data` block will be
+             * * updated; any unspecified fields will remain unchanged.
+             * *
+             * * When using this method, it is best to specify only those fields you wish
+             * * to change, or else you may overwrite changes made by another user since
+             * * you last retrieved the task.
+             * *
+             * * Returns the complete updated project record.
+             *   * @param {Number} project The project to update.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            update(project: number, data: Projects.CreateParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * A specific, existing project can be deleted by making a DELETE request
+             * * on the URL for that project.
+             * *
+             * * Returns an empty data record.
+             *   * @param {Number} project The project to delete.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param dispatchOptions?
+             * @return
+             */
+            delete(project: number, dispatchOptions?: any): Promise<void>;
+
+            /**
+             * * Returns the compact project records for some filtered set of projects.
+             * * Use one or more of the parameters provided to filter the projects returned.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {String} [params.workspace] The workspace or organization to filter projects on.
+             *   * @param {String} [params.team] The team to filter projects on.
+             *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
+             *   * this parameter.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params?: Projects.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
+
+            /**
+             * * Returns the compact project records for all projects in the workspace.
+             *   * @param {Number} workspace The workspace or organization to find projects in.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
+             *   * this parameter.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByWorkspace(workspace: number, params?: Projects.FindByParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
+
+            /**
+             * * Returns the compact project records for all projects in the team.
+             *   * @param {Number} team The team to find projects in.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Boolean} [params.archived] Only return projects whose `archived` field takes on the value of
+             *   * this parameter.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByTeam(team: number, params?: Projects.FindByParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
+
+            /**
+             * * Returns compact records for all sections in the specified project.
+             *   * @param {Number} project The project to get sections from.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            sections(project: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Returns the compact task records for all tasks within the given project,
+             * * ordered by their priority within the project. Tasks can exist in more than one project at a time.
+             *   * @param {Number} project The project in which to search for tasks.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            tasks(project: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Adds the specified list of users as followers to the project. Followers are a subset of members, therefore if
+             * * the users are not already members of the project they will also become members as a result of this operation.
+             * * Returns the updated project record.
+             *   * @param {Number} project The project to add followers to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.followers An array of followers to add to the project.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addFollowers(project: number, data: Projects.FollowersParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Removes the specified list of users from following the project, this will not affect project membership status.
+             * * Returns the updated project record.
+             *   * @param {Number} project The project to remove followers from.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.followers An array of followers to remove from the project.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeFollowers(project: number, data: Projects.FollowersParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Adds the specified list of users as members of the project. Returns the updated project record.
+             *   * @param {Number} project The project to add members to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.members An array of members to add to the project.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addMembers(project: number, data: Projects.MembersParams, dispatchOptions?: any): Promise<Projects.Type>;
+
+            /**
+             * * Removes the specified list of members from the project. Returns the updated project record.
+             *   * @param {Number} project The project to remove members from.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.members An array of members to remove from the project.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param project
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeMembers(project: number, data: Projects.MembersParams, dispatchOptions?: any): Promise<Projects.Type>;
+        }
+
+        interface StoriesStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Stories;
+        }
+
+        namespace Stories {
+            interface ShortType extends Resource {
+                created_at: string;
+                created_by: Resource;
+                type: string;
+                text: string;
+            }
+
+            interface Type extends ShortType {
+                html_text: string;
+                source: string;
+                target: Resource;
+                hearts: Type[];
+            }
+        }
+
+        var Stories: StoriesStatic;
+
+        /**
+         * A _story_ represents an activity associated with an object in the Asana
+         * system. Stories are generated by the system whenever users take actions such
+         * as creating or assigning tasks, or moving tasks between projects. _Comments_
+         * are also a form of user-generated story.
+         *
+         * Stories are a form of history in the system, and as such they are read-only.
+         * Once generated, it is not possible to modify a story.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Stories extends Resource {
+            /**
+             * * Returns the compact records for all stories on the task.
+             *   * @param {Number} task Globally unique identifier for the task.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByTask(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Stories.Type>>;
+
+            /**
+             * * Returns the full record for a single story.
+             *   * @param {Number} story Globally unique identifier for the story.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param story
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(story: number, params?: Params, dispatchOptions?: any): Promise<Stories.Type>;
+
+            /**
+             * * Adds a comment to a task. The comment will be authored by the
+             * * currently authenticated user, and timestamped when the server receives
+             * * the request.
+             * *
+             * * Returns the full record for the new story added to the task.
+             *   * @param {Number} task Globally unique identifier for the task.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.text The plain text of the comment to add.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createOnTask(task: number, data: any, dispatchOptions?: any): Promise<ResourceList<Stories.ShortType>>;
+        }
+
+        interface TagsStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Tags;
+        }
+
+        namespace Tags {
+            interface Type extends Resource {
+                created_at: string;
+                notes: string;
+                workspace: Resource;
+                color: string;
+                followers: Resource[];
+            }
+
+            interface FindAllParams extends PaginationParams {
+                team?: number;
+                archived?: boolean;
+            }
+        }
+
+        var Tags: TagsStatic;
+
+        /**
+         * A _tag_ is a label that can be attached to any task in Asana. It exists in a
+         * single workspace or organization.
+         *
+         * Tags have some metadata associated with them, but it is possible that we will
+         * simplify them in the future so it is not encouraged to rely too heavily on it.
+         * Unlike projects, tags do not provide any ordering on the tasks they
+         * are associated with.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Tags extends Resource {
+            /**
+             * * Creates a new tag in a workspace or organization.
+             * *
+             * * Every tag is required to be created in a specific workspace or
+             * * organization, and this cannot be changed once set. Note that you can use
+             * * the `workspace` parameter regardless of whether or not it is an
+             * * organization.
+             * *
+             * * Returns the full record of the newly created tag.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.workspace The workspace or organization to create the tag in.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            create(data: Tags.Type & { workspace: string }, dispatchOptions?: any): Promise<Tags.Type>;
+
+            /**
+             * * Creates a new tag in a workspace or organization.
+             * *
+             * * Every tag is required to be created in a specific workspace or
+             * * organization, and this cannot be changed once set. Note that you can use
+             * * the `workspace` parameter regardless of whether or not it is an
+             * * organization.
+             * *
+             * * Returns the full record of the newly created tag.
+             *   * @param {Number} workspace The workspace or organization to create the tag in.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createInWorkspace(workspace: number, data: Tags.Type, dispatchOptions?: any): Promise<Tags.Type>;
+
+            /**
+             * * Returns the complete tag record for a single tag.
+             *   * @param {Number} tag The tag to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param tag
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(tag: number, params?: Params, dispatchOptions?: any): Promise<Tags.Type>;
+
+            /**
+             * * Updates the properties of a tag. Only the fields provided in the `data`
+             * * block will be updated; any unspecified fields will remain unchanged.
+             * *
+             * * When using this method, it is best to specify only those fields you wish
+             * * to change, or else you may overwrite changes made by another user since
+             * * you last retrieved the task.
+             * *
+             * * Returns the complete updated tag record.
+             *   * @param {Number} tag The tag to update.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param tag
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            update(tag: number, data: Tags.Type, dispatchOptions?: any): Promise<Tags.Type>;
+
+            /**
+             * * A specific, existing tag can be deleted by making a DELETE request
+             * * on the URL for that tag.
+             * *
+             * * Returns an empty data record.
+             *   * @param {Number} tag The tag to delete.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param tag
+             * @param dispatchOptions?
+             * @return
+             */
+            delete(tag: number, dispatchOptions?: any): Promise<void>;
+
+            /**
+             * * Returns the compact tag records for some filtered set of tags.
+             * * Use one or more of the parameters provided to filter the tags returned.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {String} [params.workspace] The workspace or organization to filter tags on.
+             *   * @param {String} [params.team] The team to filter tags on.
+             *   * @param {Boolean} [params.archived] Only return tags whose `archived` field takes on the value of
+             *   * this parameter.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params?: Tags.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
+
+            /**
+             * * Returns the compact tag records for all tags in the workspace.
+             *   * @param {Number} workspace The workspace or organization to find tags in.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByWorkspace(workspace: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
+
+            /**
+             * * Returns the compact task records for all tasks with the given tag.
+             * * Tasks can have more than one tag at a time.
+             *   * @param {Number} tag The tag to fetch tasks from.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param tag
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            getTasksWithTag(tag: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+        }
+
+        interface TasksStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Tasks;
+        }
+
+        namespace Tasks {
+            interface Type extends Resource {
+                created_at: string;
+                modified_at: string;
+                completed_at: string;
+                completed: boolean;
+                due_on: string;
+                due_at: string;
+                assignee_status: string;
+                assignee: Resource;
+                notes: string;
+                workspace: Resource;
+                num_hearts: number;
+                hearted: boolean;
+                parent: Resource;
+                tags: Resource[];
+                projects: Resource[];
+                memberships: Membership[];
+                followers: Resource[];
+            }
+
+            interface CreateParams {
+                name: string;
+                completed?: boolean;
+                hearted?: boolean;
+                notes?: string;
+            }
+
+            interface FollowersParams {
+                followers: (number | string)[];
+            }
+
+            interface AddProjectParams {
+                project: number;
+                insertBefore?: number;
+                insertAfter?: number;
+                section?: number;
+            }
+
+            interface RemoveProjectParams {
+                project: number;
+            }
+
+            interface TagParams {
+                tag: string;
+            }
+
+            interface CommentParams {
+                text: string;
+            }
+
+            interface FindAllParams extends PaginationParams {
+                assignee?: number;
+                workspace: number;
+                completed_since?: string;
+                modified_since?: string;
+            }
+        }
+
+        var Tasks: TasksStatic;
+
+        /**
+         * The _task_ is the basic object around which many operations in Asana are
+         * centered. In the Asana application, multiple tasks populate the middle pane
+         * according to some view parameters, and the set of selected tasks determines
+         * the more detailed information presented in the details pane.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Tasks extends Resource {
+            /**
+             * * Creating a new task is as easy as POSTing to the `/tasks` endpoint
+             * * with a data block containing the fields you'd like to set on the task.
+             * * Any unspecified fields will take on default values.
+             * *
+             * * Every task is required to be created in a specific workspace, and this
+             * * workspace cannot be changed once set. The workspace need not be set
+             * * explicitly if you specify a `project` or a `parent` task instead.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number} [data.workspace] The workspace to create a task in.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            create(data: Tasks.CreateParams & { workspace: string }, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Creating a new task is as easy as POSTing to the `/tasks` endpoint
+             * * with a data block containing the fields you'd like to set on the task.
+             * * Any unspecified fields will take on default values.
+             * *
+             * * Every task is required to be created in a specific workspace, and this
+             * * workspace cannot be changed once set. The workspace need not be set
+             * * explicitly if you specify a `project` or a `parent` task instead.
+             *   * @param {Number} workspace The workspace to create a task in.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            createInWorkspace(workspace: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Returns the complete task record for a single task.
+             *   * @param {Number} task The task to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(task: number, params?: Params, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * A specific, existing task can be updated by making a PUT request on the
+             * * URL for that task. Only the fields provided in the `data` block will be
+             * * updated; any unspecified fields will remain unchanged.
+             * *
+             * * When using this method, it is best to specify only those fields you wish
+             * * to change, or else you may overwrite changes made by another user since
+             * * you last retrieved the task.
+             * *
+             * * Returns the complete updated task record.
+             *   * @param {Number} task The task to update.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            update(task: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * A specific, existing task can be deleted by making a DELETE request on the
+             * * URL for that task. Deleted tasks go into the "trash" of the user making
+             * * the delete request. Tasks can be recovered from the trash within a period
+             * * of 30 days; afterward they are completely removed from the system.
+             * *
+             * * Returns an empty data record.
+             *   * @param {Number} task The task to delete.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param dispatchOptions?
+             * @return
+             */
+            delete(task: number, dispatchOptions?: any): Promise<void>;
+
+            /**
+             * * Returns the compact task records for all tasks within the given project,
+             * * ordered by their priority within the project.
+             *   * @param {Number} projectId The project in which to search for tasks.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param projectId
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByProject(projectId: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Returns the compact task records for all tasks with the given tag.
+             *   * @param {Number} tag The tag in which to search for tasks.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param tag
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByTag(tag: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Returns the compact task records for some filtered set of tasks. Use one
+             * * or more of the parameters provided to filter the tasks returned.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Number} [params.assignee] The assignee to filter tasks on.
+             *   * @param {Number} [params.workspace] The workspace or organization to filter tasks on.
+             *   * @param {Number} [params.completed_since] Only return tasks that are either incomplete or that have been
+             *   * completed since this time.
+             *   * @param {Number} [params.modified_since] Only return tasks that have been modified since the given time.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params?: Tasks.FindAllParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Adds each of the specified followers to the task, if they are not already
+             * * following. Returns the complete, updated record for the affected task.
+             *   * @param {Number} task The task to add followers to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.followers An array of followers to add to the task.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addFollowers(task: number, data: Tasks.FollowersParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Removes each of the specified followers from the task if they are
+             * * following. Returns the complete, updated record for the affected task.
+             *   * @param {Number} task The task to remove followers from.
+             *   * @param {Object} data Data for the request
+             *   * @param {Array} data.followers An array of followers to remove from the task.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeFollowers(task: number, data: Tasks.FollowersParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Returns a compact representation of all of the projects the task is in.
+             *   * @param {Number} task The task to get projects on.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            projects(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Projects.Type>>;
+
+            /**
+             * * Adds the task to the specified project, in the optional location
+             * * specified. If no location arguments are given, the task will be added to
+             * * the beginning of the project.
+             * *
+             * * `addProject` can also be used to reorder a task within a project that
+             * * already contains it.
+             * *
+             * * Returns an empty data block.
+             *   * @param {Number} task The task to add to a project.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number} data.project The project to add the task to.
+             *   * @param {Number} [data.insertAfter] A task in the project to insert the task after, or `null` to
+             *   * insert at the beginning of the list.
+             *   * @param {Number} [data.insertBefore] A task in the project to insert the task before, or `null` to
+             *   * insert at the end of the list.
+             *   * @param {Number} [data.section] A section in the project to insert the task into. The task will be
+             *   * inserted at the top of the section.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addProject(task: number, data: Tasks.AddProjectParams, dispatchOptions?: any): Promise<{}>;
+
+            /**
+             * * Removes the task from the specified project. The task will still exist
+             * * in the system, but it will not be in the project anymore.
+             * *
+             * * Returns an empty data block.
+             *   * @param {Number} task The task to remove from a project.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number} data.project The project to remove the task from.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeProject(task: number, data: Tasks.RemoveProjectParams, dispatchOptions?: any): Promise<{}>;
+
+            /**
+             * * Returns a compact representation of all of the tags the task has.
+             *   * @param {Number} task The task to get tags on.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            tags(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tags.Type>>;
+
+            /**
+             * * Adds a tag to a task. Returns an empty data block.
+             *   * @param {Number} task The task to add a tag to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number} data.tag The tag to add to the task.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addTag(task: number, data: Tasks.TagParams, dispatchOptions?: any): Promise<{}>;
+
+            /**
+             * * Removes a tag from the task. Returns an empty data block.
+             *   * @param {Number} task The task to remove a tag from.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.tag The tag to remove from the task.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeTag(task: number, data: Tasks.TagParams, dispatchOptions?: any): Promise<{}>;
+
+            /**
+             * * Returns a compact representation of all of the subtasks of a task.
+             *   * @param {Number} task The task to get the subtasks of.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            subtasks(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Tasks.Type>>;
+
+            /**
+             * * Creates a new subtask and adds it to the parent task. Returns the full record
+             * * for the newly created subtask.
+             *   * @param {Number} task The task to add a subtask to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addSubtask(task: number, data: Tasks.CreateParams, dispatchOptions?: any): Promise<Tasks.Type>;
+
+            /**
+             * * Returns a compact representation of all of the stories on the task.
+             *   * @param {Number} task The task containing the stories to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            stories(task: number, params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Stories.Type>>;
+
+            /**
+             * * Adds a comment to a task. The comment will be authored by the
+             * * currently authenticated user, and timestamped when the server receives
+             * * the request.
+             * *
+             * * Returns the full record for the new story added to the task.
+             *   * @param {Number} task Globally unique identifier for the task.
+             *   * @param {Object} data Data for the request
+             *   * @param {String} data.text The plain text of the comment to add.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param task
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addComment(task: number, data: Tasks.CommentParams, dispatchOptions?: any): Promise<Stories.Type>;
+        }
+
+        interface TeamsStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Teams;
+        }
+
+        namespace Teams {
+            interface Type extends Resource {
+                organization: Resource;
+            }
+        }
+
+        var Teams: TeamsStatic;
+
+        /**
+         * A _team_ is used to group related projects and people together within an
+         * organization. Each project in an organization is associated with a team.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Teams extends Resource {
+            /**
+             * * Returns the full record for a single team.
+             *   * @param {Number} team Globally unique identifier for the team.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param team
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(team: number, params?: Params, dispatchOptions?: any): Promise<Teams.Type>;
+
+            /**
+             * * Returns the compact records for all teams in the organization visible to
+             * * the authorized user.
+             *   * @param {Number} organization Globally unique identifier for the workspace or organization.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param organization
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByOrganization(organization: number, params?: Params, dispatchOptions?: any): Promise<SimpleResourceList>;
+
+            /**
+             * * Returns the compact records for all users that are members of the team.
+             *   * @param {Number} team Globally unique identifier for the team.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            users(team: number, params?: Params, dispatchOptions?: any): Promise<SimpleResourceList>;
+
+            /**
+             * * The user making this call must be a member of the team in order to add others.
+             * * The user to add must exist in the same organization as the team in order to be added.
+             * * The user to add can be referenced by their globally unique user ID or their email address.
+             * * Returns the full user record for the added user.
+             *   * @param {Number} team Globally unique identifier for the team.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addUser(team: number, data: UserParams, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * * The user to remove can be referenced by their globally unique user ID or their email address.
+             * * Removes the user from the specified team. Returns an empty data record.
+             *   * @param {Number} team Globally unique identifier for the team.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param team
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeUser(team: number, data: UserParams, dispatchOptions?: any): Promise<any>;
+        }
+
+        interface UsersStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Users;
+        }
+
+        namespace Users {
+            interface FindAllParams extends PaginationParams {
+                workspace: number;
+            }
+
+            interface Type extends Resource {
+                email: string;
+                workspaces: Resource[];
+                photo: { [key: string]: string };
+            }
+        }
+
+        var Users: UsersStatic;
+
+        /**
+         * A _user_ object represents an account in Asana that can be given access to
+         * various workspaces, projects, and tasks.
+         *
+         * Like other objects in the system, users are referred to by numerical IDs.
+         * However, the special string identifier `me` can be used anywhere
+         * a user ID is accepted, to refer to the current authenticated user.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Users extends Resource {
+            /**
+             * * Returns the full user record for the currently authenticated user.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            me(params?: Params, dispatchOptions?: any): Promise<Users.Type>;
+
+            /**
+             * * Returns the full user record for the single user with the provided ID.
+             *   * @param {Number|String} user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param user
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(user: string | number, params?: Params, dispatchOptions?: any): Promise<Users.Type>;
+
+            /**
+             * * Returns the user records for all users in the specified workspace or
+             * * organization.
+             *   * @param {Number} workspace The workspace in which to get users.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findByWorkspace(workspace: number, params?: Params, dispatchOptions?: any): Promise<ResourceList<Users.Type>>;
+
+            /**
+             * * Returns the user records for all users in all workspaces and organizations
+             * * accessible to the authenticated user. Accepts an optional workspace ID
+             * * parameter.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Number} [params.workspace] The workspace or organization to filter users on.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params: Users.FindAllParams, dispatchOptions?: any): Promise<SimpleResourceList>;
+        }
+
+        /**
+         * **Webhooks are currently in BETA - The information here may change.**
+         *
+         * Webhooks allow an application to be notified of changes. This is in addition
+         * to the ability to fetch those changes directly as
+         * [Events](/developers/api-reference/events) - in fact, Webhooks are just a way
+         * to receive Events via HTTP POST at the time they occur instead of polling for
+         * them. For services accessible via HTTP this is often vastly more convenient,
+         * and if events are not too frequent can be significantly more efficient.
+         *
+         * In both cases, however, changes are represented as Event objects - refer to
+         * the [Events documentation](/developers/api-reference/events) for more
+         * information on what data these events contain.
+         *
+         * **NOTE:** While Webhooks send arrays of Event objects to their target, the
+         * Event objects themselves contain *only IDs*, rather than the actual resource
+         * they are referencing. So while a normal event you receive via GET /events
+         * would look like this:
+         *
+         *     {\
+         *       "resource": {\
+         *         "id": 1337,\
+         *         "name": "My Task"\
+         *       },\
+         *       "parent": null,\
+         *       "created_at": "2013-08-21T18:20:37.972Z",\
+         *       "user": {\
+         *         "id": 1123,\
+         *         "name": "Tom Bizarro"\
+         *       },\
+         *       "action": "changed",\
+         *       "type": "task"\
+         *     }
+         *
+         * In a Webhook payload you would instead receive this:
+         *
+         *     {\
+         *       "resource": 1337,\
+         *       "parent": null,\
+         *       "created_at": "2013-08-21T18:20:37.972Z",\
+         *       "user": 1123,\
+         *       "action": "changed",\
+         *       "type": "task"\
+         *     }
+         *
+         * Webhooks themselves contain only the information necessary to deliver the
+         * events to the desired target as they are generated.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        class Webhooks extends Resource {
+            /**
+             * @param dispatcher
+             */
+            constructor(dispatcher: Dispatcher);
+
+            /**
+             * * Establishing a webhook is a two-part process. First, a simple HTTP POST
+             * * similar to any other resource creation. Since you could have multiple
+             * * webhooks we recommend specifying a unique local id for each target.
+             * *
+             * * Next comes the confirmation handshake. When a webhook is created, we will
+             * * send a test POST to the `target` with an `X-Hook-Secret` header as
+             * * described in the
+             * * [Resthooks Security documentation](http://resthooks.org/docs/security/).
+             * * The target must respond with a `200 OK` and a matching `X-Hook-Secret`
+             * * header to confirm that this webhook subscription is indeed expected.
+             * *
+             * * If you do not acknowledge the webhook's confirmation handshake it will
+             * * fail to setup, and you will receive an error in response to your attempt
+             * * to create it. This means you need to be able to receive and complete the
+             * * webhook *while* the POST request is in-flight.
+             *   * @param {Number} resource A resource ID to subscribe to. The resource can be a task or project.
+             *   * @param {String} target The URL to receive the HTTP POST.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param resource
+             * @param target
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            create(resource: number, target: string, data: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * * Returns the compact representation of all webhooks your app has
+             * * registered for the authenticated user in the given workspace.
+             *   * @param {Number} workspace The workspace to query for webhooks in.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Number} [params.resource] Only return webhooks for the given resource.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            getAll(workspace: number, params?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * * Returns the full record for the given webhook.
+             *   * @param {String} webhook The webhook to get.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param webhook
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            getById(webhook: string, params?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * * This method permanently removes a webhook. Note that it may be possible
+             * * to receive a request that was already in flight after deleting the
+             * * webhook, but no further requests will be issued.
+             *   * @param {String} webhook The webhook to delete.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param webhook
+             * @param dispatchOptions?
+             * @return
+             */
+            deleteById(webhook: string, dispatchOptions?: any): Promise<any>;
+        }
+
+        interface WorkspacesStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Workspaces;
+        }
+
+        namespace Workspaces {
+            interface ShortType extends Resource {
+                id_organization?: boolean;
+            }
+
+            interface Type extends Resource {
+                id_organization: boolean;
+                email_domains: string[];
+            }
+
+            interface TypeaheadParams {
+                type: string;
+                query?: string;
+                count?: number;
+            }
+        }
+
+        var Workspaces: WorkspacesStatic;
+
+        /**
+         * A _workspace_ is the highest-level organizational unit in Asana. All projects
+         * and tasks have an associated workspace.
+         *
+         * An _organization_ is a special kind of workspace that represents a company.
+         * In an organization, you can group your projects into teams. You can read
+         * more about how organizations work on the Asana Guide.
+         * To tell if your workspace is an organization or not, check its
+         * `is_organization` property.
+         *
+         * Over time, we intend to migrate most workspaces into organizations and to
+         * release more organization-specific functionality. We may eventually deprecate
+         * using workspace-based APIs for organizations. Currently, and until after
+         * some reasonable grace period following any further announcements, you can
+         * still reference organizations in any `workspace` parameter.
+         * @class
+         * @param {Dispatcher} dispatcher The API dispatcher
+         */
+        interface Workspaces extends Resource {
+            /**
+             * * Returns the full workspace record for a single workspace.
+             *   * @param {Number} workspace Globally unique identifier for the workspace or organization.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The requested resource
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findById(workspace: number, params?: Params, dispatchOptions?: any): Promise<Workspaces.Type>;
+
+            /**
+             * * Returns the compact records for all workspaces visible to the authorized user.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            findAll(params?: PaginationParams, dispatchOptions?: any): Promise<ResourceList<Workspaces.ShortType>>;
+
+            /**
+             * * A specific, existing workspace can be updated by making a PUT request on
+             * * the URL for that workspace. Only the fields provided in the data block
+             * * will be updated; any unspecified fields will remain unchanged.
+             * *
+             * * Currently the only field that can be modified for a workspace is its `name`.
+             * *
+             * * Returns the complete, updated workspace record.
+             *   * @param {Number} workspace The workspace to update.
+             *   * @param {Object} data Data for the request
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            update(workspace: number, data: { name?: string }, dispatchOptions?: any): Promise<Workspaces.Type>;
+
+            /**
+             * * Retrieves objects in the workspace based on an auto-completion/typeahead
+             * * search algorithm. This feature is meant to provide results quickly, so do
+             * * not rely on this API to provide extremely accurate search results. The
+             * * result set is limited to a single page of results with a maximum size,
+             * * so you won't be able to fetch large numbers of results.
+             *   * @param {Number} workspace The workspace to fetch objects from.
+             *   * @param {Object} [params] Parameters for the request
+             *   * @param {String} params.type The type of values the typeahead should return.
+             *   * Note that unlike in the names of endpoints, the types listed here are
+             *   * in singular form (e.g. `task`). Using multiple types is not yet supported.
+             *   * @param {String} [params.query] The string that will be used to search for relevant objects. If an
+             *   * empty string is passed in, the API will currently return an empty
+             *   * result set.
+             *   * @param {Number} [params.count] The number of results to return. The default is `20` if this
+             *   * parameter is omitted, with a minimum of `1` and a maximum of `100`.
+             *   * If there are fewer results found than requested, all will be returned.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param params?
+             * @param dispatchOptions?
+             * @return
+             */
+            typeahead(workspace: number, params?: Workspaces.TypeaheadParams, dispatchOptions?: any): Promise<SimpleResourceList>;
+
+            /**
+             * * The user can be referenced by their globally unique user ID or their email address.
+             * * Returns the full user record for the invited user.
+             *   * @param {Number} workspace The workspace or organization to invite the user to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            addUser(workspace: number, data: UserParams, dispatchOptions?: any): Promise<Users.Type>;
+
+            /**
+             * * The user making this call must be an admin in the workspace.
+             * * Returns an empty data record.
+             *   * @param {Number} workspace The workspace or organization to invite the user to.
+             *   * @param {Object} data Data for the request
+             *   * @param {Number|String} data.user An identifier for the user. Can be one of an email address,
+             *   * the globally unique identifier for the user, or the keyword `me`
+             *   * to indicate the current user making the request.
+             *   * @param {Object} [dispatchOptions] Options, if any, to pass the dispatcher for the request
+             *   * @return {Promise} The response from the API
+             * @param workspace
+             * @param data
+             * @param dispatchOptions?
+             * @return
+             */
+            removeUser(workspace: number, data: UserParams, dispatchOptions?: any): Promise<any>;
+        }
+
+        interface ResourceStatic {
+            /**
+             * @param dispatcher
+             */
+            new (dispatcher: Dispatcher): Resource;
+
+            /**
+             * @type {number} Default number of items to get per page.
+             */
+            DEFAULT_PAGE_LIMIT: number;
+
+            /**
+             * Helper method that dispatches a GET request to the API, where the expected
+             * result is a collection.
+             * @param  {Dispatcher} dispatcher
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise<SimpleResourceList>} The Collection response for the request
+             * @param dispatcher
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             */
+            getCollection(dispatcher: any, path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Helper method for any request Promise from the Dispatcher, unwraps the `data`
+             * value from the payload.
+             * @param  {Promise} promise A promise returned from a `Dispatcher` request.
+             * @return {Promise}         The `data` portion of the response payload.
+             * @param promise
+             * @return
+             */
+            unwrap(promise: any): Promise<any>;
+        }
+
+        var Resource: ResourceStatic;
+
+        /**
+         * Base class for a resource accessible via the API. Uses a `Dispatcher` to
+         * access the resources.
+         * @param {Dispatcher} dispatcher
+         * @constructor
+         */
+        interface Resource {
+            /**
+             * Dispatches a GET request to the API, where the expected result is a
+             * single resource.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchGet(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Dispatches a GET request to the API, where the expected result is a
+             * collection.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchGetCollection(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Dispatches a POST request to the API, where the expected response is a
+             * single resource.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchPost(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Dispatches a POST request to the API, where the expected response is a
+             * single resource.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [query] The query params
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param query?
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchPut(path: string, query?: any, dispatchOptions?: any): Promise<any>;
+
+            /**
+             * Dispatches a DELETE request to the API. The expected response is an
+             * empty resource.
+             * @param  {String}     path    The path of the API
+             * @param  {Object}     [dispatchOptions] Options for handling the request and
+             *     response. See `Dispatcher.dispatch`.
+             * @return {Promise}            The response for the request
+             * @param path
+             * @param dispatchOptions?
+             * @return
+             */
+            dispatchDelete(path: string, dispatchOptions?: any): Promise<any>;
+        }
+
+        interface ResourceList<T extends Resource> {
+            data: T[];
+            _response: {
+                data: T[];
+                next_page?: NextPage;
+            };
+            _dispatcher: {
+                authenticator: {
+                    apiKey: string;
+                };
+                asanaBaseUrl: string;
+                retryOnRateLimit: boolean;
+                requestTimeout: number;
+                _cachedVersionInfo: VersionInfo;
+            }
+        }
+
+        type SimpleResourceList = ResourceList<Resource>;
+
+        interface NextPage {
+            offset: string;
+            uri: string;
+            path: string;
+        }
+
+        interface VersionInfo {
+            version: string;
+            language: string;
+            language_version: string;
+            os: string;
+            os_version: string;
+        }
+
+        interface Resource {
+            id: number;
+            name: string;
+        }
+
+        interface PaginationParams extends Params {
+            limit?: number;
+            offset?: string;
+        }
+
+        interface Params {
+            opt_fields?: string;
+            opt_expand?: string;
+        }
+
+        interface UserParams {
+            user: string | number;
+        }
+
+        interface Membership {
+            project: Resource;
+            section: Resource;
+        }
     }
 
     var VERSION: string;
-  }
-
-  export = asana;
 }
 
+export = asana;
diff --git a/aspnet-identity-pw/aspnet-identity-pw.d.ts b/aspnet-identity-pw/aspnet-identity-pw.d.ts
index 390033602b..4fd74c721b 100644
--- a/aspnet-identity-pw/aspnet-identity-pw.d.ts
+++ b/aspnet-identity-pw/aspnet-identity-pw.d.ts
@@ -3,11 +3,10 @@
 // Definitions by: jt000 <https://github.com/jt000>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "aspnet-identity-pw" {
 
-	export function hashPassword(password: string): string;
-	export function hashPassword(password: string, callback: (err: any, result: string)=>void): void;
 
-	export function validatePassword(password: string, hashedPass: string): boolean;
-	export function validatePassword(password: string, hashedPass: string, callback: (err: any, result: boolean) => void): void; 
-}
+declare export function hashPassword(password: string): string;
+declare export function hashPassword(password: string, callback: (err: any, result: string) => void): void;
+
+declare export function validatePassword(password: string, hashedPass: string): boolean;
+declare export function validatePassword(password: string, hashedPass: string, callback: (err: any, result: boolean) => void): void;
diff --git a/assertion-error/assertion-error.d.ts b/assertion-error/assertion-error.d.ts
index a0295bd8b3..8663df799d 100644
--- a/assertion-error/assertion-error.d.ts
+++ b/assertion-error/assertion-error.d.ts
@@ -3,13 +3,12 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'assertion-error' {
-	class AssertionError implements Error {
-		constructor(message: string, props?: any, ssf?: Function);
-		name: string;
-		message: string;
-		showDiff: boolean;
-		stack: string;
-	}
-	export = AssertionError;
+
+declare class AssertionError implements Error {
+    constructor(message: string, props?: any, ssf?: Function);
+    name: string;
+    message: string;
+    showDiff: boolean;
+    stack: string;
 }
+export = AssertionError;
diff --git a/assertsharp/assertsharp.d.ts b/assertsharp/assertsharp.d.ts
index c4cf80e867..ef800f5396 100644
--- a/assertsharp/assertsharp.d.ts
+++ b/assertsharp/assertsharp.d.ts
@@ -3,19 +3,18 @@
 // Definitions by: Bruno Leonardo Michels <https://github.com/brunolm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "assertsharp" {
-    export default class Assert {
-        static AreEqual<T>(expected: T, actual: T, message?: string): void;
-        static AreNotEqual<T>(notExpected: T, actual: T, message?: string): void;
-        static AreNotSame<T>(notExpected: T, actual: T, message?: string): void;
-        static AreSequenceEqual<T>(expected: T[], actual: T[], equals?: (x: any, y: any) => boolean, message?: string): void;
-        static Fail(message?: string): void;
-        static IsFalse(actual: boolean, message?: string): void;
-        static IsInstanceOfType(actual: any, expectedType: Function, message?: string): void;
-        static IsNotInstanceOfType(actual: any, wrongType: Function, message?: string): void;
-        static IsNotNull(actual: any, message?: string): void;
-        static IsNull(actual: any, message?: string): void;
-        static IsTrue(actual: boolean, message?: string): void;
-        static Throws(fn: () => void, message?: string): void;
-    }
+
+declare export default class Assert {
+    static AreEqual<T>(expected: T, actual: T, message?: string): void;
+    static AreNotEqual<T>(notExpected: T, actual: T, message?: string): void;
+    static AreNotSame<T>(notExpected: T, actual: T, message?: string): void;
+    static AreSequenceEqual<T>(expected: T[], actual: T[], equals?: (x: any, y: any) => boolean, message?: string): void;
+    static Fail(message?: string): void;
+    static IsFalse(actual: boolean, message?: string): void;
+    static IsInstanceOfType(actual: any, expectedType: Function, message?: string): void;
+    static IsNotInstanceOfType(actual: any, wrongType: Function, message?: string): void;
+    static IsNotNull(actual: any, message?: string): void;
+    static IsNull(actual: any, message?: string): void;
+    static IsTrue(actual: boolean, message?: string): void;
+    static Throws(fn: () => void, message?: string): void;
 }
diff --git a/async-lock/async-lock.d.ts b/async-lock/async-lock.d.ts
index e5f8613c73..296307300c 100644
--- a/async-lock/async-lock.d.ts
+++ b/async-lock/async-lock.d.ts
@@ -3,28 +3,27 @@
 // Definitions by: Elisée MAURER <https://github.com/elisee/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "async-lock" {
-  interface AsyncLockDoneCallback {
-    (err?: Error, ret?: any): void;
-  }
 
-  interface AsyncLockOptions {
+interface AsyncLockDoneCallback {
+    (err?: Error, ret?: any): void;
+}
+
+interface AsyncLockOptions {
     timeout?: number;
     maxPending?: number;
     domainReentrant?: boolean;
     Promise?: any;
-  }
+}
 
-  class AsyncLock {
+declare class AsyncLock {
     constructor(options?: AsyncLockOptions);
 
-    acquire(key: string|string[], fn: (done: AsyncLockDoneCallback) => any, cb: AsyncLockDoneCallback, opts?: AsyncLockOptions): void;
-    acquire(key: string|string[], fn: (done: AsyncLockDoneCallback) => any, opts?: AsyncLockOptions): PromiseLike<any>;
+    acquire(key: string | string[], fn: (done: AsyncLockDoneCallback) => any, cb: AsyncLockDoneCallback, opts?: AsyncLockOptions): void;
+    acquire(key: string | string[], fn: (done: AsyncLockDoneCallback) => any, opts?: AsyncLockOptions): PromiseLike<any>;
 
     isBusy(): boolean;
-  }
-
-  namespace AsyncLock {}
-
-  export = AsyncLock;
 }
+
+declare namespace AsyncLock { }
+
+export = AsyncLock;
diff --git a/async-writer/async-writer.d.ts b/async-writer/async-writer.d.ts
index 56c5bb898b..ef8bddfac3 100644
--- a/async-writer/async-writer.d.ts
+++ b/async-writer/async-writer.d.ts
@@ -5,74 +5,73 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'async-writer' {
-	import stream = require('stream');
-	import events = require('events');
 
-	namespace async_writer {
-		interface EventFunction {
-			(event: string, callback: Function): void;
-		}
+import stream = require('stream');
+import events = require('events');
 
-		class StringWriter {
-			constructor(events: events.EventEmitter);
-			end(): void;
-			write(what: string): StringWriter;
-			toString(): string;
-		}
+declare namespace async_writer {
+    interface EventFunction {
+        (event: string, callback: Function): void;
+    }
 
-		class BufferedWriter {
-			constructor(wrappedStream: stream.Stream);
-			flush(): void;
-			on(event: string, callback: Function): BufferedWriter;
-			once(event: string, callback: Function): BufferedWriter;
-			clear(): void;
-			end(): void;
-			write(what: string): BufferedWriter;
-		}
+    class StringWriter {
+        constructor(events: events.EventEmitter);
+        end(): void;
+        write(what: string): StringWriter;
+        toString(): string;
+    }
 
-		interface BeginAsyncOptions {
-			last?: boolean;
-			timeout?: number;
-			name?: string;
-		}
+    class BufferedWriter {
+        constructor(wrappedStream: stream.Stream);
+        flush(): void;
+        on(event: string, callback: Function): BufferedWriter;
+        once(event: string, callback: Function): BufferedWriter;
+        clear(): void;
+        end(): void;
+        write(what: string): BufferedWriter;
+    }
 
-		class AsyncWriter {
-			static enableAsyncStackTrace():void;
+    interface BeginAsyncOptions {
+        last?: boolean;
+        timeout?: number;
+        name?: string;
+    }
 
-			constructor(writer?: any, global?: {[s: string]: any}, async?: boolean, buffer?: boolean);
-			isAsyncWriter: AsyncWriter;
-			sync(): void;
-			getAttributes(): {[s: string]: any};
-			getAttribute(): any;
-			write(str: string): AsyncWriter;
-			getOutput(): string;
-			captureString(func: Function, thisObj: Object): string;
-			swapWriter(newWriter: StringWriter | BufferedWriter, func: Function, thisObj: Object): void;
-			createNestedWriter(writer: StringWriter | BufferedWriter): AsyncWriter;
-			beginAsync(options?: number | BeginAsyncOptions): AsyncWriter;
-			handleBeginAsync(options: number | BeginAsyncOptions, parent: AsyncWriter): void;
-			on(event: string, callback: Function): AsyncWriter;
-			once(event: string, callback: Function): AsyncWriter;
-			onLast(callback: Function): AsyncWriter;
-			emit(arg: any): AsyncWriter;
-			removeListener(): AsyncWriter;
-			pipe(stream: stream.Stream): AsyncWriter;
-			error(e: Error): void;
-			end(data?: any): AsyncWriter;
-			handleEnd(isAsync: boolean): void;
-			_finish(): void;
-			flush(): void;
-		}
+    class AsyncWriter {
+        static enableAsyncStackTrace(): void;
 
-		interface AsyncWriterOptions {
-			global?: {[s: string]: any};
-			buffer?: boolean;
-		}
+        constructor(writer?: any, global?: { [s: string]: any }, async?: boolean, buffer?: boolean);
+        isAsyncWriter: AsyncWriter;
+        sync(): void;
+        getAttributes(): { [s: string]: any };
+        getAttribute(): any;
+        write(str: string): AsyncWriter;
+        getOutput(): string;
+        captureString(func: Function, thisObj: Object): string;
+        swapWriter(newWriter: StringWriter | BufferedWriter, func: Function, thisObj: Object): void;
+        createNestedWriter(writer: StringWriter | BufferedWriter): AsyncWriter;
+        beginAsync(options?: number | BeginAsyncOptions): AsyncWriter;
+        handleBeginAsync(options: number | BeginAsyncOptions, parent: AsyncWriter): void;
+        on(event: string, callback: Function): AsyncWriter;
+        once(event: string, callback: Function): AsyncWriter;
+        onLast(callback: Function): AsyncWriter;
+        emit(arg: any): AsyncWriter;
+        removeListener(): AsyncWriter;
+        pipe(stream: stream.Stream): AsyncWriter;
+        error(e: Error): void;
+        end(data?: any): AsyncWriter;
+        handleEnd(isAsync: boolean): void;
+        _finish(): void;
+        flush(): void;
+    }
 
-		function create(writer?: any, options?: AsyncWriterOptions): AsyncWriter;
-		function enableAsyncStackTrace(): void;
-	}
+    interface AsyncWriterOptions {
+        global?: { [s: string]: any };
+        buffer?: boolean;
+    }
 
-	export = async_writer;
+    function create(writer?: any, options?: AsyncWriterOptions): AsyncWriter;
+    function enableAsyncStackTrace(): void;
 }
+
+export = async_writer;
diff --git a/asyncblock/asyncblock.d.ts b/asyncblock/asyncblock.d.ts
index 6ec1ad1579..c4f8d3da21 100644
--- a/asyncblock/asyncblock.d.ts
+++ b/asyncblock/asyncblock.d.ts
@@ -4,70 +4,68 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare module "asyncblock" {
-  function asyncblock<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
 
-  namespace asyncblock {
+declare function asyncblock<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
+
+declare namespace asyncblock {
     export function nostack<T>(f: (flow: asyncblock.IFlow) => void, callback?: (err: any, res: T) => void): void;
 
     export interface IFlow {
-      add(responseFormat?: string[]): IExecuteFunction;
-      add(key: string, responseFormat?: string[]): IExecuteFunction;
-      add(key: number, responseFormat?: string[]): IExecuteFunction;
-      add(options: IFlowOptions): IExecuteFunction;
-      callback(responseFormat?: string[]): IExecuteFunction;
-      callback(key: string, responseFormat?: string[]): IExecuteFunction;
-      callback(key: number, responseFormat?: string[]): IExecuteFunction;
-      callback(options: IFlowOptions): IExecuteFunction;
-      wait<T>(key?: string): T;
-      wait<T>(key?: number): T;
+        add(responseFormat?: string[]): IExecuteFunction;
+        add(key: string, responseFormat?: string[]): IExecuteFunction;
+        add(key: number, responseFormat?: string[]): IExecuteFunction;
+        add(options: IFlowOptions): IExecuteFunction;
+        callback(responseFormat?: string[]): IExecuteFunction;
+        callback(key: string, responseFormat?: string[]): IExecuteFunction;
+        callback(key: number, responseFormat?: string[]): IExecuteFunction;
+        callback(options: IFlowOptions): IExecuteFunction;
+        wait<T>(key?: string): T;
+        wait<T>(key?: number): T;
 
-      get<T>(key: string): T;
-      set(key: string, responseFormat?: string[]): IExecuteFunction;
-      set(options: IFlowOptions): IExecuteFunction;
-      del(key: string): void;
+        get<T>(key: string): T;
+        set(key: string, responseFormat?: string[]): IExecuteFunction;
+        set(options: IFlowOptions): IExecuteFunction;
+        del(key: string): void;
 
-      sync<T>(task: any): T;
-      queue(toExecute: IExecuteFunction): void;
-      queue(key: string, toExecute: IExecuteFunction): void;
-      queue(key: number, toExecute: IExecuteFunction): void;
-      queue(responseFormat: string[], toExecute: IExecuteFunction): void;
-      queue(key: string, responseFormat: string[], toExecute: IExecuteFunction): void;
-      queue(key: number, responseFormat: string[], toExecute: IExecuteFunction): void;
-      queue(options: IFlowOptions, toExecute: IExecuteFunction): void;
-      doneAdding(): void;
-      forceWait<T>(): T;
+        sync<T>(task: any): T;
+        queue(toExecute: IExecuteFunction): void;
+        queue(key: string, toExecute: IExecuteFunction): void;
+        queue(key: number, toExecute: IExecuteFunction): void;
+        queue(responseFormat: string[], toExecute: IExecuteFunction): void;
+        queue(key: string, responseFormat: string[], toExecute: IExecuteFunction): void;
+        queue(key: number, responseFormat: string[], toExecute: IExecuteFunction): void;
+        queue(options: IFlowOptions, toExecute: IExecuteFunction): void;
+        doneAdding(): void;
+        forceWait<T>(): T;
 
-      maxParallel: number;
-      errorCallback: (err: any) => void;
-      taskTimeout: number;
-      timeoutIsError: boolean;
+        maxParallel: number;
+        errorCallback: (err: any) => void;
+        taskTimeout: number;
+        timeoutIsError: boolean;
     }
 
     export interface IFlowOptions {
-      ignoreError?: boolean;  // default false
-      key?: string;  // string | number
-      responseFormat?: string[];
-      timeout?: number;
-      timeoutIsError?: boolean;
-      dontWait?: boolean;
-      firstArgIsError?: boolean;  // default true
+        ignoreError?: boolean;  // default false
+        key?: string;  // string | number
+        responseFormat?: string[];
+        timeout?: number;
+        timeoutIsError?: boolean;
+        dontWait?: boolean;
+        firstArgIsError?: boolean;  // default true
     }
 
     export interface IExecuteFunction {
-      <T1, T2, T3>(err: any, res1: T1, res2: T2, res3: T3): any;
-      <T1, T2>(err: any, res1: T1, res2: T2): any;
-      <T>(err: any, res: T): any;
-      (err: any): any;
+        <T1, T2, T3>(err: any, res1: T1, res2: T2, res3: T3): any;
+        <T1, T2>(err: any, res1: T1, res2: T2): any;
+        <T>(err: any, res: T): any;
+        (err: any): any;
 
-      // firstArgIsError === false
-      <T1, T2, T3>(res1: T1, res2: T2, res3: T3): any;
-      <T1, T2>(res1: T1, res2: T2): any;
-      <T>(res: T): any;
+        // firstArgIsError === false
+        <T1, T2, T3>(res1: T1, res2: T2, res3: T3): any;
+        <T1, T2>(res1: T1, res2: T2): any;
+        <T>(res: T): any;
     }
 
-  }
-
-  export = asyncblock;
 }
 
+export = asyncblock;
diff --git a/atpl/atpl.d.ts b/atpl/atpl.d.ts
index a966a8383f..ccb3bfa1c7 100644
--- a/atpl/atpl.d.ts
+++ b/atpl/atpl.d.ts
@@ -5,16 +5,15 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/atpl.d.ts
 
-declare module "atpl" {
-	export function compile(templateString: string, options: any): (context:any) => string;
-	export function __express(filename: string, options: any, callback: Function): any;
 
-	export function registerExtension(items: any): void;
-	export function registerTags(items: any): void;
-	export function registerFunctions(items: any): void;
-	export function registerFilters(items: any): void;
-	export function registerTests(items: any): void;
+declare export function compile(templateString: string, options: any): (context: any) => string;
+declare export function __express(filename: string, options: any, callback: Function): any;
 
-	export function renderFileSync(viewsPath: string, filename: string, parameters: any, cache: boolean ): string;
-	export function renderFile(viewsPath: string, filename: string, parameters: any, cache: boolean, done: (err: Error, result?: string) => void): void;
-}
+declare export function registerExtension(items: any): void;
+declare export function registerTags(items: any): void;
+declare export function registerFunctions(items: any): void;
+declare export function registerFilters(items: any): void;
+declare export function registerTests(items: any): void;
+
+declare export function renderFileSync(viewsPath: string, filename: string, parameters: any, cache: boolean): string;
+declare export function renderFile(viewsPath: string, filename: string, parameters: any, cache: boolean, done: (err: Error, result?: string) => void): void;
diff --git a/autoprefixer-core/autoprefixer-core.d.ts b/autoprefixer-core/autoprefixer-core.d.ts
index 2463880441..1b04092a71 100644
--- a/autoprefixer-core/autoprefixer-core.d.ts
+++ b/autoprefixer-core/autoprefixer-core.d.ts
@@ -3,42 +3,41 @@
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "autoprefixer-core" {
-    interface Config {
-        browsers?: string[];
-        cascade?: boolean;
-        remove?: boolean;
-    }
 
-    interface Options {
-        from?: string;
-        to?: string;
-        safe?: boolean;
-        map?: {
-            inline?: boolean;
-            prev?: string | Object;
-        }
-    }
-
-    interface Result {
-        css: string;
-        map: string;
-        opts: Options;
-    }
-
-    interface Processor {
-        postcss: any;
-        info(): string;
-        process(css: string, opts?: Options): Result;
-    }
-
-    interface Exports {
-        (config: Config): Processor;
-        postcss: any;
-        info(): string;
-        process(css: string, opts?: Options): Result;
-    }
-
-    var exports: Exports;
-    export = exports;
+interface Config {
+    browsers?: string[];
+    cascade?: boolean;
+    remove?: boolean;
 }
+
+interface Options {
+    from?: string;
+    to?: string;
+    safe?: boolean;
+    map?: {
+        inline?: boolean;
+        prev?: string | Object;
+    }
+}
+
+interface Result {
+    css: string;
+    map: string;
+    opts: Options;
+}
+
+interface Processor {
+    postcss: any;
+    info(): string;
+    process(css: string, opts?: Options): Result;
+}
+
+interface Exports {
+    (config: Config): Processor;
+    postcss: any;
+    info(): string;
+    process(css: string, opts?: Options): Result;
+}
+
+declare var exports: Exports;
+export = exports;
diff --git a/aws-sdk/aws-sdk.d.ts b/aws-sdk/aws-sdk.d.ts
index eb54a5991d..786e840b84 100644
--- a/aws-sdk/aws-sdk.d.ts
+++ b/aws-sdk/aws-sdk.d.ts
@@ -7,1191 +7,1190 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "aws-sdk" {
 
-	export var config: ClientConfig;
 
-	export function Config(json: any): void;
+declare export var config: ClientConfig;
 
-	export class Credentials {
-		constructor(accessKeyId: string, secretAccessKey: string, sessionToken?: string);
-		accessKeyId: string;
-	}
+declare export function Config(json: any): void;
 
-	export interface Logger {
-		write?: (chunk: any, encoding?: string, callback?: () => void) => void;
-		log?: (...messages: any[]) => void;
-	}
-
-	export interface HttpOptions {
-		proxy?: string;
-		agent?: any;
-		timeout?: number;
-		xhrAsync?: boolean;
-		xhrWithCredentials?: boolean;
-	}
-	
-	export class Endpoint {
-		constructor(endpoint:string);
-		
-		host:string;
-		hostname:string;
-		href:string;
-		port:number;
-		protocol:string;
-	}
-
-	export interface Services {
-		autoscaling?: any;
-		cloudformation?: any;
-		cloudfront?: any;
-		cloudsearch?: any;
-		cloudsearchdomain?: any;
-		cloudtrail?: any;
-		cloudwatch?: any;
-		cloudwatchlogs?: any;
-		cognitoidentity?: any;
-		cognitosync?: any;
-		datapipeline?: any;
-		directconnect?: any;
-		dynamodb?: any;
-		ec2?: any;
-		ecs?: any;
-		elasticache?: any;
-		elasticbeanstalk?: any;
-		elastictranscoder?: any;
-		elb?: any;
-		emr?: any;
-		glacier?: any;
-		httpOptions?: HttpOptions;
-		iam?: any;
-		importexport?: any;
-		kinesis?: any;
-		opsworks?: any;
-		rds?: any;
-		redshift?: any;
-		route53?: any;
-		route53domains?: any;
-		s3?: any;
-		ses?: any;
-		simpledb?: any;
-		sns?: any;
-		sqs?: any;
-		storagegateway?: any;
-		sts?: any;
-		support?: any;
-		swf?: any;
-	}
-
-	export interface ClientConfigPartial extends Services {
-		credentials?: Credentials;
-		region?: string;
-		computeChecksums?: boolean;
-		convertResponseTypes?: boolean;
-		logger?: Logger;
-		maxRedirects?: number;
-		maxRetries?: number;
-		paramValidation?: boolean;
-		s3ForcePathStyle?: boolean;
-		apiVersion?: any;
-		apiVersions?: Services;
-		signatureVersion?: string;
-		sslEnabled?: boolean;
-		systemClockOffset?: number;
-	}
-
-	export interface ClientConfig extends ClientConfigPartial {
-		update?: (options: ClientConfigPartial, allUnknownKeys?: boolean) => void;
-		getCredentials?: (callback: (err?: any) => void) => void ;
-		loadFromPath?: (path: string) => void;
-		credentials: Credentials;
-		region: string;
-	}
-
-	export class SQS {
-		constructor(options?: any);
-		endpoint:Endpoint;
-		
-		addPermission(params: SQS.AddPermissionParams, callback: (err:Error, data:any) => void): void;
-		changeMessageVisibility(params: SQS.ChangeMessageVisibilityParams, callback: (err:Error, data:any) => void): void;
-		changeMessageVisibilityBatch(params: SQS.ChangeMessageVisibilityBatchParams, callback: (err:Error, data:SQS.ChangeMessageVisibilityBatchResponse) => void): void;
-		createQueue(params: SQS.CreateQueueParams, callback: (err: Error, data: SQS.CreateQueueResult) => void): void;
-		deleteMessage(params: SQS.DeleteMessageParams, callback: (err: Error, data: any) => void): void;
-		deleteMessageBatch(params: SQS.DeleteMessageBatchParams, callback: (err: Error, data: SQS.DeleteMessageBatchResult) => void): void;
-		deleteQueue(params: { QueueUrl: string; }, callback: (err: Error, data: any) => void): void;
-		getQueueAttributes(params: SQS.GetQueueAttributesParams, callback: (err: Error, data: SQS.GetQueueAttributesResult) => void): void;
-		getQueueUrl(params: SQS.GetQueueUrlParams, callback: (err: Error, data: { QueueUrl: string; }) => void): void;
-		listDeadLetterSourceQueues(params: {QueueUrl:string}, callback: (err: Error, data: {queueUrls: string[]}) => void): void;
-		listQueues(params: {QueueNamePrefix?:string}, callback: (err: Error, data: {QueueUrls: string[]}) => void): void;
-		purgeQueue(params: {QueueUrl: string}, callback: (err: Error, data: any) => void): void;
-		receiveMessage(params: SQS.ReceiveMessageParams, callback: (err: Error, data: SQS.ReceiveMessageResult) => void): void;
-		removePermission(params: {QueueUrl: string, Label: string}, callback: (err: Error, data: any) => void): void;
-		sendMessage(params: SQS.SendMessageParams, callback: (err: Error, data: SQS.SendMessageResult) => void): void;
-		sendMessageBatch(params: SQS.SendMessageBatchParams, callback: (err: Error, data: SQS.SendMessageBatchResult) => void): void;
-		setQueueAttributes(params: SQS.SetQueueAttributesParams, callback: (err: Error, data: any) => void): void;			
-	}
-
-	export class SES {
-		constructor(options?: any);
-		public client: Ses.Client;
-	}
-
-	export class SNS {
-		constructor(options?: any);
-		public client: Sns.Client;
-	}
-
-	export class SimpleWorkflow {
-		constructor(options?: any);
-		public client: Swf.Client;
-	}
-
-	export class S3 {
-		constructor(options?: any);
-		putObject(params: s3.PutObjectRequest, callback: (err: any, data: any) => void): void;
-		getObject(params: s3.GetObjectRequest, callback: (err: any, data: any) => void): void;
-	}
-
-	export class ECS {
-		constructor(options?: any);
-
-		createService(params: ecs.CreateServicesParams, callback: (err: any, data: any) => void): void;
-		describeServices(params: ecs.DescribeServicesParams, callback: (err: any, data: any) => void): void;
-		describeTaskDefinition(params: ecs.DescribeTaskDefinitionParams, callback: (err: any, data: any) => void): void;
-		registerTaskDefinition(params: ecs.RegisterTaskDefinitionParams, callback: (err: any, data: any) => void): void;
-		updateService(params: ecs.UpdateServiceParams, callback: (err: any, data: any) => void): void;
-	}
-
-	export class DynamoDB {
-		constructor(options?: any);
-	}
-
-	export module DynamoDB {
-		export class DocumentClient {
-			constructor(options?: any);
-		}
-	}
-
-	export module SQS {
-		
-		export interface SqsOptions {
-			params?: any;
-			endpoint?: string;
-			accessKeyId?: string;
-			secretAccessKey?: string;
-			sessionToken?: Credentials;
-			credentials?: Credentials;
-			credentialProvider?: any;
-			region?: string;
-			maxRetries?: number;
-			maxRedirects?: number;
-			sslEnabled?: boolean;
-			paramValidation?: boolean;
-			computeChecksums?: boolean;
-			convertResponseTypes?: boolean;
-			correctClockSkew?: boolean;
-			s3ForcePathStyle?: boolean;
-			s3BucketEndpoint?: boolean;
-			httpOptions?: HttpOptions;
-			apiVersion?: string;
-			apiVersions?: { [serviceName:string]: string};
-			logger?: Logger;
-			systemClockOffset?: number;
-			signatureVersion?: string;
-			signatureCache?: boolean;
-		}
-		
-		export interface AddPermissionParams {
-			QueueUrl: string;
-			Label: string;
-			AWSAccountIds:string[];
-			Actions:string[];
-		}
-		
-		export interface ChangeMessageVisibilityParams { 
-			QueueUrl: string, 
-			ReceiptHandle: string, 
-			VisibilityTimeout: number 
-		}
-		
-		export interface ChangeMessageVisibilityBatchParams { 
-			QueueUrl: string, 
-			Entries: { Id: string; ReceiptHandle: string; VisibilityTimeout?: number; }[]
-		}
-		
-		export interface ChangeMessageVisibilityBatchResponse {
-			Successful: { Id:string }[];
-			Failed: BatchResultErrorEntry[];
-		}
-
-		export interface SendMessageParams {
-			QueueUrl: string;
-			MessageBody: string;
-			DelaySeconds?: number;
-			MessageAttributes?: { [name:string]: MessageAttribute; }
-		}
-
-		export interface ReceiveMessageParams {
-			QueueUrl: string;
-			MaxNumberOfMessages?: number;
-			VisibilityTimeout?: number;
-			AttributeNames?: string[];
-			MessageAttributeNames?: string[];
-			WaitTimeSeconds?:number;
-		}
-
-		export interface DeleteMessageBatchParams {
-			QueueUrl: string;
-			Entries: DeleteMessageBatchRequestEntry[];
-		}
-
-		export interface DeleteMessageBatchRequestEntry {
-			Id: string;
-			ReceiptHandle: string;
-		}
-
-		export interface DeleteMessageParams {
-			QueueUrl: string;
-			ReceiptHandle: string;
-		}
-
-		export interface SendMessageBatchParams {
-			QueueUrl: string;
-			Entries: SendMessageBatchRequestEntry[];
-		}
-
-		export interface SendMessageBatchRequestEntry {
-			Id: string;
-			MessageBody: string;
-			DelaySeconds?: number;
-			MessageAttributes?: { [name:string]: MessageAttribute; }
-		}
-
-		export interface CreateQueueParams {
-			QueueName: string;
-			Attributes: QueueAttributes;
-		}
-		
-		export interface QueueAttributes {
-			[name:string]: any;
-			DelaySeconds?: number;
-			MaximumMessageSize?: number;
-			MessageRetentionPeriod?: number;
-			Policy?: any;
-			ReceiveMessageWaitTimeSeconds?: number;
-			VisibilityTimeout?: number;
-			RedrivePolicy?: any;
-		}
-		
-		export interface GetQueueAttributesParams {
-			QueueUrl: string;
-			AttributeNames: string[];
-		}
-		
-		export interface GetQueueAttributesResult {
-			Attributes: {[name:string]: string};
-		}
-		
-		export interface GetQueueUrlParams {
-			QueueName: string;
-			QueueOwnerAWSAccountId?: string;
-		}
-		
-		export interface SendMessageResult {
-			MessageId: string;
-			MD5OfMessageBody: string;
-			MD5OfMessageAttributes: string;
-		}
-
-		export interface ReceiveMessageResult {
-			Messages: Message[];
-		}
-
-		export interface Message {
-			MessageId: string;
-			ReceiptHandle: string;
-			MD5OfBody: string;
-			Body: string;
-			Attributes: { [name:string]:any };
-			MD5OfMessageAttributes:string;
-			MessageAttributes: { [name:string]: MessageAttribute; }
-		}
-
-		export interface MessageAttribute {
-			StringValue?: string;
-			BinaryValue?: any; //(Buffer, Typed Array, Blob, String) 
-			StringListValues?: string[];
-			BinaryListValues?: any[];
-			DataType: string;
-		}
-				
-		export interface DeleteMessageBatchResult {
-			Successful: DeleteMessageBatchResultEntry[];
-			Failed: BatchResultErrorEntry[];
-		}
-
-		export interface DeleteMessageBatchResultEntry {
-			Id: string;
-		}
-
-		export interface BatchResultErrorEntry {
-			Id: string;
-			Code: string;
-			Message?: string;
-			SenderFault: boolean;
-		}
-
-		export interface SendMessageBatchResult {
-			Successful: SendMessageBatchResultEntry[];
-			Failed: BatchResultErrorEntry[];
-		}
-
-		export interface SendMessageBatchResultEntry {
-			Id: string;
-			MessageId: string;
-			MD5OfMessageBody: string;
-			MD5OfMessageAttributes:string;
-		}
-
-		export interface CreateQueueResult {
-			QueueUrl: string;
-		}
-		
-		export interface SetQueueAttributesParams {
-			QueueUrl: string;
-			Attributes: QueueAttributes;
-		}
-
-	}
-
-	export module Ses {
-
-		export interface Client {
-			config: ClientConfig;
-
-			sendEmail(params: any, callback: (err: any, data: SendEmailResult) => void): void;
-		}
-
-		export interface SendEmailRequest {
-			Source: string;
-			Destination: Destination;
-			Message: Message;
-			ReplyToAddresses: string[];
-			ReturnPath: string;
-		}
-
-		export class Destination {
-			ToAddresses: string[];
-			CcAddresses: string[];
-			BccAddresses: string[];
-		}
-
-		export class Message {
-			Subject: Content;
-			Body: Body;
-		}
-
-		export class Content {
-			Data: string;
-			Charset: string;
-		}
-
-		export class Body {
-			Text: Content;
-			Html: Content;
-		}
-
-		export class SendEmailResult {
-			MessageId: string;
-		}
-
-	}
-
-	export module Swf {
-
-		export class Client {
-			//constructor(options?: any);
-			public config: ClientConfig;
-
-			countClosedWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
-			countOpenWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
-			countPendingActivityTasks(params: any, callback: (err: any, data: any) => void): void;
-			countPendingDecisionTasks(params: any, callback: (err: any, data: any) => void): void;
-			deprecateActivityType(params: any, callback: (err: any, data: any) => void): void;
-			deprecateDomain(params: any, callback: (err: any, data: any) => void): void;
-			deprecateWorkflowType(params: any, callback: (err: any, data: any) => void): void;
-			describeActivityType(params: any, callback: (err: any, data: any) => void): void;
-			describeDomain(params: any, callback: (err: any, data: any) => void): void;
-			describeWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
-			describeWorkflowType(params: any, callback: (err: any, data: any) => void): void;
-			getWorkflowExecutionHistory(params: any, callback: (err: any, data: any) => void): void;
-			listActivityTypes(params: any, callback: (err: any, data: any) => void): void;
-			listClosedWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
-			listDomains(params: any, callback: (err: any, data: any) => void): void;
-			listOpenWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
-			listWorkflowTypes(params: any, callback: (err: any, data: any) => void): void;
-			pollForActivityTask(params: any, callback: (err: any, data: ActivityTask) => void): void;
-			pollForDecisionTask(params: any, callback: (err: any, data: DecisionTask) => void): void;
-			recordActivityTaskHeartbeat(params: any, callback: (err: any, data: any) => void): void;
-			registerActivityType(params: any, callback: (err: any, data: any) => void): void;
-			registerDomain(params: any, callback: (err: any, data: any) => void): void;
-			registerWorkflowType(params: any, callback: (err: any, data: any) => void): void;
-			requestCancelWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
-			respondActivityTaskCanceled(params: RespondActivityTaskCanceledRequest, callback: (err: any, data: any) => void): void;
-			respondActivityTaskCompleted(params: RespondActivityTaskCompletedRequest, callback: (err: any, data: any) => void): void;
-			respondActivityTaskFailed(params: RespondActivityTaskFailedRequest, callback: (err: any, data: any) => void): void;
-			respondDecisionTaskCompleted(params: RespondDecisionTaskCompletedRequest, callback: (err: any, data: any) => void): void;
-			signalWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
-			startWorkflowExecution(params: any, callback: (err: any, data: StartWorkflowExecutionResult) => void): void;
-			terminateWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
-		}
-
-		export interface PollForActivityTaskRequest {
-			domain?: string;
-			taskList?: TaskList;
-			identity?: string;
-		}
-
-		export interface TaskList {
-			name?: string;
-		}
-
-		export interface PollForDecisionTaskRequest {
-			domain?: string;
-			taskList?: TaskList;
-			identity?: string;
-			nextPageToken?: string;
-			maximumPageSize?: number;
-			reverseOrder?: Boolean;
-		}
-
-		export interface StartWorkflowExecutionRequest {
-			domain?: string;
-			workflowId?: string;
-			workflowType?: WorkflowType;
-			taskList?: TaskList;
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			tagList?: string[];
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-		}
-
-		export interface WorkflowType {
-			name?: string;
-			version?: string;
-		}
-
-		export interface RespondDecisionTaskCompletedRequest {
-			taskToken?: string;
-			decisions?: Decision[];
-			executionContext?: string;
-		}
-
-		export interface Decision {
-			decisionType?: string;
-			scheduleActivityTaskDecisionAttributes?: ScheduleActivityTaskDecisionAttributes;
-			requestCancelActivityTaskDecisionAttributes?: RequestCancelActivityTaskDecisionAttributes;
-			completeWorkflowExecutionDecisionAttributes?: CompleteWorkflowExecutionDecisionAttributes;
-			failWorkflowExecutionDecisionAttributes?: FailWorkflowExecutionDecisionAttributes;
-			cancelWorkflowExecutionDecisionAttributes?: CancelWorkflowExecutionDecisionAttributes;
-			continueAsNewWorkflowExecutionDecisionAttributes?: ContinueAsNewWorkflowExecutionDecisionAttributes;
-			recordMarkerDecisionAttributes?: RecordMarkerDecisionAttributes;
-			startTimerDecisionAttributes?: StartTimerDecisionAttributes;
-			cancelTimerDecisionAttributes?: CancelTimerDecisionAttributes;
-			signalExternalWorkflowExecutionDecisionAttributes?: SignalExternalWorkflowExecutionDecisionAttributes;
-			requestCancelExternalWorkflowExecutionDecisionAttributes?: RequestCancelExternalWorkflowExecutionDecisionAttributes;
-			startChildWorkflowExecutionDecisionAttributes?: StartChildWorkflowExecutionDecisionAttributes;
-		}
-
-		export interface ScheduleActivityTaskDecisionAttributes {
-			activityType?: ActivityType;
-			activityId?: string;
-			control?: string;
-			input?: string;
-			scheduleToCloseTimeout?: string;
-			taskList?: TaskList;
-			scheduleToStartTimeout?: string;
-			startToCloseTimeout?: string;
-			heartbeatTimeout?: string;
-		}
-
-		export interface ActivityType {
-			name?: string;
-			version?: string;
-		}
-
-		export interface RequestCancelActivityTaskDecisionAttributes {
-			activityId?: string;
-		}
-
-		export interface CompleteWorkflowExecutionDecisionAttributes {
-			result?: string;
-		}
-
-		export interface FailWorkflowExecutionDecisionAttributes {
-			reason?: string;
-			details?: string;
-		}
-
-		export interface CancelWorkflowExecutionDecisionAttributes {
-			details?: string;
-		}
-
-		export interface ContinueAsNewWorkflowExecutionDecisionAttributes {
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			taskList?: TaskList;
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-			tagList?: string[];
-			workflowTypeVersion?: string;
-		}
-
-		export interface RecordMarkerDecisionAttributes {
-			markerName?: string;
-			details?: string;
-		}
-
-		export interface StartTimerDecisionAttributes {
-			timerId?: string;
-			control?: string;
-			startToFireTimeout?: string;
-		}
-
-		export interface CancelTimerDecisionAttributes {
-			timerId?: string;
-		}
-
-		export interface SignalExternalWorkflowExecutionDecisionAttributes {
-			workflowId?: string;
-			runId?: string;
-			signalName?: string;
-			input?: string;
-			control?: string;
-		}
-
-		export interface RequestCancelExternalWorkflowExecutionDecisionAttributes {
-			workflowId?: string;
-			runId?: string;
-			control?: string;
-		}
-
-		export interface StartChildWorkflowExecutionDecisionAttributes {
-			workflowType?: WorkflowType;
-			workflowId?: string;
-			control?: string;
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			taskList?: TaskList;
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-			tagList?: string[];
-		}
-
-		export interface RespondActivityTaskCompletedRequest {
-			taskToken?: string;
-			result?: string;
-		}
-
-		export interface RespondActivityTaskFailedRequest {
-			taskToken?: string;
-			reason?: string;
-			details?: string;
-		}
-
-		export interface RespondActivityTaskCanceledRequest {
-			taskToken?: string;
-			details?: string;
-		}
-
-		export interface DecisionTask {
-			taskToken?: string;
-			startedEventId?: number;
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			events?: HistoryEvent[];
-			nextPageToken?: string;
-			previousStartedEventId?: number;
-		}
-
-		export interface WorkflowExecution {
-			workflowId?: string;
-			runId?: string;
-		}
-
-		export interface HistoryEvent {
-			eventTimestamp?: any;
-			eventType?: string;
-			eventId?: number;
-			workflowExecutionStartedEventAttributes?: WorkflowExecutionStartedEventAttributes;
-			workflowExecutionCompletedEventAttributes?: WorkflowExecutionCompletedEventAttributes;
-			completeWorkflowExecutionFailedEventAttributes?: CompleteWorkflowExecutionFailedEventAttributes;
-			workflowExecutionFailedEventAttributes?: WorkflowExecutionFailedEventAttributes;
-			failWorkflowExecutionFailedEventAttributes?: FailWorkflowExecutionFailedEventAttributes;
-			workflowExecutionTimedOutEventAttributes?: WorkflowExecutionTimedOutEventAttributes;
-			workflowExecutionCanceledEventAttributes?: WorkflowExecutionCanceledEventAttributes;
-			cancelWorkflowExecutionFailedEventAttributes?: CancelWorkflowExecutionFailedEventAttributes;
-			workflowExecutionContinuedAsNewEventAttributes?: WorkflowExecutionContinuedAsNewEventAttributes;
-			continueAsNewWorkflowExecutionFailedEventAttributes?: ContinueAsNewWorkflowExecutionFailedEventAttributes;
-			workflowExecutionTerminatedEventAttributes?: WorkflowExecutionTerminatedEventAttributes;
-			workflowExecutionCancelRequestedEventAttributes?: WorkflowExecutionCancelRequestedEventAttributes;
-			decisionTaskScheduledEventAttributes?: DecisionTaskScheduledEventAttributes;
-			decisionTaskStartedEventAttributes?: DecisionTaskStartedEventAttributes;
-			decisionTaskCompletedEventAttributes?: DecisionTaskCompletedEventAttributes;
-			decisionTaskTimedOutEventAttributes?: DecisionTaskTimedOutEventAttributes;
-			activityTaskScheduledEventAttributes?: ActivityTaskScheduledEventAttributes;
-			activityTaskStartedEventAttributes?: ActivityTaskStartedEventAttributes;
-			activityTaskCompletedEventAttributes?: ActivityTaskCompletedEventAttributes;
-			activityTaskFailedEventAttributes?: ActivityTaskFailedEventAttributes;
-			activityTaskTimedOutEventAttributes?: ActivityTaskTimedOutEventAttributes;
-			activityTaskCanceledEventAttributes?: ActivityTaskCanceledEventAttributes;
-			activityTaskCancelRequestedEventAttributes?: ActivityTaskCancelRequestedEventAttributes;
-			workflowExecutionSignaledEventAttributes?: WorkflowExecutionSignaledEventAttributes;
-			markerRecordedEventAttributes?: MarkerRecordedEventAttributes;
-			timerStartedEventAttributes?: TimerStartedEventAttributes;
-			timerFiredEventAttributes?: TimerFiredEventAttributes;
-			timerCanceledEventAttributes?: TimerCanceledEventAttributes;
-			startChildWorkflowExecutionInitiatedEventAttributes?: StartChildWorkflowExecutionInitiatedEventAttributes;
-			childWorkflowExecutionStartedEventAttributes?: ChildWorkflowExecutionStartedEventAttributes;
-			childWorkflowExecutionCompletedEventAttributes?: ChildWorkflowExecutionCompletedEventAttributes;
-			childWorkflowExecutionFailedEventAttributes?: ChildWorkflowExecutionFailedEventAttributes;
-			childWorkflowExecutionTimedOutEventAttributes?: ChildWorkflowExecutionTimedOutEventAttributes;
-			childWorkflowExecutionCanceledEventAttributes?: ChildWorkflowExecutionCanceledEventAttributes;
-			childWorkflowExecutionTerminatedEventAttributes?: ChildWorkflowExecutionTerminatedEventAttributes;
-			signalExternalWorkflowExecutionInitiatedEventAttributes?: SignalExternalWorkflowExecutionInitiatedEventAttributes;
-			externalWorkflowExecutionSignaledEventAttributes?: ExternalWorkflowExecutionSignaledEventAttributes;
-			signalExternalWorkflowExecutionFailedEventAttributes?: SignalExternalWorkflowExecutionFailedEventAttributes;
-			externalWorkflowExecutionCancelRequestedEventAttributes?: ExternalWorkflowExecutionCancelRequestedEventAttributes;
-			requestCancelExternalWorkflowExecutionInitiatedEventAttributes?: RequestCancelExternalWorkflowExecutionInitiatedEventAttributes;
-			requestCancelExternalWorkflowExecutionFailedEventAttributes?: RequestCancelExternalWorkflowExecutionFailedEventAttributes;
-			scheduleActivityTaskFailedEventAttributes?: ScheduleActivityTaskFailedEventAttributes;
-			requestCancelActivityTaskFailedEventAttributes?: RequestCancelActivityTaskFailedEventAttributes;
-			startTimerFailedEventAttributes?: StartTimerFailedEventAttributes;
-			cancelTimerFailedEventAttributes?: CancelTimerFailedEventAttributes;
-			startChildWorkflowExecutionFailedEventAttributes?: StartChildWorkflowExecutionFailedEventAttributes;
-		}
-
-		export interface WorkflowExecutionStartedEventAttributes {
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-			taskList?: TaskList;
-			workflowType?: WorkflowType;
-			tagList?: string[];
-			continuedExecutionRunId?: string;
-			parentWorkflowExecution?: WorkflowExecution;
-			parentInitiatedEventId?: number;
-		}
-
-		export interface WorkflowExecutionCompletedEventAttributes {
-			result?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface CompleteWorkflowExecutionFailedEventAttributes {
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface WorkflowExecutionFailedEventAttributes {
-			reason?: string;
-			details?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface FailWorkflowExecutionFailedEventAttributes {
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface WorkflowExecutionTimedOutEventAttributes {
-			timeoutType?: string;
-			childPolicy?: string;
-		}
-
-		export interface WorkflowExecutionCanceledEventAttributes {
-			details?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface CancelWorkflowExecutionFailedEventAttributes {
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface WorkflowExecutionContinuedAsNewEventAttributes {
-			input?: string;
-			decisionTaskCompletedEventId?: number;
-			newExecutionRunId?: string;
-			executionStartToCloseTimeout?: string;
-			taskList?: TaskList;
-			taskStartToCloseTimeout?: string;
-			childPolicy?: string;
-			tagList?: string[];
-			workflowType?: WorkflowType;
-		}
-
-		export interface ContinueAsNewWorkflowExecutionFailedEventAttributes {
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface WorkflowExecutionTerminatedEventAttributes {
-			reason?: string;
-			details?: string;
-			childPolicy?: string;
-			cause?: string;
-		}
-
-		export interface WorkflowExecutionCancelRequestedEventAttributes {
-			externalWorkflowExecution?: WorkflowExecution;
-			externalInitiatedEventId?: number;
-			cause?: string;
-		}
-
-		export interface DecisionTaskScheduledEventAttributes {
-			taskList?: TaskList;
-			startToCloseTimeout?: string;
-		}
-
-		export interface DecisionTaskStartedEventAttributes {
-			identity?: string;
-			scheduledEventId?: number;
-		}
-
-		export interface DecisionTaskCompletedEventAttributes {
-			executionContext?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface DecisionTaskTimedOutEventAttributes {
-			timeoutType?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ActivityTaskScheduledEventAttributes {
-			activityType?: ActivityType;
-			activityId?: string;
-			input?: string;
-			control?: string;
-			scheduleToStartTimeout?: string;
-			scheduleToCloseTimeout?: string;
-			startToCloseTimeout?: string;
-			taskList?: TaskList;
-			decisionTaskCompletedEventId?: number;
-			heartbeatTimeout?: string;
-		}
-
-		export interface ActivityTaskStartedEventAttributes {
-			identity?: string;
-			scheduledEventId?: number;
-		}
-
-		export interface ActivityTaskCompletedEventAttributes {
-			result?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ActivityTaskFailedEventAttributes {
-			reason?: string;
-			details?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ActivityTaskTimedOutEventAttributes {
-			timeoutType?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-			details?: string;
-		}
-
-		export interface ActivityTaskCanceledEventAttributes {
-			details?: string;
-			scheduledEventId?: number;
-			startedEventId?: number;
-			latestCancelRequestedEventId?: number;
-		}
-
-		export interface ActivityTaskCancelRequestedEventAttributes {
-			decisionTaskCompletedEventId?: number;
-			activityId?: string;
-		}
-
-		export interface WorkflowExecutionSignaledEventAttributes {
-			signalName?: string;
-			input?: string;
-			externalWorkflowExecution?: WorkflowExecution;
-			externalInitiatedEventId?: number;
-		}
-
-		export interface MarkerRecordedEventAttributes {
-			markerName?: string;
-			details?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface TimerStartedEventAttributes {
-			timerId?: string;
-			control?: string;
-			startToFireTimeout?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface TimerFiredEventAttributes {
-			timerId?: string;
-			startedEventId?: number;
-		}
-
-		export interface TimerCanceledEventAttributes {
-			timerId?: string;
-			startedEventId?: number;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface StartChildWorkflowExecutionInitiatedEventAttributes {
-			workflowId?: string;
-			workflowType?: WorkflowType;
-			control?: string;
-			input?: string;
-			executionStartToCloseTimeout?: string;
-			taskList?: TaskList;
-			decisionTaskCompletedEventId?: number;
-			childPolicy?: string;
-			taskStartToCloseTimeout?: string;
-			tagList?: string[];
-		}
-
-		export interface ChildWorkflowExecutionStartedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			initiatedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionCompletedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			result?: string;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionFailedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			reason?: string;
-			details?: string;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionTimedOutEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			timeoutType?: string;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionCanceledEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			details?: string;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface ChildWorkflowExecutionTerminatedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			workflowType?: WorkflowType;
-			initiatedEventId?: number;
-			startedEventId?: number;
-		}
-
-		export interface SignalExternalWorkflowExecutionInitiatedEventAttributes {
-			workflowId?: string;
-			runId?: string;
-			signalName?: string;
-			input?: string;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface ExternalWorkflowExecutionSignaledEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			initiatedEventId?: number;
-		}
-
-		export interface SignalExternalWorkflowExecutionFailedEventAttributes {
-			workflowId?: string;
-			runId?: string;
-			cause?: string;
-			initiatedEventId?: number;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface ExternalWorkflowExecutionCancelRequestedEventAttributes {
-			workflowExecution?: WorkflowExecution;
-			initiatedEventId?: number;
-		}
-
-		export interface RequestCancelExternalWorkflowExecutionInitiatedEventAttributes {
-			workflowId?: string;
-			runId?: string;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface RequestCancelExternalWorkflowExecutionFailedEventAttributes {
-			workflowId?: string;
-			runId?: string;
-			cause?: string;
-			initiatedEventId?: number;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface ScheduleActivityTaskFailedEventAttributes {
-			activityType?: ActivityType;
-			activityId?: string;
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface RequestCancelActivityTaskFailedEventAttributes {
-			activityId?: string;
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface StartTimerFailedEventAttributes {
-			timerId?: string;
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface CancelTimerFailedEventAttributes {
-			timerId?: string;
-			cause?: string;
-			decisionTaskCompletedEventId?: number;
-		}
-
-		export interface StartChildWorkflowExecutionFailedEventAttributes {
-			workflowType?: WorkflowType;
-			cause?: string;
-			workflowId?: string;
-			initiatedEventId?: number;
-			decisionTaskCompletedEventId?: number;
-			control?: string;
-		}
-
-		export interface ActivityTask {
-			taskToken?: string;
-			activityId?: string;
-			startedEventId?: number;
-			workflowExecution?: WorkflowExecution;
-			activityType?: ActivityType;
-			input?: string;
-		}
-
-		export interface PollForActivityTaskResult {
-			activityTask?: ActivityTask;
-		}
-
-		export interface PollForDecisionTaskResult {
-			decisionTask?: DecisionTask;
-		}
-
-		export interface StartWorkflowExecutionResult {
-			run?: Run;
-		}
-
-		export interface Run {
-			runId?: string;
-		}
-
-	}
-
-	export module Sns {
-
-		export interface Client {
-			config: ClientConfig;
-
-			publicTopic(params: PublishRequest, callback: (err: any, data: PublishResult) => void): void;
-			createTopic(params: CreateTopicRequest, callback: (err: any, data: CreateTopicResult) => void): void;
-			deleteTopic(params: DeleteTopicRequest, callback: (err: any, data: any) => void): void;
-		}
-
-		export interface PublishRequest {
-			TopicArn?: string;
-			Message?: string;
-			MessageStructure?: string;
-			Subject?: string;
-		}
-
-		export interface PublishResult {
-			MessageId?: string;
-		}
-
-		export interface CreateTopicRequest {
-			Name?: string;
-		}
-
-		export interface CreateTopicResult {
-			TopicArn?: string;
-		}
-
-		export interface DeleteTopicRequest {
-			TopicArn?: string;
-		}
-
-	}
-
-	export module s3 {
-		
-		export interface PutObjectRequest {
-			ACL?: string;
-			Body?: any;
-			Bucket: string;
-			CacheControl?: string;
-			ContentDisposition?: string;
-			ContentEncoding?: string;
-			ContentLanguage?: string;
-			ContentLength?: string;
-			ContentMD5?: string;
-			ContentType?: string;
-			Expires?: any;
-			GrantFullControl?: string;
-			GrantRead?: string;
-			GrantReadACP?: string;
-			GrantWriteACP?: string;
-			Key: string;
-			Metadata?: string[];
-			ServerSideEncryption?: string;
-			StorageClass?: string;
-			WebsiteRedirectLocation?: string;
-		}
-
-		export interface GetObjectRequest {
-			Bucket: string;
-			IfMatch?: string;
-			IfModifiedSince?: any;
-			IfNoneMatch?: string;
-			IfUnmodifiedSince?: any;
-			Key: string;
-			Range?: string;
-			ResponseCacheControl?: string;
-			ResponseContentDisposition?: string;
-			ResponseContentEncoding?: string;
-			ResponseContentLanguage?: string;
-			ResponseContentType?: string;
-			ResponseExpires?: any;
-			VersionId?: string;
-		}
-
-	}
-
-	export module ecs {
-		export interface CreateServicesParams {
-			desiredCount: number;
-			serviceName: string;
-			taskDefinition: string;
-			clientToken?: string;
-			cluster?: string;
-			deploymentConfiguration?: {
-				maximumPercent?: number;
-				minimumHealthyPercent?: number;
-			};
-			loadBalancers?: {
-				containerName?: string;
-				containerPort?: number;
-				loadBalancerName?: string;
-			}[];
-			role?: string;
-		}
-
-		export interface DescribeServicesParams {
-			services: string[];
-			cluster: string;
-		}
-
-		export interface DescribeTaskDefinitionParams {
-			taskDefinition: string;
-		}
-
-		export interface RegisterTaskDefinitionParams {
-			containerDefinitions: {
-				command?: string[],
-				cpu?: number,
-				disableNetworking?: boolean,
-				dnsSearchDomains?: string[],
-				dnsServers?: string[],
-				dockerLabels?: any,
-				dockerSecurityOptions?: string[],
-				entryPoint?: string[],
-				environment?: any[],
-				essential?: boolean,
-				extraHosts?: {
-					hostName: string,
-					ipAddress: string
-				}[];
-				hostname?: string,
-				image?: string,
-				links?: string[],
-				logConfiguration?: {
-					logDriver: string,
-					options: any
-				}[],
-				memory?: number,
-				mountPoints?: {
-					containerPath: string,
-					readOnly: boolean,
-					sourceVolume: string
-				}[];
-				name?: string,
-				portMappings?: {
-					containerPort?: number,
-					hostPort?: number,
-					protocol: string
-				}[];
-				privileged?: boolean,
-				readonlyRootFilesystem?: boolean,
-				ulimits?: {
-					hardLimit: number,
-					name: string,
-					softLimit: number
-				}[];
-				user?: string,
-				volumesFrom?: {
-					readOnly?: boolean,
-					sourceContainer?: string
-				}[],
-				workingDirectory?: string
-			}[];
-			family: string;
-			volumes?: {
-				host: {
-					sourcePath: string
-				},
-				name: string
-			}[];
-		}
-
-		export interface UpdateServiceParams {
-			service: string;
-			cluster?: string;
-			deploymentConfiguration?: {
-				maximumPercent: number;
-				minimumHealthyPercent: number;
-			};
-			desiredCount?: number;
-			taskDefinition: string;
-		}
-	}
+declare export class Credentials {
+    constructor(accessKeyId: string, secretAccessKey: string, sessionToken?: string);
+    accessKeyId: string;
+}
+
+export interface Logger {
+    write?: (chunk: any, encoding?: string, callback?: () => void) => void;
+    log?: (...messages: any[]) => void;
+}
+
+export interface HttpOptions {
+    proxy?: string;
+    agent?: any;
+    timeout?: number;
+    xhrAsync?: boolean;
+    xhrWithCredentials?: boolean;
+}
+
+declare export class Endpoint {
+    constructor(endpoint: string);
+
+    host: string;
+    hostname: string;
+    href: string;
+    port: number;
+    protocol: string;
+}
+
+export interface Services {
+    autoscaling?: any;
+    cloudformation?: any;
+    cloudfront?: any;
+    cloudsearch?: any;
+    cloudsearchdomain?: any;
+    cloudtrail?: any;
+    cloudwatch?: any;
+    cloudwatchlogs?: any;
+    cognitoidentity?: any;
+    cognitosync?: any;
+    datapipeline?: any;
+    directconnect?: any;
+    dynamodb?: any;
+    ec2?: any;
+    ecs?: any;
+    elasticache?: any;
+    elasticbeanstalk?: any;
+    elastictranscoder?: any;
+    elb?: any;
+    emr?: any;
+    glacier?: any;
+    httpOptions?: HttpOptions;
+    iam?: any;
+    importexport?: any;
+    kinesis?: any;
+    opsworks?: any;
+    rds?: any;
+    redshift?: any;
+    route53?: any;
+    route53domains?: any;
+    s3?: any;
+    ses?: any;
+    simpledb?: any;
+    sns?: any;
+    sqs?: any;
+    storagegateway?: any;
+    sts?: any;
+    support?: any;
+    swf?: any;
+}
+
+export interface ClientConfigPartial extends Services {
+    credentials?: Credentials;
+    region?: string;
+    computeChecksums?: boolean;
+    convertResponseTypes?: boolean;
+    logger?: Logger;
+    maxRedirects?: number;
+    maxRetries?: number;
+    paramValidation?: boolean;
+    s3ForcePathStyle?: boolean;
+    apiVersion?: any;
+    apiVersions?: Services;
+    signatureVersion?: string;
+    sslEnabled?: boolean;
+    systemClockOffset?: number;
+}
+
+export interface ClientConfig extends ClientConfigPartial {
+    update?: (options: ClientConfigPartial, allUnknownKeys?: boolean) => void;
+    getCredentials?: (callback: (err?: any) => void) => void;
+    loadFromPath?: (path: string) => void;
+    credentials: Credentials;
+    region: string;
+}
+
+declare export class SQS {
+    constructor(options?: any);
+    endpoint: Endpoint;
+
+    addPermission(params: SQS.AddPermissionParams, callback: (err: Error, data: any) => void): void;
+    changeMessageVisibility(params: SQS.ChangeMessageVisibilityParams, callback: (err: Error, data: any) => void): void;
+    changeMessageVisibilityBatch(params: SQS.ChangeMessageVisibilityBatchParams, callback: (err: Error, data: SQS.ChangeMessageVisibilityBatchResponse) => void): void;
+    createQueue(params: SQS.CreateQueueParams, callback: (err: Error, data: SQS.CreateQueueResult) => void): void;
+    deleteMessage(params: SQS.DeleteMessageParams, callback: (err: Error, data: any) => void): void;
+    deleteMessageBatch(params: SQS.DeleteMessageBatchParams, callback: (err: Error, data: SQS.DeleteMessageBatchResult) => void): void;
+    deleteQueue(params: { QueueUrl: string; }, callback: (err: Error, data: any) => void): void;
+    getQueueAttributes(params: SQS.GetQueueAttributesParams, callback: (err: Error, data: SQS.GetQueueAttributesResult) => void): void;
+    getQueueUrl(params: SQS.GetQueueUrlParams, callback: (err: Error, data: { QueueUrl: string; }) => void): void;
+    listDeadLetterSourceQueues(params: { QueueUrl: string }, callback: (err: Error, data: { queueUrls: string[] }) => void): void;
+    listQueues(params: { QueueNamePrefix?: string }, callback: (err: Error, data: { QueueUrls: string[] }) => void): void;
+    purgeQueue(params: { QueueUrl: string }, callback: (err: Error, data: any) => void): void;
+    receiveMessage(params: SQS.ReceiveMessageParams, callback: (err: Error, data: SQS.ReceiveMessageResult) => void): void;
+    removePermission(params: { QueueUrl: string, Label: string }, callback: (err: Error, data: any) => void): void;
+    sendMessage(params: SQS.SendMessageParams, callback: (err: Error, data: SQS.SendMessageResult) => void): void;
+    sendMessageBatch(params: SQS.SendMessageBatchParams, callback: (err: Error, data: SQS.SendMessageBatchResult) => void): void;
+    setQueueAttributes(params: SQS.SetQueueAttributesParams, callback: (err: Error, data: any) => void): void;
+}
+
+declare export class SES {
+    constructor(options?: any);
+    public client: Ses.Client;
+}
+
+declare export class SNS {
+    constructor(options?: any);
+    public client: Sns.Client;
+}
+
+declare export class SimpleWorkflow {
+    constructor(options?: any);
+    public client: Swf.Client;
+}
+
+declare export class S3 {
+    constructor(options?: any);
+    putObject(params: s3.PutObjectRequest, callback: (err: any, data: any) => void): void;
+    getObject(params: s3.GetObjectRequest, callback: (err: any, data: any) => void): void;
+}
+
+declare export class ECS {
+    constructor(options?: any);
+
+    createService(params: ecs.CreateServicesParams, callback: (err: any, data: any) => void): void;
+    describeServices(params: ecs.DescribeServicesParams, callback: (err: any, data: any) => void): void;
+    describeTaskDefinition(params: ecs.DescribeTaskDefinitionParams, callback: (err: any, data: any) => void): void;
+    registerTaskDefinition(params: ecs.RegisterTaskDefinitionParams, callback: (err: any, data: any) => void): void;
+    updateService(params: ecs.UpdateServiceParams, callback: (err: any, data: any) => void): void;
+}
+
+declare export class DynamoDB {
+    constructor(options?: any);
+}
+
+declare export module DynamoDB {
+    export class DocumentClient {
+        constructor(options?: any);
+    }
+}
+
+declare export module SQS {
+
+    export interface SqsOptions {
+        params?: any;
+        endpoint?: string;
+        accessKeyId?: string;
+        secretAccessKey?: string;
+        sessionToken?: Credentials;
+        credentials?: Credentials;
+        credentialProvider?: any;
+        region?: string;
+        maxRetries?: number;
+        maxRedirects?: number;
+        sslEnabled?: boolean;
+        paramValidation?: boolean;
+        computeChecksums?: boolean;
+        convertResponseTypes?: boolean;
+        correctClockSkew?: boolean;
+        s3ForcePathStyle?: boolean;
+        s3BucketEndpoint?: boolean;
+        httpOptions?: HttpOptions;
+        apiVersion?: string;
+        apiVersions?: { [serviceName: string]: string };
+        logger?: Logger;
+        systemClockOffset?: number;
+        signatureVersion?: string;
+        signatureCache?: boolean;
+    }
+
+    export interface AddPermissionParams {
+        QueueUrl: string;
+        Label: string;
+        AWSAccountIds: string[];
+        Actions: string[];
+    }
+
+    export interface ChangeMessageVisibilityParams {
+        QueueUrl: string,
+        ReceiptHandle: string,
+        VisibilityTimeout: number
+    }
+
+    export interface ChangeMessageVisibilityBatchParams {
+        QueueUrl: string,
+        Entries: { Id: string; ReceiptHandle: string; VisibilityTimeout?: number; }[]
+    }
+
+    export interface ChangeMessageVisibilityBatchResponse {
+        Successful: { Id: string }[];
+        Failed: BatchResultErrorEntry[];
+    }
+
+    export interface SendMessageParams {
+        QueueUrl: string;
+        MessageBody: string;
+        DelaySeconds?: number;
+        MessageAttributes?: { [name: string]: MessageAttribute; }
+    }
+
+    export interface ReceiveMessageParams {
+        QueueUrl: string;
+        MaxNumberOfMessages?: number;
+        VisibilityTimeout?: number;
+        AttributeNames?: string[];
+        MessageAttributeNames?: string[];
+        WaitTimeSeconds?: number;
+    }
+
+    export interface DeleteMessageBatchParams {
+        QueueUrl: string;
+        Entries: DeleteMessageBatchRequestEntry[];
+    }
+
+    export interface DeleteMessageBatchRequestEntry {
+        Id: string;
+        ReceiptHandle: string;
+    }
+
+    export interface DeleteMessageParams {
+        QueueUrl: string;
+        ReceiptHandle: string;
+    }
+
+    export interface SendMessageBatchParams {
+        QueueUrl: string;
+        Entries: SendMessageBatchRequestEntry[];
+    }
+
+    export interface SendMessageBatchRequestEntry {
+        Id: string;
+        MessageBody: string;
+        DelaySeconds?: number;
+        MessageAttributes?: { [name: string]: MessageAttribute; }
+    }
+
+    export interface CreateQueueParams {
+        QueueName: string;
+        Attributes: QueueAttributes;
+    }
+
+    export interface QueueAttributes {
+        [name: string]: any;
+        DelaySeconds?: number;
+        MaximumMessageSize?: number;
+        MessageRetentionPeriod?: number;
+        Policy?: any;
+        ReceiveMessageWaitTimeSeconds?: number;
+        VisibilityTimeout?: number;
+        RedrivePolicy?: any;
+    }
+
+    export interface GetQueueAttributesParams {
+        QueueUrl: string;
+        AttributeNames: string[];
+    }
+
+    export interface GetQueueAttributesResult {
+        Attributes: { [name: string]: string };
+    }
+
+    export interface GetQueueUrlParams {
+        QueueName: string;
+        QueueOwnerAWSAccountId?: string;
+    }
+
+    export interface SendMessageResult {
+        MessageId: string;
+        MD5OfMessageBody: string;
+        MD5OfMessageAttributes: string;
+    }
+
+    export interface ReceiveMessageResult {
+        Messages: Message[];
+    }
+
+    export interface Message {
+        MessageId: string;
+        ReceiptHandle: string;
+        MD5OfBody: string;
+        Body: string;
+        Attributes: { [name: string]: any };
+        MD5OfMessageAttributes: string;
+        MessageAttributes: { [name: string]: MessageAttribute; }
+    }
+
+    export interface MessageAttribute {
+        StringValue?: string;
+        BinaryValue?: any; //(Buffer, Typed Array, Blob, String) 
+        StringListValues?: string[];
+        BinaryListValues?: any[];
+        DataType: string;
+    }
+
+    export interface DeleteMessageBatchResult {
+        Successful: DeleteMessageBatchResultEntry[];
+        Failed: BatchResultErrorEntry[];
+    }
+
+    export interface DeleteMessageBatchResultEntry {
+        Id: string;
+    }
+
+    export interface BatchResultErrorEntry {
+        Id: string;
+        Code: string;
+        Message?: string;
+        SenderFault: boolean;
+    }
+
+    export interface SendMessageBatchResult {
+        Successful: SendMessageBatchResultEntry[];
+        Failed: BatchResultErrorEntry[];
+    }
+
+    export interface SendMessageBatchResultEntry {
+        Id: string;
+        MessageId: string;
+        MD5OfMessageBody: string;
+        MD5OfMessageAttributes: string;
+    }
+
+    export interface CreateQueueResult {
+        QueueUrl: string;
+    }
+
+    export interface SetQueueAttributesParams {
+        QueueUrl: string;
+        Attributes: QueueAttributes;
+    }
+
+}
+
+declare export module Ses {
+
+    export interface Client {
+        config: ClientConfig;
+
+        sendEmail(params: any, callback: (err: any, data: SendEmailResult) => void): void;
+    }
+
+    export interface SendEmailRequest {
+        Source: string;
+        Destination: Destination;
+        Message: Message;
+        ReplyToAddresses: string[];
+        ReturnPath: string;
+    }
+
+    export class Destination {
+        ToAddresses: string[];
+        CcAddresses: string[];
+        BccAddresses: string[];
+    }
+
+    export class Message {
+        Subject: Content;
+        Body: Body;
+    }
+
+    export class Content {
+        Data: string;
+        Charset: string;
+    }
+
+    export class Body {
+        Text: Content;
+        Html: Content;
+    }
+
+    export class SendEmailResult {
+        MessageId: string;
+    }
+
+}
+
+declare export module Swf {
+
+    export class Client {
+        //constructor(options?: any);
+        public config: ClientConfig;
+
+        countClosedWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
+        countOpenWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
+        countPendingActivityTasks(params: any, callback: (err: any, data: any) => void): void;
+        countPendingDecisionTasks(params: any, callback: (err: any, data: any) => void): void;
+        deprecateActivityType(params: any, callback: (err: any, data: any) => void): void;
+        deprecateDomain(params: any, callback: (err: any, data: any) => void): void;
+        deprecateWorkflowType(params: any, callback: (err: any, data: any) => void): void;
+        describeActivityType(params: any, callback: (err: any, data: any) => void): void;
+        describeDomain(params: any, callback: (err: any, data: any) => void): void;
+        describeWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
+        describeWorkflowType(params: any, callback: (err: any, data: any) => void): void;
+        getWorkflowExecutionHistory(params: any, callback: (err: any, data: any) => void): void;
+        listActivityTypes(params: any, callback: (err: any, data: any) => void): void;
+        listClosedWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
+        listDomains(params: any, callback: (err: any, data: any) => void): void;
+        listOpenWorkflowExecutions(params: any, callback: (err: any, data: any) => void): void;
+        listWorkflowTypes(params: any, callback: (err: any, data: any) => void): void;
+        pollForActivityTask(params: any, callback: (err: any, data: ActivityTask) => void): void;
+        pollForDecisionTask(params: any, callback: (err: any, data: DecisionTask) => void): void;
+        recordActivityTaskHeartbeat(params: any, callback: (err: any, data: any) => void): void;
+        registerActivityType(params: any, callback: (err: any, data: any) => void): void;
+        registerDomain(params: any, callback: (err: any, data: any) => void): void;
+        registerWorkflowType(params: any, callback: (err: any, data: any) => void): void;
+        requestCancelWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
+        respondActivityTaskCanceled(params: RespondActivityTaskCanceledRequest, callback: (err: any, data: any) => void): void;
+        respondActivityTaskCompleted(params: RespondActivityTaskCompletedRequest, callback: (err: any, data: any) => void): void;
+        respondActivityTaskFailed(params: RespondActivityTaskFailedRequest, callback: (err: any, data: any) => void): void;
+        respondDecisionTaskCompleted(params: RespondDecisionTaskCompletedRequest, callback: (err: any, data: any) => void): void;
+        signalWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
+        startWorkflowExecution(params: any, callback: (err: any, data: StartWorkflowExecutionResult) => void): void;
+        terminateWorkflowExecution(params: any, callback: (err: any, data: any) => void): void;
+    }
+
+    export interface PollForActivityTaskRequest {
+        domain?: string;
+        taskList?: TaskList;
+        identity?: string;
+    }
+
+    export interface TaskList {
+        name?: string;
+    }
+
+    export interface PollForDecisionTaskRequest {
+        domain?: string;
+        taskList?: TaskList;
+        identity?: string;
+        nextPageToken?: string;
+        maximumPageSize?: number;
+        reverseOrder?: Boolean;
+    }
+
+    export interface StartWorkflowExecutionRequest {
+        domain?: string;
+        workflowId?: string;
+        workflowType?: WorkflowType;
+        taskList?: TaskList;
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        tagList?: string[];
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+    }
+
+    export interface WorkflowType {
+        name?: string;
+        version?: string;
+    }
+
+    export interface RespondDecisionTaskCompletedRequest {
+        taskToken?: string;
+        decisions?: Decision[];
+        executionContext?: string;
+    }
+
+    export interface Decision {
+        decisionType?: string;
+        scheduleActivityTaskDecisionAttributes?: ScheduleActivityTaskDecisionAttributes;
+        requestCancelActivityTaskDecisionAttributes?: RequestCancelActivityTaskDecisionAttributes;
+        completeWorkflowExecutionDecisionAttributes?: CompleteWorkflowExecutionDecisionAttributes;
+        failWorkflowExecutionDecisionAttributes?: FailWorkflowExecutionDecisionAttributes;
+        cancelWorkflowExecutionDecisionAttributes?: CancelWorkflowExecutionDecisionAttributes;
+        continueAsNewWorkflowExecutionDecisionAttributes?: ContinueAsNewWorkflowExecutionDecisionAttributes;
+        recordMarkerDecisionAttributes?: RecordMarkerDecisionAttributes;
+        startTimerDecisionAttributes?: StartTimerDecisionAttributes;
+        cancelTimerDecisionAttributes?: CancelTimerDecisionAttributes;
+        signalExternalWorkflowExecutionDecisionAttributes?: SignalExternalWorkflowExecutionDecisionAttributes;
+        requestCancelExternalWorkflowExecutionDecisionAttributes?: RequestCancelExternalWorkflowExecutionDecisionAttributes;
+        startChildWorkflowExecutionDecisionAttributes?: StartChildWorkflowExecutionDecisionAttributes;
+    }
+
+    export interface ScheduleActivityTaskDecisionAttributes {
+        activityType?: ActivityType;
+        activityId?: string;
+        control?: string;
+        input?: string;
+        scheduleToCloseTimeout?: string;
+        taskList?: TaskList;
+        scheduleToStartTimeout?: string;
+        startToCloseTimeout?: string;
+        heartbeatTimeout?: string;
+    }
+
+    export interface ActivityType {
+        name?: string;
+        version?: string;
+    }
+
+    export interface RequestCancelActivityTaskDecisionAttributes {
+        activityId?: string;
+    }
+
+    export interface CompleteWorkflowExecutionDecisionAttributes {
+        result?: string;
+    }
+
+    export interface FailWorkflowExecutionDecisionAttributes {
+        reason?: string;
+        details?: string;
+    }
+
+    export interface CancelWorkflowExecutionDecisionAttributes {
+        details?: string;
+    }
+
+    export interface ContinueAsNewWorkflowExecutionDecisionAttributes {
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        taskList?: TaskList;
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+        tagList?: string[];
+        workflowTypeVersion?: string;
+    }
+
+    export interface RecordMarkerDecisionAttributes {
+        markerName?: string;
+        details?: string;
+    }
+
+    export interface StartTimerDecisionAttributes {
+        timerId?: string;
+        control?: string;
+        startToFireTimeout?: string;
+    }
+
+    export interface CancelTimerDecisionAttributes {
+        timerId?: string;
+    }
+
+    export interface SignalExternalWorkflowExecutionDecisionAttributes {
+        workflowId?: string;
+        runId?: string;
+        signalName?: string;
+        input?: string;
+        control?: string;
+    }
+
+    export interface RequestCancelExternalWorkflowExecutionDecisionAttributes {
+        workflowId?: string;
+        runId?: string;
+        control?: string;
+    }
+
+    export interface StartChildWorkflowExecutionDecisionAttributes {
+        workflowType?: WorkflowType;
+        workflowId?: string;
+        control?: string;
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        taskList?: TaskList;
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+        tagList?: string[];
+    }
+
+    export interface RespondActivityTaskCompletedRequest {
+        taskToken?: string;
+        result?: string;
+    }
+
+    export interface RespondActivityTaskFailedRequest {
+        taskToken?: string;
+        reason?: string;
+        details?: string;
+    }
+
+    export interface RespondActivityTaskCanceledRequest {
+        taskToken?: string;
+        details?: string;
+    }
+
+    export interface DecisionTask {
+        taskToken?: string;
+        startedEventId?: number;
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        events?: HistoryEvent[];
+        nextPageToken?: string;
+        previousStartedEventId?: number;
+    }
+
+    export interface WorkflowExecution {
+        workflowId?: string;
+        runId?: string;
+    }
+
+    export interface HistoryEvent {
+        eventTimestamp?: any;
+        eventType?: string;
+        eventId?: number;
+        workflowExecutionStartedEventAttributes?: WorkflowExecutionStartedEventAttributes;
+        workflowExecutionCompletedEventAttributes?: WorkflowExecutionCompletedEventAttributes;
+        completeWorkflowExecutionFailedEventAttributes?: CompleteWorkflowExecutionFailedEventAttributes;
+        workflowExecutionFailedEventAttributes?: WorkflowExecutionFailedEventAttributes;
+        failWorkflowExecutionFailedEventAttributes?: FailWorkflowExecutionFailedEventAttributes;
+        workflowExecutionTimedOutEventAttributes?: WorkflowExecutionTimedOutEventAttributes;
+        workflowExecutionCanceledEventAttributes?: WorkflowExecutionCanceledEventAttributes;
+        cancelWorkflowExecutionFailedEventAttributes?: CancelWorkflowExecutionFailedEventAttributes;
+        workflowExecutionContinuedAsNewEventAttributes?: WorkflowExecutionContinuedAsNewEventAttributes;
+        continueAsNewWorkflowExecutionFailedEventAttributes?: ContinueAsNewWorkflowExecutionFailedEventAttributes;
+        workflowExecutionTerminatedEventAttributes?: WorkflowExecutionTerminatedEventAttributes;
+        workflowExecutionCancelRequestedEventAttributes?: WorkflowExecutionCancelRequestedEventAttributes;
+        decisionTaskScheduledEventAttributes?: DecisionTaskScheduledEventAttributes;
+        decisionTaskStartedEventAttributes?: DecisionTaskStartedEventAttributes;
+        decisionTaskCompletedEventAttributes?: DecisionTaskCompletedEventAttributes;
+        decisionTaskTimedOutEventAttributes?: DecisionTaskTimedOutEventAttributes;
+        activityTaskScheduledEventAttributes?: ActivityTaskScheduledEventAttributes;
+        activityTaskStartedEventAttributes?: ActivityTaskStartedEventAttributes;
+        activityTaskCompletedEventAttributes?: ActivityTaskCompletedEventAttributes;
+        activityTaskFailedEventAttributes?: ActivityTaskFailedEventAttributes;
+        activityTaskTimedOutEventAttributes?: ActivityTaskTimedOutEventAttributes;
+        activityTaskCanceledEventAttributes?: ActivityTaskCanceledEventAttributes;
+        activityTaskCancelRequestedEventAttributes?: ActivityTaskCancelRequestedEventAttributes;
+        workflowExecutionSignaledEventAttributes?: WorkflowExecutionSignaledEventAttributes;
+        markerRecordedEventAttributes?: MarkerRecordedEventAttributes;
+        timerStartedEventAttributes?: TimerStartedEventAttributes;
+        timerFiredEventAttributes?: TimerFiredEventAttributes;
+        timerCanceledEventAttributes?: TimerCanceledEventAttributes;
+        startChildWorkflowExecutionInitiatedEventAttributes?: StartChildWorkflowExecutionInitiatedEventAttributes;
+        childWorkflowExecutionStartedEventAttributes?: ChildWorkflowExecutionStartedEventAttributes;
+        childWorkflowExecutionCompletedEventAttributes?: ChildWorkflowExecutionCompletedEventAttributes;
+        childWorkflowExecutionFailedEventAttributes?: ChildWorkflowExecutionFailedEventAttributes;
+        childWorkflowExecutionTimedOutEventAttributes?: ChildWorkflowExecutionTimedOutEventAttributes;
+        childWorkflowExecutionCanceledEventAttributes?: ChildWorkflowExecutionCanceledEventAttributes;
+        childWorkflowExecutionTerminatedEventAttributes?: ChildWorkflowExecutionTerminatedEventAttributes;
+        signalExternalWorkflowExecutionInitiatedEventAttributes?: SignalExternalWorkflowExecutionInitiatedEventAttributes;
+        externalWorkflowExecutionSignaledEventAttributes?: ExternalWorkflowExecutionSignaledEventAttributes;
+        signalExternalWorkflowExecutionFailedEventAttributes?: SignalExternalWorkflowExecutionFailedEventAttributes;
+        externalWorkflowExecutionCancelRequestedEventAttributes?: ExternalWorkflowExecutionCancelRequestedEventAttributes;
+        requestCancelExternalWorkflowExecutionInitiatedEventAttributes?: RequestCancelExternalWorkflowExecutionInitiatedEventAttributes;
+        requestCancelExternalWorkflowExecutionFailedEventAttributes?: RequestCancelExternalWorkflowExecutionFailedEventAttributes;
+        scheduleActivityTaskFailedEventAttributes?: ScheduleActivityTaskFailedEventAttributes;
+        requestCancelActivityTaskFailedEventAttributes?: RequestCancelActivityTaskFailedEventAttributes;
+        startTimerFailedEventAttributes?: StartTimerFailedEventAttributes;
+        cancelTimerFailedEventAttributes?: CancelTimerFailedEventAttributes;
+        startChildWorkflowExecutionFailedEventAttributes?: StartChildWorkflowExecutionFailedEventAttributes;
+    }
+
+    export interface WorkflowExecutionStartedEventAttributes {
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+        taskList?: TaskList;
+        workflowType?: WorkflowType;
+        tagList?: string[];
+        continuedExecutionRunId?: string;
+        parentWorkflowExecution?: WorkflowExecution;
+        parentInitiatedEventId?: number;
+    }
+
+    export interface WorkflowExecutionCompletedEventAttributes {
+        result?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface CompleteWorkflowExecutionFailedEventAttributes {
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface WorkflowExecutionFailedEventAttributes {
+        reason?: string;
+        details?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface FailWorkflowExecutionFailedEventAttributes {
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface WorkflowExecutionTimedOutEventAttributes {
+        timeoutType?: string;
+        childPolicy?: string;
+    }
+
+    export interface WorkflowExecutionCanceledEventAttributes {
+        details?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface CancelWorkflowExecutionFailedEventAttributes {
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface WorkflowExecutionContinuedAsNewEventAttributes {
+        input?: string;
+        decisionTaskCompletedEventId?: number;
+        newExecutionRunId?: string;
+        executionStartToCloseTimeout?: string;
+        taskList?: TaskList;
+        taskStartToCloseTimeout?: string;
+        childPolicy?: string;
+        tagList?: string[];
+        workflowType?: WorkflowType;
+    }
+
+    export interface ContinueAsNewWorkflowExecutionFailedEventAttributes {
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface WorkflowExecutionTerminatedEventAttributes {
+        reason?: string;
+        details?: string;
+        childPolicy?: string;
+        cause?: string;
+    }
+
+    export interface WorkflowExecutionCancelRequestedEventAttributes {
+        externalWorkflowExecution?: WorkflowExecution;
+        externalInitiatedEventId?: number;
+        cause?: string;
+    }
+
+    export interface DecisionTaskScheduledEventAttributes {
+        taskList?: TaskList;
+        startToCloseTimeout?: string;
+    }
+
+    export interface DecisionTaskStartedEventAttributes {
+        identity?: string;
+        scheduledEventId?: number;
+    }
+
+    export interface DecisionTaskCompletedEventAttributes {
+        executionContext?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface DecisionTaskTimedOutEventAttributes {
+        timeoutType?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ActivityTaskScheduledEventAttributes {
+        activityType?: ActivityType;
+        activityId?: string;
+        input?: string;
+        control?: string;
+        scheduleToStartTimeout?: string;
+        scheduleToCloseTimeout?: string;
+        startToCloseTimeout?: string;
+        taskList?: TaskList;
+        decisionTaskCompletedEventId?: number;
+        heartbeatTimeout?: string;
+    }
+
+    export interface ActivityTaskStartedEventAttributes {
+        identity?: string;
+        scheduledEventId?: number;
+    }
+
+    export interface ActivityTaskCompletedEventAttributes {
+        result?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ActivityTaskFailedEventAttributes {
+        reason?: string;
+        details?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ActivityTaskTimedOutEventAttributes {
+        timeoutType?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+        details?: string;
+    }
+
+    export interface ActivityTaskCanceledEventAttributes {
+        details?: string;
+        scheduledEventId?: number;
+        startedEventId?: number;
+        latestCancelRequestedEventId?: number;
+    }
+
+    export interface ActivityTaskCancelRequestedEventAttributes {
+        decisionTaskCompletedEventId?: number;
+        activityId?: string;
+    }
+
+    export interface WorkflowExecutionSignaledEventAttributes {
+        signalName?: string;
+        input?: string;
+        externalWorkflowExecution?: WorkflowExecution;
+        externalInitiatedEventId?: number;
+    }
+
+    export interface MarkerRecordedEventAttributes {
+        markerName?: string;
+        details?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface TimerStartedEventAttributes {
+        timerId?: string;
+        control?: string;
+        startToFireTimeout?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface TimerFiredEventAttributes {
+        timerId?: string;
+        startedEventId?: number;
+    }
+
+    export interface TimerCanceledEventAttributes {
+        timerId?: string;
+        startedEventId?: number;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface StartChildWorkflowExecutionInitiatedEventAttributes {
+        workflowId?: string;
+        workflowType?: WorkflowType;
+        control?: string;
+        input?: string;
+        executionStartToCloseTimeout?: string;
+        taskList?: TaskList;
+        decisionTaskCompletedEventId?: number;
+        childPolicy?: string;
+        taskStartToCloseTimeout?: string;
+        tagList?: string[];
+    }
+
+    export interface ChildWorkflowExecutionStartedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        initiatedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionCompletedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        result?: string;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionFailedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        reason?: string;
+        details?: string;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionTimedOutEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        timeoutType?: string;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionCanceledEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        details?: string;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface ChildWorkflowExecutionTerminatedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        workflowType?: WorkflowType;
+        initiatedEventId?: number;
+        startedEventId?: number;
+    }
+
+    export interface SignalExternalWorkflowExecutionInitiatedEventAttributes {
+        workflowId?: string;
+        runId?: string;
+        signalName?: string;
+        input?: string;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface ExternalWorkflowExecutionSignaledEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        initiatedEventId?: number;
+    }
+
+    export interface SignalExternalWorkflowExecutionFailedEventAttributes {
+        workflowId?: string;
+        runId?: string;
+        cause?: string;
+        initiatedEventId?: number;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface ExternalWorkflowExecutionCancelRequestedEventAttributes {
+        workflowExecution?: WorkflowExecution;
+        initiatedEventId?: number;
+    }
+
+    export interface RequestCancelExternalWorkflowExecutionInitiatedEventAttributes {
+        workflowId?: string;
+        runId?: string;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface RequestCancelExternalWorkflowExecutionFailedEventAttributes {
+        workflowId?: string;
+        runId?: string;
+        cause?: string;
+        initiatedEventId?: number;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface ScheduleActivityTaskFailedEventAttributes {
+        activityType?: ActivityType;
+        activityId?: string;
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface RequestCancelActivityTaskFailedEventAttributes {
+        activityId?: string;
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface StartTimerFailedEventAttributes {
+        timerId?: string;
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface CancelTimerFailedEventAttributes {
+        timerId?: string;
+        cause?: string;
+        decisionTaskCompletedEventId?: number;
+    }
+
+    export interface StartChildWorkflowExecutionFailedEventAttributes {
+        workflowType?: WorkflowType;
+        cause?: string;
+        workflowId?: string;
+        initiatedEventId?: number;
+        decisionTaskCompletedEventId?: number;
+        control?: string;
+    }
+
+    export interface ActivityTask {
+        taskToken?: string;
+        activityId?: string;
+        startedEventId?: number;
+        workflowExecution?: WorkflowExecution;
+        activityType?: ActivityType;
+        input?: string;
+    }
+
+    export interface PollForActivityTaskResult {
+        activityTask?: ActivityTask;
+    }
+
+    export interface PollForDecisionTaskResult {
+        decisionTask?: DecisionTask;
+    }
+
+    export interface StartWorkflowExecutionResult {
+        run?: Run;
+    }
+
+    export interface Run {
+        runId?: string;
+    }
+
+}
+
+declare export module Sns {
+
+    export interface Client {
+        config: ClientConfig;
+
+        publicTopic(params: PublishRequest, callback: (err: any, data: PublishResult) => void): void;
+        createTopic(params: CreateTopicRequest, callback: (err: any, data: CreateTopicResult) => void): void;
+        deleteTopic(params: DeleteTopicRequest, callback: (err: any, data: any) => void): void;
+    }
+
+    export interface PublishRequest {
+        TopicArn?: string;
+        Message?: string;
+        MessageStructure?: string;
+        Subject?: string;
+    }
+
+    export interface PublishResult {
+        MessageId?: string;
+    }
+
+    export interface CreateTopicRequest {
+        Name?: string;
+    }
+
+    export interface CreateTopicResult {
+        TopicArn?: string;
+    }
+
+    export interface DeleteTopicRequest {
+        TopicArn?: string;
+    }
+
+}
+
+declare export module s3 {
+
+    export interface PutObjectRequest {
+        ACL?: string;
+        Body?: any;
+        Bucket: string;
+        CacheControl?: string;
+        ContentDisposition?: string;
+        ContentEncoding?: string;
+        ContentLanguage?: string;
+        ContentLength?: string;
+        ContentMD5?: string;
+        ContentType?: string;
+        Expires?: any;
+        GrantFullControl?: string;
+        GrantRead?: string;
+        GrantReadACP?: string;
+        GrantWriteACP?: string;
+        Key: string;
+        Metadata?: string[];
+        ServerSideEncryption?: string;
+        StorageClass?: string;
+        WebsiteRedirectLocation?: string;
+    }
+
+    export interface GetObjectRequest {
+        Bucket: string;
+        IfMatch?: string;
+        IfModifiedSince?: any;
+        IfNoneMatch?: string;
+        IfUnmodifiedSince?: any;
+        Key: string;
+        Range?: string;
+        ResponseCacheControl?: string;
+        ResponseContentDisposition?: string;
+        ResponseContentEncoding?: string;
+        ResponseContentLanguage?: string;
+        ResponseContentType?: string;
+        ResponseExpires?: any;
+        VersionId?: string;
+    }
+
+}
+
+declare export module ecs {
+    export interface CreateServicesParams {
+        desiredCount: number;
+        serviceName: string;
+        taskDefinition: string;
+        clientToken?: string;
+        cluster?: string;
+        deploymentConfiguration?: {
+            maximumPercent?: number;
+            minimumHealthyPercent?: number;
+        };
+        loadBalancers?: {
+            containerName?: string;
+            containerPort?: number;
+            loadBalancerName?: string;
+        }[];
+        role?: string;
+    }
+
+    export interface DescribeServicesParams {
+        services: string[];
+        cluster: string;
+    }
+
+    export interface DescribeTaskDefinitionParams {
+        taskDefinition: string;
+    }
+
+    export interface RegisterTaskDefinitionParams {
+        containerDefinitions: {
+            command?: string[],
+            cpu?: number,
+            disableNetworking?: boolean,
+            dnsSearchDomains?: string[],
+            dnsServers?: string[],
+            dockerLabels?: any,
+            dockerSecurityOptions?: string[],
+            entryPoint?: string[],
+            environment?: any[],
+            essential?: boolean,
+            extraHosts?: {
+                hostName: string,
+                ipAddress: string
+            }[];
+            hostname?: string,
+            image?: string,
+            links?: string[],
+            logConfiguration?: {
+                logDriver: string,
+                options: any
+            }[],
+            memory?: number,
+            mountPoints?: {
+                containerPath: string,
+                readOnly: boolean,
+                sourceVolume: string
+            }[];
+            name?: string,
+            portMappings?: {
+                containerPort?: number,
+                hostPort?: number,
+                protocol: string
+            }[];
+            privileged?: boolean,
+            readonlyRootFilesystem?: boolean,
+            ulimits?: {
+                hardLimit: number,
+                name: string,
+                softLimit: number
+            }[];
+            user?: string,
+            volumesFrom?: {
+                readOnly?: boolean,
+                sourceContainer?: string
+            }[],
+            workingDirectory?: string
+        }[];
+        family: string;
+        volumes?: {
+            host: {
+                sourcePath: string
+            },
+            name: string
+        }[];
+    }
+
+    export interface UpdateServiceParams {
+        service: string;
+        cluster?: string;
+        deploymentConfiguration?: {
+            maximumPercent: number;
+            minimumHealthyPercent: number;
+        };
+        desiredCount?: number;
+        taskDefinition: string;
+    }
 }
diff --git a/azure/azure.d.ts b/azure/azure.d.ts
index da2c14871f..ffa545166f 100644
--- a/azure/azure.d.ts
+++ b/azure/azure.d.ts
@@ -10,1873 +10,1872 @@
 /**
 * TODO
 */
-declare module "azure" {
-    import events = require("events");
-    import stream = require("stream");
-    import url = require("url");
 
-    //#region Services
-    export class TableService extends BatchServiceClient {
-        static incorrectTableNameErr: string;
-        static incorrectCallbackErr: string;
-        static incorrectTableQuery: string;
-        static incorrectPartitionErr: string;
-
-        //#region Constructors
-
-        /**
-        * Creates a new TableService object.
-        * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
-        *
-        * @constructor
-        * @extends {ServiceClient}
-        */
-        constructor();
-        /**
-        * Creates a new TableService object.
-        * Uses a connectionString to connect
-        *
-        * @constructor
-        * @extends {ServiceClient}
-        * @param {string} connectionString The connection string.
-        */
-        constructor(connectionString: string);
-        /**
-        * Creates a new TableService object.
-        * Uses a storage account and an access key.
-        *
-        * @constructor
-        * @extends {ServiceClient}
-        * @param {string} storageAccount                    The storage account or the connection string.
-        * @param {string} storageAccessKey                  The storage access key.
-        * @param {string} host                              The host address.
-        * @param {object} authenticationProvider            The authentication provider.
-        */
-        constructor(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string);
-
-        //#endregion
-
-        //#region Service Methods
-
-        getServiceProperties(callback: StorageServicePropertiesCallback): void;
-        getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
-
-        setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
-        setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
-
-        //#endregion
-
-        //#region Table Methods
-
-        getTable(table: string, callback?: TableRequestCallback): void;
-        getTable(table: string, options: TimeoutIntervalOptions, callback?: TableRequestCallback): void;
-
-        createTable(table: string, callback?: TableRequestCallback): void;
-        createTable(table: string, options: TimeoutIntervalOptions, callback?: TableRequestCallback): void;
-
-        createTableIfNotExists(table: string, callback?: CreateTableIfNotExistsCallback): void;
-        createTableIfNotExists(table: string, options: TimeoutIntervalOptions, callback?: CreateTableIfNotExistsCallback): void;
-
-        deleteTable(table: string, callback?: DeleteTableCallback): void;
-        deleteTable(table: string, options: TimeoutIntervalOptions, callback?: DeleteTableCallback): void;
-
-        queryTables(callback?: QueryTablesCallback): void;
-        queryTables(options: QueryTablesOptions, callback?: QueryTablesCallback): void;
-
-        //#endregion
-
-        //#region Entities Methods
-
-        queryEntity(table: string, partitionKey: string, rowKey: string, callback?: QueryEntityCallback): void;
-        queryEntity(table: string, partitionKey: string, rowKey: string, options: TimeoutIntervalOptions, callback?: QueryEntityCallback): void;
-
-        queryEntities(tableQuery: TableQuery, callback?: QueryEntitiesCallback): void;
-        queryEntities(tableQuery: TableQuery, options: TimeoutIntervalOptions, callback?: QueryEntitiesCallback): void;
-
-        insertEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        insertEntity(tableName: string, entityDescriptor: Entity, options: TimeoutIntervalOptions, callback?: ModifyEntityCallback): void;
-
-        insertOrReplaceEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        insertOrReplaceEntity(tableName: string, entityDescriptor: Entity, options: TimeoutIntervalOptions, callback?: ModifyEntityCallback): void;
-
-        updateEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        updateEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
-
-        mergeEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        mergeEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
-
-        insertOrMergeEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
-        insertOrMergeEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
-
-        deleteEntity(tableName: string, entityDescriptor: Entity, callback?: DeleteEntityCallback): void;
-        deleteEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: DeleteEntityCallback): void;
-
-        //#endregion
-    }
-
-    export class BlobService extends StorageServiceClient {
-        singleBlobPutThresholdInBytes: number;
-        parallelOperationThreadCount: number;
-
-        SpeedSummary: typeof SpeedSummary;
-
-        //#region Constructors
-
-        /**
-        * Creates a new BlobService object.
-        * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        */
-        constructor();
-
-        /**
-        * Creates a new BlobService object.
-        * Uses a connectionString to connect
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        * @param {string} connectionString The connection string.
-        */
-        constructor(connectionString: string);
-
-        /**
-        * Creates a new BlobService object.
-        * Uses a storage account and an access key.
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        * @param {string} storageAccount                    The storage account or the connection string.
-        * @param {string} storageAccessKey                  The storage access key.
-        * @param {string} host                              The host address.
-        * @param {object} sasToken                          The Shared Access Signature token.
-        */
-        constructor(storageAccount: string, storageAccessKey: string, host?: string, sasToken?: string);
-
-        //#endregion
-
-        //#region Service Methods
-
-        /**
-        * Gets the properties of a storage account�s Blob service, including Azure Storage Analytics.
-        */
-        getServiceProperties(callback: StorageServicePropertiesCallback): void;
-        getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
-
-        /**
-        * Sets the properties of a storage account�s Blob service, including Azure Storage Analytics.
-        * You can also use this operation to set the default request version for all incoming requests that do not have a version specified.
-        */
-        setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
-        setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
-
-        //#endregion
-
-        //#region Containers Methods
-
-        /**
-        * Lists a segment containing a collection of container items under the specified account.
-        */
-        listContainers(callback: ListContainersCallback): void;
-        listContainers(options: ListContainersOptions, callback: ListContainersCallback): void;
-
-        /**
-         * Creates a new container under the specified account.
-         * If a container with the same name already exists, the operation fails.
-         */
-        createContainer(container: string, callback: StorageCallback<ContainerResult>): void;
-        createContainer(container: string, options: CreateContainerOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Creates a new container under the specified account if the container does not exists.
-         */
-        createContainerIfNotExists(container: string, callback: StorageCallback<boolean>): void;
-        createContainerIfNotExists(container: string, options: CreateContainerOptions, callback: StorageCallback<boolean>): void;
-
-        /**
-         * Retrieves a container and its properties from a specified account.
-         */
-        getContainerProperties(container: string, callback: StorageCallback<ContainerResult>): void;
-        getContainerProperties(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Returns all user-defined metadata for the container.
-         */
-        getContainerMetadata(container: string, callback: StorageCallback<ContainerResult>): void;
-        getContainerMetadata(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Sets the container's metadata.
-         */
-        setContainerMetadata(container: string, metadata: StorageMetadata, callback: StorageCallback<ContainerResult>): void;
-        setContainerMetadata(container: string, metadata: StorageMetadata, options: AccessConditionsOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Gets the container's ACL.
-         */
-        getContainerAcl(container: string, callback: StorageCallback<ContainerResult>): void;
-        getContainerAcl(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Updates the container's ACL.
-         */
-        setContainerAcl(container: string, publicAccessLevel: string, callback: StorageCallback<ContainerResult>): void;
-        setContainerAcl(container: string, publicAccessLevel: string, options: StorageAclOptions, callback: StorageCallback<ContainerResult>): void;
-
-        /**
-         * Marks the specified container for deletion.
-         * The container and any blobs contained within it are later deleted during garbage collection.
-         */
-        deleteContainer(container: string, callback: StorageCallbackVoid): void;
-        deleteContainer(container: string, options: LeaseIdOptions, callback: StorageCallbackVoid): void;
-
-        //#endregion
-
-        //#region Blob Methods
-
-        /**
-        * Lists all of the blobs in the given container.
-        */
-        listBlobs(container: string, callback: ListBlobsCallback): void;
-        listBlobs(container: string, options: ListBlobsOptions, callback: ListBlobsCallback): void;
-
-        /**
-         * Returns all user-defined metadata, standard HTTP properties, and system properties for the blob.
-         * It does not return or modify the content of the blob.
-         */
-        getBlobProperties(container: string, blob: string, callback: StorageCallback<BlobResult>): void;
-        getBlobProperties(container: string, blob: string, options: GetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Sets user-defined properties for the specified blob or snapshot.
-         * It does not return or modify the content of the blob.
-         */
-        setBlobProperties(container: string, blob: string, callback: StorageCallback<BlobResult>): void;
-        setBlobProperties(container: string, blob: string, options: SetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Sets user-defined metadata for the specified blob or snapshot as one or more name-value pairs 
-         * It does not return or modify the content of the blob.
-         */
-        setBlobMetadata(container: string, blob: string, metadata: StorageMetadata, callback: StorageCallback<BlobResult>): void;
-        setBlobMetadata(container: string, blob: string, metadata: StorageMetadata, options: GetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Provides a stream to read from a blob.
-         */
-        getBlob(container: string, blob: string, callback: StorageCallback<BlobResult>): stream.Readable;
-        getBlob(container: string, blob: string, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): stream.Readable;
-
-        /**
-         * Downloads a blob into a file.
-         */
-        getBlobToFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): void;
-        getBlobToFile(container: string, blob: string, localFileName: string, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Downloads a blob into a stream.
-         */
-        getBlobToStream(container: string, blob: string, stream: stream.Writable, callback: StorageCallback<BlobResult>): void;
-        getBlobToStream(container: string, blob: string, stream: stream.Writable, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Downloads a blob into a text string.
-         */
-        getBlobToText(container: string, blob: string, callback: GetBlobToTextCallback): void;
-        getBlobToText(container: string, blob: string, options: ReadBlobOptions, callback: GetBlobToTextCallback): void;
-
-        /**
-         * Marks the specified blob or snapshot for deletion. The blob is later deleted during garbage collection.
-         * If a blob has snapshots, you must delete them when deleting the blob. Using the deleteSnapshots option, you can choose either to delete both the blob and its snapshots, 
-         * or to delete only the snapshots but not the blob itself. If the blob has snapshots, you must include the deleteSnapshots option or the blob service will return an error
-         * and nothing will be deleted. 
-         * If you are deleting a specific snapshot using the snapshotId option, the deleteSnapshots option must NOT be included.
-         */
-        deleteBlob(container: string, blob: string, callback: StorageCallback<boolean>): void;
-        deleteBlob(container: string, blob: string, options: DeleteBlobOptions, callback: StorageCallback<boolean>): void;
-
-        /**
-         * Creates a read-only snapshot of a blob.
-         */
-        createBlobSnapshot(container: string, blob: string, callback: StorageCallback<string>): void;
-        createBlobSnapshot(container: string, blob: string, options: BlobSnapshotOptions, callback: StorageCallback<string>): void;
-
-        /**
-         * Starts to copy a blob to a destination within the storage account. The Copy Blob operation copies the entire committed blob.
-         */
-        copyBlob(sourceUri: string, targetContainer: string, targetBlob: string, callback: StorageCallback<BlobResult>): void;
-        copyBlob(sourceUri: string, targetContainer: string, targetBlob: string, options: CopyBlobOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Creates a read-only snapshot of a blob.
-         */
-        abortCopyBlob(container: string, blob: string, copyId: string, callback: StorageCallbackVoid): void;
-        abortCopyBlob(container: string, blob: string, copyId: string, options: LeaseIdOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Retrieves a shared access signature token.
-         */
-        generateSharedAccessSignature(container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): SharedAccessSignatureResult;
-
-        /**
-         * Retrieves a blob or container URL.
-         */
-        getBlobUrl(container: string): string;
-        getBlobUrl(container: string, blob: string): string;
-        getBlobUrl(container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): string;
-
-        /**
-         * Uploads a blob.
-         */
-        createBlob(container: string, blob: string, blobType: string, callback: StorageCallback<string>): stream.Writable;
-        createBlob(container: string, blob: string, blobType: string, options: UploadBlockBlobOptions, callback: StorageCallback<string>): stream.Writable;
-
-        //#endregion
-
-        //#region Page Blob Methods
-
-        /**
-         * Creates a page blob of the specified length.
-         */
-        createPageBlob(container: string, blob: string, length: number, callback: StorageCallbackVoid): void;
-        createPageBlob(container: string, blob: string, length: number, options: SetBlobPropertiesOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Updates a page blob from a stream.
-         */
-        createBlobPagesFromStream(container: string, blob: string, readStream: stream.Readable, rangeStart: number, rangeEnd: number, callback: StorageCallback<BlobResult>): void;
-        createBlobPagesFromStream(container: string, blob: string, readStream: stream.Readable, rangeStart: number, rangeEnd: number, options: CreatePagesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Updates a page blob from a text string.
-         */
-        createBlobPagesFromText(container: string, blob: string, text: string, rangeStart: number, rangeEnd: number, callback: StorageCallback<BlobResult>): void;
-        createBlobPagesFromText(container: string, blob: string, text: string, rangeStart: number, rangeEnd: number, options: CreatePagesOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Lists page ranges.
-         * Lists all of the page ranges by default, or only the page ranges over a specific range of bytes if rangeStart and rangeEnd are specified.
-         */
-        listBlobRegions(container: string, blob: string, callback: StorageCallback<PageRange[]>): void;
-        listBlobRegions(container: string, blob: string, options: PageRangeOptions, callback: StorageCallback<PageRange[]>): void;
-
-        /**
-         * Clears a range of pages.
-         */
-        clearBlobPages(container: string, blob: string, rangeStart: number, rangeEnd: number, callback: StorageCallbackVoid): void;
-        clearBlobPages(container: string, blob: string, rangeStart: number, rangeEnd: number, options: LeaseAccessConditionsOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Resizes a page blob.
-         */
-        resizePageBlob(container: string, blob: string, size: number, callback: StorageCallback<BlobResult>): void;
-        resizePageBlob(container: string, blob: string, size: number, options: LeaseAccessConditionsOptions, callback: StorageCallback<BlobResult>): void;
-
-        /**
-         * Sets the page blob's sequence number.
-         */
-        setPageBlobSequenceNumber(container: string, blob: string, sequenceNumberAction: string, sequenceNumber: string, callback: StorageCallback<BlobResult>): void;
-        setPageBlobSequenceNumber(container: string, blob: string, sequenceNumberAction: string, sequenceNumber: string, options: AccessConditionsOptions, callback: StorageCallback<BlobResult>): void;
-
-        //#endregion
-
-        //#region Block Blob Methods
-
-        /**
-         * Uploads a block blob from file.
-         */
-        putBlockBlobFromFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): SpeedSummary;
-        putBlockBlobFromFile(container: string, blob: string, localFileName: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromFile(container: string, blob: string, localFileName: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-
-        /**
-         * Uploads a block blob from a stream.
-         */
-        putBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, callback: StorageCallback<BlobResult>): SpeedSummary;
-        putBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-
-        /**
-         * Uploads a block blob from a text string.
-         */
-        createBlockBlobFromText(container: string, blob: string, text: string, callback: StorageCallback<BlobResult>): SpeedSummary;
-        createBlockBlobFromText(container: string, blob: string, text: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
-
-        /**
-         * Creates a new block to be committed as part of a blob.
-         */
-        createBlobBlockFromStream(blockId: string, container: string, blob: string, readStream: stream.Stream, streamLength: number, callback: StorageCallbackVoid): void;
-        createBlobBlockFromStream(blockId: string, container: string, blob: string, readStream: stream.Stream, streamLength: number, options: CreateBlockOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Creates a new block to be committed as part of a blob.
-         */
-        createBlobBlockFromText(blockId: string, container: string, blob: string, text: string, callback: StorageCallbackVoid): void;
-        createBlobBlockFromText(blockId: string, container: string, blob: string, text: string, options: CreateBlockOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Writes a blob by specifying the list of block IDs that make up the blob.
-         * In order to be written as part of a blob, a block must have been successfully written to the server in a prior
-         * createBlock operation.
-         */
-        commitBlobBlocks(container: string, blob: string, blockList: BlockList, callback: StorageCallback<BlockList>): void;
-        commitBlobBlocks(container: string, blob: string, blockList: BlockList, options: CreateBlockOptions, callback: StorageCallback<BlockList>): void;
-
-        /**
-         * Retrieves the list of blocks that have been uploaded as part of a block blob.
-         */
-        listBlobBlocks(container: string, blob: string, blockListType: string, callback: StorageCallback<BlockList>): void;
-        listBlobBlocks(container: string, blob: string, blockListType: string, options: GetBlobPropertiesOptions, callback: StorageCallback<BlockList>): void;
-
-        /**
-         * Generate a random block id prefix.
-         */
-        generateBlockIdPrefix(): string;
-        /**
-         * Get a block id according to prefix and block number.
-         */
-        getBlockId(prefix: string, number: number): string;
-
-        //#endregion
-
-        //#region Lease Methods
-
-        /**
-         * Acquires a new lease. 
-         * If container and blob are specified, acquires a blob lease. 
-         * Otherwise, if only container is specified and blob is null, acquires a container lease.
-         */
-        acquireLease(container: string, blob: string, callback: StorageCallback<LeaseResult>): void;
-        acquireLease(container: string, blob: string, options: LeaseOptions, callback: StorageCallback<LeaseResult>): void;
-
-        /**
-         * Renews an existing lease.
-         * If container and blob are specified, renews the blob lease.
-         * Otherwise, if only container is specified and blob is null, renews the container lease.
-         */
-        renewLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
-        renewLease(container: string, blob: string, leaseId: string, options: AccessConditionsOptions, callback: StorageCallback<LeaseResult>): void;
-
-        /**
-         * Releases the lease.
-         * If container and blob are specified, releases the blob lease.
-         * Otherwise, if only container is specified and blob is null, releases the container lease.
-         */
-        releaseLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
-        releaseLease(container: string, blob: string, leaseId: string, options: AccessConditionsOptions, callback: StorageCallback<LeaseResult>): void;
-
-        /**
-         * Breaks the lease but ensures that another client cannot acquire a new lease until the current lease period has expired.
-         * If container and blob are specified, breaks the blob lease.
-         * Otherwise, if only container is specified and blob is null, breaks the container lease.
-         */
-        breakLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
-        breakLease(container: string, blob: string, leaseId: string, options: BreakLeaseOptions, callback: StorageCallback<LeaseResult>): void;
-
-        //#endregion
-    }
-
-    export class QueueService extends StorageServiceClient {
-        authenticationProvider: SharedKey;
-
-        //#region Constructors
-
-        /**
-        * Creates a new BlobService object.
-        * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        */
-        constructor();
-
-        /**
-        * Creates a new BlobService object.
-        * Uses a connectionString to connect
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        * @param {string} connectionString The connection string.
-        */
-        constructor(connectionString: string);
-
-        /**
-        * Creates a new BlobService object.
-        * Uses a storage account and an access key.
-        *
-        * @constructor
-        * @extends {StorageServiceClient}
-        * @param {string} storageAccount                    The storage account or the connection string.
-        * @param {string} storageAccessKey                  The storage access key.
-        * @param {string} host                              The host address.
-        * @param {object} sasToken                          The Shared Access Signature token.
-        */
-        constructor(storageAccount: string, storageAccessKey: string, host?: string, sasToken?: string);
-
-        //#endregion
-
-        //#region Service Methods
-
-        /**
-        * Gets the properties of a storage account�s Blob service, including Azure Storage Analytics.
-        */
-        getServiceProperties(callback: StorageServicePropertiesCallback): void;
-        getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
-
-        /**
-        * Sets the properties of a storage account�s Blob service, including Azure Storage Analytics.
-        * You can also use this operation to set the default request version for all incoming requests that do not have a version specified.
-        */
-        setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
-        setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
-
-        //#endregion
-
-        //#region Queue Methods
-
-        /**
-         * Lists all queues under the given account.
-         */
-        listQueues(callback: ListQueuesCallback): void;
-        listQueues(options: ListQueuesOptions, callback: ListQueuesCallback): void;
-
-        /**
-         * Creates a new queue under the given account.
-         */
-        createQueue(queue: string, callback: StorageCallback<QueueResult>): void;
-        createQueue(queue: string, options: MetadataOptions, callback: StorageCallback<QueueResult>): void;
-
-        /**
-         * Creates a new queue under the given account if it doesn't exist.
-         */
-        createQueueIfNotExists(queue: string, callback: StorageCallback<boolean>): void;
-        createQueueIfNotExists(queue: string, options: MetadataOptions, callback: StorageCallback<boolean>): void;
-
-        /**
-         * Permanently deletes the specified queue.
-         */
-        deleteQueue(queue: string, callback: StorageCallback<boolean>): void;
-        deleteQueue(queue: string, options: TimeoutIntervalOptions, callback: StorageCallback<boolean>): void;
-
-        /**
-         * Returns queue properties, including user-defined metadata.
-         */
-        getQueueMetadata(queue: string, callback: StorageCallback<QueueResult>): void;
-        getQueueMetadata(queue: string, options: TimeoutIntervalOptions, callback: StorageCallback<QueueResult>): void;
-
-        /**
-         * Sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.
-         */
-        setQueueMetadata(queue: string, metadata: StorageMetadata, callback: StorageCallback<QueueResult>): void;
-        setQueueMetadata(queue: string, metadata: StorageMetadata, options: TimeoutIntervalOptions, callback: StorageCallback<QueueResult>): void;
-
-        //#endregion
-
-        //#region Message Methods
-
-        /**
-         * Adds a new message to the back of the message queue. A visibility timeout can also be specified to make the message
-         * invisible until the visibility timeout expires. A message must be in a format that can be included in an XML request
-         * with UTF-8 encoding. The encoded message can be up to 64KB in size for versions 2011-08-18 and newer, or 8KB in size
-         * for previous versions.
-         */
-        createMessage(queue: string, messageText: string, callback: StorageCallback<QueueMessageResult>): void
-        createMessage(queue: string, messageText: string, options: CreateQueueMessageOptions, callback: StorageCallback<QueueMessageResult>): void
-
-        /**
-         * Retrieves a message from the queue and makes it invisible to other consumers.
-         */
-        getMessages(queue: string, callback: StorageCallback<QueueMessageResult[]>): void;
-        getMessages(queue: string, options: GetQueueMessagesOptions, callback: StorageCallback<QueueMessageResult[]>): void;
-
-        /**
-         * Retrieves a message from the front of the queue, without changing the message visibility.
-         */
-        peekMessages(queue: string, callback: StorageCallback<QueueMessageResult[]>): void;
-        peekMessages(queue: string, options: PeekQueueMessagesOptions, callback: StorageCallback<QueueMessageResult[]>): void;
-
-        /**
-         * Deletes a specified message from the queue.
-         */
-        deleteMessage(queue: string, messageId: string, popreceipt: string, callback: StorageCallback<boolean>): void
-        deleteMessage(queue: string, messageId: string, popreceipt: string, options: TimeoutIntervalOptions, callback: StorageCallback<boolean>): void
-
-        /**
-         * Clears all messages from the queue.
-         */
-        clearMessages(queue: string, callback: StorageCallbackVoid): void;
-        clearMessages(queue: string, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
-
-        /**
-         * Deletes a specified message from the queue.
-         */
-        updateMessage(queue: string, messageId: string, popreceipt: string, visibilitytimeout: number, callback: StorageCallback<QueueMessageResult>): void
-        updateMessage(queue: string, messageId: string, popreceipt: string, visibilitytimeout: number, options: UpdateQueueMessagesOptions, callback: StorageCallback<QueueMessageResult>): void
-
-        //#endregion
-    }
-
-    export class ServiceBusService {
-
-    }
-
-    export class SqlService {
-
-    }
-
-    export class ServiceManagementService {
-
-    }
-
-    export class SqlManagementService {
-    }
-    //#endregion
-
-    //#region Service Creators
-    export function createTableService(): TableService;
-    export function createTableService(connectionString: string): TableService;
-    export function createTableService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): TableService;
-
-    export function createBlobService(): BlobService;
-    export function createBlobService(connectionString: string): BlobService;
-    export function createBlobService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): BlobService;
-
-    export function createQueueService(): QueueService;
-    export function createQueueService(connectionString: string): QueueService;
-    export function createQueueService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): QueueService;
-
-    export function createServiceBusService(): ServiceBusService;
-    export function createServiceBusService(connectionString: string): ServiceBusService;
-    export function createServiceBusService(namespace: string, accessKey?: string, issuer?: string, acsNamespace?: string, host?: string, authenticationProvider?: string): ServiceBusService;
-
-    export function createSqlService(serverName: string, administratorLogin: string, administratorLoginPassword: string, host?: string, acsHost?: string, authenticationProvider?: string): SqlService;
-
-    export function createServiceManagementService(subscriptionId: string, authentication: string, hostOptions: string): ServiceManagementService;
-
-    export function createSqlManagementService(subscriptionId: string, authentication: string, hostOptions: string): SqlManagementService;
-    //#endregion
-
-    //#region RoleEnvironment
-
-    interface RoleEnvironmentInterface extends events.EventEmitter {
-        incorrectCallbackErr: string;
-        clientId: string;
-        VersionEndpointFixedPath: string;
-        EnvironmentVariables: {
-            [key: string]: string;
-            VersionEndpointEnvironmentName: string;
-        };
-
-        /**
-         * Returns a RoleInstance object that represents the role instance
-         * in which this code is currently executing.
-         */
-        getCurrentRoleInstance(callback: SimpleCallback<RoleInstance>): void;
-
-        /**
-         * Returns the deployment ID that uniquely identifies the deployment in
-         * which this role instance is running.
-         */
-        getDeploymentId(callback: SimpleCallback<string>): void;
-
-        /**
-         * Indicates whether the role instance is running in the Microsoft Azure
-         * environment.  It is good practice to enclose any code that uses 
-         * service runtime in the isAvailable callback.
-         */
-        isAvailable(callback: SimpleCallback<boolean>): void;
-
-        /**
-         * Indicates whether the role instance is running in the development fabric.
-         */
-        isEmulated(callback: SimpleCallback<boolean>): void;
-
-        /**
-         * Returns the set of Role objects defined for your service.
-         * Roles are defined in the service definition file.
-         */
-        getRoles(callback: SimpleCallback<Dictionary<Role>>): void;
-
-        /**
-         * Retrieves the settings in the service configuration file.
-         * 
-         * A role's configuration settings are defined in the service definition file.
-         * Values for configuration settings are set in the service configuration file.
-         * For more information on configuration settings, see the [Service Definition Schema](http://msdn.microsoft.com/en-us/library/windowsazure/ee758711.aspx)
-         * and [Service Configuration Schema](http://msdn.microsoft.com/en-us/library/windowsazure/ee758710.aspx).
-         */
-        getConfigurationSettings(callback: SimpleCallback<Dictionary<string>>): void;
-
-        /**
-         * Retrieves the set of named local storage resources, along with the path.
-         * For example, the DiagnosticStore resource which is defined for every role
-         * provides a location for runtime diagnostics and logs.
-         */
-        getLocalResources(callback: SimpleCallback<Dictionary<RoleLocalResource>>): void;
-
-        /**
-         * Requests that the current role instance be stopped and restarted.
-         * 
-         * Before the role instance is recycled, the Microsoft Azure load balancer takes the role instance out of rotation.
-         * This ensures that no new requests are routed to the instance while it is restarting.
-         * 
-         * A call to `RequestRecycle` initiates the normal shutdown cycle. Microsoft Azure raises the
-         * `Stopping` event and calls the `OnStop` method so that you can run the necessary code to
-         * prepare the instance to be recycled.
-         */
-        requestRecycle(callback: ErrorCallback): void;
-
-        /**
-         * Sets the status of the role instance.
-         * 
-         * An instance may indicate that it is in one of two states: Ready or Busy. If an instance's state is Ready, it is
-         * prepared to receive requests from the load balancer. If the instance's state is Busy, it will not receive
-         * requests from the load balancer.
-         */
-        setStatus(roleInstanceStatus: string, expirationUtc: Date, callback: ErrorCallback): void;
-
-        /**
-         * Clears the status of the role instance.
-         * An instance may indicate that it has completed communicating status by calling this method.
-         */
-        clearStatus(callback: ErrorCallback): void;
-    }
-
-    export var RoleEnvironment: RoleEnvironmentInterface;
+import events = require("events");
+import stream = require("stream");
+import url = require("url");
+
+//#region Services
+declare export class TableService extends BatchServiceClient {
+    static incorrectTableNameErr: string;
+    static incorrectCallbackErr: string;
+    static incorrectTableQuery: string;
+    static incorrectPartitionErr: string;
+
+    //#region Constructors
+
+    /**
+    * Creates a new TableService object.
+    * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
+    *
+    * @constructor
+    * @extends {ServiceClient}
+    */
+    constructor();
+    /**
+    * Creates a new TableService object.
+    * Uses a connectionString to connect
+    *
+    * @constructor
+    * @extends {ServiceClient}
+    * @param {string} connectionString The connection string.
+    */
+    constructor(connectionString: string);
+    /**
+    * Creates a new TableService object.
+    * Uses a storage account and an access key.
+    *
+    * @constructor
+    * @extends {ServiceClient}
+    * @param {string} storageAccount                    The storage account or the connection string.
+    * @param {string} storageAccessKey                  The storage access key.
+    * @param {string} host                              The host address.
+    * @param {object} authenticationProvider            The authentication provider.
+    */
+    constructor(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string);
 
     //#endregion
 
-    //#region Export of internal classes
-    export class WebResource {
-        rawResponse: boolean;
-        queryString: Dictionary<string>;
+    //#region Service Methods
 
-        constructor();
+    getServiceProperties(callback: StorageServicePropertiesCallback): void;
+    getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
 
-        get(path: string): WebResource;
-        put(path: string): WebResource;
-        post(path: string): WebResource;
-        merge(path: string): WebResource;
-        head(path: string): WebResource;
-        del(path: string): WebResource;
+    setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
+    setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
 
-        withProperty(name: string, value: string): WebResource;
-        withRawResponse(rawResponse: boolean): WebResource;
-        withHeadersOnly(headersOnly: boolean): WebResource;
-        withQueryOption(name: string, value: string, defaultValue: string): WebResource;
-        withQueryOptions(queryOptions: Dictionary<string>): WebResource;
-        withHeader(name: string, value: string): WebResource;
-        withHeaders(headers: Dictionary<string>): WebResource;
-        withBody(body: any): WebResource;
-        addOptionalMetadataHeaders(metadata: StorageMetadata): WebResource;
-
-        validResponse(statusCode: number): boolean;
-        pipeInput(inputStream: stream.Stream, destStream: stream.Stream): stream.Stream;
-    }
-
-    export class ServiceClient extends events.EventEmitter {
-        static EnvironmentVariables: any;
-        static DEVSTORE_STORAGE_ACCOUNT: string;
-        static DEVSTORE_STORAGE_ACCESS_KEY: string;
-        static DEVSTORE_BLOB_HOST: string;
-        static DEVSTORE_QUEUE_HOST: string;
-        static DEVSTORE_TABLE_HOST: string;
-        static CLOUD_BLOB_HOST: string;
-        static CLOUD_QUEUE_HOST: string;
-        static CLOUD_TABLE_HOST: string;
-        static CLOUD_SERVICEBUS_HOST: string;
-        static CLOUD_ACCESS_CONTROL_HOST: string;
-        static CLOUD_SERVICE_MANAGEMENT_HOST: string;
-        static CLOUD_DATABASE_HOST: string;
-        static DEFAULT_SERVICEBUS_ISSUER: string;
-        static DEFAULT_WRAP_NAMESPACE_SUFFIX: string;
-        static DEFAULT_PROTOCOL: string;
-
-        constructor(host: string, authenticationProvider: any);
-
-        setHost(host: string): void;
-        performRequest(webResource: WebResource, outputData: string, options: any, callback: Function): void;
-        performRequestOutputStream(webResource: WebResource, outputStream: any, options: any, callback: Function): void;
-        performRequestInputStream(webResource: WebResource, outputData: string, inputStream: any, options: any, callback: Function): void;
-        withFilter(newFilter: Filter): ServiceClient;
-        parseMetadataHeaders(headers: any): any;
-        isEmulated(): boolean;
-        setProxy(proxyUrl: string, proxyPort: number): void;
-    }
-
-    export class BatchServiceClient extends StorageServiceClient {
-        operations: any[];
-
-        constructor(storageAccount: string, storageAccessKey: string, host: string, usePathstyleUri: boolean, authenticationProvider: any);
-        beginBatch(): void;
-        isInBatch(): boolean;
-        rollback(): void;
-        hasOperations(): boolean;
-        addOperation(webResource: WebResource, outputData: any): void;
-        commitBatch(callback: (error: any, operationResponses: any[], response: any) => void): void;
-        commitBatch(options: any, callback: (error: any, operationResponses: any[], response: any) => void): void;
-        processResponse(responseObject: any, requestOperations: any[]): any[];
-        processOperation(webResource: WebResource, rawResponse: string): any;
-    }
-
-    export class ServiceManagementClient {
-
-    }
-
-    export class TableQuery {
-        static select(...fields: string[]): TableQuery;
-        from(table: string): TableQuery;
-        whereKeys(partitionKey: string, rowKey: string): TableQuery;
-        whereNextKeys(partitionKey: string, rowKey: string): TableQuery;
-        where(condition: string, ...values: string[]): TableQuery;
-        and(condition: string, ...args: string[]): TableQuery;
-        or(condition: string, ...args: string[]): TableQuery;
-        top(integer: number): TableQuery;
-        toQueryObject(): any;
-        toPath(): string;
-    }
-
-    export class BlobResult {
-        blob: string;
-        container: string;
-
-        etag: string;
-        lastModified: string;
-        contentType: string;
-        contentEncoding: string;
-        contentLanguage: string;
-        contentMD5: string;
-        cacheControl: string;
-        contentRange: string;
-        contentTypeHeader: string;
-        contentEncodingHeader: string;
-        contentLanguageHeader: string;
-        contentMD5Header: string;
-        cacheControlHeader: string;
-        contentLength: number;
-        contentLengthHeader: number;
-        contentDisposition: string;
-        contentDispositionHeader: string;
-        range: string;
-        rangeHeader: string;
-        getContentMd5: string;
-        acceptRanges: string;
-        blobType: string;
-        leaseStatus: string;
-        leaseId: string;
-        leaseDuration: string;
-        leaseState: string;
-        sequenceNumber: string;
-        copyStatus: string;
-        copyCompletionTime: string;
-        copyStatusDescription: string;
-        copyId: string;
-        copyProgress: number;
-        requestId: string;
-
-        metadata: StorageMetadata;
-
-        constructor();
-        constructor(container: string);
-        constructor(container: string, blob: string);
-
-        static parse(blobXml: any): BlobResult;
-        static setHeadersFromBlob(webResource: WebResource, blob: BlobResult): void;
-
-        getPropertiesFromHeaders(headers: any): void;
-    }
-
-    export class ContainerResult {
-        name: string;
-        publicAccessLevel: string;
-
-        etag: string;
-        lastModified: string;
-        leaseStatus: string;
-        leaseDuration: string;
-        leaseState: string;
-        requestId: string;
-
-        metadata: StorageMetadata;
-        signedIdentifiers: SignedIdentifier[];
-
-        constructor();
-        constructor(name: string);
-        constructor(name: string, publicAccessLevel: string);
-
-        static parse(containerXml: any): ContainerResult;
-
-        getPropertiesFromHeaders(headers: any): void;
-    }
-
-    export class LeaseResult {
-        container: string;
-        blob: string;
-        id: string;
-        time: string;
-        etag: string;
-        lastModified: string;
-
-        constructor();
-        constructor(container: string);
-        constructor(container: string, blob: string);
-        constructor(container: string, blob: string, id: string);
-        constructor(container: string, blob: string, id: string, time: string);
-
-        getPropertiesFromHeaders(header: any): void;
-    }
-
-    export class QueueResult {
-        name: string;
-        metadata: StorageMetadata;
-        approximatemessagecount: number;
-
-        constructor();
-        constructor(name: string);
-        constructor(name: string, metadata: StorageMetadata);
-
-        static parse(messageXml: any): QueueResult;
-
-        getPropertiesFromHeaders(headers: any): void;
-    }
-
-    export class QueueMessageResult {
-        queue: string;
-        insertiontime: string;
-        expirationtime: string;
-        timenextvisible: string;
-        messagetext: string;
-        dequeuecount: string;
-        messageid: string;
-        popreceipt: string;
-        metadata: StorageMetadata;
-
-        constructor();
-        constructor(queue: string);
-        constructor(queue: string, messageid: string);
-        constructor(queue: string, messageid: string, popreceipt: string);
-        constructor(queue: string, messageid: string, popreceipt: string, metadata: StorageMetadata);
-
-        static serialize(messageJs: string): string;
-        static parse(messageXml: any): QueueMessageResult;
-
-        getPropertiesFromHeaders(headers: any): void;
-    }
-
-    export class SpeedSummary {
-        name: string;
-        totalSize: number;
-        completeSize: number;
-
-        _startTime: Date;
-        _timeWindowInSeconds: number;
-        _timeWindow: number;
-        _totalWindowSize: number;
-        _speedTracks: number[];
-        _speedTrackPtr: number;
-
-        constructor(name: string);
-
-        /**
-         * Get running seconds
-         */
-        getElapsedSeconds(): string;
-        getElapsedSeconds(humanReadable: boolean): number;
-
-        /**
-         * Get complete percentage
-         */
-        getCompletePercent(): number;
-        getCompletePercent(len: number): number;
-
-        /**
-         * Get average upload/download speed
-         */
-        getAverageSpeed(): string;
-        getAverageSpeed(humanReadable: boolean): number;
-
-        /**
-         * Get internal speed
-         */
-        getSpeed(): string;
-        getSpeed(humanReadable: boolean): number;
-
-        /**
-         * Get auto increment function
-         */
-        getSpeed(size: number): (error: Error, value: any) => void;
-
-        /**
-         * Get total size
-         */
-        getTotalSize(): string;
-        getTotalSize(humanReadable: boolean): number;
-
-        /**
-         * Get completed data size
-         */
-        getCompleteSize(): string;
-        getCompleteSize(humanReadable: boolean): number;
-    }
-
-    export module Constants {
-
-    }
-
-    export interface Filter {
-        handle(requestOptions: any, next: Function): void;
-    }
-
-    export class LinearRetryPolicyFilter implements Filter {
-        constructor(retryCount?: number, retryInterval?: number);
-        retryCount: number;
-        retryInterval: number;
-        handle(requestOptions: any, next: Function): void;
-    }
-
-    export class ExponentialRetryPolicyFilter implements Filter {
-        constructor(retryCount?: number, retryInterval?: number, minRetryInterval?: number, maxRetryInterval?: number);
-        retryCount: number;
-        retryInterval: number;
-        minRetryInterval: number;
-        maxRetryInterval: number;
-        handle(requestOptions: any, next: Function): void;
-    }
-
-    export class HmacSha256Sign {
-
-    }
-
-    export class SharedAccessSignature {
-        storageAccount: string;
-        storageAccessKey: string;
-        permissionSet: string[];
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, permissionSet: string[])
-
-        /**
-         * Generates the query string for a shared access signature signing.
-         */
-        generateSignedQueryString(path: string, queryString: Dictionary<string>, resourceType: string, sharedAccessPolicy: SharedAccessPolicy): Dictionary<string>;
-
-        /**
-         * Signs a request with the signature header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Generates the shared access signature for a resource.
-         */
-        _generateSignature(path: string, resourceType: string, sharedAccessPolicy: SharedAccessPolicy): string;
-
-        /**
-         * Generates the query string for a shared access signature signing.
-         */
-        _permissionMatchesRequest(sharedAccessSignature: string, webResource: WebResource, resourceType: string, requiredPermissions: string[]): string;
-    }
-
-    export class SharedKey {
-        storageAccount: string;
-        storageAccessKey: string;
-        usePathStyleUri: string;
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
-
-        /**
-         * Signs a request with the Authentication header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Retrieves the webresource's canonicalized resource string.
-         */
-        _getCanonicalizedResource(webResource: WebResource): string;
-
-        /**
-         * Constructs the Canonicalized Headers string.
-         *
-         * To construct the CanonicalizedHeaders portion of the signature string,
-         * follow these steps: 1. Retrieve all headers for the resource that begin
-         * with x-ms-, including the x-ms-date header. 2. Convert each HTTP header
-         * name to lowercase. 3. Sort the headers lexicographically by header name,
-         * in ascending order. Each header may appear only once in the
-         * string. 4. Unfold the string by replacing any breaking white space with a
-         * single space. 5. Trim any white space around the colon in the header. 6.
-         * Finally, append a new line character to each canonicalized header in the
-         * resulting list. Construct the CanonicalizedHeaders string by
-         * concatenating all headers in this list into a single string.
-         */
-        _getCanonicalizedHeaders(webResource: WebResource): string;
-    }
-
-    export class SharedKeyLite {
-        storageAccount: string;
-        storageAccessKey: string;
-        usePathStyleUri: string;
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
-
-        /**
-         * Signs a request with the Authentication header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Retrieves the webresource's canonicalized resource string.
-         */
-        _getCanonicalizedResource(webResource: WebResource): string;
-
-        /**
-         * Constructs the Canonicalized Headers string.
-         *
-         * To construct the CanonicalizedHeaders portion of the signature string,
-         * follow these steps: 1. Retrieve all headers for the resource that begin
-         * with x-ms-, including the x-ms-date header. 2. Convert each HTTP header
-         * name to lowercase. 3. Sort the headers lexicographically by header name,
-         * in ascending order. Each header may appear only once in the
-         * string. 4. Unfold the string by replacing any breaking white space with a
-         * single space. 5. Trim any white space around the colon in the header. 6.
-         * Finally, append a new line character to each canonicalized header in the
-         * resulting list. Construct the CanonicalizedHeaders string by
-         * concatenating all headers in this list into a single string.
-         */
-        _getCanonicalizedHeaders(webResource: WebResource): string;
-    }
-
-    export class SharedKeyTable {
-        storageAccount: string;
-        storageAccessKey: string;
-        usePathStyleUri: string;
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
-
-        /**
-         * Signs a request with the Authentication header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Retrieves the webresource's canonicalized resource string.
-         */
-        _getCanonicalizedResource(webResource: WebResource): string;
-    }
-
-    export class SharedKeyLiteTable {
-        torageAccount: string;
-        storageAccessKey: string;
-        usePathStyleUri: string;
-        signer: HmacSha256Sign;
-
-        constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
-
-        /**
-         * Signs a request with the Authentication header.
-         */
-        signRequest(webResource: WebResource, callback: ErrorCallback): void;
-
-        /**
-         * Retrieves the webresource's canonicalized resource string.
-         */
-        _getCanonicalizedResource(webResource: WebResource): string;
-    }
-
-    export module ISO8061Date {
-        /**
-         * Formats a date into an iso 8061 string.
-         */
-        export function format(date: Date): string;
-
-        /**
-         * Parses an ISO 8061 date string into a date object.
-         */
-        export function parse(stringDateTime: string): Date;
-    }
-
-    export class Logger {
-        level: string;
-        loggerFunction: (level: string, message: string) => void;
-
-        static LogLevels: {
-            EMERGENCY: string;
-            ALERT: string;
-            CRITICAL: string;
-            ERROR: string;
-            WARNING: string;
-            NOTICE: string;
-            INFO: string;
-            DEBUG: string;
-        };
-        static logPriority: string[];
-
-        log(level: string, message: string): void;
-        emergency(message: string): void;
-        alert(message: string): void;
-        critical(message: string): void;
-        error(message: string): void;
-        warning(message: string): void;
-        notice(message: string): void;
-        info(message: string): void;
-        debug(message: string): void;
-
-        defaultLoggerFunction(level: string, message: string): void;
-    }
-
-    export class ConnectionStringParser {
-        _value: string;
-        _pos: number;
-        _state: string;
-
-        constructor(connectionString: string);
-
-        _parse(options: ConnectionStringParseOptions): Dictionary<string>;
-
-        _extractKey(): string;
-        _extractString(quote: string): string;
-        _extractValue(): string;
-
-        _skipWhitespaces(): void;
-        _skipOperator(operator: string): void;
-
-        static parse(connectionString: string): Dictionary<string>;
-    }
-
-    export module ServiceSettings {
-        export var DEFAULT_PROTOCOL: string;
-
-        export class NoMatchError implements Error {
-            name: string;
-            message: string;
-            constr: any;
-
-            constructor();
-            constructor(message: string);
-            constructor(message: string, constr: any);
-        }
-
-        /**
-         * Throws an exception if the connection string format does not match any of the
-         * available formats.
-         */
-        export function noMatchConnectionString(connectionString: string): void;
-
-        /**
-         * Throws an exception if the settings dont match any of the available formats.
-         */
-        export function noMatchSettings(settings: any): void;
-
-        /**
-         * Parses the connection string and then validate that the parsed keys belong to
-         * the validSettingKeys
-         */
-        export function parseAndValidateKeys(connectionString: string, validKeys: string[]): string[];
-
-        /**
-         * Creates an anonymous function that acts as predicate to perform a validation.
-         */
-        export function getValidator(requirements: Dictionary<Requirement>, isRequired: boolean, atLeastOne: boolean): ValidatorFunction;
-
-        /**
-         * Creates a setting value condition that validates it is one of the passed valid values.
-         */
-        export function setting(name: string): string[];
-
-        /**
-         * Creates an "at least one" predicate for the provided list of requirements.
-         */
-        export function atLeastOne(...args: any[]): ValidatorFunction;
-
-        /**
-         * Creates an optional predicate for the provided list of requirements.
-         */
-        export function optional(...args: any[]): ValidatorFunction;
-
-        /**
-         * Creates an required predicate for the provided list of requirements.
-         */
-        export function allRequired(...args: any[]): ValidatorFunction;
-
-        /**
-         * Creates a setting value condition using the passed predicate.
-         */
-        export function settingWithFunc(name: string, predicate: Function): Requirement[];
-
-        /**
-         * Tests to see if a given list of settings matches a set of filters exactly.
-         */
-        export function matchedSpecification(settings: Dictionary<any>): boolean;
-
-        /**
-         * Tests to see if a given list of settings matches a set of filters exactly.
-         */
-        export function parseHost(uri: string): url.Url;
-    }
-
-    export class StorageServiceSettings {
-        _name: string;
-        _key: string;
-        _blobEndpointUri: string;
-        _queueEndpointUri: string;
-        _tableEndpointUri: string;
-        _usePathStyleUri: boolean;
-
-        constructor(name: string, key: string, blobEndpointUri: string, queueEndpointUri: string, tableEndpointUri: string, usePathStyleUri: boolean);
-
-        /**
-         * Returns a StorageServiceSettings with development storage credentials using
-         * the specified proxy Uri.
-         */
-        static _getDevelopmentStorageAccount(): StorageServiceSettings;
-        static _getDevelopmentStorageAccount(proxy: string): StorageServiceSettings;
-
-        /**
-         * Gets a StorageServiceSettings object that references the development storage
-         * account.
-         */
-        static getDevelopmentStorageAccountSettings(): StorageServiceSettings;
-
-        /**
-         * Gets the default service endpoint using the specified protocol and account
-         * name.
-         */
-        static _getDefaultServiceEndpoint(settings: Dictionary<string>, dns: string): string;
-
-        /**
-         * Creates StorageServiceSettings object given endpoints uri.
-         */
-        static _createStorageServiceSettings(settings: Dictionary<string>, blobEndpointUri: string, queueEndpointUri: string, tableEndpointUri: string): StorageServiceSettings;
-
-        /**
-         * Creates a ServiceBusSettings object from a set of settings.
-         */
-        static createFromSettings(settings: Dictionary<string>): StorageServiceSettings;
-
-        /**
-         * Creates a StorageServiceSettings object from the given connection string.
-         */
-        static createFromConnectionString(connectionString: string): StorageServiceSettings;
-
-        static createExplicitlyOrFromEnvironment(storageAccount: string, storageAccessKey: string, host: string): StorageServiceSettings;
-
-        static isDevelopmentStorage(storageAccount: string, storageAccessKey: string, parsedHost: string): boolean;
-
-        static createFromConfig(config: any): StorageServiceSettings;
-
-        static customizeConfig(config: any): void;
-    }
-
-    export class ServiceBusSettings {
-
-    }
-
-    export class ServiceManagementSettinsg {
-
-    }
-
-    export module Validate {
-        /**
-         * Checks if the given uri is valid or not.
-         */
-        export function isValidUri(uri: string): boolean;
-
-        /**
-         * Validates that a clusterCreationObject is properly formed.
-         */
-        export function isValidHDInsightCreationObject(clusterCreationObject: ClusterCreationOptions): void;
-        export function isValidHDInsightCreationObject(clusterCreationObject: ClusterCreationOptions, callback: ErrorCallback): void;
-
-        export function isValidUuid(uuid: string): void;
-        export function isValidUuid(uuid: string, callback: ErrorCallback): void;
-
-        /**
-         * Creates a anonymous function that check if a given key is base 64 encoded.
-         */
-        export function isBase64Encoded(key: string): boolean;
-
-        /**
-         * Validates a function.
-         */
-        export function isValidFunction(functionObject: any, functionName: string): void;
-
-        /**
-         * Validates that a Service Bus namespace name
-         * is legally allowable. Does not check availability.
-         */
-        export function namespaceNameIsValid(name: string): boolean;
-        export function namespaceNameIsValid(name: string, callback: ErrorCallback): boolean;
-
-        /**
-         * Validates a container name.
-         */
-        export function containerNameIsValid(containerName: string): boolean;
-        export function containerNameIsValid(containerName: string, callback: ErrorCallback): boolean;
-
-        /**
-         * Validates a blob name.
-         */
-        export function blobNameIsValid(containerName: string, blob: string): boolean;
-        export function blobNameIsValid(containerName: string, blob: string, callback: ErrorCallback): boolean;
-
-        /**
-         * Validates a table name.
-         */
-        export function tableNameIsValid(tableName: string): boolean;
-        export function tableNameIsValid(tableName: string, callback: ErrorCallback): boolean;
-
-        /**
-         * Validates a queue name.
-         */
-        export function queueNameIsValid(queueName: string): boolean;
-        export function queueNameIsValid(queueName: string, callback: ErrorCallback): boolean;
-
-        export function pageRangesAreValid(rangeStart: number, rangeEnd: number, writeBlockSizeInBytes: number): boolean;
-        export function pageRangesAreValid(rangeStart: number, rangeEnd: number, writeBlockSizeInBytes: number, callback: ErrorCallback): boolean;
-
-        export function validateArgs(functionName: string, validationRules: Function): boolean;
-    }
-
-    export module date {
-        /**
-         * Generates a Date object which is in the given days from now.
-         */
-        export function daysFromNow(days: number): Date;
-
-        /**
-         * Generates a Date object which is in the given hours from now.
-         */
-        export function hoursFromNow(hours: number): Date;
-
-        /**
-         * Generates a Date object which is in the given minutes from now.
-         */
-        export function minutesFromNow(minutes: number): Date;
-
-        /**
-         * Generates a Date object which is in the given seconds from now.
-         */
-        export function secondsFromNow(seconds: number): Date;
-    }
     //#endregion
 
-    //#region Non-explicit, undeclared interfaces
-    export interface WebResponse {
-        isSuccessful: boolean;
-        statusCode: number;
-        body: {
-            entry: {
-                id: string;
-                title: any;
-                updated: string;
-                author: {
-                    name: any;
-                };
-                link: any;
-                category: any;
-                content: any;
-            };
-        };
-        headers: any;
-        md5: any;
-    }
+    //#region Table Methods
 
-    //#region Common Interfaces
-    export interface SimpleCallback<T> {
-        (error: Error, result: T): void;
-    }
-    export interface ErrorCallback {
-        (error: Error): void;
-    }
-    export interface StorageCallbackVoid {
-        (err: Error, response: WebResponse): void;
-    }
-    export interface StorageCallback<T> {
-        (err: Error, result: T, response: WebResponse): void;
-    }
-    export interface StorageServiceStatsCallback extends StorageCallback<StorageServiceStats> { }
-    export interface StorageServicePropertiesCallback extends StorageCallback<StorageServiceProperties> { }
+    getTable(table: string, callback?: TableRequestCallback): void;
+    getTable(table: string, options: TimeoutIntervalOptions, callback?: TableRequestCallback): void;
 
-    export interface TimeoutIntervalOptions {
-        locationMode?: string;
-        timeoutIntervalInMs?: number;
-        maximumExecutionTimeInMs?: number;
-    }
-    export interface MetadataOptions extends TimeoutIntervalOptions {
-        metadata?: StorageMetadata;
-    }
-    export interface StorageAclOptions extends TimeoutIntervalOptions {
-        leaseId?: string;
-        signedIdentifiers: SignedIdentifier[]
-    }
+    createTable(table: string, callback?: TableRequestCallback): void;
+    createTable(table: string, options: TimeoutIntervalOptions, callback?: TableRequestCallback): void;
 
-    export interface Dictionary<T> {
-        [key: string]: T;
-    }
-    export interface StorageServiceProperties {
-        Logging: {
-            Version: number;
-            Delete: boolean;
-            Read: boolean;
-            Write: boolean;
-            RetentionPolicy: {
-                Enabled: boolean;
-                Days: number;
-            };
-        };
-        Metrics: {
-            Version: number;
-            Enabled: boolean;
-            IncludeAPIs: boolean;
-            RetentionPolicy: {
-                Enabled: boolean;
-                Days: number;
-            };
-        };
-        DefaultServiceVersion: string;
-    }
-    export interface StorageServiceStats {
-        GeoReplication: {
-            Status: string;
-            LastSyncTime: Date;
-        }
-    }
-    export interface SignedIdentifier {
-        Id: string;
-        AccessPolicy: SharedAccessPolicy;
-    }
-    export interface StorageMetadata {
+    createTableIfNotExists(table: string, callback?: CreateTableIfNotExistsCallback): void;
+    createTableIfNotExists(table: string, options: TimeoutIntervalOptions, callback?: CreateTableIfNotExistsCallback): void;
+
+    deleteTable(table: string, callback?: DeleteTableCallback): void;
+    deleteTable(table: string, options: TimeoutIntervalOptions, callback?: DeleteTableCallback): void;
+
+    queryTables(callback?: QueryTablesCallback): void;
+    queryTables(options: QueryTablesOptions, callback?: QueryTablesCallback): void;
+
+    //#endregion
+
+    //#region Entities Methods
+
+    queryEntity(table: string, partitionKey: string, rowKey: string, callback?: QueryEntityCallback): void;
+    queryEntity(table: string, partitionKey: string, rowKey: string, options: TimeoutIntervalOptions, callback?: QueryEntityCallback): void;
+
+    queryEntities(tableQuery: TableQuery, callback?: QueryEntitiesCallback): void;
+    queryEntities(tableQuery: TableQuery, options: TimeoutIntervalOptions, callback?: QueryEntitiesCallback): void;
+
+    insertEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    insertEntity(tableName: string, entityDescriptor: Entity, options: TimeoutIntervalOptions, callback?: ModifyEntityCallback): void;
+
+    insertOrReplaceEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    insertOrReplaceEntity(tableName: string, entityDescriptor: Entity, options: TimeoutIntervalOptions, callback?: ModifyEntityCallback): void;
+
+    updateEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    updateEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
+
+    mergeEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    mergeEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
+
+    insertOrMergeEntity(tableName: string, entityDescriptor: Entity, callback?: ModifyEntityCallback): void;
+    insertOrMergeEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: ModifyEntityCallback): void;
+
+    deleteEntity(tableName: string, entityDescriptor: Entity, callback?: DeleteEntityCallback): void;
+    deleteEntity(tableName: string, entityDescriptor: Entity, options: UpdateEntityOptions, callback?: DeleteEntityCallback): void;
+
+    //#endregion
+}
+
+declare export class BlobService extends StorageServiceClient {
+    singleBlobPutThresholdInBytes: number;
+    parallelOperationThreadCount: number;
+
+    SpeedSummary: typeof SpeedSummary;
+
+    //#region Constructors
+
+    /**
+    * Creates a new BlobService object.
+    * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    */
+    constructor();
+
+    /**
+    * Creates a new BlobService object.
+    * Uses a connectionString to connect
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    * @param {string} connectionString The connection string.
+    */
+    constructor(connectionString: string);
+
+    /**
+    * Creates a new BlobService object.
+    * Uses a storage account and an access key.
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    * @param {string} storageAccount                    The storage account or the connection string.
+    * @param {string} storageAccessKey                  The storage access key.
+    * @param {string} host                              The host address.
+    * @param {object} sasToken                          The Shared Access Signature token.
+    */
+    constructor(storageAccount: string, storageAccessKey: string, host?: string, sasToken?: string);
+
+    //#endregion
+
+    //#region Service Methods
+
+    /**
+    * Gets the properties of a storage account�s Blob service, including Azure Storage Analytics.
+    */
+    getServiceProperties(callback: StorageServicePropertiesCallback): void;
+    getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
+
+    /**
+    * Sets the properties of a storage account�s Blob service, including Azure Storage Analytics.
+    * You can also use this operation to set the default request version for all incoming requests that do not have a version specified.
+    */
+    setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
+    setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
+
+    //#endregion
+
+    //#region Containers Methods
+
+    /**
+    * Lists a segment containing a collection of container items under the specified account.
+    */
+    listContainers(callback: ListContainersCallback): void;
+    listContainers(options: ListContainersOptions, callback: ListContainersCallback): void;
+
+    /**
+     * Creates a new container under the specified account.
+     * If a container with the same name already exists, the operation fails.
+     */
+    createContainer(container: string, callback: StorageCallback<ContainerResult>): void;
+    createContainer(container: string, options: CreateContainerOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Creates a new container under the specified account if the container does not exists.
+     */
+    createContainerIfNotExists(container: string, callback: StorageCallback<boolean>): void;
+    createContainerIfNotExists(container: string, options: CreateContainerOptions, callback: StorageCallback<boolean>): void;
+
+    /**
+     * Retrieves a container and its properties from a specified account.
+     */
+    getContainerProperties(container: string, callback: StorageCallback<ContainerResult>): void;
+    getContainerProperties(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Returns all user-defined metadata for the container.
+     */
+    getContainerMetadata(container: string, callback: StorageCallback<ContainerResult>): void;
+    getContainerMetadata(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Sets the container's metadata.
+     */
+    setContainerMetadata(container: string, metadata: StorageMetadata, callback: StorageCallback<ContainerResult>): void;
+    setContainerMetadata(container: string, metadata: StorageMetadata, options: AccessConditionsOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Gets the container's ACL.
+     */
+    getContainerAcl(container: string, callback: StorageCallback<ContainerResult>): void;
+    getContainerAcl(container: string, options: GetContainerPropertiesOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Updates the container's ACL.
+     */
+    setContainerAcl(container: string, publicAccessLevel: string, callback: StorageCallback<ContainerResult>): void;
+    setContainerAcl(container: string, publicAccessLevel: string, options: StorageAclOptions, callback: StorageCallback<ContainerResult>): void;
+
+    /**
+     * Marks the specified container for deletion.
+     * The container and any blobs contained within it are later deleted during garbage collection.
+     */
+    deleteContainer(container: string, callback: StorageCallbackVoid): void;
+    deleteContainer(container: string, options: LeaseIdOptions, callback: StorageCallbackVoid): void;
+
+    //#endregion
+
+    //#region Blob Methods
+
+    /**
+    * Lists all of the blobs in the given container.
+    */
+    listBlobs(container: string, callback: ListBlobsCallback): void;
+    listBlobs(container: string, options: ListBlobsOptions, callback: ListBlobsCallback): void;
+
+    /**
+     * Returns all user-defined metadata, standard HTTP properties, and system properties for the blob.
+     * It does not return or modify the content of the blob.
+     */
+    getBlobProperties(container: string, blob: string, callback: StorageCallback<BlobResult>): void;
+    getBlobProperties(container: string, blob: string, options: GetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Sets user-defined properties for the specified blob or snapshot.
+     * It does not return or modify the content of the blob.
+     */
+    setBlobProperties(container: string, blob: string, callback: StorageCallback<BlobResult>): void;
+    setBlobProperties(container: string, blob: string, options: SetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Sets user-defined metadata for the specified blob or snapshot as one or more name-value pairs 
+     * It does not return or modify the content of the blob.
+     */
+    setBlobMetadata(container: string, blob: string, metadata: StorageMetadata, callback: StorageCallback<BlobResult>): void;
+    setBlobMetadata(container: string, blob: string, metadata: StorageMetadata, options: GetBlobPropertiesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Provides a stream to read from a blob.
+     */
+    getBlob(container: string, blob: string, callback: StorageCallback<BlobResult>): stream.Readable;
+    getBlob(container: string, blob: string, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): stream.Readable;
+
+    /**
+     * Downloads a blob into a file.
+     */
+    getBlobToFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): void;
+    getBlobToFile(container: string, blob: string, localFileName: string, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Downloads a blob into a stream.
+     */
+    getBlobToStream(container: string, blob: string, stream: stream.Writable, callback: StorageCallback<BlobResult>): void;
+    getBlobToStream(container: string, blob: string, stream: stream.Writable, options: ReadBlobOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Downloads a blob into a text string.
+     */
+    getBlobToText(container: string, blob: string, callback: GetBlobToTextCallback): void;
+    getBlobToText(container: string, blob: string, options: ReadBlobOptions, callback: GetBlobToTextCallback): void;
+
+    /**
+     * Marks the specified blob or snapshot for deletion. The blob is later deleted during garbage collection.
+     * If a blob has snapshots, you must delete them when deleting the blob. Using the deleteSnapshots option, you can choose either to delete both the blob and its snapshots, 
+     * or to delete only the snapshots but not the blob itself. If the blob has snapshots, you must include the deleteSnapshots option or the blob service will return an error
+     * and nothing will be deleted. 
+     * If you are deleting a specific snapshot using the snapshotId option, the deleteSnapshots option must NOT be included.
+     */
+    deleteBlob(container: string, blob: string, callback: StorageCallback<boolean>): void;
+    deleteBlob(container: string, blob: string, options: DeleteBlobOptions, callback: StorageCallback<boolean>): void;
+
+    /**
+     * Creates a read-only snapshot of a blob.
+     */
+    createBlobSnapshot(container: string, blob: string, callback: StorageCallback<string>): void;
+    createBlobSnapshot(container: string, blob: string, options: BlobSnapshotOptions, callback: StorageCallback<string>): void;
+
+    /**
+     * Starts to copy a blob to a destination within the storage account. The Copy Blob operation copies the entire committed blob.
+     */
+    copyBlob(sourceUri: string, targetContainer: string, targetBlob: string, callback: StorageCallback<BlobResult>): void;
+    copyBlob(sourceUri: string, targetContainer: string, targetBlob: string, options: CopyBlobOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Creates a read-only snapshot of a blob.
+     */
+    abortCopyBlob(container: string, blob: string, copyId: string, callback: StorageCallbackVoid): void;
+    abortCopyBlob(container: string, blob: string, copyId: string, options: LeaseIdOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Retrieves a shared access signature token.
+     */
+    generateSharedAccessSignature(container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): SharedAccessSignatureResult;
+
+    /**
+     * Retrieves a blob or container URL.
+     */
+    getBlobUrl(container: string): string;
+    getBlobUrl(container: string, blob: string): string;
+    getBlobUrl(container: string, blob: string, sharedAccessPolicy: SharedAccessPolicy): string;
+
+    /**
+     * Uploads a blob.
+     */
+    createBlob(container: string, blob: string, blobType: string, callback: StorageCallback<string>): stream.Writable;
+    createBlob(container: string, blob: string, blobType: string, options: UploadBlockBlobOptions, callback: StorageCallback<string>): stream.Writable;
+
+    //#endregion
+
+    //#region Page Blob Methods
+
+    /**
+     * Creates a page blob of the specified length.
+     */
+    createPageBlob(container: string, blob: string, length: number, callback: StorageCallbackVoid): void;
+    createPageBlob(container: string, blob: string, length: number, options: SetBlobPropertiesOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Updates a page blob from a stream.
+     */
+    createBlobPagesFromStream(container: string, blob: string, readStream: stream.Readable, rangeStart: number, rangeEnd: number, callback: StorageCallback<BlobResult>): void;
+    createBlobPagesFromStream(container: string, blob: string, readStream: stream.Readable, rangeStart: number, rangeEnd: number, options: CreatePagesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Updates a page blob from a text string.
+     */
+    createBlobPagesFromText(container: string, blob: string, text: string, rangeStart: number, rangeEnd: number, callback: StorageCallback<BlobResult>): void;
+    createBlobPagesFromText(container: string, blob: string, text: string, rangeStart: number, rangeEnd: number, options: CreatePagesOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Lists page ranges.
+     * Lists all of the page ranges by default, or only the page ranges over a specific range of bytes if rangeStart and rangeEnd are specified.
+     */
+    listBlobRegions(container: string, blob: string, callback: StorageCallback<PageRange[]>): void;
+    listBlobRegions(container: string, blob: string, options: PageRangeOptions, callback: StorageCallback<PageRange[]>): void;
+
+    /**
+     * Clears a range of pages.
+     */
+    clearBlobPages(container: string, blob: string, rangeStart: number, rangeEnd: number, callback: StorageCallbackVoid): void;
+    clearBlobPages(container: string, blob: string, rangeStart: number, rangeEnd: number, options: LeaseAccessConditionsOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Resizes a page blob.
+     */
+    resizePageBlob(container: string, blob: string, size: number, callback: StorageCallback<BlobResult>): void;
+    resizePageBlob(container: string, blob: string, size: number, options: LeaseAccessConditionsOptions, callback: StorageCallback<BlobResult>): void;
+
+    /**
+     * Sets the page blob's sequence number.
+     */
+    setPageBlobSequenceNumber(container: string, blob: string, sequenceNumberAction: string, sequenceNumber: string, callback: StorageCallback<BlobResult>): void;
+    setPageBlobSequenceNumber(container: string, blob: string, sequenceNumberAction: string, sequenceNumber: string, options: AccessConditionsOptions, callback: StorageCallback<BlobResult>): void;
+
+    //#endregion
+
+    //#region Block Blob Methods
+
+    /**
+     * Uploads a block blob from file.
+     */
+    putBlockBlobFromFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): SpeedSummary;
+    putBlockBlobFromFile(container: string, blob: string, localFileName: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromFile(container: string, blob: string, localFileName: string, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromFile(container: string, blob: string, localFileName: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+
+    /**
+     * Uploads a block blob from a stream.
+     */
+    putBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, callback: StorageCallback<BlobResult>): SpeedSummary;
+    putBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromStream(container: string, blob: string, stream: stream.Stream, streamLength: number, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+
+    /**
+     * Uploads a block blob from a text string.
+     */
+    createBlockBlobFromText(container: string, blob: string, text: string, callback: StorageCallback<BlobResult>): SpeedSummary;
+    createBlockBlobFromText(container: string, blob: string, text: string, options: UploadBlockBlobOptions, callback: StorageCallback<BlobResult>): SpeedSummary;
+
+    /**
+     * Creates a new block to be committed as part of a blob.
+     */
+    createBlobBlockFromStream(blockId: string, container: string, blob: string, readStream: stream.Stream, streamLength: number, callback: StorageCallbackVoid): void;
+    createBlobBlockFromStream(blockId: string, container: string, blob: string, readStream: stream.Stream, streamLength: number, options: CreateBlockOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Creates a new block to be committed as part of a blob.
+     */
+    createBlobBlockFromText(blockId: string, container: string, blob: string, text: string, callback: StorageCallbackVoid): void;
+    createBlobBlockFromText(blockId: string, container: string, blob: string, text: string, options: CreateBlockOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Writes a blob by specifying the list of block IDs that make up the blob.
+     * In order to be written as part of a blob, a block must have been successfully written to the server in a prior
+     * createBlock operation.
+     */
+    commitBlobBlocks(container: string, blob: string, blockList: BlockList, callback: StorageCallback<BlockList>): void;
+    commitBlobBlocks(container: string, blob: string, blockList: BlockList, options: CreateBlockOptions, callback: StorageCallback<BlockList>): void;
+
+    /**
+     * Retrieves the list of blocks that have been uploaded as part of a block blob.
+     */
+    listBlobBlocks(container: string, blob: string, blockListType: string, callback: StorageCallback<BlockList>): void;
+    listBlobBlocks(container: string, blob: string, blockListType: string, options: GetBlobPropertiesOptions, callback: StorageCallback<BlockList>): void;
+
+    /**
+     * Generate a random block id prefix.
+     */
+    generateBlockIdPrefix(): string;
+    /**
+     * Get a block id according to prefix and block number.
+     */
+    getBlockId(prefix: string, number: number): string;
+
+    //#endregion
+
+    //#region Lease Methods
+
+    /**
+     * Acquires a new lease. 
+     * If container and blob are specified, acquires a blob lease. 
+     * Otherwise, if only container is specified and blob is null, acquires a container lease.
+     */
+    acquireLease(container: string, blob: string, callback: StorageCallback<LeaseResult>): void;
+    acquireLease(container: string, blob: string, options: LeaseOptions, callback: StorageCallback<LeaseResult>): void;
+
+    /**
+     * Renews an existing lease.
+     * If container and blob are specified, renews the blob lease.
+     * Otherwise, if only container is specified and blob is null, renews the container lease.
+     */
+    renewLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
+    renewLease(container: string, blob: string, leaseId: string, options: AccessConditionsOptions, callback: StorageCallback<LeaseResult>): void;
+
+    /**
+     * Releases the lease.
+     * If container and blob are specified, releases the blob lease.
+     * Otherwise, if only container is specified and blob is null, releases the container lease.
+     */
+    releaseLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
+    releaseLease(container: string, blob: string, leaseId: string, options: AccessConditionsOptions, callback: StorageCallback<LeaseResult>): void;
+
+    /**
+     * Breaks the lease but ensures that another client cannot acquire a new lease until the current lease period has expired.
+     * If container and blob are specified, breaks the blob lease.
+     * Otherwise, if only container is specified and blob is null, breaks the container lease.
+     */
+    breakLease(container: string, blob: string, leaseId: string, callback: StorageCallback<LeaseResult>): void;
+    breakLease(container: string, blob: string, leaseId: string, options: BreakLeaseOptions, callback: StorageCallback<LeaseResult>): void;
+
+    //#endregion
+}
+
+declare export class QueueService extends StorageServiceClient {
+    authenticationProvider: SharedKey;
+
+    //#region Constructors
+
+    /**
+    * Creates a new BlobService object.
+    * Uses the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_ACCESS_KEY environment variables.
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    */
+    constructor();
+
+    /**
+    * Creates a new BlobService object.
+    * Uses a connectionString to connect
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    * @param {string} connectionString The connection string.
+    */
+    constructor(connectionString: string);
+
+    /**
+    * Creates a new BlobService object.
+    * Uses a storage account and an access key.
+    *
+    * @constructor
+    * @extends {StorageServiceClient}
+    * @param {string} storageAccount                    The storage account or the connection string.
+    * @param {string} storageAccessKey                  The storage access key.
+    * @param {string} host                              The host address.
+    * @param {object} sasToken                          The Shared Access Signature token.
+    */
+    constructor(storageAccount: string, storageAccessKey: string, host?: string, sasToken?: string);
+
+    //#endregion
+
+    //#region Service Methods
+
+    /**
+    * Gets the properties of a storage account�s Blob service, including Azure Storage Analytics.
+    */
+    getServiceProperties(callback: StorageServicePropertiesCallback): void;
+    getServiceProperties(options: TimeoutIntervalOptions, callback: StorageServicePropertiesCallback): void;
+
+    /**
+    * Sets the properties of a storage account�s Blob service, including Azure Storage Analytics.
+    * You can also use this operation to set the default request version for all incoming requests that do not have a version specified.
+    */
+    setServiceProperties(serviceProperties: StorageServiceProperties, callback: StorageCallbackVoid): void;
+    setServiceProperties(serviceProperties: StorageServiceProperties, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
+
+    //#endregion
+
+    //#region Queue Methods
+
+    /**
+     * Lists all queues under the given account.
+     */
+    listQueues(callback: ListQueuesCallback): void;
+    listQueues(options: ListQueuesOptions, callback: ListQueuesCallback): void;
+
+    /**
+     * Creates a new queue under the given account.
+     */
+    createQueue(queue: string, callback: StorageCallback<QueueResult>): void;
+    createQueue(queue: string, options: MetadataOptions, callback: StorageCallback<QueueResult>): void;
+
+    /**
+     * Creates a new queue under the given account if it doesn't exist.
+     */
+    createQueueIfNotExists(queue: string, callback: StorageCallback<boolean>): void;
+    createQueueIfNotExists(queue: string, options: MetadataOptions, callback: StorageCallback<boolean>): void;
+
+    /**
+     * Permanently deletes the specified queue.
+     */
+    deleteQueue(queue: string, callback: StorageCallback<boolean>): void;
+    deleteQueue(queue: string, options: TimeoutIntervalOptions, callback: StorageCallback<boolean>): void;
+
+    /**
+     * Returns queue properties, including user-defined metadata.
+     */
+    getQueueMetadata(queue: string, callback: StorageCallback<QueueResult>): void;
+    getQueueMetadata(queue: string, options: TimeoutIntervalOptions, callback: StorageCallback<QueueResult>): void;
+
+    /**
+     * Sets user-defined metadata on the specified queue. Metadata is associated with the queue as name-value pairs.
+     */
+    setQueueMetadata(queue: string, metadata: StorageMetadata, callback: StorageCallback<QueueResult>): void;
+    setQueueMetadata(queue: string, metadata: StorageMetadata, options: TimeoutIntervalOptions, callback: StorageCallback<QueueResult>): void;
+
+    //#endregion
+
+    //#region Message Methods
+
+    /**
+     * Adds a new message to the back of the message queue. A visibility timeout can also be specified to make the message
+     * invisible until the visibility timeout expires. A message must be in a format that can be included in an XML request
+     * with UTF-8 encoding. The encoded message can be up to 64KB in size for versions 2011-08-18 and newer, or 8KB in size
+     * for previous versions.
+     */
+    createMessage(queue: string, messageText: string, callback: StorageCallback<QueueMessageResult>): void
+    createMessage(queue: string, messageText: string, options: CreateQueueMessageOptions, callback: StorageCallback<QueueMessageResult>): void
+
+    /**
+     * Retrieves a message from the queue and makes it invisible to other consumers.
+     */
+    getMessages(queue: string, callback: StorageCallback<QueueMessageResult[]>): void;
+    getMessages(queue: string, options: GetQueueMessagesOptions, callback: StorageCallback<QueueMessageResult[]>): void;
+
+    /**
+     * Retrieves a message from the front of the queue, without changing the message visibility.
+     */
+    peekMessages(queue: string, callback: StorageCallback<QueueMessageResult[]>): void;
+    peekMessages(queue: string, options: PeekQueueMessagesOptions, callback: StorageCallback<QueueMessageResult[]>): void;
+
+    /**
+     * Deletes a specified message from the queue.
+     */
+    deleteMessage(queue: string, messageId: string, popreceipt: string, callback: StorageCallback<boolean>): void
+    deleteMessage(queue: string, messageId: string, popreceipt: string, options: TimeoutIntervalOptions, callback: StorageCallback<boolean>): void
+
+    /**
+     * Clears all messages from the queue.
+     */
+    clearMessages(queue: string, callback: StorageCallbackVoid): void;
+    clearMessages(queue: string, options: TimeoutIntervalOptions, callback: StorageCallbackVoid): void;
+
+    /**
+     * Deletes a specified message from the queue.
+     */
+    updateMessage(queue: string, messageId: string, popreceipt: string, visibilitytimeout: number, callback: StorageCallback<QueueMessageResult>): void
+    updateMessage(queue: string, messageId: string, popreceipt: string, visibilitytimeout: number, options: UpdateQueueMessagesOptions, callback: StorageCallback<QueueMessageResult>): void
+
+    //#endregion
+}
+
+declare export class ServiceBusService {
+
+}
+
+declare export class SqlService {
+
+}
+
+declare export class ServiceManagementService {
+
+}
+
+declare export class SqlManagementService {
+}
+//#endregion
+
+//#region Service Creators
+declare export function createTableService(): TableService;
+declare export function createTableService(connectionString: string): TableService;
+declare export function createTableService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): TableService;
+
+declare export function createBlobService(): BlobService;
+declare export function createBlobService(connectionString: string): BlobService;
+declare export function createBlobService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): BlobService;
+
+declare export function createQueueService(): QueueService;
+declare export function createQueueService(connectionString: string): QueueService;
+declare export function createQueueService(storageAccount: string, storageAccessKey: string, host?: string, authenticationProvider?: string): QueueService;
+
+declare export function createServiceBusService(): ServiceBusService;
+declare export function createServiceBusService(connectionString: string): ServiceBusService;
+declare export function createServiceBusService(namespace: string, accessKey?: string, issuer?: string, acsNamespace?: string, host?: string, authenticationProvider?: string): ServiceBusService;
+
+declare export function createSqlService(serverName: string, administratorLogin: string, administratorLoginPassword: string, host?: string, acsHost?: string, authenticationProvider?: string): SqlService;
+
+declare export function createServiceManagementService(subscriptionId: string, authentication: string, hostOptions: string): ServiceManagementService;
+
+declare export function createSqlManagementService(subscriptionId: string, authentication: string, hostOptions: string): SqlManagementService;
+//#endregion
+
+//#region RoleEnvironment
+
+interface RoleEnvironmentInterface extends events.EventEmitter {
+    incorrectCallbackErr: string;
+    clientId: string;
+    VersionEndpointFixedPath: string;
+    EnvironmentVariables: {
         [key: string]: string;
-    }
-    export interface ContinuationToken {
-        nextMarker: string;
-        targetLocation: string;
-    }
-    export interface SharedAccessPolicy {
-        Id?: string;
-        AccessPolicy: {
-            Start?: Date;
-            Expiry: Date;
-            Permission?: string;
-        }
-    }
-    //#endregion
-    //#region TableService Interfaces
-    export interface TableRequestCallback {
-        (error: Error, tableResult: { TableName: string; }, response: WebResponse): void;
-    }
+        VersionEndpointEnvironmentName: string;
+    };
 
-    export interface CreateTableIfNotExistsCallback {
-        (error: Error, created: boolean, response: WebResponse): void;
-    }
+    /**
+     * Returns a RoleInstance object that represents the role instance
+     * in which this code is currently executing.
+     */
+    getCurrentRoleInstance(callback: SimpleCallback<RoleInstance>): void;
 
-    export interface DeleteTableCallback {
-        (error: Error, successful: boolean, response: WebResponse): void;
-    }
+    /**
+     * Returns the deployment ID that uniquely identifies the deployment in
+     * which this role instance is running.
+     */
+    getDeploymentId(callback: SimpleCallback<string>): void;
 
-    export interface QueryTablesCallback {
-        (error: Error, queryTablesResult: TableResult[], resultsContinuation: QueryResultContinuation, response: WebResponse): void;
-    }
+    /**
+     * Indicates whether the role instance is running in the Microsoft Azure
+     * environment.  It is good practice to enclose any code that uses 
+     * service runtime in the isAvailable callback.
+     */
+    isAvailable(callback: SimpleCallback<boolean>): void;
 
-    export interface QueryResultContinuation {
-        tableService: TableService;
-    }
+    /**
+     * Indicates whether the role instance is running in the development fabric.
+     */
+    isEmulated(callback: SimpleCallback<boolean>): void;
 
-    export interface QueryTablesOptions extends TimeoutIntervalOptions {
-        nextTableName?: string;
-    }
+    /**
+     * Returns the set of Role objects defined for your service.
+     * Roles are defined in the service definition file.
+     */
+    getRoles(callback: SimpleCallback<Dictionary<Role>>): void;
 
-    export interface TableResult {
-        TableName: string;
-    }
+    /**
+     * Retrieves the settings in the service configuration file.
+     * 
+     * A role's configuration settings are defined in the service definition file.
+     * Values for configuration settings are set in the service configuration file.
+     * For more information on configuration settings, see the [Service Definition Schema](http://msdn.microsoft.com/en-us/library/windowsazure/ee758711.aspx)
+     * and [Service Configuration Schema](http://msdn.microsoft.com/en-us/library/windowsazure/ee758710.aspx).
+     */
+    getConfigurationSettings(callback: SimpleCallback<Dictionary<string>>): void;
 
-    export interface QueryEntityCallback {
-        (error: Error, entity: Entity, response: WebResponse): void;
-    }
+    /**
+     * Retrieves the set of named local storage resources, along with the path.
+     * For example, the DiagnosticStore resource which is defined for every role
+     * provides a location for runtime diagnostics and logs.
+     */
+    getLocalResources(callback: SimpleCallback<Dictionary<RoleLocalResource>>): void;
 
-    export interface QueryEntitiesCallback {
-        (error: Error, entities: Entity[], resultContinuation: QueryEntitiesResultContinuation, response: WebResponse): void;
-    }
+    /**
+     * Requests that the current role instance be stopped and restarted.
+     * 
+     * Before the role instance is recycled, the Microsoft Azure load balancer takes the role instance out of rotation.
+     * This ensures that no new requests are routed to the instance while it is restarting.
+     * 
+     * A call to `RequestRecycle` initiates the normal shutdown cycle. Microsoft Azure raises the
+     * `Stopping` event and calls the `OnStop` method so that you can run the necessary code to
+     * prepare the instance to be recycled.
+     */
+    requestRecycle(callback: ErrorCallback): void;
 
-    export interface QueryEntitiesResultContinuation extends QueryResultContinuation {
-        tableQuery: TableQuery;
-        nextPartitionKey: string;
-        nextRowKey: string;
-        getNextPage(callback?: QueryEntitiesCallback): void;
-        hasNextPage(): boolean;
-    }
+    /**
+     * Sets the status of the role instance.
+     * 
+     * An instance may indicate that it is in one of two states: Ready or Busy. If an instance's state is Ready, it is
+     * prepared to receive requests from the load balancer. If the instance's state is Busy, it will not receive
+     * requests from the load balancer.
+     */
+    setStatus(roleInstanceStatus: string, expirationUtc: Date, callback: ErrorCallback): void;
 
-    export interface ModifyEntityCallback {
-        (error: Error, entity: Entity, response: WebResponse): void;
-    }
+    /**
+     * Clears the status of the role instance.
+     * An instance may indicate that it has completed communicating status by calling this method.
+     */
+    clearStatus(callback: ErrorCallback): void;
+}
 
-    export interface DeleteEntityCallback {
-        (error: Error, successful: boolean, response: WebResponse): void;
-    }
+declare export var RoleEnvironment: RoleEnvironmentInterface;
 
-    export interface UpdateEntityOptions extends TimeoutIntervalOptions {
-        checkEtag?: boolean;
-    }
+//#endregion
 
-    export interface Entity {
-        PartitionKey: string;
-        RowKey: string;
-        Timestamp?: Date;
-        etag?: string;
-        [property: string]: string | number | boolean | Date;
-    }
-    //#endregion
-    //#region BlobService Interfaces
-    export interface LeaseIdOptions extends TimeoutIntervalOptions {
-        leaseId?: string;
-    }
-    export interface AccessConditionsOptions extends TimeoutIntervalOptions {
-        accessConditions?: StorageAccessCondition;
-    }
-    export interface LeaseAccessConditionsOptions extends LeaseIdOptions {
-        accessConditions?: StorageAccessCondition;
-    }
+//#region Export of internal classes
+declare export class WebResource {
+    rawResponse: boolean;
+    queryString: Dictionary<string>;
 
-    export interface ListContainersOptions extends TimeoutIntervalOptions {
-        prefix?: string;
-        maxresults?: number;
-        marker: string;
-        include?: string;
-    }
-    export interface ListContainersCallback {
-        (err: Error, containers: ContainerResult[], continuationToken: ContinuationToken, response: WebResponse): void;
-    }
-    export interface CreateContainerOptions extends TimeoutIntervalOptions {
-        metadata?: StorageMetadata;
-        publicAccessLevel?: string;
-    }
-    export interface GetContainerPropertiesOptions extends TimeoutIntervalOptions {
-        leaseId?: string;
-    }
-    export interface GetContainerMetadataOptions extends GetContainerPropertiesOptions {
-        accessConditions?: StorageAccessCondition;
-    }
+    constructor();
 
-    export interface ListBlobsOptions extends ListContainersOptions {
-        prefix?: string;
-        delimiter?: string;
-    }
-    export interface ListBlobsCallback {
-        (err: Error, blobs: BlobResult[], continuationToken: ContinuationToken, response: WebResponse): void;
-    }
-    export interface GetBlobPropertiesOptions extends LeaseAccessConditionsOptions {
-        snapshotId?: string;
-    }
-    export interface SetBlobPropertiesOptions extends LeaseAccessConditionsOptions {
-        contentType?: string;
-        contentEncoding?: string;
-        contentLanguage?: string;
-        contentMD5?: string;
-        cacheControl?: string;
-        contentDisposition?: string;
-    }
-    export interface ReadBlobOptions extends GetBlobPropertiesOptions {
-        rangeStart?: string;
-        rangeEnd?: string;
-        useTransactionalMD5?: boolean;
-        disableContentMD5Validation?: boolean;
-    }
-    export interface GetBlobToTextCallback {
-        (err: Error, text: string, result: BlobResult, response: WebResponse): void;
-    }
-    export interface DeleteBlobOptions extends GetBlobPropertiesOptions {
-        deleteSnapshots?: string;
-    }
-    export interface BlobSnapshotOptions extends GetBlobPropertiesOptions {
-        metadata?: StorageMetadata;
-    }
-    export interface CopyBlobOptions extends BlobSnapshotOptions {
-        sourceLeaseId?: string;
-        sourceAccessConditions: StorageAccessCondition;
-    }
+    get(path: string): WebResource;
+    put(path: string): WebResource;
+    post(path: string): WebResource;
+    merge(path: string): WebResource;
+    head(path: string): WebResource;
+    del(path: string): WebResource;
 
-    export interface UploadBlobOptions extends SetBlobPropertiesOptions {
-        metadata?: StorageMetadata;
-        speedSummary?: SpeedSummary;
-        parallelOperationThreadCount?: number;
-        storeBlobContentMD5?: boolean;
-        useTransactionalMD5?: boolean;
-    }
-    export interface CreatePagesOptions extends LeaseAccessConditionsOptions {
-        contentMD5?: string;
-        useTransactionalMD5?: boolean;
-    }
-    export interface PageRangeOptions extends LeaseIdOptions {
-        snapshotId?: string;
-        rangeStart?: number;
-        rangeEnd?: number;
-    }
+    withProperty(name: string, value: string): WebResource;
+    withRawResponse(rawResponse: boolean): WebResource;
+    withHeadersOnly(headersOnly: boolean): WebResource;
+    withQueryOption(name: string, value: string, defaultValue: string): WebResource;
+    withQueryOptions(queryOptions: Dictionary<string>): WebResource;
+    withHeader(name: string, value: string): WebResource;
+    withHeaders(headers: Dictionary<string>): WebResource;
+    withBody(body: any): WebResource;
+    addOptionalMetadataHeaders(metadata: StorageMetadata): WebResource;
 
-    export interface UploadBlockBlobOptions extends UploadBlobOptions {
-        blockIdPrefix?: string;
-    }
-    export interface CreateBlockOptions extends LeaseAccessConditionsOptions {
-        contentMD5?: string;
-        useTransactionalMD5?: boolean;
-    }
+    validResponse(statusCode: number): boolean;
+    pipeInput(inputStream: stream.Stream, destStream: stream.Stream): stream.Stream;
+}
 
-    export interface LeaseOptions extends AccessConditionsOptions {
-        leaseDuration?: string;
-        proposedLeaseId?: string;
-    }
-    export interface BreakLeaseOptions extends AccessConditionsOptions {
-        leaseBreakPeriod?: number;
-    }
+declare export class ServiceClient extends events.EventEmitter {
+    static EnvironmentVariables: any;
+    static DEVSTORE_STORAGE_ACCOUNT: string;
+    static DEVSTORE_STORAGE_ACCESS_KEY: string;
+    static DEVSTORE_BLOB_HOST: string;
+    static DEVSTORE_QUEUE_HOST: string;
+    static DEVSTORE_TABLE_HOST: string;
+    static CLOUD_BLOB_HOST: string;
+    static CLOUD_QUEUE_HOST: string;
+    static CLOUD_TABLE_HOST: string;
+    static CLOUD_SERVICEBUS_HOST: string;
+    static CLOUD_ACCESS_CONTROL_HOST: string;
+    static CLOUD_SERVICE_MANAGEMENT_HOST: string;
+    static CLOUD_DATABASE_HOST: string;
+    static DEFAULT_SERVICEBUS_ISSUER: string;
+    static DEFAULT_WRAP_NAMESPACE_SUFFIX: string;
+    static DEFAULT_PROTOCOL: string;
 
-    export interface SharedAccessSignatureResult {
-        baseUrl: string;
-        path: string;
-        queryString: {
-            se: string;
-            sp: string;
-            sr: string;
-            sv: string;
-            sig: string;
-        };
-        url: () => string;
-    }
-    export interface BlobHeaders {
-        cacheControl?: string;
-        contentType?: string;
-        contentEncoding?: string;
-        contentLanguage?: string;
-        contentDisposition?: string;
-    }
-    export interface PageRange {
-        start: number;
-        end: number;
-    }
-    export interface BlockList {
-        LatestBlocks: string[];
-        CommittedBlocks: string[];
-        UncommittedBlocks: string[];
-    }
-    export interface StorageAccessCondition {
-        "If-Modified-Since": Date;
-        "If-Unmodified-Since": Date;
-        "If-Match": string;
-        "If-None-Match": string;
-    }
-    //#endregion
-    //#region QueueService Interfaces
-    export interface ListQueuesOptions extends TimeoutIntervalOptions {
-        prefix?: string;
-        maxresults?: number;
-        marker: string;
-        include?: string;
-    }
-    export interface ListQueuesCallback {
-        (err: Error, queues: QueueResult[], continuationToken: ContinuationToken, response: WebResponse): void;
-    }
+    constructor(host: string, authenticationProvider: any);
 
-    export interface CreateQueueMessageOptions extends TimeoutIntervalOptions {
-        messagettl?: number;
-        visibilitytimeout?: number;
-    }
-    export interface PeekQueueMessagesOptions extends TimeoutIntervalOptions {
-        numofmessages?: number;
-    }
-    export interface GetQueueMessagesOptions extends PeekQueueMessagesOptions {
-        peekonly?: boolean;
-        visibilitytimeout?: number;
-    }
-    export interface UpdateQueueMessagesOptions extends TimeoutIntervalOptions {
-        messagetext?: string;
-    }
-    //#endregion
+    setHost(host: string): void;
+    performRequest(webResource: WebResource, outputData: string, options: any, callback: Function): void;
+    performRequestOutputStream(webResource: WebResource, outputStream: any, options: any, callback: Function): void;
+    performRequestInputStream(webResource: WebResource, outputData: string, inputStream: any, options: any, callback: Function): void;
+    withFilter(newFilter: Filter): ServiceClient;
+    parseMetadataHeaders(headers: any): any;
+    isEmulated(): boolean;
+    setProxy(proxyUrl: string, proxyPort: number): void;
+}
 
-    //#region RoleEnvironment Interfaces
-    export interface Role {
+declare export class BatchServiceClient extends StorageServiceClient {
+    operations: any[];
+
+    constructor(storageAccount: string, storageAccessKey: string, host: string, usePathstyleUri: boolean, authenticationProvider: any);
+    beginBatch(): void;
+    isInBatch(): boolean;
+    rollback(): void;
+    hasOperations(): boolean;
+    addOperation(webResource: WebResource, outputData: any): void;
+    commitBatch(callback: (error: any, operationResponses: any[], response: any) => void): void;
+    commitBatch(options: any, callback: (error: any, operationResponses: any[], response: any) => void): void;
+    processResponse(responseObject: any, requestOperations: any[]): any[];
+    processOperation(webResource: WebResource, rawResponse: string): any;
+}
+
+declare export class ServiceManagementClient {
+
+}
+
+declare export class TableQuery {
+    static select(...fields: string[]): TableQuery;
+    from(table: string): TableQuery;
+    whereKeys(partitionKey: string, rowKey: string): TableQuery;
+    whereNextKeys(partitionKey: string, rowKey: string): TableQuery;
+    where(condition: string, ...values: string[]): TableQuery;
+    and(condition: string, ...args: string[]): TableQuery;
+    or(condition: string, ...args: string[]): TableQuery;
+    top(integer: number): TableQuery;
+    toQueryObject(): any;
+    toPath(): string;
+}
+
+declare export class BlobResult {
+    blob: string;
+    container: string;
+
+    etag: string;
+    lastModified: string;
+    contentType: string;
+    contentEncoding: string;
+    contentLanguage: string;
+    contentMD5: string;
+    cacheControl: string;
+    contentRange: string;
+    contentTypeHeader: string;
+    contentEncodingHeader: string;
+    contentLanguageHeader: string;
+    contentMD5Header: string;
+    cacheControlHeader: string;
+    contentLength: number;
+    contentLengthHeader: number;
+    contentDisposition: string;
+    contentDispositionHeader: string;
+    range: string;
+    rangeHeader: string;
+    getContentMd5: string;
+    acceptRanges: string;
+    blobType: string;
+    leaseStatus: string;
+    leaseId: string;
+    leaseDuration: string;
+    leaseState: string;
+    sequenceNumber: string;
+    copyStatus: string;
+    copyCompletionTime: string;
+    copyStatusDescription: string;
+    copyId: string;
+    copyProgress: number;
+    requestId: string;
+
+    metadata: StorageMetadata;
+
+    constructor();
+    constructor(container: string);
+    constructor(container: string, blob: string);
+
+    static parse(blobXml: any): BlobResult;
+    static setHeadersFromBlob(webResource: WebResource, blob: BlobResult): void;
+
+    getPropertiesFromHeaders(headers: any): void;
+}
+
+declare export class ContainerResult {
+    name: string;
+    publicAccessLevel: string;
+
+    etag: string;
+    lastModified: string;
+    leaseStatus: string;
+    leaseDuration: string;
+    leaseState: string;
+    requestId: string;
+
+    metadata: StorageMetadata;
+    signedIdentifiers: SignedIdentifier[];
+
+    constructor();
+    constructor(name: string);
+    constructor(name: string, publicAccessLevel: string);
+
+    static parse(containerXml: any): ContainerResult;
+
+    getPropertiesFromHeaders(headers: any): void;
+}
+
+declare export class LeaseResult {
+    container: string;
+    blob: string;
+    id: string;
+    time: string;
+    etag: string;
+    lastModified: string;
+
+    constructor();
+    constructor(container: string);
+    constructor(container: string, blob: string);
+    constructor(container: string, blob: string, id: string);
+    constructor(container: string, blob: string, id: string, time: string);
+
+    getPropertiesFromHeaders(header: any): void;
+}
+
+declare export class QueueResult {
+    name: string;
+    metadata: StorageMetadata;
+    approximatemessagecount: number;
+
+    constructor();
+    constructor(name: string);
+    constructor(name: string, metadata: StorageMetadata);
+
+    static parse(messageXml: any): QueueResult;
+
+    getPropertiesFromHeaders(headers: any): void;
+}
+
+declare export class QueueMessageResult {
+    queue: string;
+    insertiontime: string;
+    expirationtime: string;
+    timenextvisible: string;
+    messagetext: string;
+    dequeuecount: string;
+    messageid: string;
+    popreceipt: string;
+    metadata: StorageMetadata;
+
+    constructor();
+    constructor(queue: string);
+    constructor(queue: string, messageid: string);
+    constructor(queue: string, messageid: string, popreceipt: string);
+    constructor(queue: string, messageid: string, popreceipt: string, metadata: StorageMetadata);
+
+    static serialize(messageJs: string): string;
+    static parse(messageXml: any): QueueMessageResult;
+
+    getPropertiesFromHeaders(headers: any): void;
+}
+
+declare export class SpeedSummary {
+    name: string;
+    totalSize: number;
+    completeSize: number;
+
+    _startTime: Date;
+    _timeWindowInSeconds: number;
+    _timeWindow: number;
+    _totalWindowSize: number;
+    _speedTracks: number[];
+    _speedTrackPtr: number;
+
+    constructor(name: string);
+
+    /**
+     * Get running seconds
+     */
+    getElapsedSeconds(): string;
+    getElapsedSeconds(humanReadable: boolean): number;
+
+    /**
+     * Get complete percentage
+     */
+    getCompletePercent(): number;
+    getCompletePercent(len: number): number;
+
+    /**
+     * Get average upload/download speed
+     */
+    getAverageSpeed(): string;
+    getAverageSpeed(humanReadable: boolean): number;
+
+    /**
+     * Get internal speed
+     */
+    getSpeed(): string;
+    getSpeed(humanReadable: boolean): number;
+
+    /**
+     * Get auto increment function
+     */
+    getSpeed(size: number): (error: Error, value: any) => void;
+
+    /**
+     * Get total size
+     */
+    getTotalSize(): string;
+    getTotalSize(humanReadable: boolean): number;
+
+    /**
+     * Get completed data size
+     */
+    getCompleteSize(): string;
+    getCompleteSize(humanReadable: boolean): number;
+}
+
+declare export module Constants {
+
+}
+
+export interface Filter {
+    handle(requestOptions: any, next: Function): void;
+}
+
+declare export class LinearRetryPolicyFilter implements Filter {
+    constructor(retryCount?: number, retryInterval?: number);
+    retryCount: number;
+    retryInterval: number;
+    handle(requestOptions: any, next: Function): void;
+}
+
+declare export class ExponentialRetryPolicyFilter implements Filter {
+    constructor(retryCount?: number, retryInterval?: number, minRetryInterval?: number, maxRetryInterval?: number);
+    retryCount: number;
+    retryInterval: number;
+    minRetryInterval: number;
+    maxRetryInterval: number;
+    handle(requestOptions: any, next: Function): void;
+}
+
+declare export class HmacSha256Sign {
+
+}
+
+declare export class SharedAccessSignature {
+    storageAccount: string;
+    storageAccessKey: string;
+    permissionSet: string[];
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, permissionSet: string[])
+
+    /**
+     * Generates the query string for a shared access signature signing.
+     */
+    generateSignedQueryString(path: string, queryString: Dictionary<string>, resourceType: string, sharedAccessPolicy: SharedAccessPolicy): Dictionary<string>;
+
+    /**
+     * Signs a request with the signature header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Generates the shared access signature for a resource.
+     */
+    _generateSignature(path: string, resourceType: string, sharedAccessPolicy: SharedAccessPolicy): string;
+
+    /**
+     * Generates the query string for a shared access signature signing.
+     */
+    _permissionMatchesRequest(sharedAccessSignature: string, webResource: WebResource, resourceType: string, requiredPermissions: string[]): string;
+}
+
+declare export class SharedKey {
+    storageAccount: string;
+    storageAccessKey: string;
+    usePathStyleUri: string;
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
+
+    /**
+     * Signs a request with the Authentication header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Retrieves the webresource's canonicalized resource string.
+     */
+    _getCanonicalizedResource(webResource: WebResource): string;
+
+    /**
+     * Constructs the Canonicalized Headers string.
+     *
+     * To construct the CanonicalizedHeaders portion of the signature string,
+     * follow these steps: 1. Retrieve all headers for the resource that begin
+     * with x-ms-, including the x-ms-date header. 2. Convert each HTTP header
+     * name to lowercase. 3. Sort the headers lexicographically by header name,
+     * in ascending order. Each header may appear only once in the
+     * string. 4. Unfold the string by replacing any breaking white space with a
+     * single space. 5. Trim any white space around the colon in the header. 6.
+     * Finally, append a new line character to each canonicalized header in the
+     * resulting list. Construct the CanonicalizedHeaders string by
+     * concatenating all headers in this list into a single string.
+     */
+    _getCanonicalizedHeaders(webResource: WebResource): string;
+}
+
+declare export class SharedKeyLite {
+    storageAccount: string;
+    storageAccessKey: string;
+    usePathStyleUri: string;
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
+
+    /**
+     * Signs a request with the Authentication header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Retrieves the webresource's canonicalized resource string.
+     */
+    _getCanonicalizedResource(webResource: WebResource): string;
+
+    /**
+     * Constructs the Canonicalized Headers string.
+     *
+     * To construct the CanonicalizedHeaders portion of the signature string,
+     * follow these steps: 1. Retrieve all headers for the resource that begin
+     * with x-ms-, including the x-ms-date header. 2. Convert each HTTP header
+     * name to lowercase. 3. Sort the headers lexicographically by header name,
+     * in ascending order. Each header may appear only once in the
+     * string. 4. Unfold the string by replacing any breaking white space with a
+     * single space. 5. Trim any white space around the colon in the header. 6.
+     * Finally, append a new line character to each canonicalized header in the
+     * resulting list. Construct the CanonicalizedHeaders string by
+     * concatenating all headers in this list into a single string.
+     */
+    _getCanonicalizedHeaders(webResource: WebResource): string;
+}
+
+declare export class SharedKeyTable {
+    storageAccount: string;
+    storageAccessKey: string;
+    usePathStyleUri: string;
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
+
+    /**
+     * Signs a request with the Authentication header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Retrieves the webresource's canonicalized resource string.
+     */
+    _getCanonicalizedResource(webResource: WebResource): string;
+}
+
+declare export class SharedKeyLiteTable {
+    torageAccount: string;
+    storageAccessKey: string;
+    usePathStyleUri: string;
+    signer: HmacSha256Sign;
+
+    constructor(storageAccount: string, storageAccessKey: string, usePathStyleUri: boolean);
+
+    /**
+     * Signs a request with the Authentication header.
+     */
+    signRequest(webResource: WebResource, callback: ErrorCallback): void;
+
+    /**
+     * Retrieves the webresource's canonicalized resource string.
+     */
+    _getCanonicalizedResource(webResource: WebResource): string;
+}
+
+declare export module ISO8061Date {
+    /**
+     * Formats a date into an iso 8061 string.
+     */
+    export function format(date: Date): string;
+
+    /**
+     * Parses an ISO 8061 date string into a date object.
+     */
+    export function parse(stringDateTime: string): Date;
+}
+
+declare export class Logger {
+    level: string;
+    loggerFunction: (level: string, message: string) => void;
+
+    static LogLevels: {
+        EMERGENCY: string;
+        ALERT: string;
+        CRITICAL: string;
+        ERROR: string;
+        WARNING: string;
+        NOTICE: string;
+        INFO: string;
+        DEBUG: string;
+    };
+    static logPriority: string[];
+
+    log(level: string, message: string): void;
+    emergency(message: string): void;
+    alert(message: string): void;
+    critical(message: string): void;
+    error(message: string): void;
+    warning(message: string): void;
+    notice(message: string): void;
+    info(message: string): void;
+    debug(message: string): void;
+
+    defaultLoggerFunction(level: string, message: string): void;
+}
+
+declare export class ConnectionStringParser {
+    _value: string;
+    _pos: number;
+    _state: string;
+
+    constructor(connectionString: string);
+
+    _parse(options: ConnectionStringParseOptions): Dictionary<string>;
+
+    _extractKey(): string;
+    _extractString(quote: string): string;
+    _extractValue(): string;
+
+    _skipWhitespaces(): void;
+    _skipOperator(operator: string): void;
+
+    static parse(connectionString: string): Dictionary<string>;
+}
+
+declare export module ServiceSettings {
+    export var DEFAULT_PROTOCOL: string;
+
+    export class NoMatchError implements Error {
         name: string;
-        instances: {
-            [instanceId: string]: RoleInstance;
+        message: string;
+        constr: any;
+
+        constructor();
+        constructor(message: string);
+        constructor(message: string, constr: any);
+    }
+
+    /**
+     * Throws an exception if the connection string format does not match any of the
+     * available formats.
+     */
+    export function noMatchConnectionString(connectionString: string): void;
+
+    /**
+     * Throws an exception if the settings dont match any of the available formats.
+     */
+    export function noMatchSettings(settings: any): void;
+
+    /**
+     * Parses the connection string and then validate that the parsed keys belong to
+     * the validSettingKeys
+     */
+    export function parseAndValidateKeys(connectionString: string, validKeys: string[]): string[];
+
+    /**
+     * Creates an anonymous function that acts as predicate to perform a validation.
+     */
+    export function getValidator(requirements: Dictionary<Requirement>, isRequired: boolean, atLeastOne: boolean): ValidatorFunction;
+
+    /**
+     * Creates a setting value condition that validates it is one of the passed valid values.
+     */
+    export function setting(name: string): string[];
+
+    /**
+     * Creates an "at least one" predicate for the provided list of requirements.
+     */
+    export function atLeastOne(...args: any[]): ValidatorFunction;
+
+    /**
+     * Creates an optional predicate for the provided list of requirements.
+     */
+    export function optional(...args: any[]): ValidatorFunction;
+
+    /**
+     * Creates an required predicate for the provided list of requirements.
+     */
+    export function allRequired(...args: any[]): ValidatorFunction;
+
+    /**
+     * Creates a setting value condition using the passed predicate.
+     */
+    export function settingWithFunc(name: string, predicate: Function): Requirement[];
+
+    /**
+     * Tests to see if a given list of settings matches a set of filters exactly.
+     */
+    export function matchedSpecification(settings: Dictionary<any>): boolean;
+
+    /**
+     * Tests to see if a given list of settings matches a set of filters exactly.
+     */
+    export function parseHost(uri: string): url.Url;
+}
+
+declare export class StorageServiceSettings {
+    _name: string;
+    _key: string;
+    _blobEndpointUri: string;
+    _queueEndpointUri: string;
+    _tableEndpointUri: string;
+    _usePathStyleUri: boolean;
+
+    constructor(name: string, key: string, blobEndpointUri: string, queueEndpointUri: string, tableEndpointUri: string, usePathStyleUri: boolean);
+
+    /**
+     * Returns a StorageServiceSettings with development storage credentials using
+     * the specified proxy Uri.
+     */
+    static _getDevelopmentStorageAccount(): StorageServiceSettings;
+    static _getDevelopmentStorageAccount(proxy: string): StorageServiceSettings;
+
+    /**
+     * Gets a StorageServiceSettings object that references the development storage
+     * account.
+     */
+    static getDevelopmentStorageAccountSettings(): StorageServiceSettings;
+
+    /**
+     * Gets the default service endpoint using the specified protocol and account
+     * name.
+     */
+    static _getDefaultServiceEndpoint(settings: Dictionary<string>, dns: string): string;
+
+    /**
+     * Creates StorageServiceSettings object given endpoints uri.
+     */
+    static _createStorageServiceSettings(settings: Dictionary<string>, blobEndpointUri: string, queueEndpointUri: string, tableEndpointUri: string): StorageServiceSettings;
+
+    /**
+     * Creates a ServiceBusSettings object from a set of settings.
+     */
+    static createFromSettings(settings: Dictionary<string>): StorageServiceSettings;
+
+    /**
+     * Creates a StorageServiceSettings object from the given connection string.
+     */
+    static createFromConnectionString(connectionString: string): StorageServiceSettings;
+
+    static createExplicitlyOrFromEnvironment(storageAccount: string, storageAccessKey: string, host: string): StorageServiceSettings;
+
+    static isDevelopmentStorage(storageAccount: string, storageAccessKey: string, parsedHost: string): boolean;
+
+    static createFromConfig(config: any): StorageServiceSettings;
+
+    static customizeConfig(config: any): void;
+}
+
+declare export class ServiceBusSettings {
+
+}
+
+declare export class ServiceManagementSettinsg {
+
+}
+
+declare export module Validate {
+    /**
+     * Checks if the given uri is valid or not.
+     */
+    export function isValidUri(uri: string): boolean;
+
+    /**
+     * Validates that a clusterCreationObject is properly formed.
+     */
+    export function isValidHDInsightCreationObject(clusterCreationObject: ClusterCreationOptions): void;
+    export function isValidHDInsightCreationObject(clusterCreationObject: ClusterCreationOptions, callback: ErrorCallback): void;
+
+    export function isValidUuid(uuid: string): void;
+    export function isValidUuid(uuid: string, callback: ErrorCallback): void;
+
+    /**
+     * Creates a anonymous function that check if a given key is base 64 encoded.
+     */
+    export function isBase64Encoded(key: string): boolean;
+
+    /**
+     * Validates a function.
+     */
+    export function isValidFunction(functionObject: any, functionName: string): void;
+
+    /**
+     * Validates that a Service Bus namespace name
+     * is legally allowable. Does not check availability.
+     */
+    export function namespaceNameIsValid(name: string): boolean;
+    export function namespaceNameIsValid(name: string, callback: ErrorCallback): boolean;
+
+    /**
+     * Validates a container name.
+     */
+    export function containerNameIsValid(containerName: string): boolean;
+    export function containerNameIsValid(containerName: string, callback: ErrorCallback): boolean;
+
+    /**
+     * Validates a blob name.
+     */
+    export function blobNameIsValid(containerName: string, blob: string): boolean;
+    export function blobNameIsValid(containerName: string, blob: string, callback: ErrorCallback): boolean;
+
+    /**
+     * Validates a table name.
+     */
+    export function tableNameIsValid(tableName: string): boolean;
+    export function tableNameIsValid(tableName: string, callback: ErrorCallback): boolean;
+
+    /**
+     * Validates a queue name.
+     */
+    export function queueNameIsValid(queueName: string): boolean;
+    export function queueNameIsValid(queueName: string, callback: ErrorCallback): boolean;
+
+    export function pageRangesAreValid(rangeStart: number, rangeEnd: number, writeBlockSizeInBytes: number): boolean;
+    export function pageRangesAreValid(rangeStart: number, rangeEnd: number, writeBlockSizeInBytes: number, callback: ErrorCallback): boolean;
+
+    export function validateArgs(functionName: string, validationRules: Function): boolean;
+}
+
+declare export module date {
+    /**
+     * Generates a Date object which is in the given days from now.
+     */
+    export function daysFromNow(days: number): Date;
+
+    /**
+     * Generates a Date object which is in the given hours from now.
+     */
+    export function hoursFromNow(hours: number): Date;
+
+    /**
+     * Generates a Date object which is in the given minutes from now.
+     */
+    export function minutesFromNow(minutes: number): Date;
+
+    /**
+     * Generates a Date object which is in the given seconds from now.
+     */
+    export function secondsFromNow(seconds: number): Date;
+}
+//#endregion
+
+//#region Non-explicit, undeclared interfaces
+export interface WebResponse {
+    isSuccessful: boolean;
+    statusCode: number;
+    body: {
+        entry: {
+            id: string;
+            title: any;
+            updated: string;
+            author: {
+                name: any;
+            };
+            link: any;
+            category: any;
+            content: any;
         };
-    }
-    export interface RoleInstance {
-        id: string;
-        faultDomain: string;
-        updateDomain: string;
-        endpoints: {
-            [endpoint: string]: RoleInstanceEndpoint
+    };
+    headers: any;
+    md5: any;
+}
+
+//#region Common Interfaces
+export interface SimpleCallback<T> {
+    (error: Error, result: T): void;
+}
+export interface ErrorCallback {
+    (error: Error): void;
+}
+export interface StorageCallbackVoid {
+    (err: Error, response: WebResponse): void;
+}
+export interface StorageCallback<T> {
+    (err: Error, result: T, response: WebResponse): void;
+}
+export interface StorageServiceStatsCallback extends StorageCallback<StorageServiceStats> { }
+export interface StorageServicePropertiesCallback extends StorageCallback<StorageServiceProperties> { }
+
+export interface TimeoutIntervalOptions {
+    locationMode?: string;
+    timeoutIntervalInMs?: number;
+    maximumExecutionTimeInMs?: number;
+}
+export interface MetadataOptions extends TimeoutIntervalOptions {
+    metadata?: StorageMetadata;
+}
+export interface StorageAclOptions extends TimeoutIntervalOptions {
+    leaseId?: string;
+    signedIdentifiers: SignedIdentifier[]
+}
+
+export interface Dictionary<T> {
+    [key: string]: T;
+}
+export interface StorageServiceProperties {
+    Logging: {
+        Version: number;
+        Delete: boolean;
+        Read: boolean;
+        Write: boolean;
+        RetentionPolicy: {
+            Enabled: boolean;
+            Days: number;
         };
+    };
+    Metrics: {
+        Version: number;
+        Enabled: boolean;
+        IncludeAPIs: boolean;
+        RetentionPolicy: {
+            Enabled: boolean;
+            Days: number;
+        };
+    };
+    DefaultServiceVersion: string;
+}
+export interface StorageServiceStats {
+    GeoReplication: {
+        Status: string;
+        LastSyncTime: Date;
     }
-    export interface RoleInstanceEndpoint {
-        protocol: string;
-        address: string;
-        port: number;
+}
+export interface SignedIdentifier {
+    Id: string;
+    AccessPolicy: SharedAccessPolicy;
+}
+export interface StorageMetadata {
+    [key: string]: string;
+}
+export interface ContinuationToken {
+    nextMarker: string;
+    targetLocation: string;
+}
+export interface SharedAccessPolicy {
+    Id?: string;
+    AccessPolicy: {
+        Start?: Date;
+        Expiry: Date;
+        Permission?: string;
     }
-    export interface RoleLocalResource {
+}
+//#endregion
+//#region TableService Interfaces
+export interface TableRequestCallback {
+    (error: Error, tableResult: { TableName: string; }, response: WebResponse): void;
+}
+
+export interface CreateTableIfNotExistsCallback {
+    (error: Error, created: boolean, response: WebResponse): void;
+}
+
+export interface DeleteTableCallback {
+    (error: Error, successful: boolean, response: WebResponse): void;
+}
+
+export interface QueryTablesCallback {
+    (error: Error, queryTablesResult: TableResult[], resultsContinuation: QueryResultContinuation, response: WebResponse): void;
+}
+
+export interface QueryResultContinuation {
+    tableService: TableService;
+}
+
+export interface QueryTablesOptions extends TimeoutIntervalOptions {
+    nextTableName?: string;
+}
+
+export interface TableResult {
+    TableName: string;
+}
+
+export interface QueryEntityCallback {
+    (error: Error, entity: Entity, response: WebResponse): void;
+}
+
+export interface QueryEntitiesCallback {
+    (error: Error, entities: Entity[], resultContinuation: QueryEntitiesResultContinuation, response: WebResponse): void;
+}
+
+export interface QueryEntitiesResultContinuation extends QueryResultContinuation {
+    tableQuery: TableQuery;
+    nextPartitionKey: string;
+    nextRowKey: string;
+    getNextPage(callback?: QueryEntitiesCallback): void;
+    hasNextPage(): boolean;
+}
+
+export interface ModifyEntityCallback {
+    (error: Error, entity: Entity, response: WebResponse): void;
+}
+
+export interface DeleteEntityCallback {
+    (error: Error, successful: boolean, response: WebResponse): void;
+}
+
+export interface UpdateEntityOptions extends TimeoutIntervalOptions {
+    checkEtag?: boolean;
+}
+
+export interface Entity {
+    PartitionKey: string;
+    RowKey: string;
+    Timestamp?: Date;
+    etag?: string;
+    [property: string]: string | number | boolean | Date;
+}
+//#endregion
+//#region BlobService Interfaces
+export interface LeaseIdOptions extends TimeoutIntervalOptions {
+    leaseId?: string;
+}
+export interface AccessConditionsOptions extends TimeoutIntervalOptions {
+    accessConditions?: StorageAccessCondition;
+}
+export interface LeaseAccessConditionsOptions extends LeaseIdOptions {
+    accessConditions?: StorageAccessCondition;
+}
+
+export interface ListContainersOptions extends TimeoutIntervalOptions {
+    prefix?: string;
+    maxresults?: number;
+    marker: string;
+    include?: string;
+}
+export interface ListContainersCallback {
+    (err: Error, containers: ContainerResult[], continuationToken: ContinuationToken, response: WebResponse): void;
+}
+export interface CreateContainerOptions extends TimeoutIntervalOptions {
+    metadata?: StorageMetadata;
+    publicAccessLevel?: string;
+}
+export interface GetContainerPropertiesOptions extends TimeoutIntervalOptions {
+    leaseId?: string;
+}
+export interface GetContainerMetadataOptions extends GetContainerPropertiesOptions {
+    accessConditions?: StorageAccessCondition;
+}
+
+export interface ListBlobsOptions extends ListContainersOptions {
+    prefix?: string;
+    delimiter?: string;
+}
+export interface ListBlobsCallback {
+    (err: Error, blobs: BlobResult[], continuationToken: ContinuationToken, response: WebResponse): void;
+}
+export interface GetBlobPropertiesOptions extends LeaseAccessConditionsOptions {
+    snapshotId?: string;
+}
+export interface SetBlobPropertiesOptions extends LeaseAccessConditionsOptions {
+    contentType?: string;
+    contentEncoding?: string;
+    contentLanguage?: string;
+    contentMD5?: string;
+    cacheControl?: string;
+    contentDisposition?: string;
+}
+export interface ReadBlobOptions extends GetBlobPropertiesOptions {
+    rangeStart?: string;
+    rangeEnd?: string;
+    useTransactionalMD5?: boolean;
+    disableContentMD5Validation?: boolean;
+}
+export interface GetBlobToTextCallback {
+    (err: Error, text: string, result: BlobResult, response: WebResponse): void;
+}
+export interface DeleteBlobOptions extends GetBlobPropertiesOptions {
+    deleteSnapshots?: string;
+}
+export interface BlobSnapshotOptions extends GetBlobPropertiesOptions {
+    metadata?: StorageMetadata;
+}
+export interface CopyBlobOptions extends BlobSnapshotOptions {
+    sourceLeaseId?: string;
+    sourceAccessConditions: StorageAccessCondition;
+}
+
+export interface UploadBlobOptions extends SetBlobPropertiesOptions {
+    metadata?: StorageMetadata;
+    speedSummary?: SpeedSummary;
+    parallelOperationThreadCount?: number;
+    storeBlobContentMD5?: boolean;
+    useTransactionalMD5?: boolean;
+}
+export interface CreatePagesOptions extends LeaseAccessConditionsOptions {
+    contentMD5?: string;
+    useTransactionalMD5?: boolean;
+}
+export interface PageRangeOptions extends LeaseIdOptions {
+    snapshotId?: string;
+    rangeStart?: number;
+    rangeEnd?: number;
+}
+
+export interface UploadBlockBlobOptions extends UploadBlobOptions {
+    blockIdPrefix?: string;
+}
+export interface CreateBlockOptions extends LeaseAccessConditionsOptions {
+    contentMD5?: string;
+    useTransactionalMD5?: boolean;
+}
+
+export interface LeaseOptions extends AccessConditionsOptions {
+    leaseDuration?: string;
+    proposedLeaseId?: string;
+}
+export interface BreakLeaseOptions extends AccessConditionsOptions {
+    leaseBreakPeriod?: number;
+}
+
+export interface SharedAccessSignatureResult {
+    baseUrl: string;
+    path: string;
+    queryString: {
+        se: string;
+        sp: string;
+        sr: string;
+        sv: string;
+        sig: string;
+    };
+    url: () => string;
+}
+export interface BlobHeaders {
+    cacheControl?: string;
+    contentType?: string;
+    contentEncoding?: string;
+    contentLanguage?: string;
+    contentDisposition?: string;
+}
+export interface PageRange {
+    start: number;
+    end: number;
+}
+export interface BlockList {
+    LatestBlocks: string[];
+    CommittedBlocks: string[];
+    UncommittedBlocks: string[];
+}
+export interface StorageAccessCondition {
+    "If-Modified-Since": Date;
+    "If-Unmodified-Since": Date;
+    "If-Match": string;
+    "If-None-Match": string;
+}
+//#endregion
+//#region QueueService Interfaces
+export interface ListQueuesOptions extends TimeoutIntervalOptions {
+    prefix?: string;
+    maxresults?: number;
+    marker: string;
+    include?: string;
+}
+export interface ListQueuesCallback {
+    (err: Error, queues: QueueResult[], continuationToken: ContinuationToken, response: WebResponse): void;
+}
+
+export interface CreateQueueMessageOptions extends TimeoutIntervalOptions {
+    messagettl?: number;
+    visibilitytimeout?: number;
+}
+export interface PeekQueueMessagesOptions extends TimeoutIntervalOptions {
+    numofmessages?: number;
+}
+export interface GetQueueMessagesOptions extends PeekQueueMessagesOptions {
+    peekonly?: boolean;
+    visibilitytimeout?: number;
+}
+export interface UpdateQueueMessagesOptions extends TimeoutIntervalOptions {
+    messagetext?: string;
+}
+//#endregion
+
+//#region RoleEnvironment Interfaces
+export interface Role {
+    name: string;
+    instances: {
+        [instanceId: string]: RoleInstance;
+    };
+}
+export interface RoleInstance {
+    id: string;
+    faultDomain: string;
+    updateDomain: string;
+    endpoints: {
+        [endpoint: string]: RoleInstanceEndpoint
+    };
+}
+export interface RoleInstanceEndpoint {
+    protocol: string;
+    address: string;
+    port: number;
+}
+export interface RoleLocalResource {
+    name: string;
+    path: string;
+    maximumSizeInMegabytes: number;
+}
+//#endregion
+//#region ConnectionStringParser Interfaces
+export interface ConnectionStringParseOptions {
+    skipLowerCase: boolean;
+}
+//#endregion
+//#region Validate Interfaces
+export interface ClusterCreationOptions {
+    name: string;
+    location: string;
+    defaultStorageAccountName: string;
+    defaultStorageAccountKey: string;
+    defaultStorageContainer: string;
+    user: string;
+    password: string;
+    nodes: number;
+    additionalStorageAccounts?: {
         name: string;
-        path: string;
-        maximumSizeInMegabytes: number;
-    }
-    //#endregion
-    //#region ConnectionStringParser Interfaces
-    export interface ConnectionStringParseOptions {
-        skipLowerCase: boolean;
-    }
-    //#endregion
-    //#region Validate Interfaces
-    export interface ClusterCreationOptions {
-        name: string;
-        location: string;
-        defaultStorageAccountName: string;
-        defaultStorageAccountKey: string;
-        defaultStorageContainer: string;
+        key: string;
+    }[];
+    oozieMetastore?: {
+        server: string;
+        database: string;
         user: string;
         password: string;
-        nodes: number;
-        additionalStorageAccounts?: {
-            name: string;
-            key: string;
-        }[];
-        oozieMetastore?: {
-            server: string;
-            database: string;
-            user: string;
-            password: string;
-        };
-        hiveMetastore?: {
-            server: string;
-            database: string;
-            user: string;
-            password: string;
-        };
-    }
-    //#endregion
-    //#region ServiceSettings Interfaces
-    export interface Requirement {
-        SettingName: string;
-        SettingPredicate: Function;
-    }
-    export interface ValidatorFunction {
-        (userSettings: Dictionary<any>): any;
-    }
-    //#endregion
-    //#endregion
-
-    //#region Un-exported internal classes
-    class StorageServiceClient extends ServiceClient {
-        static incorrectStorageAccountErr: string;
-        static incorrectStorageAccessKeyErr: string;
-        static getStorageSettings(connectionString: string): StorageServiceSettings;
-        static getStorageSettings(storageAccount?: string, storageAccessKey?: string, host?: string): StorageServiceSettings;
-
-        apiVersion: string;
-        usePathStyleUri: string;
-
-        constructor(storageAccount: string, storageAccessKey: string, host: string, usePathStyleUri: boolean, authenticationProvider: any);
-    }
-    //#endregion
-
-    export function isEmulated(): boolean;
+    };
+    hiveMetastore?: {
+        server: string;
+        database: string;
+        user: string;
+        password: string;
+    };
 }
+//#endregion
+//#region ServiceSettings Interfaces
+export interface Requirement {
+    SettingName: string;
+    SettingPredicate: Function;
+}
+export interface ValidatorFunction {
+    (userSettings: Dictionary<any>): any;
+}
+//#endregion
+//#endregion
+
+//#region Un-exported internal classes
+declare class StorageServiceClient extends ServiceClient {
+    static incorrectStorageAccountErr: string;
+    static incorrectStorageAccessKeyErr: string;
+    static getStorageSettings(connectionString: string): StorageServiceSettings;
+    static getStorageSettings(storageAccount?: string, storageAccessKey?: string, host?: string): StorageServiceSettings;
+
+    apiVersion: string;
+    usePathStyleUri: string;
+
+    constructor(storageAccount: string, storageAccessKey: string, host: string, usePathStyleUri: boolean, authenticationProvider: any);
+}
+//#endregion
+
+declare export function isEmulated(): boolean;
diff --git a/barcode/barcode.d.ts b/barcode/barcode.d.ts
index c2ad43eb76..3afdf81b2b 100644
--- a/barcode/barcode.d.ts
+++ b/barcode/barcode.d.ts
@@ -5,21 +5,20 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "barcode" {
 
-    interface BarcodeOptions {
-        data:string|number;
-        width:number;
-        height:number;
-    }
 
-    interface BarcodeResult {
-        getStream(callback:(err:NodeJS.ErrnoException, stream:NodeJS.ReadableStream) => void):void;
-        saveImage(outputfilePath:string, callback:(err:NodeJS.ErrnoException) => void):void;
-        getBase64(callback:(err:NodeJS.ErrnoException, base64String:string) => void):void;
-    }
-
-    function barcode(type:string, options:BarcodeOptions):BarcodeResult;
-
-    export = barcode;
+interface BarcodeOptions {
+    data: string | number;
+    width: number;
+    height: number;
 }
+
+interface BarcodeResult {
+    getStream(callback: (err: NodeJS.ErrnoException, stream: NodeJS.ReadableStream) => void): void;
+    saveImage(outputfilePath: string, callback: (err: NodeJS.ErrnoException) => void): void;
+    getBase64(callback: (err: NodeJS.ErrnoException, base64String: string) => void): void;
+}
+
+declare function barcode(type: string, options: BarcodeOptions): BarcodeResult;
+
+export = barcode;
diff --git a/basic-auth/basic-auth.d.ts b/basic-auth/basic-auth.d.ts
index 911299a6c6..08cbcd1975 100644
--- a/basic-auth/basic-auth.d.ts
+++ b/basic-auth/basic-auth.d.ts
@@ -5,15 +5,14 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "basic-auth" {
-    function auth(req: Express.Request): auth.BasicAuthResult;
 
-    namespace auth {
-        interface BasicAuthResult {
-            name: string;
-            pass: string;
-        }
+declare function auth(req: Express.Request): auth.BasicAuthResult;
+
+declare namespace auth {
+    interface BasicAuthResult {
+        name: string;
+        pass: string;
     }
-
-    export = auth;
 }
+
+export = auth;
diff --git a/batch-stream/batch-stream.d.ts b/batch-stream/batch-stream.d.ts
index 5b27050104..30a27f3199 100644
--- a/batch-stream/batch-stream.d.ts
+++ b/batch-stream/batch-stream.d.ts
@@ -5,20 +5,19 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "batch-stream" {
-  import stream = require('stream');
 
-  interface Options {
+import stream = require('stream');
+
+interface Options {
     size?: number;
     highWaterMark?: number;
-  }
+}
 
-  class BatchStream extends stream.Transform {
+declare class BatchStream extends stream.Transform {
     size: number;
     batch: any[];
 
     constructor(options: Options);
-  }
+}
 
-  export = BatchStream;
-}
\ No newline at end of file
+export = BatchStream;
diff --git a/bcrypt-nodejs/bcrypt-nodejs.d.ts b/bcrypt-nodejs/bcrypt-nodejs.d.ts
index 6df662346a..982efaa60c 100644
--- a/bcrypt-nodejs/bcrypt-nodejs.d.ts
+++ b/bcrypt-nodejs/bcrypt-nodejs.d.ts
@@ -3,66 +3,65 @@
 // Definitions by: David Broder-Rodgers <https://github.com/DavidBR-SW/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "bcrypt-nodejs" {
-    /**
-     * Generate a salt synchronously
-     * @param rounds Number of rounds to process the data for (default - 10)
-     * @return Generated salt
-     */
-    export function genSaltSync(rounds?: number): string;
 
-    /**
-     * Generate a salt asynchronously
-     * @param rounds Number of rounds to process the data for (default - 10)
-     * @param callback Callback with error and resulting salt, to be fired once the salt has been generated
-     */
-    export function genSalt(rounds: number, callback: (error: Error, result: string) => void): void;
+/**
+ * Generate a salt synchronously
+ * @param rounds Number of rounds to process the data for (default - 10)
+ * @return Generated salt
+ */
+declare export function genSaltSync(rounds?: number): string;
 
-    /**
-     * Generate a hash synchronously
-     * @param data Data to be encrypted
-     * @param salt Salt to be used in encryption (default - new salt generated with 10 rounds)
-     * @return Generated hash
-     */
-    export function hashSync(data: string, salt?: string): string;
+/**
+ * Generate a salt asynchronously
+ * @param rounds Number of rounds to process the data for (default - 10)
+ * @param callback Callback with error and resulting salt, to be fired once the salt has been generated
+ */
+declare export function genSalt(rounds: number, callback: (error: Error, result: string) => void): void;
 
-    /**
-     * Generate a hash asynchronously
-     * @param data Data to be encrypted
-     * @param salt Salt to be used in encryption
-     * @param callback Callback with error and hashed result, to be fired once the data has been encrypted
-     */
-    export function hash(data: string, salt: string, callback: (error: Error, result: string) => void): void;
+/**
+ * Generate a hash synchronously
+ * @param data Data to be encrypted
+ * @param salt Salt to be used in encryption (default - new salt generated with 10 rounds)
+ * @return Generated hash
+ */
+declare export function hashSync(data: string, salt?: string): string;
 
-    /**
-     * Generate a hash asynchronously
-     * @param data Data to be encrypted
-     * @param salt Salt to be used in encryption
-     * @param progressCallback Callback to be fired multiple times during the hash calculation to signify progress
-     * @param callback Callback with error and hashed result, to be fired once the data has been encrypted
-     */
-    export function hash(data: string, salt: string, progressCallback: () => void, callback: (error: Error, result: string) => void): void;
+/**
+ * Generate a hash asynchronously
+ * @param data Data to be encrypted
+ * @param salt Salt to be used in encryption
+ * @param callback Callback with error and hashed result, to be fired once the data has been encrypted
+ */
+declare export function hash(data: string, salt: string, callback: (error: Error, result: string) => void): void;
 
-    /**
-     * Compares data with a hash synchronously
-     * @param data Data to be compared
-     * @param hash Hash to be compared to
-     * @return true if matching, false otherwise
-     */
-    export function compareSync(data: string, hash: string): boolean;
+/**
+ * Generate a hash asynchronously
+ * @param data Data to be encrypted
+ * @param salt Salt to be used in encryption
+ * @param progressCallback Callback to be fired multiple times during the hash calculation to signify progress
+ * @param callback Callback with error and hashed result, to be fired once the data has been encrypted
+ */
+declare export function hash(data: string, salt: string, progressCallback: () => void, callback: (error: Error, result: string) => void): void;
 
-    /**
-     * Compares data with a hash asynchronously
-     * @param data Data to be compared
-     * @param hash Hash to be compared to
-     * @param callback Callback with error and match result, to be fired once the data has been compared
-     */
-    export function compare(data: string, hash: string, callback: (error: Error, result: boolean) => void): void;
+/**
+ * Compares data with a hash synchronously
+ * @param data Data to be compared
+ * @param hash Hash to be compared to
+ * @return true if matching, false otherwise
+ */
+declare export function compareSync(data: string, hash: string): boolean;
 
-    /**
-     * Get number of rounds used for hash
-     * @param hash Hash from which the number of rounds used should be extracted
-     * @return number of rounds used to encrypt a given hash
-     */
-    export function getRounds(hash: string): number;
-}
+/**
+ * Compares data with a hash asynchronously
+ * @param data Data to be compared
+ * @param hash Hash to be compared to
+ * @param callback Callback with error and match result, to be fired once the data has been compared
+ */
+declare export function compare(data: string, hash: string, callback: (error: Error, result: boolean) => void): void;
+
+/**
+ * Get number of rounds used for hash
+ * @param hash Hash from which the number of rounds used should be extracted
+ * @return number of rounds used to encrypt a given hash
+ */
+declare export function getRounds(hash: string): number;
diff --git a/bcrypt/bcrypt.d.ts b/bcrypt/bcrypt.d.ts
index 38d9604b44..304214cc5d 100644
--- a/bcrypt/bcrypt.d.ts
+++ b/bcrypt/bcrypt.d.ts
@@ -3,63 +3,62 @@
 // Definitions by: Peter Harris <https://github.com/codeanimal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "bcrypt" {
-  /**
-   * @param rounds  The cost of processing the data. Default 10.
-   */
-  export function genSaltSync(rounds?: number): string;
 
-  /**
-   * @param rounds    The cost of processing the data. Default 10.
-   * @param callback  A callback to be fire once the sald has been generated. Uses eio making it asynchronous.
-   */
-  export function genSalt(rounds: number, callback: (err: Error, salt: string) => void): void;
-  /**
-   * @param callback  A callback to be fire once the sald has been generated. Uses eio making it asynchronous.
-   */
-  export function genSalt(callback: (err: Error, salt: string) => void): void;
+/**
+ * @param rounds  The cost of processing the data. Default 10.
+ */
+declare export function genSaltSync(rounds?: number): string;
 
-  /**
-   * @param data  The data to be encrypted.
-   * @param salt  The salt to be used in encryption.
-   */
-  export function hashSync(data: any, salt: string): string;
-  /**
-   * @param data    The data to be encrypted.
-   * @param rounds  A salt will be generated using the rounds specified.
-   */
-  export function hashSync(data: any, rounds: number): string;
+/**
+ * @param rounds    The cost of processing the data. Default 10.
+ * @param callback  A callback to be fire once the sald has been generated. Uses eio making it asynchronous.
+ */
+declare export function genSalt(rounds: number, callback: (err: Error, salt: string) => void): void;
+/**
+ * @param callback  A callback to be fire once the sald has been generated. Uses eio making it asynchronous.
+ */
+declare export function genSalt(callback: (err: Error, salt: string) => void): void;
 
-  /**
-   * @param data      The data to be encrypted.
-   * @param salt      The salt to be used in encryption.
-   * @param callback  A callback to be fired once the data has been encrypted. Uses eio making it asynchronous.
-   */
-  export function hash(data: any, salt: string, callback: (err: Error, encrypted: string) => void): void;
-  /**
-   * @param data      The data to be encrypted.
-   * @param rounds    A salt will be generated using the rounds specified.
-   * @param callback  A callback to be fired once the data has been encrypted. Uses eio making it asynchronous.
-   */
-  export function hash(data: any, rounds: number, callback: (err: Error, encrypted: string) => void): void;
+/**
+ * @param data  The data to be encrypted.
+ * @param salt  The salt to be used in encryption.
+ */
+declare export function hashSync(data: any, salt: string): string;
+/**
+ * @param data    The data to be encrypted.
+ * @param rounds  A salt will be generated using the rounds specified.
+ */
+declare export function hashSync(data: any, rounds: number): string;
 
-  /**
-   * @param data      The data to be encrypted.
-   * @param encrypted The data to be compared against.
-   */
-  export function compareSync(data: any, encrypted: string): boolean;
+/**
+ * @param data      The data to be encrypted.
+ * @param salt      The salt to be used in encryption.
+ * @param callback  A callback to be fired once the data has been encrypted. Uses eio making it asynchronous.
+ */
+declare export function hash(data: any, salt: string, callback: (err: Error, encrypted: string) => void): void;
+/**
+ * @param data      The data to be encrypted.
+ * @param rounds    A salt will be generated using the rounds specified.
+ * @param callback  A callback to be fired once the data has been encrypted. Uses eio making it asynchronous.
+ */
+declare export function hash(data: any, rounds: number, callback: (err: Error, encrypted: string) => void): void;
 
-  /**
-   * @param data      The data to be encrypted.
-   * @param encrypted The data to be compared against.
-   * @param callback  A callback to be fire once the data has been compared. Uses eio making it asynchronous.
-   */
-  export function compare(data: any, encrypted: string, callback: (err: Error, same: boolean) => void): void;
+/**
+ * @param data      The data to be encrypted.
+ * @param encrypted The data to be compared against.
+ */
+declare export function compareSync(data: any, encrypted: string): boolean;
 
-  /**
-   * Return the number of rounds used to encrypt a given hash
-   * 
-   * @param encrypted Hash from which the number of rounds used should be extracted.
-   */
-  export function getRounds(encrypted: string): number;
-}
+/**
+ * @param data      The data to be encrypted.
+ * @param encrypted The data to be compared against.
+ * @param callback  A callback to be fire once the data has been compared. Uses eio making it asynchronous.
+ */
+declare export function compare(data: any, encrypted: string, callback: (err: Error, same: boolean) => void): void;
+
+/**
+ * Return the number of rounds used to encrypt a given hash
+ * 
+ * @param encrypted Hash from which the number of rounds used should be extracted.
+ */
+declare export function getRounds(encrypted: string): number;
diff --git a/bcryptjs/bcryptjs.d.ts b/bcryptjs/bcryptjs.d.ts
index 3d3128d022..896d1c5961 100644
--- a/bcryptjs/bcryptjs.d.ts
+++ b/bcryptjs/bcryptjs.d.ts
@@ -3,80 +3,79 @@
 // Definitions by: Joshua Filby <https://github.com/Joshua-F/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "bcryptjs" {
 
-    /**
-     * Sets the pseudo random number generator to use as a fallback if neither node's crypto module nor the Web Crypto API is available.
-     * Please note: It is highly important that the PRNG used is cryptographically secure and that it is seeded properly!
-     * @param  random Function taking the number of bytes to generate as its sole argument, returning the corresponding array of cryptographically secure random byte values.
-     */
-    export function setRandomFallback(random: (random: number) => number[]): void;
 
-    /**
-     * Synchronously generates a salt.
-     * @param  rounds Number of rounds to use, defaults to 10 if omitted
-     * @return Resulting salt
-     */
-    export function genSaltSync(rounds?: number): string;
+/**
+ * Sets the pseudo random number generator to use as a fallback if neither node's crypto module nor the Web Crypto API is available.
+ * Please note: It is highly important that the PRNG used is cryptographically secure and that it is seeded properly!
+ * @param  random Function taking the number of bytes to generate as its sole argument, returning the corresponding array of cryptographically secure random byte values.
+ */
+declare export function setRandomFallback(random: (random: number) => number[]): void;
 
-    /**
-     * Asynchronously generates a salt.
-     * @param callback Callback receiving the error, if any, and the resulting salt
-     */
-    export function genSalt(callback: (err: Error, salt: string) => void): void;
+/**
+ * Synchronously generates a salt.
+ * @param  rounds Number of rounds to use, defaults to 10 if omitted
+ * @return Resulting salt
+ */
+declare export function genSaltSync(rounds?: number): string;
 
-    /**
-     * Asynchronously generates a salt.
-     * @param  rounds   Number of rounds to use, defaults to 10 if omitted
-     * @param  callback Callback receiving the error, if any, and the resulting salt
-     */
-    export function genSalt(rounds: number, callback: (err: Error, salt: string) => void): void;
+/**
+ * Asynchronously generates a salt.
+ * @param callback Callback receiving the error, if any, and the resulting salt
+ */
+declare export function genSalt(callback: (err: Error, salt: string) => void): void;
 
-    /**
-     * Synchronously generates a hash for the given string.
-     * @param  s    String to hash
-     * @param  salt Salt length to generate or salt to use, default to 10
-     * @return Resulting hash
-     */
-    export function hashSync(s: string, salt?: number | string): string;
+/**
+ * Asynchronously generates a salt.
+ * @param  rounds   Number of rounds to use, defaults to 10 if omitted
+ * @param  callback Callback receiving the error, if any, and the resulting salt
+ */
+declare export function genSalt(rounds: number, callback: (err: Error, salt: string) => void): void;
 
-    /**
-     * Asynchronously generates a hash for the given string.
-     * @param s                String to hash
-     * @param salt             Salt length to generate or salt to use
-     * @param callback         Callback receiving the error, if any, and the resulting hash
-     * @param progressCallback Callback successively called with the percentage of rounds completed (0.0 - 1.0), maximally once per MAX_EXECUTION_TIME = 100 ms.
-     */
-    export function hash(s: string, salt: number | string, callback: (err: Error, hash: string) => void, progressCallback?: (percent: number) => void): void;
+/**
+ * Synchronously generates a hash for the given string.
+ * @param  s    String to hash
+ * @param  salt Salt length to generate or salt to use, default to 10
+ * @return Resulting hash
+ */
+declare export function hashSync(s: string, salt?: number | string): string;
 
-    /**
-     * Synchronously tests a string against a hash.
-     * @param  s    String to compare
-     * @param  hash Hash to test against
-     * @return true if matching, otherwise false
-     */
-    export function compareSync(s: string, hash: string): boolean;
+/**
+ * Asynchronously generates a hash for the given string.
+ * @param s                String to hash
+ * @param salt             Salt length to generate or salt to use
+ * @param callback         Callback receiving the error, if any, and the resulting hash
+ * @param progressCallback Callback successively called with the percentage of rounds completed (0.0 - 1.0), maximally once per MAX_EXECUTION_TIME = 100 ms.
+ */
+declare export function hash(s: string, salt: number | string, callback: (err: Error, hash: string) => void, progressCallback?: (percent: number) => void): void;
 
-    /**
-     * Asynchronously compares the given data against the given hash.
-     * @param  s                Data to compare
-     * @param  hash             Data to be compared to
-     * @param  callback         Callback receiving the error, if any, otherwise the result
-     * @param  progressCallback Callback successively called with the percentage of rounds completed (0.0 - 1.0), maximally once per MAX_EXECUTION_TIME = 100 ms.
-     */
-    export function compare(s: string, hash: string, callback: (err: Error, success: boolean) => void, progressCallback?: (percent: number) => void): void;
+/**
+ * Synchronously tests a string against a hash.
+ * @param  s    String to compare
+ * @param  hash Hash to test against
+ * @return true if matching, otherwise false
+ */
+declare export function compareSync(s: string, hash: string): boolean;
 
-    /**
-     * Gets the number of rounds used to encrypt the specified hash.
-     * @param  hash Hash to extract the used number of rounds from
-     * @return Number of rounds used
-     */
-    export function getRounds(hash: string): number;
+/**
+ * Asynchronously compares the given data against the given hash.
+ * @param  s                Data to compare
+ * @param  hash             Data to be compared to
+ * @param  callback         Callback receiving the error, if any, otherwise the result
+ * @param  progressCallback Callback successively called with the percentage of rounds completed (0.0 - 1.0), maximally once per MAX_EXECUTION_TIME = 100 ms.
+ */
+declare export function compare(s: string, hash: string, callback: (err: Error, success: boolean) => void, progressCallback?: (percent: number) => void): void;
 
-    /**
-     * Gets the salt portion from a hash. Does not validate the hash.
-     * @param  hash Hash to extract the salt from
-     * @return Extracted salt part
-     */
-    export function getSalt(hash: string): string;
-}
+/**
+ * Gets the number of rounds used to encrypt the specified hash.
+ * @param  hash Hash to extract the used number of rounds from
+ * @return Number of rounds used
+ */
+declare export function getRounds(hash: string): number;
+
+/**
+ * Gets the salt portion from a hash. Does not validate the hash.
+ * @param  hash Hash to extract the salt from
+ * @return Extracted salt part
+ */
+declare export function getSalt(hash: string): string;
diff --git a/benchmark/benchmark.d.ts b/benchmark/benchmark.d.ts
index c5c257aaaa..01bb379a48 100644
--- a/benchmark/benchmark.d.ts
+++ b/benchmark/benchmark.d.ts
@@ -3,190 +3,189 @@
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "benchmark" {
-    class Benchmark {
-        static deepClone<T>(value: T): T;
-        static each(obj: Object | any[], callback: Function, thisArg?: any): void;
-        static extend(destination: Object, ...sources: Object[]): Object;
-        static filter<T>(arr: T[], callback: (value: T) => any, thisArg?: any): T[];
-        static filter<T>(arr: T[], filter: string, thisArg?: any): T[];
-        static forEach<T>(arr: T[], callback: (value: T) => any, thisArg?: any): void;
-        static formatNumber(num: number): string;
-        static forOwn(obj: Object, callback: Function, thisArg?: any): void;
-        static hasKey(obj: Object, key: string): boolean;
-        static indexOf<T>(arr: T[], value: T, fromIndex?: number): number;
-        static interpolate(template: string, values: Object): string;
-        static invoke(benches: Benchmark[], name: string | Object, ...args: any[]): any[];
-        static join(obj: Object, separator1?: string, separator2?: string): string;
-        static map<T, K>(arr: T[], callback: (value: T) => K, thisArg?: any): K[];
-        static pluck<T, K>(arr: T[], key: string): K[];
-        static reduce<T, K>(arr: T[], callback: (accumulator: K, value: T) => K, thisArg?: any): K;
 
-        static options: Benchmark.Options;
-        static platform: Benchmark.Platform;
-        static support: Benchmark.Support;
-        static version: string;
+declare class Benchmark {
+    static deepClone<T>(value: T): T;
+    static each(obj: Object | any[], callback: Function, thisArg?: any): void;
+    static extend(destination: Object, ...sources: Object[]): Object;
+    static filter<T>(arr: T[], callback: (value: T) => any, thisArg?: any): T[];
+    static filter<T>(arr: T[], filter: string, thisArg?: any): T[];
+    static forEach<T>(arr: T[], callback: (value: T) => any, thisArg?: any): void;
+    static formatNumber(num: number): string;
+    static forOwn(obj: Object, callback: Function, thisArg?: any): void;
+    static hasKey(obj: Object, key: string): boolean;
+    static indexOf<T>(arr: T[], value: T, fromIndex?: number): number;
+    static interpolate(template: string, values: Object): string;
+    static invoke(benches: Benchmark[], name: string | Object, ...args: any[]): any[];
+    static join(obj: Object, separator1?: string, separator2?: string): string;
+    static map<T, K>(arr: T[], callback: (value: T) => K, thisArg?: any): K[];
+    static pluck<T, K>(arr: T[], key: string): K[];
+    static reduce<T, K>(arr: T[], callback: (accumulator: K, value: T) => K, thisArg?: any): K;
 
-        constructor(fn: Function | string, options?: Benchmark.Options);
-        constructor(name: string, fn: Function | string, options?: Benchmark.Options);
-        constructor(name: string, options?: Benchmark.Options);
-        constructor(options: Benchmark.Options);
+    static options: Benchmark.Options;
+    static platform: Benchmark.Platform;
+    static support: Benchmark.Support;
+    static version: string;
 
-        aborted: boolean;
-        compiled: Function | string;
-        count: number;
-        cycles: number;
-        error: Error;
-        fn: Function | string;
-        hz: number;
-        running: boolean;
-        setup: Function | string;
-        teardown: Function | string;
+    constructor(fn: Function | string, options?: Benchmark.Options);
+    constructor(name: string, fn: Function | string, options?: Benchmark.Options);
+    constructor(name: string, options?: Benchmark.Options);
+    constructor(options: Benchmark.Options);
 
-        stats: Benchmark.Stats;
-        times: Benchmark.Times;
+    aborted: boolean;
+    compiled: Function | string;
+    count: number;
+    cycles: number;
+    error: Error;
+    fn: Function | string;
+    hz: number;
+    running: boolean;
+    setup: Function | string;
+    teardown: Function | string;
 
-        abort(): Benchmark;
-        clone(options: Benchmark.Options): Benchmark;
-        compare(benchmark: Benchmark): number;
-        emit(type: string | Object): any;
-        listeners(type: string): Function[];
-        off(type?: string, listener?: Function): Benchmark;
-        off(types: string[]): Benchmark;
-        on(type?: string, listener?: Function): Benchmark;
-        on(types: string[]): Benchmark;
-        reset(): Benchmark;
-        run(options?: Benchmark.Options): Benchmark;
+    stats: Benchmark.Stats;
+    times: Benchmark.Times;
+
+    abort(): Benchmark;
+    clone(options: Benchmark.Options): Benchmark;
+    compare(benchmark: Benchmark): number;
+    emit(type: string | Object): any;
+    listeners(type: string): Function[];
+    off(type?: string, listener?: Function): Benchmark;
+    off(types: string[]): Benchmark;
+    on(type?: string, listener?: Function): Benchmark;
+    on(types: string[]): Benchmark;
+    reset(): Benchmark;
+    run(options?: Benchmark.Options): Benchmark;
+    toString(): string;
+}
+
+declare namespace Benchmark {
+    export interface Options {
+        async?: boolean;
+        defer?: boolean;
+        delay?: number;
+        id?: string;
+        initCount?: number;
+        maxTime?: number;
+        minSamples?: number;
+        minTime?: number;
+        name?: string;
+        onAbort?: Function;
+        onComplete?: Function;
+        onCycle?: Function;
+        onError?: Function;
+        onReset?: Function;
+        onStart?: Function;
+        setup?: Function | string;
+        teardown?: Function | string;
+        fn?: Function | string;
+        queued?: boolean;
+    }
+
+    export interface Platform {
+        description: string;
+        layout: string;
+        manufacturer: string;
+        name: string;
+        os: string;
+        prerelease: string;
+        product: string;
+        version: string;
         toString(): string;
     }
 
-    namespace Benchmark {
-        export interface Options {
-            async?: boolean;
-            defer?: boolean;
-            delay?: number;
-            id?: string;
-            initCount?: number;
-            maxTime?: number;
-            minSamples?: number;
-            minTime?: number;
-            name?: string;
-            onAbort?: Function;
-            onComplete?: Function;
-            onCycle?: Function;
-            onError?: Function;
-            onReset?: Function;
-            onStart?: Function;
-            setup?: Function | string;
-            teardown?: Function | string;
-            fn?: Function | string;
-            queued?: boolean;
-        }
-
-        export interface Platform {
-            description: string;
-            layout: string;
-            manufacturer: string;
-            name: string;
-            os: string;
-            prerelease: string;
-            product: string;
-            version: string;
-            toString(): string;
-        }
-
-        export interface Support {
-            air: boolean;
-            argumentsClass: boolean;
-            browser: boolean;
-            charByIndex: boolean;
-            charByOwnIndex: boolean;
-            decompilation: boolean;
-            descriptors: boolean;
-            getAllKeys: boolean;
-            iteratesOwnFirst: boolean;
-            java: boolean;
-            nodeClass: boolean;
-            timeout: boolean;
-        }
-
-        export interface Stats {
-            deviation: number;
-            mean: number;
-            moe: number;
-            rme: number;
-            sample: any[];
-            sem: number;
-            variance: number;
-        }
-
-        export interface Times {
-            cycle: number;
-            elapsed: number;
-            period: number;
-            timeStamp: number;
-        }
-
-        export class Deferred {
-            constructor(clone: Benchmark);
-
-            benchmark: Benchmark;
-            cycles: number;
-            elapsed: number;
-            timeStamp: number;
-        }
-
-        export class Event {
-            constructor(type: string | Object);
-
-            aborted: boolean;
-            cancelled: boolean;
-            currentTarget: Object;
-            result: any;
-            target: Object;
-            timeStamp: number;
-            type: string;
-        }
-
-        export class Suite {
-            static options: { name: string };
-
-            constructor(name?: string, options?: Options);
-
-            aborted: boolean;
-            length: number;
-            running: boolean;
-            abort(): Suite;
-            add(name: string, fn: Function | string, options?: Options): Suite;
-            add(fn: Function | string, options?: Options): Suite;
-            add(name: string, options?: Options): Suite;
-            add(options: Options): Suite;
-            clone(options: Options): Suite;
-            emit(type: string | Object): any;
-            filter(callback: Function | string): Suite;
-            forEach(callback: Function): Suite;
-            indexOf(value: any): number;
-            invoke(name: string, ...args: any[]): any[];
-            join(separator?: string): string;
-            listeners(type: string): Function[];
-            map(callback: Function): any[];
-            off(type?: string, callback?: Function): Benchmark;
-            off(types: string[]): Benchmark;
-            on(type?: string, callback?: Function): Benchmark;
-            on(types: string[]): Benchmark;
-            pluck(property: string): any[];
-            pop(): Function;
-            push(benchmark: Benchmark): number;
-            reduce<T>(callback: Function, accumulator: T): T;
-            reset(): Suite;
-            reverse(): any[];
-            run(options?: Options): Suite;
-            shift(): Benchmark;
-            slice(start: number, end: number): any[];
-            slice(start: number, deleteCount: number, ...values: any[]): any[];
-            unshift(benchmark: Benchmark): number;
-        }
+    export interface Support {
+        air: boolean;
+        argumentsClass: boolean;
+        browser: boolean;
+        charByIndex: boolean;
+        charByOwnIndex: boolean;
+        decompilation: boolean;
+        descriptors: boolean;
+        getAllKeys: boolean;
+        iteratesOwnFirst: boolean;
+        java: boolean;
+        nodeClass: boolean;
+        timeout: boolean;
     }
 
-    export = Benchmark;
+    export interface Stats {
+        deviation: number;
+        mean: number;
+        moe: number;
+        rme: number;
+        sample: any[];
+        sem: number;
+        variance: number;
+    }
+
+    export interface Times {
+        cycle: number;
+        elapsed: number;
+        period: number;
+        timeStamp: number;
+    }
+
+    export class Deferred {
+        constructor(clone: Benchmark);
+
+        benchmark: Benchmark;
+        cycles: number;
+        elapsed: number;
+        timeStamp: number;
+    }
+
+    export class Event {
+        constructor(type: string | Object);
+
+        aborted: boolean;
+        cancelled: boolean;
+        currentTarget: Object;
+        result: any;
+        target: Object;
+        timeStamp: number;
+        type: string;
+    }
+
+    export class Suite {
+        static options: { name: string };
+
+        constructor(name?: string, options?: Options);
+
+        aborted: boolean;
+        length: number;
+        running: boolean;
+        abort(): Suite;
+        add(name: string, fn: Function | string, options?: Options): Suite;
+        add(fn: Function | string, options?: Options): Suite;
+        add(name: string, options?: Options): Suite;
+        add(options: Options): Suite;
+        clone(options: Options): Suite;
+        emit(type: string | Object): any;
+        filter(callback: Function | string): Suite;
+        forEach(callback: Function): Suite;
+        indexOf(value: any): number;
+        invoke(name: string, ...args: any[]): any[];
+        join(separator?: string): string;
+        listeners(type: string): Function[];
+        map(callback: Function): any[];
+        off(type?: string, callback?: Function): Benchmark;
+        off(types: string[]): Benchmark;
+        on(type?: string, callback?: Function): Benchmark;
+        on(types: string[]): Benchmark;
+        pluck(property: string): any[];
+        pop(): Function;
+        push(benchmark: Benchmark): number;
+        reduce<T>(callback: Function, accumulator: T): T;
+        reset(): Suite;
+        reverse(): any[];
+        run(options?: Options): Suite;
+        shift(): Benchmark;
+        slice(start: number, end: number): any[];
+        slice(start: number, deleteCount: number, ...values: any[]): any[];
+        unshift(benchmark: Benchmark): number;
+    }
 }
+
+export = Benchmark;
diff --git a/bitwise-xor/bitwise-xor.d.ts b/bitwise-xor/bitwise-xor.d.ts
index 09f104b9af..ef3271e981 100644
--- a/bitwise-xor/bitwise-xor.d.ts
+++ b/bitwise-xor/bitwise-xor.d.ts
@@ -4,14 +4,12 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-declare module "bitwise-xor" {
 
-	/**
-	 * Bitwise XOR between two Buffers or Strings, returns a Buffer
-	 */
-	function xor(b1: Buffer, b2: Buffer): Buffer;
-	function xor(s1: string, s2: string): Buffer;
 
-	export = xor;
-}
+/**
+ * Bitwise XOR between two Buffers or Strings, returns a Buffer
+ */
+declare function xor(b1: Buffer, b2: Buffer): Buffer;
+declare function xor(s1: string, s2: string): Buffer;
 
+export = xor;
diff --git a/bl/bl.d.ts b/bl/bl.d.ts
index b3b97b3983..b0c8628334 100644
--- a/bl/bl.d.ts
+++ b/bl/bl.d.ts
@@ -5,36 +5,35 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'bl' {
-	import stream = require('stream');
 
-	class BufferList  extends stream.Duplex {
-		new (callback?:(err:Error, buffer:Buffer) => void): void;
+import stream = require('stream');
 
-		append(buffer: Buffer):void;
-		get(index: number): number;
-		slice(start?: number, end?: number): Buffer;
-		copy(dest: Buffer, destStart?: number, srcStart?: number, srcEnd?: number): void;
-		duplicate(): BufferList;
-		consume(bytes?: number): void;
-		toString(encoding?: string, start?: number, end?: number): string;
-		length: number;
+declare class BufferList extends stream.Duplex {
+    new(callback?: (err: Error, buffer: Buffer) => void): void;
 
-		readDoubleBE(offset: number, noAssert?: boolean): number;
-		readDoubleLE(offset: number, noAssert?: boolean): number;
-		readFloatBE(offset: number, noAssert?: boolean): number;
-		readFloatLE(offset: number, noAssert?: boolean): number;
-		readInt32BE(offset: number, noAssert?: boolean): number;
-		readInt32LE(offset: number, noAssert?: boolean): number;
-		readUInt32BE(offset: number, noAssert?: boolean): number;
-		readUInt32LE(offset: number, noAssert?: boolean): number;
-		readInt16BE(offset: number, noAssert?: boolean): number;
-		readInt16LE(offset: number, noAssert?: boolean): number;
-		readUInt16BE(offset: number, noAssert?: boolean): number;
-		readUInt16LE(offset: number, noAssert?: boolean): number;
-		readInt8(offset: number, noAssert?: boolean): number;
-		readUInt8(offset: number, noAssert?: boolean): number;
-	}
+    append(buffer: Buffer): void;
+    get(index: number): number;
+    slice(start?: number, end?: number): Buffer;
+    copy(dest: Buffer, destStart?: number, srcStart?: number, srcEnd?: number): void;
+    duplicate(): BufferList;
+    consume(bytes?: number): void;
+    toString(encoding?: string, start?: number, end?: number): string;
+    length: number;
 
-	export = BufferList;
+    readDoubleBE(offset: number, noAssert?: boolean): number;
+    readDoubleLE(offset: number, noAssert?: boolean): number;
+    readFloatBE(offset: number, noAssert?: boolean): number;
+    readFloatLE(offset: number, noAssert?: boolean): number;
+    readInt32BE(offset: number, noAssert?: boolean): number;
+    readInt32LE(offset: number, noAssert?: boolean): number;
+    readUInt32BE(offset: number, noAssert?: boolean): number;
+    readUInt32LE(offset: number, noAssert?: boolean): number;
+    readInt16BE(offset: number, noAssert?: boolean): number;
+    readInt16LE(offset: number, noAssert?: boolean): number;
+    readUInt16BE(offset: number, noAssert?: boolean): number;
+    readUInt16LE(offset: number, noAssert?: boolean): number;
+    readInt8(offset: number, noAssert?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
 }
+
+export = BufferList;
diff --git a/blue-tape/blue-tape.d.ts b/blue-tape/blue-tape.d.ts
index 1216600cab..4a973c1715 100644
--- a/blue-tape/blue-tape.d.ts
+++ b/blue-tape/blue-tape.d.ts
@@ -6,7 +6,6 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../tape/tape.d.ts" />
 
-declare module 'blue-tape' {
-	import tape = require('tape');
-	export = tape;
-}
+
+import tape = require('tape');
+export = tape;
diff --git a/bluebird-retry/bluebird-retry.d.ts b/bluebird-retry/bluebird-retry.d.ts
index 1210bf3b53..01023ea8b9 100644
--- a/bluebird-retry/bluebird-retry.d.ts
+++ b/bluebird-retry/bluebird-retry.d.ts
@@ -4,21 +4,20 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../bluebird/bluebird.d.ts" />
-declare module "bluebird-retry" {
-	import Promise = require('bluebird');
 
-	function retry<T>(func:(param:T)=>void, options?:retry.Options):Promise<T>;
+import Promise = require('bluebird');
 
-	namespace retry {
-		export interface Options {
-			interval?:number;
-			backoff?:number;
-			max_interval?:number;
-			timeout?:number;
-			max_tries?:number;
-		}
+declare function retry<T>(func: (param: T) => void, options?: retry.Options): Promise<T>;
 
-	}
+declare namespace retry {
+    export interface Options {
+        interval?: number;
+        backoff?: number;
+        max_interval?: number;
+        timeout?: number;
+        max_tries?: number;
+    }
 
-	export = retry;
 }
+
+export = retry;
diff --git a/blueimp-md5/blueimp-md5.d.ts b/blueimp-md5/blueimp-md5.d.ts
index 99880ba0d6..4434c55ab8 100644
--- a/blueimp-md5/blueimp-md5.d.ts
+++ b/blueimp-md5/blueimp-md5.d.ts
@@ -2,6 +2,5 @@
 // Project: https://github.com/blueimp/JavaScript-MD5
 // Definitions by: Ray Martone <https://github.com/rmartone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module 'blueimp-md5' {
-    export function md5(value: string, key?: string, raw?: boolean): string;
-}
+
+declare export function md5(value: string, key?: string, raw?: boolean): string;
diff --git a/body-parser/body-parser.d.ts b/body-parser/body-parser.d.ts
index 16f639dfaf..64f97e8d33 100644
--- a/body-parser/body-parser.d.ts
+++ b/body-parser/body-parser.d.ts
@@ -5,15 +5,43 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "body-parser" {
-    import * as express from "express";
 
+import * as express from "express";
+
+/**
+ * bodyParser: use individual json/urlencoded middlewares
+ * @deprecated
+ */
+
+declare function bodyParser(options?: {
     /**
-     * bodyParser: use individual json/urlencoded middlewares
-     * @deprecated
+     * if deflated bodies will be inflated. (default: true)
      */
+    inflate?: boolean;
+    /**
+     * maximum request body size. (default: '100kb')
+     */
+    limit?: any;
+    /**
+     * function to verify body content, the parsing can be aborted by throwing an error.
+     */
+    verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+    /**
+     * only parse objects and arrays. (default: true)
+     */
+    strict?: boolean;
+    /**
+     * passed to JSON.parse().
+     */
+    receiver?: (key: string, value: any) => any;
+    /**
+     * parse extended syntax with the qs module. (default: true)
+     */
+    extended?: boolean;
+}): express.RequestHandler;
 
-    function bodyParser(options?: {
+declare namespace bodyParser {
+    export function json(options?: {
         /**
          * if deflated bodies will be inflated. (default: true)
          */
@@ -22,6 +50,10 @@ declare module "body-parser" {
          * maximum request body size. (default: '100kb')
          */
         limit?: any;
+        /**
+         * request content-type to parse, passed directly to the type-is library. (default: 'json')
+         */
+        type?: any;
         /**
          * function to verify body content, the parsing can be aborted by throwing an error.
          */
@@ -34,105 +66,72 @@ declare module "body-parser" {
          * passed to JSON.parse().
          */
         receiver?: (key: string, value: any) => any;
-        /**
-         * parse extended syntax with the qs module. (default: true)
-         */
-        extended?: boolean;
     }): express.RequestHandler;
 
-    namespace bodyParser {
-        export function json(options?: {
-            /**
-             * if deflated bodies will be inflated. (default: true)
-             */
-            inflate?: boolean;
-            /**
-             * maximum request body size. (default: '100kb')
-             */
-            limit?: any;
-            /**
-             * request content-type to parse, passed directly to the type-is library. (default: 'json')
-             */
-            type?: any;
-            /**
-             * function to verify body content, the parsing can be aborted by throwing an error.
-             */
-            verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-            /**
-             * only parse objects and arrays. (default: true)
-             */
-            strict?: boolean;
-            /**
-             * passed to JSON.parse().
-             */
-            receiver?: (key: string, value: any) => any;
-        }): express.RequestHandler;
+    export function raw(options?: {
+        /**
+         * if deflated bodies will be inflated. (default: true)
+         */
+        inflate?: boolean;
+        /**
+         * maximum request body size. (default: '100kb')
+         */
+        limit?: any;
+        /**
+         * request content-type to parse, passed directly to the type-is library. (default: 'application/octet-stream')
+         */
+        type?: any;
+        /**
+         * function to verify body content, the parsing can be aborted by throwing an error.
+         */
+        verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+    }): express.RequestHandler;
 
-        export function raw(options?: {
-            /**
-             * if deflated bodies will be inflated. (default: true)
-             */
-            inflate?: boolean;
-            /**
-             * maximum request body size. (default: '100kb')
-             */
-            limit?: any;
-            /**
-             * request content-type to parse, passed directly to the type-is library. (default: 'application/octet-stream')
-             */
-            type?: any;
-            /**
-             * function to verify body content, the parsing can be aborted by throwing an error.
-             */
-            verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-        }): express.RequestHandler;
+    export function text(options?: {
+        /**
+         * if deflated bodies will be inflated. (default: true)
+         */
+        inflate?: boolean;
+        /**
+         * maximum request body size. (default: '100kb')
+         */
+        limit?: any;
+        /**
+         * request content-type to parse, passed directly to the type-is library. (default: 'text/plain')
+         */
+        type?: any;
+        /**
+         * function to verify body content, the parsing can be aborted by throwing an error.
+         */
+        verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+        /**
+         * the default charset to parse as, if not specified in content-type. (default: 'utf-8')
+         */
+        defaultCharset?: string;
+    }): express.RequestHandler;
 
-        export function text(options?: {
-            /**
-             * if deflated bodies will be inflated. (default: true)
-             */
-            inflate?: boolean;
-            /**
-             * maximum request body size. (default: '100kb')
-             */
-            limit?: any;
-            /**
-             * request content-type to parse, passed directly to the type-is library. (default: 'text/plain')
-             */
-            type?: any;
-            /**
-             * function to verify body content, the parsing can be aborted by throwing an error.
-             */
-            verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-            /**
-             * the default charset to parse as, if not specified in content-type. (default: 'utf-8')
-             */
-            defaultCharset?: string;
-        }): express.RequestHandler;
-
-        export function urlencoded(options: {
-            /**
-             * if deflated bodies will be inflated. (default: true)
-             */
-            inflate?: boolean;
-            /**
-             * maximum request body size. (default: '100kb')
-             */
-            limit?: any;
-            /**
-             * request content-type to parse, passed directly to the type-is library. (default: 'urlencoded')
-             */
-            type?: any;
-            /**
-             * function to verify body content, the parsing can be aborted by throwing an error.
-             */
-            verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
-            /**
-             * parse extended syntax with the qs module.
-             */
-            extended: boolean;
-        }): express.RequestHandler;
-    }
-
-    export = bodyParser;
+    export function urlencoded(options: {
+        /**
+         * if deflated bodies will be inflated. (default: true)
+         */
+        inflate?: boolean;
+        /**
+         * maximum request body size. (default: '100kb')
+         */
+        limit?: any;
+        /**
+         * request content-type to parse, passed directly to the type-is library. (default: 'urlencoded')
+         */
+        type?: any;
+        /**
+         * function to verify body content, the parsing can be aborted by throwing an error.
+         */
+        verify?: (req: express.Request, res: express.Response, buf: Buffer, encoding: string) => void;
+        /**
+         * parse extended syntax with the qs module.
+         */
+        extended: boolean;
+    }): express.RequestHandler;
 }
+
+export = bodyParser;
diff --git a/bookshelf/bookshelf.d.ts b/bookshelf/bookshelf.d.ts
index 74f5e83d4a..bb877c6745 100644
--- a/bookshelf/bookshelf.d.ts
+++ b/bookshelf/bookshelf.d.ts
@@ -7,308 +7,307 @@
 /// <reference path='../lodash/lodash-3.10.d.ts' />
 /// <reference path="../knex/knex.d.ts" />
 
-declare module 'bookshelf' {
-	import knex = require('knex');
-	import Promise = require('bluebird');
-	import Lodash = require('lodash');
 
-	interface Bookshelf extends Bookshelf.Events<any> {
-		VERSION : string;
-		knex : knex;
-		Model : typeof Bookshelf.Model;
-		Collection : typeof Bookshelf.Collection;
+import knex = require('knex');
+import Promise = require('bluebird');
+import Lodash = require('lodash');
 
-		plugin(name: string) : Bookshelf;
-		transaction<T>(callback : (transaction : knex.Transaction) => T) : Promise<T>;
-	}
+interface Bookshelf extends Bookshelf.Events<any> {
+    VERSION: string;
+    knex: knex;
+    Model: typeof Bookshelf.Model;
+    Collection: typeof Bookshelf.Collection;
 
-	function Bookshelf(knex : knex) : Bookshelf;
-
-	namespace Bookshelf {
-		abstract class Events<T> {
-			on(event? : string, callback? : EventFunction<T>, context? : any) : void;
-			off(event? : string) : void;
-			trigger(event? : string, ...args : any[]) : void;
-			triggerThen(name : string, ...args : any[]) : Promise<any>;
-			once(event : string, callback : EventFunction<T>, context? : any) : void;
-		}
-
-		interface IModelBase {
-			/** Should be declared as a getter instead of a plain property. */
-			hasTimestamps? : boolean|string[];
-			/** Should be declared as a getter instead of a plain property. Should be required, but cannot have abstract properties yet. */
-			tableName? : string;
-		}
-
-		abstract class ModelBase<T extends Model<any>> extends Events<T|Collection<T>> implements IModelBase {
-			/** If overriding, must use a getter instead of a plain property. */
-			idAttribute : string;
-
-			constructor(attributes? : any, options? : ModelOptions);
-
-			clear() : T;
-			clone() : T;
-			escape(attribute : string) : string;
-			format(attributes : any) : any;
-			get(attribute : string) : any;
-			has(attribute : string) : boolean;
-			hasChanged(attribute? : string) : boolean;
-			isNew() : boolean;
-			parse(response : any) : any;
-			previousAttributes() : any;
-			previous(attribute : string) : any;
-			related<R extends Model<any>>(relation : string) : R | Collection<R>;
-			serialize(options? : SerializeOptions) : any;
-			set(attribute?: {[key : string] : any}, options? : SetOptions) : T;
-			set(attribute : string, value? : any, options? : SetOptions) : T;
-			timestamp(options? : TimestampOptions) : any;
-			toJSON(options? : SerializeOptions) : any;
-			unset(attribute : string) : T;
-
-			// lodash methods
-			invert<R extends {}>() : R;
-			keys() : string[];
-			omit<R extends {}>(predicate? : Lodash.ObjectIterator<any, boolean>, thisArg? : any) : R;
-			omit<R extends {}>(...attributes : string[]) : R;
-			pairs() : any[][];
-			pick<R extends {}>(predicate? : Lodash.ObjectIterator<any, boolean>, thisArg? : any) : R;
-			pick<R extends {}>(...attributes : string[]) : R;
-			values() : any[];
-		}
-
-		class Model<T extends Model<any>> extends ModelBase<T> {
-			static collection<T extends Model<any>>(models? : T[], options? : CollectionOptions<T>) : Collection<T>;
-			static count(column? : string, options? : SyncOptions) : Promise<number>;
-			/** @deprecated use Typescript classes */
-			static extend<T extends Model<any>>(prototypeProperties? : any, classProperties? : any) : Function; // should return a type
-			static fetchAll<T extends Model<any>>() : Promise<Collection<T>>;
-			/** @deprecated should use `new` objects instead. */
-			static forge<T>(attributes? : any, options? : ModelOptions) : T;
-
-			belongsTo<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : R;
-			belongsToMany<R extends Model<any>>(target : {new(...args : any[]) : R}, table? : string, foreignKey? : string, otherKey? : string) : Collection<R>;
-			count(column? : string, options? : SyncOptions) : Promise<number>;
-			destroy(options? : SyncOptions) : Promise<T>;
-			fetch(options? : FetchOptions) : Promise<T>;
-			fetchAll(options? : FetchAllOptions) : Promise<Collection<T>>;
-			hasMany<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : Collection<R>;
-			hasOne<R extends Model<any>>(target : {new(...args : any[]) : R}, foreignKey? : string) : R;
-			load(relations : string|string[], options? : LoadOptions) : Promise<T>;
-			morphMany<R extends Model<any>>(target : {new(...args : any[]) : R}, name? : string, columnNames? : string[], morphValue? : string) : Collection<R>;
-			morphOne<R extends Model<any>>(target : {new(...args : any[]) : R}, name? : string, columnNames? : string[], morphValue? : string) : R;
-			morphTo(name : string, columnNames? : string[], ...target : typeof Model[]) : T;
-			morphTo(name : string, ...target : typeof Model[]) : T;
-			query(...query : string[]) : T;
-			query(query : {[key : string] : any}) : T;
-			query(callback : (qb : knex.QueryBuilder) => void) : T;
-			query() : knex.QueryBuilder;
-			refresh(options? : FetchOptions) : Promise<T>;
-			resetQuery() : T;
-			save(key? : string, val? : string, options? : SaveOptions) : Promise<T>;
-			save(attrs? : {[key : string] : any}, options? : SaveOptions) : Promise<T>;
-			through<R extends Model<any>>(interim : typeof Model, throughForeignKey? : string, otherKey? : string) : R | Collection<R>;
-			where(properties : {[key : string] : any}) : T;
-			where(key : string, operatorOrValue : string|number|boolean, valueIfOperator? : string|number|boolean) : T;
-		}
-
-		abstract class CollectionBase<T extends Model<any>> extends Events<T> {
-			add(models : T[]|{[key : string] : any}[], options? : CollectionAddOptions) : Collection<T>;
-			at(index : number) : T;
-			clone() : Collection<T>;
-			fetch(options? : CollectionFetchOptions) : Promise<Collection<T>>;
-			findWhere(match : {[key : string] : any}) : T;
-			get(id : any) : T;
-			invokeThen(name : string, ...args : any[]) : Promise<any>;
-			parse(response : any) : any;
-			pluck(attribute : string) : any[];
-			pop() : void;
-			push(model : any) : Collection<T>;
-			reduceThen<R>(iterator : (prev : R, cur : T, idx : number, array : T[]) => R, initialValue : R, context : any) : Promise<R>;
-			remove(model : T, options? : EventOptions) : T;
-			remove(model : T[], options? : EventOptions) : T[];
-			reset(model : any[], options? : CollectionAddOptions) : T[];
-			serialize(options? : SerializeOptions) : any;
-			set(models : T[]|{[key : string] : any}[], options? : CollectionSetOptions) : Collection<T>;
-			shift(options? : EventOptions) : void;
-			slice(begin? : number, end? : number) : void;
-			toJSON(options? : SerializeOptions) : any;
-			unshift(model : any, options? : CollectionAddOptions) : void;
-			where(match : {[key : string] : any}, firstOnly : boolean) : T|Collection<T>;
-
-			// lodash methods
-			all(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
-			all<R extends {}>(predicate? : R) : boolean;
-			any(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
-			any<R extends {}>(predicate? : R) : boolean;
-			chain() : Lodash.LoDashExplicitObjectWrapper<T>;
-			collect(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			collect<R extends {}>(predicate? : R) : T[];
-			contains(value : any, fromIndex? : number) : boolean;
-			countBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : Lodash.Dictionary<number>;
-			countBy<R extends {}>(predicate? : R) : Lodash.Dictionary<number>;
-			detect(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T;
-			detect<R extends {}>(predicate? : R) : T;
-			difference(...values : T[]) : T[];
-			drop(n? : number) : T[];
-			each(callback? : Lodash.ListIterator<T, void>, thisArg? : any) : Lodash.List<T>;
-			each(callback? : Lodash.DictionaryIterator<T, void>, thisArg? : any) : Lodash.Dictionary<T>;
-			each(callback? : Lodash.ObjectIterator<T, void>, thisArg? : any) : T;
-			every(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
-			every<R extends {}>(predicate? : R) : boolean;
-			filter(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			filter<R extends {}>(predicate? : R) : T[];
-			find(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T;
-			find<R extends {}>(predicate? : R) : T;
-			first() : T;
-			foldl<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			foldr<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			forEach(callback? : Lodash.ListIterator<T, void>, thisArg? : any) : Lodash.List<T>;
-			forEach(callback? : Lodash.DictionaryIterator<T, void>, thisArg? : any) : Lodash.Dictionary<T>;
-			forEach(callback? : Lodash.ObjectIterator<T, void>, thisArg? : any) : T;
-			groupBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : Lodash.Dictionary<T[]>;
-			groupBy<R extends {}>(predicate? : R) : Lodash.Dictionary<T[]>;
-			head() : T;
-			include(value : any, fromIndex? : number) : boolean;
-			indexOf(value : any, fromIndex? : number) : number;
-			initial() : T[];
-			inject<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			invoke(methodName : string|Function, ...args : any[]) : any;
-			isEmpty() : boolean;
-			keys() : string[];
-			last() : T;
-			lastIndexOf(value : any, fromIndex? : number) : number;
-			map(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			map<R extends {}>(predicate? : R) : T[];
-			max(predicate? : Lodash.ListIterator<T, boolean>|string, thisArg? : any) : T;
-			max<R extends {}>(predicate? : R) : T;
-			min(predicate? : Lodash.ListIterator<T, boolean>|string, thisArg? : any) : T;
-			min<R extends {}>(predicate? : R) : T;
-			reduce<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			reduceRight<R>(callback? : Lodash.MemoIterator<T, R>, accumulator? : R, thisArg? : any) : R;
-			reject(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			reject<R extends {}>(predicate? : R) : T[];
-			rest() : T[];
-			select(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			select<R extends {}>(predicate? : R) : T[];
-			shuffle() : T[];
-			size() : number;
-			some(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : boolean;
-			some<R extends {}>(predicate? : R) : boolean;
-			sortBy(predicate? : Lodash.ListIterator<T, boolean>|Lodash.DictionaryIterator<T, boolean>|string, thisArg? : any) : T[];
-			sortBy<R extends {}>(predicate? : R) : T[];
-			tail() : T[];
-			take(n? : number) : T[];
-			toArray() : T[];
-			without(...values : any[]) : T[];
-		}
-
-		class Collection<T extends Model<any>> extends CollectionBase<T> {
-			/** @deprecated use Typescript classes */
-			static extend<T>(prototypeProperties? : any, classProperties? : any) : Function;
-			/** @deprecated should use `new` objects instead. */
-			static forge<T>(attributes? : any, options? : ModelOptions) : T;
-
-			attach(ids : any[], options? : SyncOptions) : Promise<Collection<T>>;
-			count(column? : string, options? : SyncOptions) : Promise<number>;
-			create(model : {[key : string] : any}, options? : CollectionCreateOptions) : Promise<T>;
-			detach(ids : any[], options? : SyncOptions) : Promise<any>;
-			fetchOne(options? : CollectionFetchOneOptions) : Promise<T>;
-			load(relations : string|string[], options? : SyncOptions) : Promise<Collection<T>>;
-			query(...query : string[]) : Collection<T>;
-			query(query : {[key : string] : any}) : Collection<T>;
-			query(callback : (qb : knex.QueryBuilder) => void) : Collection<T>;
-			query() : knex.QueryBuilder;
-			resetQuery() : Collection<T>;
-			through<R extends Model<any>>(interim : typeof Model, throughForeignKey? : string, otherKey? : string) : R | Collection<R>;
-			updatePivot(attributes : any, options? : PivotOptions) : Promise<number>;
-			withPivot(columns : string[]) : Collection<T>;
-		}
-
-		interface ModelOptions {
-			tableName? : string;
-			hasTimestamps? : boolean;
-			parse? : boolean;
-		}
-
-		interface LoadOptions extends SyncOptions {
-			withRelated: string|any|any[];
-		}
-
-		interface FetchOptions extends SyncOptions {
-			require? : boolean;
-			columns? : string|string[];
-			withRelated? : string|any|any[];
-		}
-
-		interface FetchAllOptions extends SyncOptions {
-			require? : boolean;
-		}
-
-		interface SaveOptions extends SyncOptions {
-			method? : string;
-			defaults? : string;
-			patch? : boolean;
-			require? : boolean;
-		}
-
-		interface SerializeOptions {
-			shallow? : boolean;
-			omitPivot? : boolean;
-		}
-
-		interface SetOptions {
-			unset? : boolean;
-		}
-
-		interface TimestampOptions {
-			method? : string;
-		}
-
-		interface SyncOptions {
-			transacting? : knex.Transaction;
-			debug? : boolean;
-		}
-
-		interface CollectionOptions<T> {
-			comparator? : boolean|string|((a : T, b : T) => number);
-		}
-
-		interface CollectionAddOptions extends EventOptions {
-			at? : number;
-			merge? : boolean;
-		}
-
-		interface CollectionFetchOptions {
-			require? : boolean;
-			withRelated? : string|string[];
-		}
-
-		interface CollectionFetchOneOptions {
-			require? : boolean;
-			columns? : string|string[];
-		}
-
-		interface CollectionSetOptions extends EventOptions {
-			add? : boolean;
-			remove? : boolean;
-			merge?: boolean;
-		}
-
-		interface PivotOptions {
-			query? : Function|any;
-			require? : boolean;
-		}
-
-		interface EventOptions {
-			silent? : boolean;
-		}
-
-		interface EventFunction<T> {
-			(model: T, attrs: any, options: any) : Promise<any>|void;
-		}
-
-		interface CollectionCreateOptions extends ModelOptions, SyncOptions, CollectionAddOptions, SaveOptions {}
-	}
-
-	export = Bookshelf;
+    plugin(name: string): Bookshelf;
+    transaction<T>(callback: (transaction: knex.Transaction) => T): Promise<T>;
 }
+
+declare function Bookshelf(knex: knex): Bookshelf;
+
+declare namespace Bookshelf {
+    abstract class Events<T> {
+        on(event?: string, callback?: EventFunction<T>, context?: any): void;
+        off(event?: string): void;
+        trigger(event?: string, ...args: any[]): void;
+        triggerThen(name: string, ...args: any[]): Promise<any>;
+        once(event: string, callback: EventFunction<T>, context?: any): void;
+    }
+
+    interface IModelBase {
+        /** Should be declared as a getter instead of a plain property. */
+        hasTimestamps?: boolean | string[];
+        /** Should be declared as a getter instead of a plain property. Should be required, but cannot have abstract properties yet. */
+        tableName?: string;
+    }
+
+    abstract class ModelBase<T extends Model<any>> extends Events<T | Collection<T>> implements IModelBase {
+        /** If overriding, must use a getter instead of a plain property. */
+        idAttribute: string;
+
+        constructor(attributes?: any, options?: ModelOptions);
+
+        clear(): T;
+        clone(): T;
+        escape(attribute: string): string;
+        format(attributes: any): any;
+        get(attribute: string): any;
+        has(attribute: string): boolean;
+        hasChanged(attribute?: string): boolean;
+        isNew(): boolean;
+        parse(response: any): any;
+        previousAttributes(): any;
+        previous(attribute: string): any;
+        related<R extends Model<any>>(relation: string): R | Collection<R>;
+        serialize(options?: SerializeOptions): any;
+        set(attribute?: { [key: string]: any }, options?: SetOptions): T;
+        set(attribute: string, value?: any, options?: SetOptions): T;
+        timestamp(options?: TimestampOptions): any;
+        toJSON(options?: SerializeOptions): any;
+        unset(attribute: string): T;
+
+        // lodash methods
+        invert<R extends {}>(): R;
+        keys(): string[];
+        omit<R extends {}>(predicate?: Lodash.ObjectIterator<any, boolean>, thisArg?: any): R;
+        omit<R extends {}>(...attributes: string[]): R;
+        pairs(): any[][];
+        pick<R extends {}>(predicate?: Lodash.ObjectIterator<any, boolean>, thisArg?: any): R;
+        pick<R extends {}>(...attributes: string[]): R;
+        values(): any[];
+    }
+
+    class Model<T extends Model<any>> extends ModelBase<T> {
+        static collection<T extends Model<any>>(models?: T[], options?: CollectionOptions<T>): Collection<T>;
+        static count(column?: string, options?: SyncOptions): Promise<number>;
+        /** @deprecated use Typescript classes */
+        static extend<T extends Model<any>>(prototypeProperties?: any, classProperties?: any): Function; // should return a type
+        static fetchAll<T extends Model<any>>(): Promise<Collection<T>>;
+        /** @deprecated should use `new` objects instead. */
+        static forge<T>(attributes?: any, options?: ModelOptions): T;
+
+        belongsTo<R extends Model<any>>(target: { new (...args: any[]): R }, foreignKey?: string): R;
+        belongsToMany<R extends Model<any>>(target: { new (...args: any[]): R }, table?: string, foreignKey?: string, otherKey?: string): Collection<R>;
+        count(column?: string, options?: SyncOptions): Promise<number>;
+        destroy(options?: SyncOptions): Promise<T>;
+        fetch(options?: FetchOptions): Promise<T>;
+        fetchAll(options?: FetchAllOptions): Promise<Collection<T>>;
+        hasMany<R extends Model<any>>(target: { new (...args: any[]): R }, foreignKey?: string): Collection<R>;
+        hasOne<R extends Model<any>>(target: { new (...args: any[]): R }, foreignKey?: string): R;
+        load(relations: string | string[], options?: LoadOptions): Promise<T>;
+        morphMany<R extends Model<any>>(target: { new (...args: any[]): R }, name?: string, columnNames?: string[], morphValue?: string): Collection<R>;
+        morphOne<R extends Model<any>>(target: { new (...args: any[]): R }, name?: string, columnNames?: string[], morphValue?: string): R;
+        morphTo(name: string, columnNames?: string[], ...target: typeof Model[]): T;
+        morphTo(name: string, ...target: typeof Model[]): T;
+        query(...query: string[]): T;
+        query(query: { [key: string]: any }): T;
+        query(callback: (qb: knex.QueryBuilder) => void): T;
+        query(): knex.QueryBuilder;
+        refresh(options?: FetchOptions): Promise<T>;
+        resetQuery(): T;
+        save(key?: string, val?: string, options?: SaveOptions): Promise<T>;
+        save(attrs?: { [key: string]: any }, options?: SaveOptions): Promise<T>;
+        through<R extends Model<any>>(interim: typeof Model, throughForeignKey?: string, otherKey?: string): R | Collection<R>;
+        where(properties: { [key: string]: any }): T;
+        where(key: string, operatorOrValue: string | number | boolean, valueIfOperator?: string | number | boolean): T;
+    }
+
+    abstract class CollectionBase<T extends Model<any>> extends Events<T> {
+        add(models: T[] | { [key: string]: any }[], options?: CollectionAddOptions): Collection<T>;
+        at(index: number): T;
+        clone(): Collection<T>;
+        fetch(options?: CollectionFetchOptions): Promise<Collection<T>>;
+        findWhere(match: { [key: string]: any }): T;
+        get(id: any): T;
+        invokeThen(name: string, ...args: any[]): Promise<any>;
+        parse(response: any): any;
+        pluck(attribute: string): any[];
+        pop(): void;
+        push(model: any): Collection<T>;
+        reduceThen<R>(iterator: (prev: R, cur: T, idx: number, array: T[]) => R, initialValue: R, context: any): Promise<R>;
+        remove(model: T, options?: EventOptions): T;
+        remove(model: T[], options?: EventOptions): T[];
+        reset(model: any[], options?: CollectionAddOptions): T[];
+        serialize(options?: SerializeOptions): any;
+        set(models: T[] | { [key: string]: any }[], options?: CollectionSetOptions): Collection<T>;
+        shift(options?: EventOptions): void;
+        slice(begin?: number, end?: number): void;
+        toJSON(options?: SerializeOptions): any;
+        unshift(model: any, options?: CollectionAddOptions): void;
+        where(match: { [key: string]: any }, firstOnly: boolean): T | Collection<T>;
+
+        // lodash methods
+        all(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): boolean;
+        all<R extends {}>(predicate?: R): boolean;
+        any(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): boolean;
+        any<R extends {}>(predicate?: R): boolean;
+        chain(): Lodash.LoDashExplicitObjectWrapper<T>;
+        collect(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): T[];
+        collect<R extends {}>(predicate?: R): T[];
+        contains(value: any, fromIndex?: number): boolean;
+        countBy(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): Lodash.Dictionary<number>;
+        countBy<R extends {}>(predicate?: R): Lodash.Dictionary<number>;
+        detect(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): T;
+        detect<R extends {}>(predicate?: R): T;
+        difference(...values: T[]): T[];
+        drop(n?: number): T[];
+        each(callback?: Lodash.ListIterator<T, void>, thisArg?: any): Lodash.List<T>;
+        each(callback?: Lodash.DictionaryIterator<T, void>, thisArg?: any): Lodash.Dictionary<T>;
+        each(callback?: Lodash.ObjectIterator<T, void>, thisArg?: any): T;
+        every(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): boolean;
+        every<R extends {}>(predicate?: R): boolean;
+        filter(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): T[];
+        filter<R extends {}>(predicate?: R): T[];
+        find(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): T;
+        find<R extends {}>(predicate?: R): T;
+        first(): T;
+        foldl<R>(callback?: Lodash.MemoIterator<T, R>, accumulator?: R, thisArg?: any): R;
+        foldr<R>(callback?: Lodash.MemoIterator<T, R>, accumulator?: R, thisArg?: any): R;
+        forEach(callback?: Lodash.ListIterator<T, void>, thisArg?: any): Lodash.List<T>;
+        forEach(callback?: Lodash.DictionaryIterator<T, void>, thisArg?: any): Lodash.Dictionary<T>;
+        forEach(callback?: Lodash.ObjectIterator<T, void>, thisArg?: any): T;
+        groupBy(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): Lodash.Dictionary<T[]>;
+        groupBy<R extends {}>(predicate?: R): Lodash.Dictionary<T[]>;
+        head(): T;
+        include(value: any, fromIndex?: number): boolean;
+        indexOf(value: any, fromIndex?: number): number;
+        initial(): T[];
+        inject<R>(callback?: Lodash.MemoIterator<T, R>, accumulator?: R, thisArg?: any): R;
+        invoke(methodName: string | Function, ...args: any[]): any;
+        isEmpty(): boolean;
+        keys(): string[];
+        last(): T;
+        lastIndexOf(value: any, fromIndex?: number): number;
+        map(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): T[];
+        map<R extends {}>(predicate?: R): T[];
+        max(predicate?: Lodash.ListIterator<T, boolean> | string, thisArg?: any): T;
+        max<R extends {}>(predicate?: R): T;
+        min(predicate?: Lodash.ListIterator<T, boolean> | string, thisArg?: any): T;
+        min<R extends {}>(predicate?: R): T;
+        reduce<R>(callback?: Lodash.MemoIterator<T, R>, accumulator?: R, thisArg?: any): R;
+        reduceRight<R>(callback?: Lodash.MemoIterator<T, R>, accumulator?: R, thisArg?: any): R;
+        reject(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): T[];
+        reject<R extends {}>(predicate?: R): T[];
+        rest(): T[];
+        select(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): T[];
+        select<R extends {}>(predicate?: R): T[];
+        shuffle(): T[];
+        size(): number;
+        some(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): boolean;
+        some<R extends {}>(predicate?: R): boolean;
+        sortBy(predicate?: Lodash.ListIterator<T, boolean> | Lodash.DictionaryIterator<T, boolean> | string, thisArg?: any): T[];
+        sortBy<R extends {}>(predicate?: R): T[];
+        tail(): T[];
+        take(n?: number): T[];
+        toArray(): T[];
+        without(...values: any[]): T[];
+    }
+
+    class Collection<T extends Model<any>> extends CollectionBase<T> {
+        /** @deprecated use Typescript classes */
+        static extend<T>(prototypeProperties?: any, classProperties?: any): Function;
+        /** @deprecated should use `new` objects instead. */
+        static forge<T>(attributes?: any, options?: ModelOptions): T;
+
+        attach(ids: any[], options?: SyncOptions): Promise<Collection<T>>;
+        count(column?: string, options?: SyncOptions): Promise<number>;
+        create(model: { [key: string]: any }, options?: CollectionCreateOptions): Promise<T>;
+        detach(ids: any[], options?: SyncOptions): Promise<any>;
+        fetchOne(options?: CollectionFetchOneOptions): Promise<T>;
+        load(relations: string | string[], options?: SyncOptions): Promise<Collection<T>>;
+        query(...query: string[]): Collection<T>;
+        query(query: { [key: string]: any }): Collection<T>;
+        query(callback: (qb: knex.QueryBuilder) => void): Collection<T>;
+        query(): knex.QueryBuilder;
+        resetQuery(): Collection<T>;
+        through<R extends Model<any>>(interim: typeof Model, throughForeignKey?: string, otherKey?: string): R | Collection<R>;
+        updatePivot(attributes: any, options?: PivotOptions): Promise<number>;
+        withPivot(columns: string[]): Collection<T>;
+    }
+
+    interface ModelOptions {
+        tableName?: string;
+        hasTimestamps?: boolean;
+        parse?: boolean;
+    }
+
+    interface LoadOptions extends SyncOptions {
+        withRelated: string | any | any[];
+    }
+
+    interface FetchOptions extends SyncOptions {
+        require?: boolean;
+        columns?: string | string[];
+        withRelated?: string | any | any[];
+    }
+
+    interface FetchAllOptions extends SyncOptions {
+        require?: boolean;
+    }
+
+    interface SaveOptions extends SyncOptions {
+        method?: string;
+        defaults?: string;
+        patch?: boolean;
+        require?: boolean;
+    }
+
+    interface SerializeOptions {
+        shallow?: boolean;
+        omitPivot?: boolean;
+    }
+
+    interface SetOptions {
+        unset?: boolean;
+    }
+
+    interface TimestampOptions {
+        method?: string;
+    }
+
+    interface SyncOptions {
+        transacting?: knex.Transaction;
+        debug?: boolean;
+    }
+
+    interface CollectionOptions<T> {
+        comparator?: boolean | string | ((a: T, b: T) => number);
+    }
+
+    interface CollectionAddOptions extends EventOptions {
+        at?: number;
+        merge?: boolean;
+    }
+
+    interface CollectionFetchOptions {
+        require?: boolean;
+        withRelated?: string | string[];
+    }
+
+    interface CollectionFetchOneOptions {
+        require?: boolean;
+        columns?: string | string[];
+    }
+
+    interface CollectionSetOptions extends EventOptions {
+        add?: boolean;
+        remove?: boolean;
+        merge?: boolean;
+    }
+
+    interface PivotOptions {
+        query?: Function | any;
+        require?: boolean;
+    }
+
+    interface EventOptions {
+        silent?: boolean;
+    }
+
+    interface EventFunction<T> {
+        (model: T, attrs: any, options: any): Promise<any> | void;
+    }
+
+    interface CollectionCreateOptions extends ModelOptions, SyncOptions, CollectionAddOptions, SaveOptions { }
+}
+
+export = Bookshelf;
diff --git a/boolify-string/boolify-string.d.ts b/boolify-string/boolify-string.d.ts
index d4ab286a5e..8d405fe032 100644
--- a/boolify-string/boolify-string.d.ts
+++ b/boolify-string/boolify-string.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/sanemat/node-boolify-string
 // Definitions by: Tobias Henöckl <http://www.sisyphus.de/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "boolify-string" {
-  function boolifyString(obj: any): boolean;
-  export = boolifyString;
-}
+
+declare function boolifyString(obj: any): boolean;
+export = boolifyString;
diff --git a/bounce.js/bounce.d.ts b/bounce.js/bounce.d.ts
index 54fe897638..3e02bfe0e6 100644
--- a/bounce.js/bounce.d.ts
+++ b/bounce.js/bounce.d.ts
@@ -5,62 +5,61 @@
 
 /// <reference path="../jquery/jquery.d.ts"/>
 
-declare module 'bounce.js' {
-    export default Bounce
 
-    interface Point2D {
-        x: number
-        y: number
-    }
+export default Bounce
 
-    interface BounceOptions<T> {
-        from: T
-        to: T
-        duration?: number
-        delay?: number
-        easing?: string
-        bounces?: number
-        stiffness?: number
-    }
-
-    interface AnimationOptions {
-        loop?: boolean
-        remove?: boolean
-        onComplete?: () => void
-    }
-
-    interface SerailizedComponent<T> {
-        type: string
-        from: T
-        to: T
-        duration: number
-        delay: number
-        easing: string
-        bounces: number
-        stiffness: number
-    }
-
-    class Bounce {
-        static FPS: number
-        static counter: number
-
-        static isSupported(): boolean
-
-        constructor();
-
-        scale(options: BounceOptions<Point2D>): Bounce
-        rotate(options: BounceOptions<number>): Bounce
-        translate(options: BounceOptions<Point2D>): Bounce
-        skew(options: BounceOptions<Point2D>): Bounce
-
-        serialize(): SerailizedComponent<number|Point2D>[]
-        deserialize(serailized: SerailizedComponent<number|Point2D>[]): Bounce
-
-        applyTo(element: Element, options?: AnimationOptions): void
-        applyTo(elements: Element[], options?: AnimationOptions): void
-        applyTo(elements: JQuery, options?: AnimationOptions): JQueryPromise<void>
-
-        define(name: string): Bounce
-        remove(): void
-    }
+interface Point2D {
+    x: number
+    y: number
+}
+
+interface BounceOptions<T> {
+    from: T
+    to: T
+    duration?: number
+    delay?: number
+    easing?: string
+    bounces?: number
+    stiffness?: number
+}
+
+interface AnimationOptions {
+    loop?: boolean
+    remove?: boolean
+    onComplete?: () => void
+}
+
+interface SerailizedComponent<T> {
+    type: string
+    from: T
+    to: T
+    duration: number
+    delay: number
+    easing: string
+    bounces: number
+    stiffness: number
+}
+
+declare class Bounce {
+    static FPS: number
+    static counter: number
+
+    static isSupported(): boolean
+
+    constructor();
+
+    scale(options: BounceOptions<Point2D>): Bounce
+    rotate(options: BounceOptions<number>): Bounce
+    translate(options: BounceOptions<Point2D>): Bounce
+    skew(options: BounceOptions<Point2D>): Bounce
+
+    serialize(): SerailizedComponent<number | Point2D>[]
+    deserialize(serailized: SerailizedComponent<number | Point2D>[]): Bounce
+
+    applyTo(element: Element, options?: AnimationOptions): void
+    applyTo(elements: Element[], options?: AnimationOptions): void
+    applyTo(elements: JQuery, options?: AnimationOptions): JQueryPromise<void>
+
+    define(name: string): Bounce
+    remove(): void
 }
diff --git a/brorand/brorand.d.ts b/brorand/brorand.d.ts
index efef9baa3f..f86618c63a 100644
--- a/brorand/brorand.d.ts
+++ b/brorand/brorand.d.ts
@@ -5,26 +5,25 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "brorand" {
-	type rand = {getByte: () => number};
 
-	interface RandStatic {
-		new (rand: rand): RandInstance;
-	}
+type rand = { getByte: () => number };
 
-	interface RandInstance {
-		rand: rand;
-		generate(len: number): Buffer|Uint8Array;
-	}
-
-	interface BrorandStatic {
-		(len: number): Buffer|Uint8Array;
-		Rand: RandStatic;
-	}
-
-	namespace Brorand {}
-
-	let Brorand: BrorandStatic;
-
-	export = Brorand;
+interface RandStatic {
+    new (rand: rand): RandInstance;
 }
+
+interface RandInstance {
+    rand: rand;
+    generate(len: number): Buffer | Uint8Array;
+}
+
+interface BrorandStatic {
+    (len: number): Buffer | Uint8Array;
+    Rand: RandStatic;
+}
+
+declare namespace Brorand { }
+
+declare let Brorand: BrorandStatic;
+
+export = Brorand;
diff --git a/browser-harness/browser-harness.d.ts b/browser-harness/browser-harness.d.ts
index c57311b1f8..d9c6116d71 100644
--- a/browser-harness/browser-harness.d.ts
+++ b/browser-harness/browser-harness.d.ts
@@ -5,129 +5,128 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "browser-harness" {
-    import _events = require('events');
 
-    interface HarnessEvents extends _events.EventEmitter {
-        once(event: string, listener: (driver: Driver) => void): this;
-        once(event: 'ready', listener: (driver: Driver) => void): this;
+import _events = require('events');
 
-        on(event: string, listener: (driver: Driver) => void): this;
-        on(event: 'ready', listener: (driver: Driver) => void): this;
-    }
+interface HarnessEvents extends _events.EventEmitter {
+    once(event: string, listener: (driver: Driver) => void): this;
+    once(event: 'ready', listener: (driver: Driver) => void): this;
 
-    interface DriverEvents extends _events.EventEmitter {
-        once(event: string, listener: (text: string) => void): this;
-        once(event: 'console.log', listener: (text: string) => void): this;
-        once(event: 'console.warn', listener: (text: string) => void): this;
-        once(event: 'console.error', listener: (text: string) => void): this;
-        once(event: 'window.onerror', listener: (text: string) => void): this;
-
-        on(event: string, listener: (text: string) => void): this;
-        on(event: 'console.log', listener: (text: string) => void): this;
-        on(event: 'console.warn', listener: (text: string) => void): this;
-        on(event: 'console.error', listener: (text: string) => void): this;
-        on(event: 'window.onerror', listener: (text: string) => void): this;
-    }
-
-    export interface Driver {
-        exec(args: { func: Function; args?: any[]}, callback?: Function) : any;
-        exec(func: Function, callback?: Function) : any;
-
-        setUrl(url: string, callback?: Function);
-
-        waitFor(args: { condition: Function; exec?: Function; timeoutMS?: number }, callback?: Function);
-        waitFor(condition: Function, callback?: Function);
-
-        findElement(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy;
-        findElements(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
-
-        findVisible(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy;
-        findVisibles(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
-        find(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
-
-        events: DriverEvents;
-    }
-
-    export interface ElementProxy {
-        click(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        focus(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        blur(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        val(value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        attr(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        removeAttr(name: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        prop(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        removeProp(name: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        html(value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        text(value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        hasClass(className: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        addClass(className: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        removeClass(className: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        toggleClass(className: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        trigger(event: string, extraParameters?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        triggerHandler(event: string, extraParameters?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        css(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        height(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        innerHeight(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        outerHeight(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        width(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        innerWidth(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        outerWidth(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        offset(value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        position(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        scrollLeft(value?: number, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        scrollTop(value?: number, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        hide(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        show(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        toggle(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        children(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        closest(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        contents(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        find(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        findElements(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        findElement(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        findVisible(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        findVisibles(selector: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        isActionable(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        first(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        has(arg: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        is(arg: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        last(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        next(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        nextAll(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        nextUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        offsetParent(callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        parent(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        parents(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        parentsUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        prev(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        prevAll(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        prevUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        siblings(selector?: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-
-        data(name: string, value?: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-        removeData(name: string, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-
-        filter(selector: any, callback?: (err: Error, element: ElementProxy) => void) : ElementProxy
-    }
-
-    export class Browser {
-        //constructor(args: { type: string; location?: string; args?: string[] });
-        constructor(args: { type: string; location?: string; args?: any; });
-
-        open(harnessUrl: string, serverUrl?: string);
-        close();
-    }
-
-    export function listen(port: number, callback?: Function)
-    export var events: HarnessEvents;
-    export var config: {
-        timeoutMS: number;
-        retryMS: number;
-    };
+    on(event: string, listener: (driver: Driver) => void): this;
+    on(event: 'ready', listener: (driver: Driver) => void): this;
 }
+
+interface DriverEvents extends _events.EventEmitter {
+    once(event: string, listener: (text: string) => void): this;
+    once(event: 'console.log', listener: (text: string) => void): this;
+    once(event: 'console.warn', listener: (text: string) => void): this;
+    once(event: 'console.error', listener: (text: string) => void): this;
+    once(event: 'window.onerror', listener: (text: string) => void): this;
+
+    on(event: string, listener: (text: string) => void): this;
+    on(event: 'console.log', listener: (text: string) => void): this;
+    on(event: 'console.warn', listener: (text: string) => void): this;
+    on(event: 'console.error', listener: (text: string) => void): this;
+    on(event: 'window.onerror', listener: (text: string) => void): this;
+}
+
+export interface Driver {
+    exec(args: { func: Function; args?: any[] }, callback?: Function): any;
+    exec(func: Function, callback?: Function): any;
+
+    setUrl(url: string, callback?: Function);
+
+    waitFor(args: { condition: Function; exec?: Function; timeoutMS?: number }, callback?: Function);
+    waitFor(condition: Function, callback?: Function);
+
+    findElement(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy;
+    findElements(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
+
+    findVisible(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy;
+    findVisibles(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
+    find(selector: string, callback?: (err: Error, elements: ElementProxy) => void): ElementProxy;
+
+    events: DriverEvents;
+}
+
+export interface ElementProxy {
+    click(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    focus(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    blur(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    val(value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    attr(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    removeAttr(name: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    prop(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    removeProp(name: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    html(value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    text(value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    hasClass(className: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    addClass(className: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    removeClass(className: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    toggleClass(className: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    trigger(event: string, extraParameters?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    triggerHandler(event: string, extraParameters?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    css(name: string, value?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    height(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    innerHeight(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    outerHeight(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    width(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    innerWidth(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    outerWidth(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    offset(value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    position(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    scrollLeft(value?: number, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    scrollTop(value?: number, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    hide(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    show(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    toggle(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    children(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    closest(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    contents(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    find(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    findElements(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    findElement(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    findVisible(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    findVisibles(selector: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    isActionable(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    first(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    has(arg: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    is(arg: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    last(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    next(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    nextAll(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    nextUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    offsetParent(callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    parent(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    parents(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    parentsUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    prev(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    prevAll(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    prevUntil(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    siblings(selector?: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+
+    data(name: string, value?: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+    removeData(name: string, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+
+    filter(selector: any, callback?: (err: Error, element: ElementProxy) => void): ElementProxy
+}
+
+declare export class Browser {
+    //constructor(args: { type: string; location?: string; args?: string[] });
+    constructor(args: { type: string; location?: string; args?: any; });
+
+    open(harnessUrl: string, serverUrl?: string);
+    close();
+}
+
+declare export function listen(port: number, callback?: Function)
+declare export var events: HarnessEvents;
+declare export var config: {
+    timeoutMS: number;
+    retryMS: number;
+};
diff --git a/browser-sync/browser-sync.d.ts b/browser-sync/browser-sync.d.ts
index 3bc083d1f1..a6740d6d93 100644
--- a/browser-sync/browser-sync.d.ts
+++ b/browser-sync/browser-sync.d.ts
@@ -7,416 +7,415 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../micromatch/micromatch.d.ts" />
 
-declare module "browser-sync" {
-    import chokidar = require("chokidar");
-    import fs = require("fs");
-    import http = require("http");
-    import mm = require("micromatch");
 
-    namespace browserSync {
-        interface Options {
-            /**
-             * Browsersync includes a user-interface that is accessed via a separate port. The UI allows to controls
-             * all devices, push sync updates and much more.
-             *
-             * port - Default: 3001
-             * weinre.port - Default: 8080
-             * Note: requires at least version 2.0.0
-             */
-            ui?: UIOptions;
-            /**
-             * Browsersync can watch your files as you work. Changes you make will either be injected into the page (CSS
-             * & images) or will cause all browsers to do a full-page refresh. See anymatch for more information on glob
-             * patterns.
-             * Default: false
-             */
-            files?: string | string[];
-            /**
-             * File watching options that get passed along to Chokidar. Check their docs for available options
-             * Default: undefined
-             * Note: requires at least version 2.6.0
-             */
-            watchOptions?: chokidar.WatchOptions;
-            /**
-             * Use the built-in static server for basic HTML/JS/CSS websites.
-             * Default: false
-             */
-            server?: ServerOptions;
-            /**
-             * Proxy an EXISTING vhost. Browsersync will wrap your vhost with a proxy URL to view your site.
-             * target - Default: undefined
-             * ws - Default: undefined
-             * middleware - Default: undefined
-             * reqHeaders - Default: undefined
-             * proxyRes - Default: undefined
-             */
-            proxy?: string | boolean | ProxyOptions;
-            /**
-             * Use a specific port (instead of the one auto-detected by Browsersync)
-             * Default: 3000
-             */
-            port?: number;
-            /**
-             * Add additional directories from which static files should be served.
-             * Should only be used in proxy or snippet mode.
-             * Default: []
-             * Note: requires at least version 2.8.0
-             */
-            serveStatic?: string[];
-            /**
-             * Enable https for localhost development.
-             * Note - this is not needed for proxy option as it will be inferred from your target url.
-             * Note: requires at least version 1.3.0
-             */
-            https?: boolean;
-            /**
-             * Clicks, Scrolls & Form inputs on any device will be mirrored to all others.
-             * clicks - Default: true
-             * scroll - Default: true
-             * forms - Default: true
-             */
-            ghostMode?: GhostOptions | boolean;
-            /**
-             * Can be either "info", "debug", "warn", or "silent"
-             * Default: info
-             */
-            logLevel?: string;
-            /**
-             * Change the console logging prefix. Useful if you're creating your own project based on Browsersync
-             * Default: BS
-             * Note: requires at least version 1.5.1
-             */
-            logPrefix?: string;
-            /**
-             * Whether or not to log connections
-             * Default: false
-             */
-            logConnections?: boolean;
-            /**
-             * Whether or not to log information about changed files
-             * Default: false
-             */
-            logFileChanges?: boolean;
-            /**
-             * Log the snippet to the console when you're in snippet mode (no proxy/server)
-             * Default: true
-             * Note: requires at least version 1.5.2
-             */
-            logSnippet?: boolean;
-            /**
-             * You can control how the snippet is injected onto each page via a custom regex + function.
-             * You can also provide patterns for certain urls that should be ignored from the snippet injection.
-             * Note: requires at least version 2.0.0
-             */
-            snippetOptions?: SnippetOptions;
-            /**
-             * Add additional HTML rewriting rules.
-             * Default: false
-             * Note: requires at least version 2.4.0
-             */
-            rewriteRules?: boolean | RewriteRules[];
-            /**
-             * Tunnel the Browsersync server through a random Public URL
-             * Default: null
-             */
-            tunnel?: string | boolean;
-            /**
-             * Some features of Browsersync (such as xip & tunnel) require an internet connection, but if you're
-             * working offline, you can reduce start-up time by setting this option to false
-             */
-            online?: boolean;
-            /**
-             * Default: true
-             * Decide which URL to open automatically when Browsersync starts. Defaults to "local" if none set.
-             * Can be true, local, external, ui, ui-external, tunnel or false
-             */
-            open?: string | boolean;
-            /**
-             * The browser(s) to open
-             * Default: default
-             */
-            browser?: string | string[];
-            /**
-             * Requires an internet connection - useful for services such as Typekit as it allows you to configure
-             * domains such as *.xip.io in your kit settings
-             * Default: false
-             */
-            xip?: boolean;
-            /**
-             * Reload each browser when Browsersync is restarted.
-             * Default: false
-             */
-            reloadOnRestart?: boolean;
-            /**
-             * The small pop-over notifications in the browser are not always needed/wanted.
-             * Default: true
-             */
-            notify?: boolean;
-            /**
-             * scrollProportionally: false // Sync viewports to TOP position
-             * Default: true
-             */
-            scrollProportionally?: boolean;
-            /**
-             * How often to send scroll events
-             * Default: 0
-             */
-            scrollThrottle?: number;
-            /**
-             * Decide which technique should be used to restore scroll position following a reload.
-             * Can be window.name or cookie
-             * Default: 'window.name'
-             */
-            scrollRestoreTechnique?: string;
-            /**
-             * Sync the scroll position of any element on the page. Add any amount of CSS selectors
-             * Default: []
-             * Note: requires at least version 2.9.0
-             */
-            scrollElements?: string[];
-            /**
-             * Default: []
-             * Note: requires at least version 2.9.0
-             * Sync the scroll position of any element on the page - where any scrolled element will cause
-             * all others to match scroll position. This is helpful when a breakpoint alters which element
-             * is actually scrolling
-             */
-            scrollElementMapping?: string[];
-            /**
-             * Time, in milliseconds, to wait before instructing the browser to reload/inject following a file
-             * change event
-             * Default: 0
-             */
-            reloadDelay?: number;
-            /**
-             * Restrict the frequency in which browser:reload events can be emitted to connected clients
-             * Default: 0
-             * Note: requires at least version 2.6.0
-             */
-            reloadDebounce?: number;
-            /**
-             * User provided plugins
-             * Default: []
-             * Note: requires at least version 2.6.0
-             */
-            plugins?: any[];
-            /**
-             * Whether to inject changes (rather than a page refresh)
-             * Default: true
-             */
-            injectChanges?: boolean;
-            /**
-             * The initial path to load
-             */
-            startPath?: string;
-            /**
-             * Whether to minify the client script
-             * Default: true
-             */
-            minify?: boolean;
-            /**
-             * Override host detection if you know the correct IP to use
-             */
-            host?: string;
-            /**
-             * Send file-change events to the browser
-             * Default: true
-             */
-            codeSync?: boolean;
-            /**
-             * Append timestamps to injected files
-             * Default: true
-             */
-            timestamps?: boolean;
-            /**
-             * Alter the script path for complete control over where the Browsersync Javascript is served
-             * from. Whatever you return from this function will be used as the script path.
-             * Note: requires at least version 1.5.0
-             */
-            scriptPath?: (path: string) => string;
-            /**
-             * Configure the Socket.IO path and namespace & domain to avoid collisions.
-             * path - Default: "/browser-sync/socket.io"
-             * clientPath - Default: "/browser-sync"
-             * namespace - Default: "/browser-sync"
-             * domain - Default: undefined
-             * port - Default: undefined
-             * clients.heartbeatTimeout - Default: 5000
-             * Note: requires at least version 1.6.2
-             */
-            socket?: SocketOptions;
-            middleware?: MiddlewareHandler | MiddlewareHandler[];
-        }
+import chokidar = require("chokidar");
+import fs = require("fs");
+import http = require("http");
+import mm = require("micromatch");
 
-        interface Hash<T> {
-            [path: string]: T;
-        }
-
-        interface UIOptions {
-            /** set the default port */
-            port?: number;
-            /** set the default weinre port */
-            weinre?: {
-                port?: number;
-            };
-        }
-
-        interface ServerOptions {
-            /** set base directory */
-            baseDir?: string | string[];
-            /** enable directory listing */
-            directory?: boolean;
-            /** set index filename */
-            index?: string;
-            /**
-             * key-value object hash, where the key is the url to match,
-             * and the value is the folder to serve (relative to your working directory)
-             */
-            routes?: Hash<string>;
-            /** configure custom middleware */
-            middleware?: MiddlewareHandler[];
-        }
-
-        interface ProxyOptions {
-            target?: string;
-            middleware?: MiddlewareHandler;
-            ws: boolean;
-            reqHeaders: (config: any) => Hash<any>;
-            proxyRes: (res: http.ServerResponse, req: http.ServerRequest, next: Function) => any;
-        }
-
-        interface MiddlewareHandler {
-            (req: http.ServerRequest, res: http.ServerResponse, next: Function): any;
-        }
-
-        interface GhostOptions {
-            clicks?: boolean;
-            scroll?: boolean;
-            forms?: boolean;
-        }
-
-        interface SnippetOptions {
-            ignorePaths?: string;
-            rule?: { match?: RegExp; fn?: (snippet: string, match: string) => any };
-        }
-
-        interface SocketOptions {
-            path?: string;
-            clientPath?: string;
-            namespace?: string;
-            domain?: string;
-            port?: number;
-            clients?: { heartbeatTimeout?: number; };
-        }
-
-        interface RewriteRules {
-            match: RegExp;
-            fn: (match: string) => string;
-        }
-
-        interface StreamOptions {
-            once?: boolean;
-            match?: mm.Pattern | mm.Pattern[];
-        }
-
-        interface BrowserSyncStatic extends BrowserSyncInstance {
-            /**
-             * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
-             * depending on your use-case.
-             */
-            (config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
-            /**
-             * Create a Browsersync instance
-             * @param name an identifier that can used for retrieval later
-             */
-            create(name?: string): BrowserSyncInstance;
-            /**
-             * Get a single instance by name. This is useful if you have your build scripts in separate files
-             * @param name the identifier used for retrieval
-             */
-            get(name: string): BrowserSyncInstance;
-            /**
-             * Check if an instance has been created.
-             * @param name the name of the instance
-             */
-            has(name: string): boolean;
-        }
-
-        interface BrowserSyncInstance {
-            /** the name of this instance of browser-sync */
-            name: string;
-            /**
-             * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
-             * depending on your use-case.
-             */
-            init(config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
-            /**
-             * Reload the browser
-             * The reload method will inform all browsers about changed files and will either cause the browser
-             * to refresh, or inject the files where possible.
-             */
-            reload(): void;
-            /**
-             * Reload a single file
-             * The reload method will inform all browsers about changed files and will either cause the browser
-             * to refresh, or inject the files where possible.
-             */
-            reload(file: string): void;
-            /**
-             * Reload multiple files
-             * The reload method will inform all browsers about changed files and will either cause the browser
-             * to refresh, or inject the files where possible.
-             */
-            reload(files: string[]): void;
-            /**
-             * The reload method will inform all browsers about changed files and will either cause the browser
-             * to refresh, or inject the files where possible.
-             */
-            reload(options: { stream: boolean }): NodeJS.ReadWriteStream;
-            /**
-             * The stream method returns a transform stream and can act once or on many files.
-             * @param opts Configuration for the stream method
-             */
-            stream(opts?: StreamOptions): NodeJS.ReadWriteStream;
-            /**
-             * Helper method for browser notifications
-             * @param message Can be a simple message such as 'Connected' or HTML
-             * @param timeout How long the message will remain in the browser. @since 1.3.0
-             */
-            notify(message: string, timeout?: number): void;
-            /**
-             * This method will close any running server, stop file watching & exit the current process.
-             */
-            exit(): void;
-            /**
-             * Stand alone file-watcher. Use this along with Browsersync to create your own, minimal build system
-             */
-            watch(patterns: string, opts?: chokidar.WatchOptions, fn?: (event: string, file: fs.Stats) => any)
-                : NodeJS.EventEmitter;
-            /**
-             * Method to pause file change events
-             */
-            pause(): void;
-            /**
-             * Method to resume paused watchers
-             */
-            resume(): void;
-            /**
-             * The internal Event Emitter used by the running Browsersync instance (if there is one). You can use
-             * this to emit your own events, such as changed files, logging etc.
-             */
-            emitter: NodeJS.EventEmitter;
-            /**
-             * A simple true/false flag that you can use to determine if there's a currently-running Browsersync instance.
-             */
-            active: boolean;
-            /**
-             * A simple true/false flag to determine if the current instance is paused
-             */
-            paused: boolean;
-        }
+declare namespace browserSync {
+    interface Options {
+        /**
+         * Browsersync includes a user-interface that is accessed via a separate port. The UI allows to controls
+         * all devices, push sync updates and much more.
+         *
+         * port - Default: 3001
+         * weinre.port - Default: 8080
+         * Note: requires at least version 2.0.0
+         */
+        ui?: UIOptions;
+        /**
+         * Browsersync can watch your files as you work. Changes you make will either be injected into the page (CSS
+         * & images) or will cause all browsers to do a full-page refresh. See anymatch for more information on glob
+         * patterns.
+         * Default: false
+         */
+        files?: string | string[];
+        /**
+         * File watching options that get passed along to Chokidar. Check their docs for available options
+         * Default: undefined
+         * Note: requires at least version 2.6.0
+         */
+        watchOptions?: chokidar.WatchOptions;
+        /**
+         * Use the built-in static server for basic HTML/JS/CSS websites.
+         * Default: false
+         */
+        server?: ServerOptions;
+        /**
+         * Proxy an EXISTING vhost. Browsersync will wrap your vhost with a proxy URL to view your site.
+         * target - Default: undefined
+         * ws - Default: undefined
+         * middleware - Default: undefined
+         * reqHeaders - Default: undefined
+         * proxyRes - Default: undefined
+         */
+        proxy?: string | boolean | ProxyOptions;
+        /**
+         * Use a specific port (instead of the one auto-detected by Browsersync)
+         * Default: 3000
+         */
+        port?: number;
+        /**
+         * Add additional directories from which static files should be served.
+         * Should only be used in proxy or snippet mode.
+         * Default: []
+         * Note: requires at least version 2.8.0
+         */
+        serveStatic?: string[];
+        /**
+         * Enable https for localhost development.
+         * Note - this is not needed for proxy option as it will be inferred from your target url.
+         * Note: requires at least version 1.3.0
+         */
+        https?: boolean;
+        /**
+         * Clicks, Scrolls & Form inputs on any device will be mirrored to all others.
+         * clicks - Default: true
+         * scroll - Default: true
+         * forms - Default: true
+         */
+        ghostMode?: GhostOptions | boolean;
+        /**
+         * Can be either "info", "debug", "warn", or "silent"
+         * Default: info
+         */
+        logLevel?: string;
+        /**
+         * Change the console logging prefix. Useful if you're creating your own project based on Browsersync
+         * Default: BS
+         * Note: requires at least version 1.5.1
+         */
+        logPrefix?: string;
+        /**
+         * Whether or not to log connections
+         * Default: false
+         */
+        logConnections?: boolean;
+        /**
+         * Whether or not to log information about changed files
+         * Default: false
+         */
+        logFileChanges?: boolean;
+        /**
+         * Log the snippet to the console when you're in snippet mode (no proxy/server)
+         * Default: true
+         * Note: requires at least version 1.5.2
+         */
+        logSnippet?: boolean;
+        /**
+         * You can control how the snippet is injected onto each page via a custom regex + function.
+         * You can also provide patterns for certain urls that should be ignored from the snippet injection.
+         * Note: requires at least version 2.0.0
+         */
+        snippetOptions?: SnippetOptions;
+        /**
+         * Add additional HTML rewriting rules.
+         * Default: false
+         * Note: requires at least version 2.4.0
+         */
+        rewriteRules?: boolean | RewriteRules[];
+        /**
+         * Tunnel the Browsersync server through a random Public URL
+         * Default: null
+         */
+        tunnel?: string | boolean;
+        /**
+         * Some features of Browsersync (such as xip & tunnel) require an internet connection, but if you're
+         * working offline, you can reduce start-up time by setting this option to false
+         */
+        online?: boolean;
+        /**
+         * Default: true
+         * Decide which URL to open automatically when Browsersync starts. Defaults to "local" if none set.
+         * Can be true, local, external, ui, ui-external, tunnel or false
+         */
+        open?: string | boolean;
+        /**
+         * The browser(s) to open
+         * Default: default
+         */
+        browser?: string | string[];
+        /**
+         * Requires an internet connection - useful for services such as Typekit as it allows you to configure
+         * domains such as *.xip.io in your kit settings
+         * Default: false
+         */
+        xip?: boolean;
+        /**
+         * Reload each browser when Browsersync is restarted.
+         * Default: false
+         */
+        reloadOnRestart?: boolean;
+        /**
+         * The small pop-over notifications in the browser are not always needed/wanted.
+         * Default: true
+         */
+        notify?: boolean;
+        /**
+         * scrollProportionally: false // Sync viewports to TOP position
+         * Default: true
+         */
+        scrollProportionally?: boolean;
+        /**
+         * How often to send scroll events
+         * Default: 0
+         */
+        scrollThrottle?: number;
+        /**
+         * Decide which technique should be used to restore scroll position following a reload.
+         * Can be window.name or cookie
+         * Default: 'window.name'
+         */
+        scrollRestoreTechnique?: string;
+        /**
+         * Sync the scroll position of any element on the page. Add any amount of CSS selectors
+         * Default: []
+         * Note: requires at least version 2.9.0
+         */
+        scrollElements?: string[];
+        /**
+         * Default: []
+         * Note: requires at least version 2.9.0
+         * Sync the scroll position of any element on the page - where any scrolled element will cause
+         * all others to match scroll position. This is helpful when a breakpoint alters which element
+         * is actually scrolling
+         */
+        scrollElementMapping?: string[];
+        /**
+         * Time, in milliseconds, to wait before instructing the browser to reload/inject following a file
+         * change event
+         * Default: 0
+         */
+        reloadDelay?: number;
+        /**
+         * Restrict the frequency in which browser:reload events can be emitted to connected clients
+         * Default: 0
+         * Note: requires at least version 2.6.0
+         */
+        reloadDebounce?: number;
+        /**
+         * User provided plugins
+         * Default: []
+         * Note: requires at least version 2.6.0
+         */
+        plugins?: any[];
+        /**
+         * Whether to inject changes (rather than a page refresh)
+         * Default: true
+         */
+        injectChanges?: boolean;
+        /**
+         * The initial path to load
+         */
+        startPath?: string;
+        /**
+         * Whether to minify the client script
+         * Default: true
+         */
+        minify?: boolean;
+        /**
+         * Override host detection if you know the correct IP to use
+         */
+        host?: string;
+        /**
+         * Send file-change events to the browser
+         * Default: true
+         */
+        codeSync?: boolean;
+        /**
+         * Append timestamps to injected files
+         * Default: true
+         */
+        timestamps?: boolean;
+        /**
+         * Alter the script path for complete control over where the Browsersync Javascript is served
+         * from. Whatever you return from this function will be used as the script path.
+         * Note: requires at least version 1.5.0
+         */
+        scriptPath?: (path: string) => string;
+        /**
+         * Configure the Socket.IO path and namespace & domain to avoid collisions.
+         * path - Default: "/browser-sync/socket.io"
+         * clientPath - Default: "/browser-sync"
+         * namespace - Default: "/browser-sync"
+         * domain - Default: undefined
+         * port - Default: undefined
+         * clients.heartbeatTimeout - Default: 5000
+         * Note: requires at least version 1.6.2
+         */
+        socket?: SocketOptions;
+        middleware?: MiddlewareHandler | MiddlewareHandler[];
     }
 
-    const browserSync: browserSync.BrowserSyncStatic;
-    export = browserSync;
+    interface Hash<T> {
+        [path: string]: T;
+    }
+
+    interface UIOptions {
+        /** set the default port */
+        port?: number;
+        /** set the default weinre port */
+        weinre?: {
+            port?: number;
+        };
+    }
+
+    interface ServerOptions {
+        /** set base directory */
+        baseDir?: string | string[];
+        /** enable directory listing */
+        directory?: boolean;
+        /** set index filename */
+        index?: string;
+        /**
+         * key-value object hash, where the key is the url to match,
+         * and the value is the folder to serve (relative to your working directory)
+         */
+        routes?: Hash<string>;
+        /** configure custom middleware */
+        middleware?: MiddlewareHandler[];
+    }
+
+    interface ProxyOptions {
+        target?: string;
+        middleware?: MiddlewareHandler;
+        ws: boolean;
+        reqHeaders: (config: any) => Hash<any>;
+        proxyRes: (res: http.ServerResponse, req: http.ServerRequest, next: Function) => any;
+    }
+
+    interface MiddlewareHandler {
+        (req: http.ServerRequest, res: http.ServerResponse, next: Function): any;
+    }
+
+    interface GhostOptions {
+        clicks?: boolean;
+        scroll?: boolean;
+        forms?: boolean;
+    }
+
+    interface SnippetOptions {
+        ignorePaths?: string;
+        rule?: { match?: RegExp; fn?: (snippet: string, match: string) => any };
+    }
+
+    interface SocketOptions {
+        path?: string;
+        clientPath?: string;
+        namespace?: string;
+        domain?: string;
+        port?: number;
+        clients?: { heartbeatTimeout?: number; };
+    }
+
+    interface RewriteRules {
+        match: RegExp;
+        fn: (match: string) => string;
+    }
+
+    interface StreamOptions {
+        once?: boolean;
+        match?: mm.Pattern | mm.Pattern[];
+    }
+
+    interface BrowserSyncStatic extends BrowserSyncInstance {
+        /**
+         * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
+         * depending on your use-case.
+         */
+        (config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
+        /**
+         * Create a Browsersync instance
+         * @param name an identifier that can used for retrieval later
+         */
+        create(name?: string): BrowserSyncInstance;
+        /**
+         * Get a single instance by name. This is useful if you have your build scripts in separate files
+         * @param name the identifier used for retrieval
+         */
+        get(name: string): BrowserSyncInstance;
+        /**
+         * Check if an instance has been created.
+         * @param name the name of the instance
+         */
+        has(name: string): boolean;
+    }
+
+    interface BrowserSyncInstance {
+        /** the name of this instance of browser-sync */
+        name: string;
+        /**
+         * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
+         * depending on your use-case.
+         */
+        init(config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
+        /**
+         * Reload the browser
+         * The reload method will inform all browsers about changed files and will either cause the browser
+         * to refresh, or inject the files where possible.
+         */
+        reload(): void;
+        /**
+         * Reload a single file
+         * The reload method will inform all browsers about changed files and will either cause the browser
+         * to refresh, or inject the files where possible.
+         */
+        reload(file: string): void;
+        /**
+         * Reload multiple files
+         * The reload method will inform all browsers about changed files and will either cause the browser
+         * to refresh, or inject the files where possible.
+         */
+        reload(files: string[]): void;
+        /**
+         * The reload method will inform all browsers about changed files and will either cause the browser
+         * to refresh, or inject the files where possible.
+         */
+        reload(options: { stream: boolean }): NodeJS.ReadWriteStream;
+        /**
+         * The stream method returns a transform stream and can act once or on many files.
+         * @param opts Configuration for the stream method
+         */
+        stream(opts?: StreamOptions): NodeJS.ReadWriteStream;
+        /**
+         * Helper method for browser notifications
+         * @param message Can be a simple message such as 'Connected' or HTML
+         * @param timeout How long the message will remain in the browser. @since 1.3.0
+         */
+        notify(message: string, timeout?: number): void;
+        /**
+         * This method will close any running server, stop file watching & exit the current process.
+         */
+        exit(): void;
+        /**
+         * Stand alone file-watcher. Use this along with Browsersync to create your own, minimal build system
+         */
+        watch(patterns: string, opts?: chokidar.WatchOptions, fn?: (event: string, file: fs.Stats) => any)
+            : NodeJS.EventEmitter;
+        /**
+         * Method to pause file change events
+         */
+        pause(): void;
+        /**
+         * Method to resume paused watchers
+         */
+        resume(): void;
+        /**
+         * The internal Event Emitter used by the running Browsersync instance (if there is one). You can use
+         * this to emit your own events, such as changed files, logging etc.
+         */
+        emitter: NodeJS.EventEmitter;
+        /**
+         * A simple true/false flag that you can use to determine if there's a currently-running Browsersync instance.
+         */
+        active: boolean;
+        /**
+         * A simple true/false flag to determine if the current instance is paused
+         */
+        paused: boolean;
+    }
 }
+
+declare const browserSync: browserSync.BrowserSyncStatic;
+export = browserSync;
diff --git a/bs58/bs58.d.ts b/bs58/bs58.d.ts
index 00ebbbfec7..d0fd579cb2 100644
--- a/bs58/bs58.d.ts
+++ b/bs58/bs58.d.ts
@@ -5,10 +5,9 @@
 
 /// <reference path="../base-x/base-x.d.ts" />
 
-declare module "bs58" {
-	namespace base58 {}
 
-	let base58: BaseX.BaseConverter;
+declare namespace base58 { }
 
-	export = base58;
-}
+declare let base58: BaseX.BaseConverter;
+
+export = base58;
diff --git a/bson/bson.d.ts b/bson/bson.d.ts
index c311103ff3..ee835175de 100644
--- a/bson/bson.d.ts
+++ b/bson/bson.d.ts
@@ -6,128 +6,126 @@
 /// <reference path="../node/node.d.ts"/>
 
 
-declare module 'bson' {
-
-  namespace bson {
-
-      export module BSONPure {
-
-          export interface DeserializeOptions {
-              /** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized. */
-              evalFunctions?: boolean;
-              /** {Boolean, default:false}, cache evaluated functions for reuse. */
-              cacheFunctions?: boolean;
-              /** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function. */
-              cacheFunctionsCrc32?: boolean;
-              /** {Boolean, default:false}, deserialize Binary data directly into node.js Buffer object. */
-              promoteBuffers?: boolean;
-          }
-          export class BSON {
-              /**
-               * @param {Object} object the Javascript object to serialize.
-               * @param {Boolean} checkKeys the serializer will check if keys are valid.
-               * @param {Boolean} asBuffer return the serialized object as a Buffer object (ignore).
-               * @param {Boolean} serializeFunctions serialize the javascript functions (default:false)
-               * @return {Buffer} returns a TypedArray or Array depending on what your browser supports
-               */
-              serialize(object: any, checkKeys?: boolean, asBuffer?: boolean, serializeFunctions?: boolean): Buffer;
-              deserialize(buffer: Buffer, options?: DeserializeOptions, isArray?: boolean): any;
-          }
 
 
-          export interface Binary {}
-          export interface BinaryStatic {
-              SUBTYPE_DEFAULT: number;
-              SUBTYPE_FUNCTION: number;
-              SUBTYPE_BYTE_ARRAY: number;
-              SUBTYPE_UUID_OLD: number;
-              SUBTYPE_UUID: number;
-              SUBTYPE_MD5: number;
-              SUBTYPE_USER_DEFINED: number;
+declare namespace bson {
 
-              new (buffer: Buffer, subType?: number): Binary;
-          }
-          export let Binary: BinaryStatic;
+    export module BSONPure {
 
-          export interface Code {}
-          export interface CodeStatic {
-              new (code: string | Function, scope?: any): Code;
-          }
-          export let Code: CodeStatic;
+        export interface DeserializeOptions {
+            /** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized. */
+            evalFunctions?: boolean;
+            /** {Boolean, default:false}, cache evaluated functions for reuse. */
+            cacheFunctions?: boolean;
+            /** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function. */
+            cacheFunctionsCrc32?: boolean;
+            /** {Boolean, default:false}, deserialize Binary data directly into node.js Buffer object. */
+            promoteBuffers?: boolean;
+        }
+        export class BSON {
+            /**
+             * @param {Object} object the Javascript object to serialize.
+             * @param {Boolean} checkKeys the serializer will check if keys are valid.
+             * @param {Boolean} asBuffer return the serialized object as a Buffer object (ignore).
+             * @param {Boolean} serializeFunctions serialize the javascript functions (default:false)
+             * @return {Buffer} returns a TypedArray or Array depending on what your browser supports
+             */
+            serialize(object: any, checkKeys?: boolean, asBuffer?: boolean, serializeFunctions?: boolean): Buffer;
+            deserialize(buffer: Buffer, options?: DeserializeOptions, isArray?: boolean): any;
+        }
 
-          export interface DBRef {}
-          export interface DBRefStatic {
-              new (namespace: string, oid: ObjectID, db?: string): DBRef;
-          }
-          export let DBRef: DBRefStatic;
 
-          export interface Double {}
-          export interface DoubleStatic {
-              new (value: number): Double;
-          }
-          export let Double: DoubleStatic;
+        export interface Binary { }
+        export interface BinaryStatic {
+            SUBTYPE_DEFAULT: number;
+            SUBTYPE_FUNCTION: number;
+            SUBTYPE_BYTE_ARRAY: number;
+            SUBTYPE_UUID_OLD: number;
+            SUBTYPE_UUID: number;
+            SUBTYPE_MD5: number;
+            SUBTYPE_USER_DEFINED: number;
 
-          export interface Long {}
-          export interface LongStatic {
-              new (low: number, high: number): Long;
-              fromInt(i: number): Long;
-              fromNumber(n: number): Long;
-              fromBits(lowBits: number, highBits: number): Long;
-              fromString(s: string, opt_radix?: number): Long;
-          }
-          export let Long: LongStatic;
+            new (buffer: Buffer, subType?: number): Binary;
+        }
+        export let Binary: BinaryStatic;
 
-          export interface MaxKey {}
-          export interface MaxKeyStatic {
-              new (): MaxKey;
-          }
-          export let MaxKey: MaxKeyStatic;
+        export interface Code { }
+        export interface CodeStatic {
+            new (code: string | Function, scope?: any): Code;
+        }
+        export let Code: CodeStatic;
 
-          export interface MinKey {}
-          export interface MinKeyStatic {
-              new (): MinKey;
-          }
-          export let MinKey: MinKeyStatic;
+        export interface DBRef { }
+        export interface DBRefStatic {
+            new (namespace: string, oid: ObjectID, db?: string): DBRef;
+        }
+        export let DBRef: DBRefStatic;
 
-          export interface ObjectID {}
-          export interface ObjectIDStatic {
-              new (id?: number | string | ObjectID): ObjectID;
-              createPk(): ObjectID;
-              createFromTime(time: number): ObjectID;
-              createFromHexString(hexString: string): ObjectID;
-              isValid(id: number | string | ObjectID): boolean;
-          }
-          export let ObjectID: ObjectIDStatic;
-          export let ObjectId: ObjectIDStatic;
+        export interface Double { }
+        export interface DoubleStatic {
+            new (value: number): Double;
+        }
+        export let Double: DoubleStatic;
 
-          export interface BSONRegExp {}
-          export interface BSONRegExpStatic {
-              new (pattern: string, options: string): BSONRegExp;
-          }
-          export let BSONRegExp: BSONRegExpStatic;
+        export interface Long { }
+        export interface LongStatic {
+            new (low: number, high: number): Long;
+            fromInt(i: number): Long;
+            fromNumber(n: number): Long;
+            fromBits(lowBits: number, highBits: number): Long;
+            fromString(s: string, opt_radix?: number): Long;
+        }
+        export let Long: LongStatic;
 
-          export interface Symbol {}
-          export interface SymbolStatic {
-              new (value: string): Symbol;
-          }
-          export let Symbol: SymbolStatic;
+        export interface MaxKey { }
+        export interface MaxKeyStatic {
+            new (): MaxKey;
+        }
+        export let MaxKey: MaxKeyStatic;
 
-          export interface Timestamp {}
-          export interface TimestampStatic {
-              new (low: number, high: number): Timestamp;
-              fromInt(i: number): Timestamp;
-              fromNumber(n: number): Timestamp;
-              fromBits(lowBits: number, highBits: number): Timestamp;
-              fromString(s: string, opt_radix?: number): Timestamp;
-          }
-          export let Timestamp: TimestampStatic;
+        export interface MinKey { }
+        export interface MinKeyStatic {
+            new (): MinKey;
+        }
+        export let MinKey: MinKeyStatic;
 
-      }
+        export interface ObjectID { }
+        export interface ObjectIDStatic {
+            new (id?: number | string | ObjectID): ObjectID;
+            createPk(): ObjectID;
+            createFromTime(time: number): ObjectID;
+            createFromHexString(hexString: string): ObjectID;
+            isValid(id: number | string | ObjectID): boolean;
+        }
+        export let ObjectID: ObjectIDStatic;
+        export let ObjectId: ObjectIDStatic;
 
-      export let BSONNative: typeof BSONPure;
+        export interface BSONRegExp { }
+        export interface BSONRegExpStatic {
+            new (pattern: string, options: string): BSONRegExp;
+        }
+        export let BSONRegExp: BSONRegExpStatic;
 
-  }
+        export interface Symbol { }
+        export interface SymbolStatic {
+            new (value: string): Symbol;
+        }
+        export let Symbol: SymbolStatic;
+
+        export interface Timestamp { }
+        export interface TimestampStatic {
+            new (low: number, high: number): Timestamp;
+            fromInt(i: number): Timestamp;
+            fromNumber(n: number): Timestamp;
+            fromBits(lowBits: number, highBits: number): Timestamp;
+            fromString(s: string, opt_radix?: number): Timestamp;
+        }
+        export let Timestamp: TimestampStatic;
+
+    }
+
+    export let BSONNative: typeof BSONPure;
 
-  export = bson;
 }
 
+export = bson;
diff --git a/buffer-compare/buffer-compare.d.ts b/buffer-compare/buffer-compare.d.ts
index 47bd3fcbec..bd61febdb7 100644
--- a/buffer-compare/buffer-compare.d.ts
+++ b/buffer-compare/buffer-compare.d.ts
@@ -3,15 +3,14 @@
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "buffer-compare" {
-	interface List {
-		[index: number]: any;
-		length: number
-	}
 
-	function compare(cmp: List, to: List): number;
-	function compare<T>(cmp: T, to: T): number;
-	function compare<C, T>(cmp: C, to: T): number;
-
-	export = compare;
+interface List {
+    [index: number]: any;
+    length: number
 }
+
+declare function compare(cmp: List, to: List): number;
+declare function compare<T>(cmp: T, to: T): number;
+declare function compare<C, T>(cmp: C, to: T): number;
+
+export = compare;
diff --git a/buffer-equal/buffer-equal.d.ts b/buffer-equal/buffer-equal.d.ts
index b3ede1fc1d..34ae5d737e 100644
--- a/buffer-equal/buffer-equal.d.ts
+++ b/buffer-equal/buffer-equal.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'buffer-equal' {
-	function bufferEqual(actual:Buffer, expected:Buffer): boolean;
-	export = bufferEqual;
-}
+
+declare function bufferEqual(actual: Buffer, expected: Buffer): boolean;
+export = bufferEqual;
diff --git a/buffers/buffers.d.ts b/buffers/buffers.d.ts
index e2ca5c2708..d817ebd407 100644
--- a/buffers/buffers.d.ts
+++ b/buffers/buffers.d.ts
@@ -5,32 +5,30 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "buffers" {
 
-    interface BuffersStatics {
-        new (bufs?: Buffer[]|Buffers): Buffers;
-        (bufs?: Buffer[]| Buffers): Buffers;
-        prototype: Buffers;
-    }
-
-    interface Buffers {
-        buffers: Buffer[];
-        length: number;
-
-        push(...items: Buffer[]): number;
-        unshift(...items: Buffer[]): number;
-        slice(i?: number, j?: number): Buffer;
-        splice(i: number, howMany?: number, ...items: Buffer[]): Buffers;
-        copy(dst: Buffer, dstStart?: number, start?: number, end?: number): number;
-        get(i: number): any;
-        set(i: number, b: any): void;
-        indexOf(needle: string|Buffer, offset?: number): number;
-        toBuffer(): Buffer;
-        toString(encoding?: any, start?: number, end?: number): string;
-    }
-
-    var Buffers: BuffersStatics;
-
-    export = Buffers;
 
+interface BuffersStatics {
+    new (bufs?: Buffer[] | Buffers): Buffers;
+    (bufs?: Buffer[] | Buffers): Buffers;
+    prototype: Buffers;
 }
+
+interface Buffers {
+    buffers: Buffer[];
+    length: number;
+
+    push(...items: Buffer[]): number;
+    unshift(...items: Buffer[]): number;
+    slice(i?: number, j?: number): Buffer;
+    splice(i: number, howMany?: number, ...items: Buffer[]): Buffers;
+    copy(dst: Buffer, dstStart?: number, start?: number, end?: number): number;
+    get(i: number): any;
+    set(i: number, b: any): void;
+    indexOf(needle: string | Buffer, offset?: number): number;
+    toBuffer(): Buffer;
+    toString(encoding?: any, start?: number, end?: number): string;
+}
+
+declare var Buffers: BuffersStatics;
+
+export = Buffers;
diff --git a/bunyan-logentries/bunyan-logentries.d.ts b/bunyan-logentries/bunyan-logentries.d.ts
index bc91174dc1..dbd167dfa6 100644
--- a/bunyan-logentries/bunyan-logentries.d.ts
+++ b/bunyan-logentries/bunyan-logentries.d.ts
@@ -6,12 +6,11 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../bunyan/bunyan.d.ts" />
 
-declare module "bunyan-logentries" {
-  import bunyan = require("bunyan");
 
-  interface StreamOptions {
+import bunyan = require("bunyan");
+
+interface StreamOptions {
     token: string;
-  }
-
-  export function createStream(options: StreamOptions): NodeJS.WritableStream;
 }
+
+declare export function createStream(options: StreamOptions): NodeJS.WritableStream;
diff --git a/bunyan-prettystream/bunyan-prettystream.d.ts b/bunyan-prettystream/bunyan-prettystream.d.ts
index 297e63731c..3a4e5a00f4 100644
--- a/bunyan-prettystream/bunyan-prettystream.d.ts
+++ b/bunyan-prettystream/bunyan-prettystream.d.ts
@@ -5,26 +5,25 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "bunyan-prettystream" {
-	import stream = require("stream");
-	class PrettyStream extends stream.Writable {
-		/**
-		 * @param options.mode Output format, can be either `long`, `short`, or `dev`,
-		 *                     defaults to `long`.
-		 * @param options.useColor Indicates whether or not output should be colored,
-		 *                         defaults to `true`.
-		 */
-		constructor(options?: { mode?: string; useColor?: boolean });
 
-		/**
-		 * Pipes data from this stream to another.
-		 *
-		 * @param destination Stream to write data to.
-		 * @param options.end Indicates whether `end()` should be called on the `destination`
-		 *                    stream when this stream emits `end`, defaults to `true`.
-		 * @return The `destination` stream.
-		 */
-		pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-	}
-	export = PrettyStream;
-}
\ No newline at end of file
+import stream = require("stream");
+declare class PrettyStream extends stream.Writable {
+    /**
+     * @param options.mode Output format, can be either `long`, `short`, or `dev`,
+     *                     defaults to `long`.
+     * @param options.useColor Indicates whether or not output should be colored,
+     *                         defaults to `true`.
+     */
+    constructor(options?: { mode?: string; useColor?: boolean });
+
+    /**
+     * Pipes data from this stream to another.
+     *
+     * @param destination Stream to write data to.
+     * @param options.end Indicates whether `end()` should be called on the `destination`
+     *                    stream when this stream emits `end`, defaults to `true`.
+     * @return The `destination` stream.
+     */
+    pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+}
+export = PrettyStream;
diff --git a/bunyan/bunyan.d.ts b/bunyan/bunyan.d.ts
index dd569301f5..ce7b17ab62 100644
--- a/bunyan/bunyan.d.ts
+++ b/bunyan/bunyan.d.ts
@@ -5,101 +5,100 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "bunyan" {
-    import { EventEmitter } from 'events';
 
-    class Logger extends EventEmitter {
-        constructor(options:LoggerOptions);
-        addStream(stream:Stream):void;
-        addSerializers(serializers:Serializers):void;
-        child(options:LoggerOptions, simple?:boolean):Logger;
-        child(obj:Object, simple?:boolean):Logger;
-        reopenFileStreams():void;
+import { EventEmitter } from 'events';
 
-        level():string|number;
-        level(value: number | string):void;
-        levels(name: number | string, value: number | string):void;
+declare class Logger extends EventEmitter {
+    constructor(options: LoggerOptions);
+    addStream(stream: Stream): void;
+    addSerializers(serializers: Serializers): void;
+    child(options: LoggerOptions, simple?: boolean): Logger;
+    child(obj: Object, simple?: boolean): Logger;
+    reopenFileStreams(): void;
 
-        fields:any;
-        src:boolean;       
+    level(): string | number;
+    level(value: number | string): void;
+    levels(name: number | string, value: number | string): void;
 
-        trace(error:Error, format?:any, ...params:any[]):void;
-        trace(buffer:Buffer, format?:any, ...params:any[]):void;
-        trace(obj:Object, format?:any, ...params:any[]):void;
-        trace(format:string, ...params:any[]):void;
-        debug(error:Error, format?:any, ...params:any[]):void;
-        debug(buffer:Buffer, format?:any, ...params:any[]):void;
-        debug(obj:Object, format?:any, ...params:any[]):void;
-        debug(format:string, ...params:any[]):void;
-        info(error:Error, format?:any, ...params:any[]):void;
-        info(buffer:Buffer, format?:any, ...params:any[]):void;
-        info(obj:Object, format?:any, ...params:any[]):void;
-        info(format:string, ...params:any[]):void;
-        warn(error:Error, format?:any, ...params:any[]):void;
-        warn(buffer:Buffer, format?:any, ...params:any[]):void;
-        warn(obj:Object, format?:any, ...params:any[]):void;
-        warn(format:string, ...params:any[]):void;
-        error(error:Error, format?:any, ...params:any[]):void;
-        error(buffer:Buffer, format?:any, ...params:any[]):void;
-        error(obj:Object, format?:any, ...params:any[]):void;
-        error(format:string, ...params:any[]):void;
-        fatal(error:Error, format?:any, ...params:any[]):void;
-        fatal(buffer:Buffer, format?:any, ...params:any[]):void;
-        fatal(obj:Object, format?:any, ...params:any[]):void;
-        fatal(format:string, ...params:any[]):void;
-    }
+    fields: any;
+    src: boolean;
 
-    interface LoggerOptions {
-        name: string;
-        streams?: Stream[];
-        level?: string | number;
-        stream?: NodeJS.WritableStream;
-        serializers?: Serializers;
-        src?: boolean;
-    }
-
-    interface Serializers {
-        [key:string]: (input:any) => string;
-    }
-
-    interface Stream {
-        type?: string;
-        level?: number | string;
-        path?: string;
-        stream?: NodeJS.WritableStream | Stream;
-        closeOnExit?: boolean;
-        period?: string;
-        count?: number;
-    }
-
-    export var stdSerializers:Serializers;
-
-    export var TRACE:number;
-    export var DEBUG:number;
-    export var INFO:number;
-    export var WARN:number;
-    export var ERROR:number;
-    export var FATAL:number;
-
-    export function resolveLevel(value: number | string):number;
-
-    export function createLogger(options:LoggerOptions):Logger;
-
-    class RingBuffer extends EventEmitter {
-        constructor(options:RingBufferOptions);
-
-        writable:boolean;
-        records:any[];
-
-        write(record:any):void;
-        end(record?:any):void;
-        destroy():void;
-        destroySoon():void;
-    }
-
-    interface RingBufferOptions {
-        limit?: number;
-    }
-
-    export function safeCycles():(key:string, value:any) => any;
+    trace(error: Error, format?: any, ...params: any[]): void;
+    trace(buffer: Buffer, format?: any, ...params: any[]): void;
+    trace(obj: Object, format?: any, ...params: any[]): void;
+    trace(format: string, ...params: any[]): void;
+    debug(error: Error, format?: any, ...params: any[]): void;
+    debug(buffer: Buffer, format?: any, ...params: any[]): void;
+    debug(obj: Object, format?: any, ...params: any[]): void;
+    debug(format: string, ...params: any[]): void;
+    info(error: Error, format?: any, ...params: any[]): void;
+    info(buffer: Buffer, format?: any, ...params: any[]): void;
+    info(obj: Object, format?: any, ...params: any[]): void;
+    info(format: string, ...params: any[]): void;
+    warn(error: Error, format?: any, ...params: any[]): void;
+    warn(buffer: Buffer, format?: any, ...params: any[]): void;
+    warn(obj: Object, format?: any, ...params: any[]): void;
+    warn(format: string, ...params: any[]): void;
+    error(error: Error, format?: any, ...params: any[]): void;
+    error(buffer: Buffer, format?: any, ...params: any[]): void;
+    error(obj: Object, format?: any, ...params: any[]): void;
+    error(format: string, ...params: any[]): void;
+    fatal(error: Error, format?: any, ...params: any[]): void;
+    fatal(buffer: Buffer, format?: any, ...params: any[]): void;
+    fatal(obj: Object, format?: any, ...params: any[]): void;
+    fatal(format: string, ...params: any[]): void;
 }
+
+interface LoggerOptions {
+    name: string;
+    streams?: Stream[];
+    level?: string | number;
+    stream?: NodeJS.WritableStream;
+    serializers?: Serializers;
+    src?: boolean;
+}
+
+interface Serializers {
+    [key: string]: (input: any) => string;
+}
+
+interface Stream {
+    type?: string;
+    level?: number | string;
+    path?: string;
+    stream?: NodeJS.WritableStream | Stream;
+    closeOnExit?: boolean;
+    period?: string;
+    count?: number;
+}
+
+declare export var stdSerializers: Serializers;
+
+declare export var TRACE: number;
+declare export var DEBUG: number;
+declare export var INFO: number;
+declare export var WARN: number;
+declare export var ERROR: number;
+declare export var FATAL: number;
+
+declare export function resolveLevel(value: number | string): number;
+
+declare export function createLogger(options: LoggerOptions): Logger;
+
+declare class RingBuffer extends EventEmitter {
+    constructor(options: RingBufferOptions);
+
+    writable: boolean;
+    records: any[];
+
+    write(record: any): void;
+    end(record?: any): void;
+    destroy(): void;
+    destroySoon(): void;
+}
+
+interface RingBufferOptions {
+    limit?: number;
+}
+
+declare export function safeCycles(): (key: string, value: any) => any;
diff --git a/byline/byline.d.ts b/byline/byline.d.ts
index 48ddd2d57a..95f035f06e 100644
--- a/byline/byline.d.ts
+++ b/byline/byline.d.ts
@@ -5,34 +5,33 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "byline" {
-    import stream = require("stream");
 
-    export interface LineStreamOptions extends stream.TransformOptions {
-        keepEmptyLines?: boolean;
-    }
+import stream = require("stream");
 
-    export interface LineStream extends stream.Transform {
-    }
-
-    export interface LineStreamCreatable extends LineStream {
-        new (options?:LineStreamOptions):LineStream
-    }
-
-    //TODO is it possible to declare static factory functions without name (directly on the module)
-    //
-    // JS:
-    // // convinience API
-    // module.exports = function(readStream, options) {
-    //      return module.exports.createStream(readStream, options);
-    // };
-    //
-    // TS:
-    // ():LineStream; // same as createStream():LineStream
-    // (stream:stream.Stream, options?:LineStreamOptions):LineStream; // same as createStream(stream, options?):LineStream
-
-    export function createStream():LineStream;
-    export function createStream(stream:NodeJS.ReadableStream, options?:LineStreamOptions):LineStream;
-
-    export var LineStream:LineStreamCreatable;
+export interface LineStreamOptions extends stream.TransformOptions {
+    keepEmptyLines?: boolean;
 }
+
+export interface LineStream extends stream.Transform {
+}
+
+export interface LineStreamCreatable extends LineStream {
+    new (options?: LineStreamOptions): LineStream
+}
+
+//TODO is it possible to declare static factory functions without name (directly on the module)
+//
+// JS:
+// // convinience API
+// module.exports = function(readStream, options) {
+//      return module.exports.createStream(readStream, options);
+// };
+//
+// TS:
+// ():LineStream; // same as createStream():LineStream
+// (stream:stream.Stream, options?:LineStreamOptions):LineStream; // same as createStream(stream, options?):LineStream
+
+declare export function createStream(): LineStream;
+declare export function createStream(stream: NodeJS.ReadableStream, options?: LineStreamOptions): LineStream;
+
+declare export var LineStream: LineStreamCreatable;
diff --git a/bytes/bytes.d.ts b/bytes/bytes.d.ts
index b99ebee7c6..37a25897a0 100644
--- a/bytes/bytes.d.ts
+++ b/bytes/bytes.d.ts
@@ -3,60 +3,59 @@
 // Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'bytes' {
+
+
+/**
+ *Convert the given value in bytes into a string.
+ *
+ * @param {number} value
+ * @param {{
+ *  thousandsSeparator: [string]
+ *  }} [options] bytes options.
+ *
+ * @returns {string}
+ */
+declare function bytes(value: number, options?: { thousandsSeparator: string }): string;
+
+/**
+ *Parse string to an integer in bytes.
+ *
+ * @param {string} value
+ * @returns {number}
+ */
+declare function bytes(value: string): number;
+
+declare namespace bytes {
 
     /**
-     *Convert the given value in bytes into a string.
+     * Format the given value in bytes into a string.
+     *
+     * If the value is negative, take Math.abs(). If it is a float,
+     * it is rounded.
      *
      * @param {number} value
-     * @param {{
-     *  thousandsSeparator: [string]
-     *  }} [options] bytes options.
-     *
-     * @returns {string}
+     * @param {BytesFormatOptions} [options]
      */
-    function bytes(value: number, options?: { thousandsSeparator: string }): string;
+
+    function format(value: number, options?: { thousandsSeparator: string }): string;
 
     /**
-     *Parse string to an integer in bytes.
+     * Just return the input number value.
+     *
+     * @param {number} value
+     * @return {number}
+     */
+    function parse(value: number): number;
+
+    /**
+     * Parse the string value into an integer in bytes.
+     *
+     * If no unit is given, it is assumed the value is in bytes.
      *
      * @param {string} value
-     * @returns {number}
+     * @return {number}
      */
-    function bytes(value: string): number;
-
-    namespace bytes {
-
-        /**
-         * Format the given value in bytes into a string.
-         *
-         * If the value is negative, take Math.abs(). If it is a float,
-         * it is rounded.
-         *
-         * @param {number} value
-         * @param {BytesFormatOptions} [options]
-         */
-
-        function format(value: number, options?: { thousandsSeparator: string }): string;
-
-        /**
-         * Just return the input number value.
-         *
-         * @param {number} value
-         * @return {number}
-         */
-        function parse(value: number): number;
-
-        /**
-         * Parse the string value into an integer in bytes.
-         *
-         * If no unit is given, it is assumed the value is in bytes.
-         *
-         * @param {string} value
-         * @return {number}
-         */
-        function parse(value: string): number;
-    }
-
-    export = bytes;
+    function parse(value: string): number;
 }
+
+export = bytes;
diff --git a/callsite/callsite.d.ts b/callsite/callsite.d.ts
index ffaa5d7e6f..780ca8b0ab 100644
--- a/callsite/callsite.d.ts
+++ b/callsite/callsite.d.ts
@@ -3,28 +3,27 @@
 // Definitions by: newclear <https://github.com/newclear>
 // Definitions: https://github.com/newclear/DefinitelyTyped
 
-declare module "callsite" {
 
-    namespace Callsite{
 
-        interface CallSite {
-            getThis(): any;
-            getTypeName(): string;
-            getFunctionName(): string;
-            getMethodName(): string;
-            getFileName(): string;
-            getLineNumber(): number;
-            getColumnNumber(): number;
-            getFunction(): Function;
-            getEvalOrigin(): string;
-            isNative(): boolean;
-            isToplevel(): boolean;
-            isEval(): boolean;
-            isConstructor(): boolean;
-        }
+declare namespace Callsite {
+
+    interface CallSite {
+        getThis(): any;
+        getTypeName(): string;
+        getFunctionName(): string;
+        getMethodName(): string;
+        getFileName(): string;
+        getLineNumber(): number;
+        getColumnNumber(): number;
+        getFunction(): Function;
+        getEvalOrigin(): string;
+        isNative(): boolean;
+        isToplevel(): boolean;
+        isEval(): boolean;
+        isConstructor(): boolean;
     }
-
-    function Callsite(): Callsite.CallSite[];
-
-    export = Callsite;
 }
+
+declare function Callsite(): Callsite.CallSite[];
+
+export = Callsite;
diff --git a/camel-case/camel-case.d.ts b/camel-case/camel-case.d.ts
index e2a4777f21..1345063e82 100644
--- a/camel-case/camel-case.d.ts
+++ b/camel-case/camel-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "camel-case" {
-	function camelCase(string: string, locale?: string): string;
-	export = camelCase;
-}
+
+declare function camelCase(string: string, locale?: string): string;
+export = camelCase;
diff --git a/camelcase/camelcase.d.ts b/camelcase/camelcase.d.ts
index 2edd71948a..79705dd423 100644
--- a/camelcase/camelcase.d.ts
+++ b/camelcase/camelcase.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Sam Verschueren <https://github.com/samverschueren>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "camelcase" {
-	function camelcase(...args: string[]): string;
-	namespace camelcase {}
-	export = camelcase;
-}
+
+declare function camelcase(...args: string[]): string;
+declare namespace camelcase { }
+export = camelcase;
diff --git a/camo/camo.d.ts b/camo/camo.d.ts
index 70f9817ffb..4823480400 100644
--- a/camo/camo.d.ts
+++ b/camo/camo.d.ts
@@ -3,137 +3,135 @@
 // Definitions by: Lucas Matías Ciruzzi <https://github.com/lucasmciruzzi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "camo" {
 
-	type TypeOrArray<Type> = Type | Type[];
 
-	/**
-	 * Supported type constructors for document properties
-	 */
-	export type SchemaTypeConstructor =
-		TypeOrArray<StringConstructor> |
-		TypeOrArray<NumberConstructor> |
-		TypeOrArray<BooleanConstructor> |
-		TypeOrArray<DateConstructor> |
-		TypeOrArray<ObjectConstructor> |
-		TypeOrArray<ArrayConstructor>;
+type TypeOrArray<Type> = Type | Type[];
 
-	/**
-	 * Supported types for document properties
-	 */
-	export type SchemaType = TypeOrArray<string | number | boolean | Date | Object>;
+/**
+ * Supported type constructors for document properties
+ */
+export type SchemaTypeConstructor =
+    TypeOrArray<StringConstructor> |
+    TypeOrArray<NumberConstructor> |
+    TypeOrArray<BooleanConstructor> |
+    TypeOrArray<DateConstructor> |
+    TypeOrArray<ObjectConstructor> |
+    TypeOrArray<ArrayConstructor>;
 
-	/**
-	 * Document property with options
-	 */
-	export interface SchemaTypeOptions<Type> {
-		/**
-		 * Type of data
-		 */
-		type: SchemaTypeConstructor;
-		/**
-		 * Default value
-		 */
-		default?: Type;
-		/**
-		 * Min value (only with Number)
-		 */
-		min?: number;
-		/**
-		 * Max value (only with Number)
-		 */
-		max?: number;
-		/**
-		 * Posible options
-		 */
-		choices?: Type[];
-		/**
-		 * RegEx to match value
-		 */
-		match?: RegExp;
-		/**
-		 * Validation function
-		 *
-		 * @param	value	Value taken
-		 * @returns			true (validation ok) or false (validation wrong)
-		 */
-		validate?(value: Type): boolean;
-		/**
-		 * Unique value (like ids)
-		 */
-		unique?: boolean;
-		/**
-		 * Required field
-		 */
-		required?: boolean;
-	}
-
-	/**
-	 * Document property type or options
-	 */
-	export type SchemaTypeExtended = SchemaTypeConstructor | SchemaTypeOptions<SchemaType>;
-
-	/**
-	 * Schema passed to Document.create()
-	 */
-	interface DocumentSchema {
-		/**
-		 * Index signature
-		 */
-		[property: string]: SchemaType;
-		/**
-		 * Document id
-		 */
-		_id?: string;
-	}
-
-	/**
-	 * Camo document instance
-	 */
-	class DocumentInstance<Schema extends DocumentSchema> {
-		public save(): Promise<Schema>;
-		public loadOne(): Promise<Schema>;
-		public loadMany(): Promise<Schema>;
-		public delete(): Promise<Schema>;
-		public deleteOne(): Promise<Schema>;
-		public deleteMany(): Promise<Schema>;
-		public loadOneAndDelete(): Promise<Schema>;
-		public count(): Promise<Schema>;
-		public preValidate(): Promise<Schema>;
-		public postValidate(): Promise<Schema>;
-		public preSave(): Promise<Schema>;
-		public postSave(): Promise<Schema>;
-		public preDelete(): Promise<Schema>;
-		public postDelete(): Promise<Schema>;
-	}
-
-	/**
-	 * Camo document
-	 */
-	export class Document {
-		/**
-		 * Index signature
-		 */
-		[property: string]: SchemaTypeExtended | string | DocumentInstance<any>;
-		/**
-		 * Static method to define the collection name
-		 *
-		 * @returns		The collection name
-		 */
-		static collectionName(): string;
-		/**
-		 * Creates a camo document instance
-		 *
-		 * @returns		A camo document instance
-		 */
-		static create<Schema extends DocumentSchema>(schema: Schema): DocumentInstance<Schema>;
-	}
-
-	/**
-	 * Connect function
-	 *
-	 * @param	uri		Connection URI
-	 */
-	export function connect (uri: string): Promise<any>;
+/**
+ * Supported types for document properties
+ */
+export type SchemaType = TypeOrArray<string | number | boolean | Date | Object>;
 
+/**
+ * Document property with options
+ */
+export interface SchemaTypeOptions<Type> {
+    /**
+     * Type of data
+     */
+    type: SchemaTypeConstructor;
+    /**
+     * Default value
+     */
+    default?: Type;
+    /**
+     * Min value (only with Number)
+     */
+    min?: number;
+    /**
+     * Max value (only with Number)
+     */
+    max?: number;
+    /**
+     * Posible options
+     */
+    choices?: Type[];
+    /**
+     * RegEx to match value
+     */
+    match?: RegExp;
+    /**
+     * Validation function
+     *
+     * @param	value	Value taken
+     * @returns			true (validation ok) or false (validation wrong)
+     */
+    validate?(value: Type): boolean;
+    /**
+     * Unique value (like ids)
+     */
+    unique?: boolean;
+    /**
+     * Required field
+     */
+    required?: boolean;
 }
+
+/**
+ * Document property type or options
+ */
+export type SchemaTypeExtended = SchemaTypeConstructor | SchemaTypeOptions<SchemaType>;
+
+/**
+ * Schema passed to Document.create()
+ */
+interface DocumentSchema {
+    /**
+     * Index signature
+     */
+    [property: string]: SchemaType;
+    /**
+     * Document id
+     */
+    _id?: string;
+}
+
+/**
+ * Camo document instance
+ */
+declare class DocumentInstance<Schema extends DocumentSchema> {
+    public save(): Promise<Schema>;
+    public loadOne(): Promise<Schema>;
+    public loadMany(): Promise<Schema>;
+    public delete(): Promise<Schema>;
+    public deleteOne(): Promise<Schema>;
+    public deleteMany(): Promise<Schema>;
+    public loadOneAndDelete(): Promise<Schema>;
+    public count(): Promise<Schema>;
+    public preValidate(): Promise<Schema>;
+    public postValidate(): Promise<Schema>;
+    public preSave(): Promise<Schema>;
+    public postSave(): Promise<Schema>;
+    public preDelete(): Promise<Schema>;
+    public postDelete(): Promise<Schema>;
+}
+
+/**
+ * Camo document
+ */
+declare export class Document {
+    /**
+     * Index signature
+     */
+    [property: string]: SchemaTypeExtended | string | DocumentInstance<any>;
+    /**
+     * Static method to define the collection name
+     *
+     * @returns		The collection name
+     */
+    static collectionName(): string;
+    /**
+     * Creates a camo document instance
+     *
+     * @returns		A camo document instance
+     */
+    static create<Schema extends DocumentSchema>(schema: Schema): DocumentInstance<Schema>;
+}
+
+/**
+ * Connect function
+ *
+ * @param	uri		Connection URI
+ */
+declare export function connect(uri: string): Promise<any>;
diff --git a/change-case/change-case.d.ts b/change-case/change-case.d.ts
index d432db1c35..80ba8e3bec 100644
--- a/change-case/change-case.d.ts
+++ b/change-case/change-case.d.ts
@@ -3,37 +3,36 @@
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "change-case" {
-    function dot(s: string): string;
-    function dotCase(s: string): string;
-    function swap(s: string): string;
-    function swapCase(s: string): string;
-    function path(s: string): string;
-    function pathCase(s: string): string;
-    function upper(s: string): string;
-    function upperCase(s: string): string;
-    function lower(s: string): string;
-    function lowerCase(s: string): string;
-    function camel(s: string): string;
-    function camelCase(s: string): string;
-    function snake(s: string): string;
-    function snakeCase(s: string): string;
-    function title(s: string): string;
-    function titleCase(s: string): string;
-    function param(s: string): string;
-    function paramCase(s: string): string;
-    function pascal(s: string): string;
-    function pascalCase(s: string): string;
-    function constant(s: string): string;
-    function constantCase(s: string): string;
-    function sentence(s: string): string;
-    function sentenceCase(s: string): string;
-    function isUpper(s: string): boolean;
-    function isUpperCase(s: string): boolean;
-    function isLower(s: string): boolean;
-    function isLowerCase(s: string): boolean;
-    function ucFirst(s: string): string;
-    function upperCaseFirst(s: string): string;
-    function lcFirst(s: string): string;
-    function lowerCaseFirst(s: string): string;
-}
+
+declare function dot(s: string): string;
+declare function dotCase(s: string): string;
+declare function swap(s: string): string;
+declare function swapCase(s: string): string;
+declare function path(s: string): string;
+declare function pathCase(s: string): string;
+declare function upper(s: string): string;
+declare function upperCase(s: string): string;
+declare function lower(s: string): string;
+declare function lowerCase(s: string): string;
+declare function camel(s: string): string;
+declare function camelCase(s: string): string;
+declare function snake(s: string): string;
+declare function snakeCase(s: string): string;
+declare function title(s: string): string;
+declare function titleCase(s: string): string;
+declare function param(s: string): string;
+declare function paramCase(s: string): string;
+declare function pascal(s: string): string;
+declare function pascalCase(s: string): string;
+declare function constant(s: string): string;
+declare function constantCase(s: string): string;
+declare function sentence(s: string): string;
+declare function sentenceCase(s: string): string;
+declare function isUpper(s: string): boolean;
+declare function isUpperCase(s: string): boolean;
+declare function isLower(s: string): boolean;
+declare function isLowerCase(s: string): boolean;
+declare function ucFirst(s: string): string;
+declare function upperCaseFirst(s: string): string;
+declare function lcFirst(s: string): string;
+declare function lowerCaseFirst(s: string): string;
diff --git a/checksum/checksum.d.ts b/checksum/checksum.d.ts
index 920164386f..3c3620bbcf 100644
--- a/checksum/checksum.d.ts
+++ b/checksum/checksum.d.ts
@@ -3,42 +3,41 @@
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "checksum" {
 
-	namespace checksum {
-		/**
-		 * Options object for all functions
-		 */
-		interface ChecksumOptions {
-			/**
-			 * Algorithm to use, default 'sha1'
-			 * Can be 'sha1' or 'md5'  (see module 'crypto').
-			 */
-			algorithm?: string;
-		}
 
-		/**
-		 * Generate the checksum for a file on disk
-		 * @param filename	The file name
-		 * @param callback	Callback which is called with the result or an error
-		 */
-		function file(filename: string, callback: (error: Error, hash: string) => void): void;
-		/**
-		 * Generate the checksum for a file on disk
-		 * @param filename	The file name
-		 * @param options	Options object to indicate hash algo
-		 * @param callback	Callback which is called with the result or an error
-		 */
-		function file(filename: string, options: ChecksumOptions, callback: (error: Error, hash: string) => void): void;
-	}
+declare namespace checksum {
+    /**
+     * Options object for all functions
+     */
+    interface ChecksumOptions {
+        /**
+         * Algorithm to use, default 'sha1'
+         * Can be 'sha1' or 'md5'  (see module 'crypto').
+         */
+        algorithm?: string;
+    }
 
-	/**
-	 * Generates a checksum for the given value
-	 * @param value	Any value
-	 * @param options	Allows to set the algorithm
-	 * @returns	Checksum
-	 */
-	function checksum(value: any, options?: checksum.ChecksumOptions): string;
-
-	export = checksum;
+    /**
+     * Generate the checksum for a file on disk
+     * @param filename	The file name
+     * @param callback	Callback which is called with the result or an error
+     */
+    function file(filename: string, callback: (error: Error, hash: string) => void): void;
+    /**
+     * Generate the checksum for a file on disk
+     * @param filename	The file name
+     * @param options	Options object to indicate hash algo
+     * @param callback	Callback which is called with the result or an error
+     */
+    function file(filename: string, options: ChecksumOptions, callback: (error: Error, hash: string) => void): void;
 }
+
+/**
+ * Generates a checksum for the given value
+ * @param value	Any value
+ * @param options	Allows to set the algorithm
+ * @returns	Checksum
+ */
+declare function checksum(value: any, options?: checksum.ChecksumOptions): string;
+
+export = checksum;
diff --git a/circular-json/circular-json.d.ts b/circular-json/circular-json.d.ts
index 343744a690..b724f92577 100644
--- a/circular-json/circular-json.d.ts
+++ b/circular-json/circular-json.d.ts
@@ -3,13 +3,12 @@
 // Definitions by: Jonathan Pevarnek <https://github.com/jpevarnek/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'circular-json' {
-  interface ICircularJSON extends JSON {
+
+interface ICircularJSON extends JSON {
     parse(text: string, reviver?: (key: any, value: any) => any): any;
     stringify(value: any, replacer?: ((key: string, value: any) => any) | any[], space?: any, placeholder?: boolean): string;
-  }
-
-  var CircularJSON: ICircularJSON;
-
-  export = CircularJSON;
 }
+
+declare var CircularJSON: ICircularJSON;
+
+export = CircularJSON;
diff --git a/clean-css/clean-css.d.ts b/clean-css/clean-css.d.ts
index 752be96571..012977f035 100644
--- a/clean-css/clean-css.d.ts
+++ b/clean-css/clean-css.d.ts
@@ -3,107 +3,106 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'clean-css' {
-  namespace CleanCSS {
+
+declare namespace CleanCSS {
     interface Options {
-      // Set to false to disable advanced optimizations - selector & property merging, reduction, etc.
-      advanced?: boolean;
+        // Set to false to disable advanced optimizations - selector & property merging, reduction, etc.
+        advanced?: boolean;
 
-      // Set to false to disable aggressive merging of properties.
-      aggressiveMerging?: boolean;
+        // Set to false to disable aggressive merging of properties.
+        aggressiveMerging?: boolean;
 
-      // Turns on benchmarking mode measuring time spent on cleaning up (run npm run bench to see example)
-      benchmark?: boolean;
+        // Turns on benchmarking mode measuring time spent on cleaning up (run npm run bench to see example)
+        benchmark?: boolean;
 
-      // Enables compatibility mode
-      compatibility?: Object;
+        // Enables compatibility mode
+        compatibility?: Object;
 
-      // Set to true to get minification statistics under stats property (see test/custom-test.js for examples)
-      debug?: boolean;
+        // Set to true to get minification statistics under stats property (see test/custom-test.js for examples)
+        debug?: boolean;
 
-      // A hash of options for @import inliner, see test/protocol-imports-test.js for examples, or this comment for a proxy use case.
-      inliner?: Object;
+        // A hash of options for @import inliner, see test/protocol-imports-test.js for examples, or this comment for a proxy use case.
+        inliner?: Object;
 
-      // Whether to keep line breaks (default is false)
-      keepBreaks?: boolean;
+        // Whether to keep line breaks (default is false)
+        keepBreaks?: boolean;
 
-      // * for keeping all (default), 1 for keeping first one only, 0 for removing all
-      keepSpecialComments?: string | number;
+        // * for keeping all (default), 1 for keeping first one only, 0 for removing all
+        keepSpecialComments?: string | number;
 
-      // Whether to merge @media at-rules (default is true)
-      mediaMerging?: boolean;
+        // Whether to merge @media at-rules (default is true)
+        mediaMerging?: boolean;
 
-      // Whether to process @import rules
-      processImport?: boolean;
+        // Whether to process @import rules
+        processImport?: boolean;
 
-      // A list of @import rules, can be ['all'] (default), ['local'], ['remote'], or a blacklisted path e.g. ['!fonts.googleapis.com']
-      processImportFrom?: Array<string>;
+        // A list of @import rules, can be ['all'] (default), ['local'], ['remote'], or a blacklisted path e.g. ['!fonts.googleapis.com']
+        processImportFrom?: Array<string>;
 
-      // Set to false to skip URL rebasing
-      rebase?: boolean;
+        // Set to false to skip URL rebasing
+        rebase?: boolean;
 
-      // Path to resolve relative @import rules and URLs
-      relativeTo?: string;
+        // Path to resolve relative @import rules and URLs
+        relativeTo?: string;
 
-      // Set to false to disable restructuring in advanced optimizations
-      restructuring?: boolean;
+        // Set to false to disable restructuring in advanced optimizations
+        restructuring?: boolean;
 
-      // Path to resolve absolute @import rules and rebase relative URLs
-      root?: string;
+        // Path to resolve absolute @import rules and rebase relative URLs
+        root?: string;
 
-      // Rounding precision; defaults to 2; -1 disables rounding
-      roundingPrecision?: number;
+        // Rounding precision; defaults to 2; -1 disables rounding
+        roundingPrecision?: number;
 
-      // Set to true to enable semantic merging mode which assumes BEM-like content (default is false as it's highly likely this will break your stylesheets - use with caution!)
-      semanticMerging?: boolean;
+        // Set to true to enable semantic merging mode which assumes BEM-like content (default is false as it's highly likely this will break your stylesheets - use with caution!)
+        semanticMerging?: boolean;
 
-      // Set to false to skip shorthand compacting (default is true unless sourceMap is set when it's false)
-      shorthandCompacting?: boolean;
+        // Set to false to skip shorthand compacting (default is true unless sourceMap is set when it's false)
+        shorthandCompacting?: boolean;
 
-      // Exposes source map under sourceMap property, e.g. new CleanCSS().minify(source).sourceMap (default is false) If input styles are a product of CSS preprocessor (Less, Sass) an input source map can be passed as a string.
-      sourceMap?: boolean | string;
+        // Exposes source map under sourceMap property, e.g. new CleanCSS().minify(source).sourceMap (default is false) If input styles are a product of CSS preprocessor (Less, Sass) an input source map can be passed as a string.
+        sourceMap?: boolean | string;
 
-      // Set to true to inline sources inside a source map's sourcesContent field (defaults to false) It is also required to process inlined sources from input source maps.
-      sourceMapInlineSources?: boolean;
+        // Set to true to inline sources inside a source map's sourcesContent field (defaults to false) It is also required to process inlined sources from input source maps.
+        sourceMapInlineSources?: boolean;
 
-      // Path to a folder or an output file to which rebase all URLs
-      target?: string;
+        // Path to a folder or an output file to which rebase all URLs
+        target?: string;
     }
 
     interface Output {
-      // Optimized output CSS as a string
-      styles: string;
+        // Optimized output CSS as a string
+        styles: string;
 
-      // Output source map (if requested with sourceMap option)
-      sourceMap: string;
+        // Output source map (if requested with sourceMap option)
+        sourceMap: string;
 
-      // A list of errors raised
-      errors: Array<string>;
+        // A list of errors raised
+        errors: Array<string>;
 
-      // A list of warnings raised
-      warnings: Array<string>;
+        // A list of warnings raised
+        warnings: Array<string>;
 
-      // A hash of statistic information (if requested with debug option)
-      stats: {
-        // Original content size (after import inlining)
-        originalSize: number;
+        // A hash of statistic information (if requested with debug option)
+        stats: {
+            // Original content size (after import inlining)
+            originalSize: number;
 
-        // Optimized content size
-        minifiedSize: number;
+            // Optimized content size
+            minifiedSize: number;
 
-        // Time spent on optimizations
-        timeSpent: number;
+            // Time spent on optimizations
+            timeSpent: number;
 
-        // A ratio of output size to input size (e.g. 25% if content was reduced from 100 bytes to 75 bytes)
-        efficiency: number;
-      };
+            // A ratio of output size to input size (e.g. 25% if content was reduced from 100 bytes to 75 bytes)
+            efficiency: number;
+        };
     }
-  }
+}
 
-  class CleanCSS {
+declare class CleanCSS {
     constructor(options?: CleanCSS.Options);
     minify(sources: string | Array<string> | Object, callback?: (error: any, minified: CleanCSS.Output) => void): CleanCSS.Output;
-  }
-
-  export = CleanCSS;
 }
+
+export = CleanCSS;
diff --git a/cli/cli.d.ts b/cli/cli.d.ts
index 2283d3d283..c19d2f4925 100644
--- a/cli/cli.d.ts
+++ b/cli/cli.d.ts
@@ -5,62 +5,61 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "cli" {
-    interface CLI {
-        app: string;
-        version: string;
-        argv: string[];
-        argc: number;
-        options: any;
-        args: string[];
-        command: string;
-        width: number;
-        option_width: number;
-        native: any;
-        output(message?: any, ...optionalParams: any[]): void;
-        exit(code: number): void;
-        no_color: boolean;
-        enable(...plugins: string[]): CLI;
-        disable(...plugins: string[]): CLI;
-        setArgv(argv: string | Array<any>, keepArg0?: boolean): void;
-        next(): string;
-        parse(opts?: { [long: string]: { 0: string | boolean, 1: string, 2?: string, 3?: any } },
-              commands?: { [name: string]: string } | string[]): any;
-        autocompleteCommand(command: string): string;
-        info(msg: string): void;
-        error(msg: string): void;
-        ok(msg: string): void;
-        debug(msg: string): void;
-        fatal(msg: string): void;
-        setApp(appName: string, version: string): CLI;
-        setApp(packageJson: string): CLI;
-        parsePackageJson(path?: string): void;
-        setUsage(usage: string): CLI;
-        getUsage(code?: number): void;
-        getOptError(expects: string, type: string): string;
-        getValue(defaultVal: string, validateFunc: (value: any) => any, errMsg: string): void;
-        getInt(defaultVal: number): number;
-        getDate(defaultVal: Date): Date;
-        getFloat(defaultVal: number): number;
-        getUrl(defautltVal: string, identifier?: string): string;
-        getEmail(defaultVal: string): string;
-        getIp(defaultVal: string): string;
-        getPath(defaultVal: string, identifier?: string): string;
-        getArrayValue<T>(arr: T[], defaultVal: T): T;
-        withStdin(callback: (data: string) => void): void;
-        withStdin(encoding: string, callback: (text: string) => void): void;
-        withStdinLines(callback: (lines: string[], newline: string) => void): void;
-        withInput(file: string, encoding: string, callback: (line: string, newline: string, eof: boolean) => void): void;
-        withInput(file: string, callback: (line: string, newline: string, eof: boolean) => void): void;
-        withInput(callback: (line: string, newline: string, eof: boolean) => void): void;
-        toType(object: any): string;
-        daemon(arg: string, callback: () => void): void;
-        main(callback: (args: string[], options: any) => void): void;
-        createServer(...args: any[]): any;
-        exec(cmd: string, callback?: (lines: string[]) => void, errback?: (err: any, stdout: string) => void): void;
-        progress(progress: number, decimals?: number, stream?: NodeJS.WritableStream): void;
-        spinner(prefix?: string | boolean, end?: boolean, stream?: NodeJS.WritableStream): void;
-    }
-    const cli: CLI;
-    export = cli;
+
+interface CLI {
+    app: string;
+    version: string;
+    argv: string[];
+    argc: number;
+    options: any;
+    args: string[];
+    command: string;
+    width: number;
+    option_width: number;
+    native: any;
+    output(message?: any, ...optionalParams: any[]): void;
+    exit(code: number): void;
+    no_color: boolean;
+    enable(...plugins: string[]): CLI;
+    disable(...plugins: string[]): CLI;
+    setArgv(argv: string | Array<any>, keepArg0?: boolean): void;
+    next(): string;
+    parse(opts?: { [long: string]: { 0: string | boolean, 1: string, 2?: string, 3?: any } },
+        commands?: { [name: string]: string } | string[]): any;
+    autocompleteCommand(command: string): string;
+    info(msg: string): void;
+    error(msg: string): void;
+    ok(msg: string): void;
+    debug(msg: string): void;
+    fatal(msg: string): void;
+    setApp(appName: string, version: string): CLI;
+    setApp(packageJson: string): CLI;
+    parsePackageJson(path?: string): void;
+    setUsage(usage: string): CLI;
+    getUsage(code?: number): void;
+    getOptError(expects: string, type: string): string;
+    getValue(defaultVal: string, validateFunc: (value: any) => any, errMsg: string): void;
+    getInt(defaultVal: number): number;
+    getDate(defaultVal: Date): Date;
+    getFloat(defaultVal: number): number;
+    getUrl(defautltVal: string, identifier?: string): string;
+    getEmail(defaultVal: string): string;
+    getIp(defaultVal: string): string;
+    getPath(defaultVal: string, identifier?: string): string;
+    getArrayValue<T>(arr: T[], defaultVal: T): T;
+    withStdin(callback: (data: string) => void): void;
+    withStdin(encoding: string, callback: (text: string) => void): void;
+    withStdinLines(callback: (lines: string[], newline: string) => void): void;
+    withInput(file: string, encoding: string, callback: (line: string, newline: string, eof: boolean) => void): void;
+    withInput(file: string, callback: (line: string, newline: string, eof: boolean) => void): void;
+    withInput(callback: (line: string, newline: string, eof: boolean) => void): void;
+    toType(object: any): string;
+    daemon(arg: string, callback: () => void): void;
+    main(callback: (args: string[], options: any) => void): void;
+    createServer(...args: any[]): any;
+    exec(cmd: string, callback?: (lines: string[]) => void, errback?: (err: any, stdout: string) => void): void;
+    progress(progress: number, decimals?: number, stream?: NodeJS.WritableStream): void;
+    spinner(prefix?: string | boolean, end?: boolean, stream?: NodeJS.WritableStream): void;
 }
+declare const cli: CLI;
+export = cli;
diff --git a/clone/clone.d.ts b/clone/clone.d.ts
index 79c05cef00..07fb70d94d 100644
--- a/clone/clone.d.ts
+++ b/clone/clone.d.ts
@@ -6,20 +6,19 @@
 /**
  * See clone JS source for API docs
  */
-declare module "clone" {
+
+/**
+ * @param val the value that you want to clone, any type allowed
+ * @param circular Call clone with circular set to false if you are certain that obj contains no circular references. This will give better performance if needed. There is no error if undefined or null is passed as obj.
+ * @param depth to wich the object is to be cloned (optional, defaults to infinity)
+ */
+declare function clone<T>(val: T, circular?: boolean, depth?: number): T;
+
+declare namespace clone {
     /**
-     * @param val the value that you want to clone, any type allowed
-     * @param circular Call clone with circular set to false if you are certain that obj contains no circular references. This will give better performance if needed. There is no error if undefined or null is passed as obj.
-     * @param depth to wich the object is to be cloned (optional, defaults to infinity)
+     * @param obj the object that you want to clone
      */
-    function clone<T>(val: T, circular?: boolean, depth?: number): T;
-
-    namespace clone {
-        /**
-         * @param obj the object that you want to clone
-         */
-        function clonePrototype<T>(obj: T): T;
-    }
-
-    export = clone
+    function clonePrototype<T>(obj: T): T;
 }
+
+export = clone
diff --git a/closure-compiler/closure-compiler.d.ts b/closure-compiler/closure-compiler.d.ts
index 2e875afbdb..9f97f74081 100644
--- a/closure-compiler/closure-compiler.d.ts
+++ b/closure-compiler/closure-compiler.d.ts
@@ -3,9 +3,8 @@
 // Definitions by: Martin Probst <https://github.com/mprobst>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'closure-compiler' {
-  type Callback = (err: Error, stdout: string, stderr: string) => any;
-  function compile(src: string, callback: Callback): void;
-  function compile(src: string, options: {[k: string]: string | string[]},
-                   callback: Callback): void;
-}
+
+type Callback = (err: Error, stdout: string, stderr: string) => any;
+declare function compile(src: string, callback: Callback): void;
+declare function compile(src: string, options: { [k: string]: string | string[] },
+    callback: Callback): void;
diff --git a/coffeeify/coffeeify.d.ts b/coffeeify/coffeeify.d.ts
index 05919f901a..6040f06026 100644
--- a/coffeeify/coffeeify.d.ts
+++ b/coffeeify/coffeeify.d.ts
@@ -5,33 +5,31 @@
 
 /// <reference path="../through/through.d.ts" />
 
-declare module "coffeeify" {
-    import through = require('through');
 
-    namespace coffeeify {
-        interface Coffeeify {
-            isCoffee(file: string): boolean;
-            isLiterate(file: string): boolean;
-            sourceMap: boolean;
-            compile(file: string, data: string, callback: Callback): void;
-            (file: string): through.ThroughStream;
-        }
+import through = require('through');
 
-        interface Callback {
-            (error: ParseError, compiled: string): void;
-        }
-
-        interface ParseError extends SyntaxError {
-            new(error: any, src: string, file: string): ParseError;
-            message: string;
-            line: number;
-            column: number;
-            annotated: string;
-        }
+declare namespace coffeeify {
+    interface Coffeeify {
+        isCoffee(file: string): boolean;
+        isLiterate(file: string): boolean;
+        sourceMap: boolean;
+        compile(file: string, data: string, callback: Callback): void;
+        (file: string): through.ThroughStream;
     }
 
-    var coffeeify: coffeeify.Coffeeify;
+    interface Callback {
+        (error: ParseError, compiled: string): void;
+    }
 
-    export = coffeeify;
+    interface ParseError extends SyntaxError {
+        new (error: any, src: string, file: string): ParseError;
+        message: string;
+        line: number;
+        column: number;
+        annotated: string;
+    }
 }
 
+declare var coffeeify: coffeeify.Coffeeify;
+
+export = coffeeify;
diff --git a/compare-version/compare-version.d.ts b/compare-version/compare-version.d.ts
index 690d517294..1807abe537 100644
--- a/compare-version/compare-version.d.ts
+++ b/compare-version/compare-version.d.ts
@@ -4,8 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare module 'compare-version' {
-  function compare(a: string, b: string): number;
 
-  export = compare;
-}
+declare function compare(a: string, b: string): number;
+
+export = compare;
diff --git a/complex/complex.d.ts b/complex/complex.d.ts
index b1ca7c4ac6..0aed9d8d8d 100644
--- a/complex/complex.d.ts
+++ b/complex/complex.d.ts
@@ -3,236 +3,235 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'complex' {
-	export default class Complex {
-		/**
-		 * @param real The real part of the number
-		 * @param im The imaginary part of the number
-		 */
-		constructor(real: number, im: number);
 
-		/**
-		 * A in line function like Number.from.
-		 *
-		 * Examples:
-		 * var z = Complex.from(2, 4);
-		 * var z = Complex.from(5);
-		 * var z = Complex.from('2+5i');
-		 *
-		 * @param real A string representation of the number, for example 1+4i
-		 */
-		static from(real: string): Complex;
+declare export default class Complex {
+    /**
+     * @param real The real part of the number
+     * @param im The imaginary part of the number
+     */
+    constructor(real: number, im: number);
 
-		/**
-		 * A in line function like Number.from.
-		 * @param real The real part of the number
-		 * @param im The imaginary part of the number
-		 */
-		static from(real: number, im?: number): Complex;
+    /**
+     * A in line function like Number.from.
+     *
+     * Examples:
+     * var z = Complex.from(2, 4);
+     * var z = Complex.from(5);
+     * var z = Complex.from('2+5i');
+     *
+     * @param real A string representation of the number, for example 1+4i
+     */
+    static from(real: string): Complex;
 
-		/**
-		 * Creates a complex instance from a polar representation
-		 * @param r The radius/magnitude of the number
-		 * @param phi The angle/phase of the number
-		 */
-		static fromPolar(r: number, phi: number): Complex;
+    /**
+     * A in line function like Number.from.
+     * @param real The real part of the number
+     * @param im The imaginary part of the number
+     */
+    static from(real: number, im?: number): Complex;
 
-		/**
-		 * A instance of the imaginary unit
-		 */
-		static i: Complex;
+    /**
+     * Creates a complex instance from a polar representation
+     * @param r The radius/magnitude of the number
+     * @param phi The angle/phase of the number
+     */
+    static fromPolar(r: number, phi: number): Complex;
 
-		/**
-		 * A instance for the real number
-		 */
-		static one: Complex;
+    /**
+     * A instance of the imaginary unit
+     */
+    static i: Complex;
 
-		/**
-		 * Set the real and imaginary properties a and b from a + bi.
-		 * @param real The real part of the number
-		 * @param im The imaginary part of the number
-		 */
-		fromRect(real: number, im: number): Complex;
+    /**
+     * A instance for the real number
+     */
+    static one: Complex;
 
-		/**
-		 * Set the a and b in a + bi from a polar representation.
-		 * @param r The radius/magnitude of the number
-		 * @param phi The angle/phase of the number
-		 */
-		fromPolar(r: number, phi: number): Complex;
+    /**
+     * Set the real and imaginary properties a and b from a + bi.
+     * @param real The real part of the number
+     * @param im The imaginary part of the number
+     */
+    fromRect(real: number, im: number): Complex;
 
-		/**
-		 * Set the precision of the numbers. Similar to Number.prototype.toPrecision. Useful before printing the number with the toString method.
-		 * @param k An integer specifying the number of significant digits
-		 */
-		toPrecision(k: number): Complex;
+    /**
+     * Set the a and b in a + bi from a polar representation.
+     * @param r The radius/magnitude of the number
+     * @param phi The angle/phase of the number
+     */
+    fromPolar(r: number, phi: number): Complex;
 
-		/**
-		 * Format a number using fixed-point notation. Similar to Number.prototype.toFixed. Useful before printing the number with the toString method.
-		 * @param k The number of digits to appear after the decimal point; this may be a value between 0 and 20, inclusive, and implementations may optionally support a larger range of values. If this argument is omitted, it is treated as 0.
-		 */
-		toFixed(k: number): Complex;
+    /**
+     * Set the precision of the numbers. Similar to Number.prototype.toPrecision. Useful before printing the number with the toString method.
+     * @param k An integer specifying the number of significant digits
+     */
+    toPrecision(k: number): Complex;
 
-		/**
-		 * Finalize the instance. The number will not change and any other method call will return a new instance. Very useful when a complex instance should stay constant. For example the Complex.i variable is a finalized instance.
-		 */
-		finalize(): Complex;
+    /**
+     * Format a number using fixed-point notation. Similar to Number.prototype.toFixed. Useful before printing the number with the toString method.
+     * @param k The number of digits to appear after the decimal point; this may be a value between 0 and 20, inclusive, and implementations may optionally support a larger range of values. If this argument is omitted, it is treated as 0.
+     */
+    toFixed(k: number): Complex;
 
-		/**
-		 * Calculate the magnitude of the complex number
-		 */
-		magnitude(): number;
+    /**
+     * Finalize the instance. The number will not change and any other method call will return a new instance. Very useful when a complex instance should stay constant. For example the Complex.i variable is a finalized instance.
+     */
+    finalize(): Complex;
 
-		/**
-		 * Alias for magnitude(). Calculate the magnitude of the complex number.
-		 */
-		abs(): number;
+    /**
+     * Calculate the magnitude of the complex number
+     */
+    magnitude(): number;
 
-		/**
-		 * Calculate the angle with respect to the real axis, in radians.
-		 */
-		angle(): number;
+    /**
+     * Alias for magnitude(). Calculate the magnitude of the complex number.
+     */
+    abs(): number;
 
-		/**
-		 * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
-		 */
-		arg(): number;
+    /**
+     * Calculate the angle with respect to the real axis, in radians.
+     */
+    angle(): number;
 
-		/**
-		 * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
-		 */
-		phase(): number;
+    /**
+     * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
+     */
+    arg(): number;
 
-		/**
-		 * Calculate the conjugate of the complex number (multiplies the imaginary part with -1)
-		 */
-		conjugate(): Complex;
+    /**
+     * Alias for angle(). Calculate the angle with respect to the real axis, in radians.
+     */
+    phase(): number;
 
-		/**
-		 * Negate the number (multiplies both the real and imaginary part with -1)
-		 */
-		negate(): Complex;
+    /**
+     * Calculate the conjugate of the complex number (multiplies the imaginary part with -1)
+     */
+    conjugate(): Complex;
 
-		/**
-		 * Multiply the number with a real or complex number
-		 * @param z The number to multiply with
-		 */
-		multiply(z: number | Complex): Complex;
+    /**
+     * Negate the number (multiplies both the real and imaginary part with -1)
+     */
+    negate(): Complex;
 
-		/**
-		 * Alias for multiply(). Multiply the number with a real or complex number
-		 * @param z The number to multiply with
-		 */
-		mult(z: number | Complex): Complex;
+    /**
+     * Multiply the number with a real or complex number
+     * @param z The number to multiply with
+     */
+    multiply(z: number | Complex): Complex;
 
-		/**
-		 * Divide the number by a real or complex number
-		 * @param z The number to divide by
-		 */
-		divide(z: number | Complex): Complex;
+    /**
+     * Alias for multiply(). Multiply the number with a real or complex number
+     * @param z The number to multiply with
+     */
+    mult(z: number | Complex): Complex;
 
-		/**
-		 * Alias for divide(). Divide the number by a real or complex number
-		 * @param z The number to divide by
-		 */
-		div(z: number | Complex): Complex;
+    /**
+     * Divide the number by a real or complex number
+     * @param z The number to divide by
+     */
+    divide(z: number | Complex): Complex;
 
-		/**
-		 * Add a real or complex number
-		 * @param z The number to add
-		 */
-		add(z: number | Complex): Complex;
+    /**
+     * Alias for divide(). Divide the number by a real or complex number
+     * @param z The number to divide by
+     */
+    div(z: number | Complex): Complex;
 
-		/**
-		 * Subtract a real or complex number
-		 * @param z The number to subtract
-		 */
-		subtract(z: number | Complex): Complex;
+    /**
+     * Add a real or complex number
+     * @param z The number to add
+     */
+    add(z: number | Complex): Complex;
 
-		/**
-		 * Alias for subtract(). Subtract a real or complex number
-		 * @param z The number to subtract
-		 */
-		sub(z: number | Complex): Complex;
+    /**
+     * Subtract a real or complex number
+     * @param z The number to subtract
+     */
+    subtract(z: number | Complex): Complex;
 
-		/**
-		 * Return the base to the exponent
-		 * @param z The exponent
-		 */
-		pow(z: number | Complex): Complex;
+    /**
+     * Alias for subtract(). Subtract a real or complex number
+     * @param z The number to subtract
+     */
+    sub(z: number | Complex): Complex;
 
-		/**
-		 * Return the square root
-		 */
-		sqrt(): Complex;
+    /**
+     * Return the base to the exponent
+     * @param z The exponent
+     */
+    pow(z: number | Complex): Complex;
 
-		/**
-		 * Return the natural logarithm (base E)
-		 * @param k The actual answer has a multiplicity (ln(z) = ln|z| + arg(z)) where arg(z) can return the same for different angles (every 2*pi), with this argument you can define which answer is required
-		 */
-		log(k?: number): Complex;
+    /**
+     * Return the square root
+     */
+    sqrt(): Complex;
 
-		/**
-		 * Calculate the e^z where the base is E and the exponential the complex number.
-		 */
-		exp(): Complex;
+    /**
+     * Return the natural logarithm (base E)
+     * @param k The actual answer has a multiplicity (ln(z) = ln|z| + arg(z)) where arg(z) can return the same for different angles (every 2*pi), with this argument you can define which answer is required
+     */
+    log(k?: number): Complex;
 
-		/**
-		 * Calculate the sine of the complex number
-		 */
-		sin(): Complex;
+    /**
+     * Calculate the e^z where the base is E and the exponential the complex number.
+     */
+    exp(): Complex;
 
-		/**
-		 * Calculate the cosine of the complex number
-		 */
-		cos(): Complex;
+    /**
+     * Calculate the sine of the complex number
+     */
+    sin(): Complex;
 
-		/**
-		 * Calculate the tangent of the complex number
-		 */
-		tan(): Complex;
+    /**
+     * Calculate the cosine of the complex number
+     */
+    cos(): Complex;
 
-		/**
-		 * Calculate the hyperbolic sine of the complex number
-		 */
-		sinh(): Complex
+    /**
+     * Calculate the tangent of the complex number
+     */
+    tan(): Complex;
 
-		/**
-		 * Calculate the hyperbolic cosine of the complex number
-		 */
-		cosh(): Complex
+    /**
+     * Calculate the hyperbolic sine of the complex number
+     */
+    sinh(): Complex
 
-		/**
-		 * Calculate the hyperbolic tangent of the complex number
-		 */
-		tanh(): Complex
+    /**
+     * Calculate the hyperbolic cosine of the complex number
+     */
+    cosh(): Complex
 
-		/**
-		 * Return a new Complex instance with the same real and imaginary properties
-		 */
-		clone(): Complex;
+    /**
+     * Calculate the hyperbolic tangent of the complex number
+     */
+    tanh(): Complex
 
-		/**
-		 * Return a string representation of the complex number
-		 *
-		 * Examples:
-		 * new Complex(1, 2).toString(); // 1+2i
-		 * new Complex(0, 1).toString(); // i
-		 * new Complex(4, 0).toString(); // 4
-		 * new Complex(1, 1).toString(); // 1+i
-		 * 'my Complex Number is: ' + (new Complex(3, 5)); // 'my Complex Number is: 3+5i
-		 */
-		toString(): string;
+    /**
+     * Return a new Complex instance with the same real and imaginary properties
+     */
+    clone(): Complex;
 
-		/**
-		 * Check if the real and imaginary components are equal to the passed in compelex components.
-		 *
-		 * Examples:
-		 * new Complex(1, 4).equals(new Complex(1, 4)); // true
-		 * new Complex(1, 4).equals(new Complex(1, 3)); // false
-		 *
-		 * @param z The complex number to compare with
-		 */
-		equals(z: number | Complex): boolean;
-	}
+    /**
+     * Return a string representation of the complex number
+     *
+     * Examples:
+     * new Complex(1, 2).toString(); // 1+2i
+     * new Complex(0, 1).toString(); // i
+     * new Complex(4, 0).toString(); // 4
+     * new Complex(1, 1).toString(); // 1+i
+     * 'my Complex Number is: ' + (new Complex(3, 5)); // 'my Complex Number is: 3+5i
+     */
+    toString(): string;
+
+    /**
+     * Check if the real and imaginary components are equal to the passed in compelex components.
+     *
+     * Examples:
+     * new Complex(1, 4).equals(new Complex(1, 4)); // true
+     * new Complex(1, 4).equals(new Complex(1, 3)); // false
+     *
+     * @param z The complex number to compare with
+     */
+    equals(z: number | Complex): boolean;
 }
diff --git a/compose-function/compose-function.d.ts b/compose-function/compose-function.d.ts
index d4f205fd32..a77317c48c 100644
--- a/compose-function/compose-function.d.ts
+++ b/compose-function/compose-function.d.ts
@@ -3,29 +3,28 @@
 // Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "compose-function" {
-	// Hardcoded signatures for 2-4 parameters
-	function f<A, B, C>(
-		f1: (b: B) => C,
-		f2: (a: A) => B
-	): (a: A) => C
-	function f<A, B, C, D>(
-		f1: (b: C) => D,
-		f2: (a: B) => C,
-		f3: (a: A) => B
-	): (a: A) => D
-	function f<A, B, C, D, E>(
-		f1: (b: D) => E,
-		f2: (a: C) => D,
-		f3: (a: B) => C,
-		f4: (a: A) => B
-	): (a: A) => E
 
-	// Minimal typing for more than 4 parameters
-	function f<Result>(
-		f1: (a: any) => Result,
-		...functions: Function[]
-	): (a: any) => Result
+// Hardcoded signatures for 2-4 parameters
+declare function f<A, B, C>(
+    f1: (b: B) => C,
+    f2: (a: A) => B
+): (a: A) => C
+declare function f<A, B, C, D>(
+    f1: (b: C) => D,
+    f2: (a: B) => C,
+    f3: (a: A) => B
+): (a: A) => D
+declare function f<A, B, C, D, E>(
+    f1: (b: D) => E,
+    f2: (a: C) => D,
+    f3: (a: B) => C,
+    f4: (a: A) => B
+): (a: A) => E
 
-	export = f;
-}
+// Minimal typing for more than 4 parameters
+declare function f<Result>(
+    f1: (a: any) => Result,
+    ...functions: Function[]
+): (a: any) => Result
+
+export = f;
diff --git a/compression/compression.d.ts b/compression/compression.d.ts
index 6a444e3f49..29757894c1 100644
--- a/compression/compression.d.ts
+++ b/compression/compression.d.ts
@@ -5,16 +5,15 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "compression" {
-    import express = require('express');
 
-    namespace e {
-        interface CompressionOptions  {
-            threshold?: number;
-            filter?: Function;
-        }
+import express = require('express');
+
+declare namespace e {
+    interface CompressionOptions {
+        threshold?: number;
+        filter?: Function;
     }
-
-    function e(options?: e.CompressionOptions): express.RequestHandler;
-    export = e;
 }
+
+declare function e(options?: e.CompressionOptions): express.RequestHandler;
+export = e;
diff --git a/confidence/confidence.d.ts b/confidence/confidence.d.ts
index 62ad82adb1..fc3a536c50 100644
--- a/confidence/confidence.d.ts
+++ b/confidence/confidence.d.ts
@@ -9,40 +9,39 @@
 * serving values based on object path ('/a/b/c' translates to a.b.c). In addition,
 * confidence defines special $-prefixed keys used to filter values for a given criteria.
 */
-declare module 'confidence' {
-
-    export class Store {
-
-        /**
-        * @constructor
-        * @param {any} document - the configuration document for this document store
-        */
-        constructor(document?: any);
-
-        /**
-        * Validates the provided configuration, clears any existing configuration, then loads the configuration where:
-        *   @param {any} document - an object containing a confidence configuration object generated from a parsed JSON document. If the document is invlaid, will throw an error.
-        */
-        load(document: any): void;
 
 
-        /**
-        * Retrieves a value from the configuration document after applying the provided criteria where:
-        *   @param {string} key - the requested key path. All keys must begin with '/'. '/' returns the the entire document.
-        *   @param {any} criteria - optional object used as criteria for applying filters in the configuration document. Defaults to {}.
-        *
-        *   @return {any} Returns the value found after applying the criteria. If the key is invalid or not found, returns undefined.
-        */
-        get(key: string, criteria?: any): any;
+declare export class Store {
+
+    /**
+    * @constructor
+    * @param {any} document - the configuration document for this document store
+    */
+    constructor(document?: any);
+
+    /**
+    * Validates the provided configuration, clears any existing configuration, then loads the configuration where:
+    *   @param {any} document - an object containing a confidence configuration object generated from a parsed JSON document. If the document is invlaid, will throw an error.
+    */
+    load(document: any): void;
 
 
-        /**
-        * Retrieves the metadata (if any) from the configuration document after applying the provided criteria where:
-        *   @param {string} key - the requested key path. All keys must begin with '/'. '/' returns the the entire document.
-        *   @param {any} criteria - optional object used as criteria for applying filters in the configuration document. Defaults to {}.
-        *
-        *   @return {any} Returns the metadata found after applying the criteria. If the key is invalid or not found, or if no metadata is available, returns undefined.
-        */
-        meta(key: string, criteria?: any): any;
-    }
+    /**
+    * Retrieves a value from the configuration document after applying the provided criteria where:
+    *   @param {string} key - the requested key path. All keys must begin with '/'. '/' returns the the entire document.
+    *   @param {any} criteria - optional object used as criteria for applying filters in the configuration document. Defaults to {}.
+    *
+    *   @return {any} Returns the value found after applying the criteria. If the key is invalid or not found, returns undefined.
+    */
+    get(key: string, criteria?: any): any;
+
+
+    /**
+    * Retrieves the metadata (if any) from the configuration document after applying the provided criteria where:
+    *   @param {string} key - the requested key path. All keys must begin with '/'. '/' returns the the entire document.
+    *   @param {any} criteria - optional object used as criteria for applying filters in the configuration document. Defaults to {}.
+    *
+    *   @return {any} Returns the metadata found after applying the criteria. If the key is invalid or not found, or if no metadata is available, returns undefined.
+    */
+    meta(key: string, criteria?: any): any;
 }
diff --git a/config/config.d.ts b/config/config.d.ts
index f09abdd3f2..a9cb505f0e 100644
--- a/config/config.d.ts
+++ b/config/config.d.ts
@@ -3,42 +3,41 @@
 // Definitions by: Roman Korneev <https://github.com/RWander>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "config" {
 
-    var c: c.IConfig;
 
-    namespace c {
+declare var c: c.IConfig;
 
-			// see https://github.com/lorenwest/node-config/wiki/Using-Config-Utilities
-			interface IUtil {
-				// Extend an object (and any object it contains) with one or more objects (and objects contained in them).
-				extendDeep(mergeInto: any, mergeFrom: any, depth?: number): any;
+declare namespace c {
 
-				// Return a deep copy of the specified object.
-				cloneDeep(copyFrom: any, depth?: number): any;
+    // see https://github.com/lorenwest/node-config/wiki/Using-Config-Utilities
+    interface IUtil {
+        // Extend an object (and any object it contains) with one or more objects (and objects contained in them).
+        extendDeep(mergeInto: any, mergeFrom: any, depth?: number): any;
 
-				// Return true if two objects have equal contents.
-				equalsDeep(object1: any, object2: any, dept?: number): boolean;
+        // Return a deep copy of the specified object.
+        cloneDeep(copyFrom: any, depth?: number): any;
 
-				// Returns an object containing all elements that differ between two objects.
-				diffDeep(object1: any, object2: any, depth?: number): any;
+        // Return true if two objects have equal contents.
+        equalsDeep(object1: any, object2: any, dept?: number): boolean;
 
-				// Make a javascript object property immutable (assuring it cannot be changed from the current value).
-				makeImmutable(object: any, propertyName?: string, propertyValue?: string): any;
+        // Returns an object containing all elements that differ between two objects.
+        diffDeep(object1: any, object2: any, depth?: number): any;
 
-				// Make an object property hidden so it doesn't appear when enumerating elements of the object.
-				makeHidden(object: any, propertyName: string, propertyValue?: string): any;
+        // Make a javascript object property immutable (assuring it cannot be changed from the current value).
+        makeImmutable(object: any, propertyName?: string, propertyValue?: string): any;
 
-				// Get the current value of a config environment variable
-				getEnv(varName: string): string;
-			}
+        // Make an object property hidden so it doesn't appear when enumerating elements of the object.
+        makeHidden(object: any, propertyName: string, propertyValue?: string): any;
 
-			interface IConfig {
-					get<T>(setting: string): T;
-					has(setting: string): boolean;
-					util: IUtil;
-			}
-		}
+        // Get the current value of a config environment variable
+        getEnv(varName: string): string;
+    }
 
-    export = c;
+    interface IConfig {
+        get<T>(setting: string): T;
+        has(setting: string): boolean;
+        util: IUtil;
+    }
 }
+
+export = c;
diff --git a/configstore/configstore.d.ts b/configstore/configstore.d.ts
index 7ca1bcb9ee..5bd5a79420 100644
--- a/configstore/configstore.d.ts
+++ b/configstore/configstore.d.ts
@@ -3,36 +3,35 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'configstore' {
-	/*
-	 Set an item
-	 */
-	export function set(key: string, val: any): void;
 
-	/*
-	 Get an item
-	 */
-	export function get(key: string): any;
+/*
+ Set an item
+ */
+declare export function set(key: string, val: any): void;
 
-	/*
-	 Delete an item
-	 */
-	export function del(key: string): void;
+/*
+ Get an item
+ */
+declare export function get(key: string): any;
 
-	/*
-	 Get all items as an object or replace the current config with an object:
+/*
+ Delete an item
+ */
+declare export function del(key: string): void;
 
-	 conf.all = {
-	    hello: 'world'
-	 };
-	 */
-	export var all: Object;
-	/*
-	 Get the item count
-	 */
-	export var size: number;
-	/*
-	 Get the path to the config file. Can be used to show the user where the config file is located or even better open it for them.
-	 */
-	export var path: string;
-}
+/*
+ Get all items as an object or replace the current config with an object:
+
+ conf.all = {
+    hello: 'world'
+ };
+ */
+declare export var all: Object;
+/*
+ Get the item count
+ */
+declare export var size: number;
+/*
+ Get the path to the config file. Can be used to show the user where the config file is located or even better open it for them.
+ */
+declare export var path: string;
diff --git a/connect-livereload/connect-livereload.d.ts b/connect-livereload/connect-livereload.d.ts
index c8246e62f1..63524bd93e 100644
--- a/connect-livereload/connect-livereload.d.ts
+++ b/connect-livereload/connect-livereload.d.ts
@@ -5,34 +5,33 @@
 
 /// <reference path="../connect/connect.d.ts" />
 
-declare module "connect-livereload" {
-	import { HandleFunction } from "connect";
 
-	function livereload(): HandleFunction;
-	function livereload(options: livereload.Options): HandleFunction;
+import { HandleFunction } from "connect";
 
-	namespace livereload {
-		export type FileMatcher = string | RegExp;
+declare function livereload(): HandleFunction;
+declare function livereload(options: livereload.Options): HandleFunction;
 
-		export interface Rule {
-			match: RegExp;
-			fn: (w: string, s: string) => string;
-		}
+declare namespace livereload {
+    export type FileMatcher = string | RegExp;
 
-		export interface Options {
-			ignore?: FileMatcher[];
-			excludeList?: FileMatcher[];
+    export interface Rule {
+        match: RegExp;
+        fn: (w: string, s: string) => string;
+    }
 
-			include?: FileMatcher[];
-			html?: (val: string) => boolean;
-			rules?: Rule[];
-			disableCompression?: boolean;
+    export interface Options {
+        ignore?: FileMatcher[];
+        excludeList?: FileMatcher[];
 
-			hostname?: string;
-			port?: number;
-			src?: string;
-		}
-	}
+        include?: FileMatcher[];
+        html?: (val: string) => boolean;
+        rules?: Rule[];
+        disableCompression?: boolean;
 
-	export = livereload;
+        hostname?: string;
+        port?: number;
+        src?: string;
+    }
 }
+
+export = livereload;
diff --git a/connect-modrewrite/connect-modrewrite.d.ts b/connect-modrewrite/connect-modrewrite.d.ts
index 57e9e842f3..9d4c81fd29 100644
--- a/connect-modrewrite/connect-modrewrite.d.ts
+++ b/connect-modrewrite/connect-modrewrite.d.ts
@@ -5,8 +5,7 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module 'connect-modrewrite' {
-    import express = require('express');
-    function modrewrite(rewrites: string[]): express.RequestHandler;
-    export = modrewrite;
-}
\ No newline at end of file
+
+import express = require('express');
+declare function modrewrite(rewrites: string[]): express.RequestHandler;
+export = modrewrite;
diff --git a/connect-mongo/connect-mongo.d.ts b/connect-mongo/connect-mongo.d.ts
index 49f93e2d46..472ae0ddeb 100644
--- a/connect-mongo/connect-mongo.d.ts
+++ b/connect-mongo/connect-mongo.d.ts
@@ -8,106 +8,105 @@
 /// <reference path="../mongodb/mongodb.d.ts" />
 /// <reference path="../express-session/express-session.d.ts" />
 
-declare module "connect-mongo" {
-    import * as express from 'express';
-    import * as mongoose from 'mongoose';
-    import * as mongodb from 'mongodb';
-    import * as session from 'express-session';
 
-    function connectMongo(connect: (options?: session.SessionOptions) => express.RequestHandler): connectMongo.MongoStoreFactory;
+import * as express from 'express';
+import * as mongoose from 'mongoose';
+import * as mongodb from 'mongodb';
+import * as session from 'express-session';
 
-    namespace connectMongo {
+declare function connectMongo(connect: (options?: session.SessionOptions) => express.RequestHandler): connectMongo.MongoStoreFactory;
 
-        export interface DefaultOptions{
-            /**
-             * The hostname of the database you are connecting to.
-             * (Default: '127.0.0.1')
-             */
-            host?: string;
+declare namespace connectMongo {
 
-            /**
-             * The port number to connect to.
-             * (Default: 27017)
-             */
-            port?: string;
+    export interface DefaultOptions {
+        /**
+         * The hostname of the database you are connecting to.
+         * (Default: '127.0.0.1')
+         */
+        host?: string;
 
-            /**
-             * (Default: false)
-             */
-            autoReconnect?: boolean;
+        /**
+         * The port number to connect to.
+         * (Default: 27017)
+         */
+        port?: string;
 
-            /**
-             * (Default: true)
-             */
-            ssl?: boolean;
+        /**
+         * (Default: false)
+         */
+        autoReconnect?: boolean;
 
-            /**
-             * (Default: 1)
-             */
-            w?: number;
+        /**
+         * (Default: true)
+         */
+        ssl?: boolean;
 
-            /**
-             * The colletion of the database you are connecting to.
-             * (Default: sessions)
-             */
-            collection?: string;
+        /**
+         * (Default: 1)
+         */
+        w?: number;
 
-            /**
-             * Serialize sessions using JSON.stringify and deserialize them with JSON.parse.
-             * (Default: true)
-             */
-            stringify?: boolean;
+        /**
+         * The colletion of the database you are connecting to.
+         * (Default: sessions)
+         */
+        collection?: string;
 
-            /**
-             * Default: false
-             */
-            hash?: boolean;
+        /**
+         * Serialize sessions using JSON.stringify and deserialize them with JSON.parse.
+         * (Default: true)
+         */
+        stringify?: boolean;
 
-            /**
-             * Default: 14 days (60 * 60 * 24 * 14)
-             */
-            ttl?: number;
+        /**
+         * Default: false
+         */
+        hash?: boolean;
 
-            /**
-             * Automatically remove expired sessions.
-             * (Default: 'native')
-             */
-            autoRemove?: string;
+        /**
+         * Default: 14 days (60 * 60 * 24 * 14)
+         */
+        ttl?: number;
 
-            /**
-             * (Default: 10)
-             */
-            autoRemoveInterval?: number;
-        }
+        /**
+         * Automatically remove expired sessions.
+         * (Default: 'native')
+         */
+        autoRemove?: string;
 
-        export interface MongoUrlOptions extends DefaultOptions {
-            url: string;
-            mongoOptions?: mongoose.ConnectionOptions;
-        }
-
-        export interface MogooseConnectionOptions extends DefaultOptions {
-            mongooseConnection: mongoose.Connection;
-        }
-
-        export interface NaitiveMongoOptions extends DefaultOptions {
-            db: mongodb.Db;
-        }
-
-        export interface MongoStoreFactory {
-            new (options: MongoUrlOptions): MongoStore;
-            new (options: MogooseConnectionOptions): MongoStore;
-            new (options: NaitiveMongoOptions): MongoStore;
-        }
-
-        export class MongoStore extends session.Store {
-            get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
-            set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-            destroy: (sid: string, callback: (err: any) => void) => void;
-            length: (callback: (err: any, length: number) => void) => void;
-            clear: (callback: (err: any) => void) => void;
-            touch: (sid: string, session: Express.Session, callback:(err: any) => void) => void;
-        }
+        /**
+         * (Default: 10)
+         */
+        autoRemoveInterval?: number;
     }
 
-    export = connectMongo;
+    export interface MongoUrlOptions extends DefaultOptions {
+        url: string;
+        mongoOptions?: mongoose.ConnectionOptions;
+    }
+
+    export interface MogooseConnectionOptions extends DefaultOptions {
+        mongooseConnection: mongoose.Connection;
+    }
+
+    export interface NaitiveMongoOptions extends DefaultOptions {
+        db: mongodb.Db;
+    }
+
+    export interface MongoStoreFactory {
+        new (options: MongoUrlOptions): MongoStore;
+        new (options: MogooseConnectionOptions): MongoStore;
+        new (options: NaitiveMongoOptions): MongoStore;
+    }
+
+    export class MongoStore extends session.Store {
+        get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
+        set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+        destroy: (sid: string, callback: (err: any) => void) => void;
+        length: (callback: (err: any, length: number) => void) => void;
+        clear: (callback: (err: any) => void) => void;
+        touch: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+    }
 }
+
+export = connectMongo;
diff --git a/connect-slashes/connect-slashes.d.ts b/connect-slashes/connect-slashes.d.ts
index 111e29c093..761ce13404 100644
--- a/connect-slashes/connect-slashes.d.ts
+++ b/connect-slashes/connect-slashes.d.ts
@@ -15,26 +15,25 @@
 /// <reference path="../express/express.d.ts" />
 
 
-declare module "connect-slashes" {
-    import express = require('express');
+
+import express = require('express');
+
+/**
+ * @see https://github.com/avinoamr/connect-slashes#usage
+ */
+declare function slashes(addTrailingSlashes?: boolean, options?: slashes.Options): express.RequestHandler;
+
+declare namespace slashes {
 
     /**
-     * @see https://github.com/avinoamr/connect-slashes#usage
+     * Additional settings
+     * @see https://github.com/avinoamr/connect-slashes#additional-settings
      */
-    function slashes (addTrailingSlashes?: boolean, options?: slashes.Options): express.RequestHandler;
-
-    namespace slashes {
-
-        /**
-         * Additional settings
-         * @see https://github.com/avinoamr/connect-slashes#additional-settings
-         */
-        interface Options {
-            base?: string;
-            code?: number;
-            headers?: {[field: string]: string};
-        }
+    interface Options {
+        base?: string;
+        code?: number;
+        headers?: { [field: string]: string };
     }
-
-    export = slashes;
 }
+
+export = slashes;
diff --git a/connect/connect.d.ts b/connect/connect.d.ts
index 4ec11f042d..816af03f9b 100644
--- a/connect/connect.d.ts
+++ b/connect/connect.d.ts
@@ -5,88 +5,87 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "connect" {
-    import * as http from "http";
 
-    /**
-     * Create a new connect server.
-     * @public
-     */
-    function createServer(): createServer.Server;
+import * as http from "http";
 
-    namespace createServer {
-    	export type ServerHandle = HandleFunction | http.Server;
+/**
+ * Create a new connect server.
+ * @public
+ */
+declare function createServer(): createServer.Server;
 
-        export type SimpleHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse) => void;
-        export type NextHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
-        export type ErrorHandleFunction = (err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
-        export type HandleFunction = SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction;
+declare namespace createServer {
+    export type ServerHandle = HandleFunction | http.Server;
 
-    	export interface ServerStackItem {
-            route: string;
-            handle: ServerHandle;
-    	}
+    export type SimpleHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse) => void;
+    export type NextHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+    export type ErrorHandleFunction = (err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+    export type HandleFunction = SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction;
 
-        export interface Server extends NodeJS.EventEmitter {
-            (req: http.IncomingMessage, res: http.ServerResponse, next?: Function): void;
-
-            route: string;
-            stack: ServerStackItem[];
-
-            /**
-            * Utilize the given middleware `handle` to the given `route`,
-            * defaulting to _/_. This "route" is the mount-point for the
-            * middleware, when given a value other than _/_ the middleware
-            * is only effective when that segment is present in the request's
-            * pathname.
-            *
-            * For example if we were to mount a function at _/admin_, it would
-            * be invoked on _/admin_, and _/admin/settings_, however it would
-            * not be invoked for _/_, or _/posts_.
-            *
-            * @public
-            */
-            use(fn: HandleFunction): Server;
-            use(route: string, fn: HandleFunction): Server;
-
-            /**
-            * Handle server requests, punting them down
-            * the middleware stack.
-            *
-            * @private
-            */
-            handle(req: http.IncomingMessage, res: http.ServerResponse, next: Function): void;
-
-            /**
-            * Listen for connections.
-            *
-            * This method takes the same arguments
-            * as node's `http.Server#listen()`.
-            *
-            * HTTP and HTTPS:
-            *
-            * If you run your application both as HTTP
-            * and HTTPS you may wrap them individually,
-            * since your Connect "server" is really just
-            * a JavaScript `Function`.
-            *
-            *      var connect = require('connect')
-            *        , http = require('http')
-            *        , https = require('https');
-            *
-            *      var app = connect();
-            *
-            *      http.createServer(app).listen(80);
-            *      https.createServer(options, app).listen(443);
-            *
-            * @api public
-            */
-            listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
-            listen(port: number, hostname?: string, callback?: Function): http.Server;
-            listen(path: string, callback?: Function): http.Server;
-            listen(handle: any, listeningListener?: Function): http.Server;
-        }
+    export interface ServerStackItem {
+        route: string;
+        handle: ServerHandle;
     }
 
-    export = createServer;
+    export interface Server extends NodeJS.EventEmitter {
+        (req: http.IncomingMessage, res: http.ServerResponse, next?: Function): void;
+
+        route: string;
+        stack: ServerStackItem[];
+
+        /**
+        * Utilize the given middleware `handle` to the given `route`,
+        * defaulting to _/_. This "route" is the mount-point for the
+        * middleware, when given a value other than _/_ the middleware
+        * is only effective when that segment is present in the request's
+        * pathname.
+        *
+        * For example if we were to mount a function at _/admin_, it would
+        * be invoked on _/admin_, and _/admin/settings_, however it would
+        * not be invoked for _/_, or _/posts_.
+        *
+        * @public
+        */
+        use(fn: HandleFunction): Server;
+        use(route: string, fn: HandleFunction): Server;
+
+        /**
+        * Handle server requests, punting them down
+        * the middleware stack.
+        *
+        * @private
+        */
+        handle(req: http.IncomingMessage, res: http.ServerResponse, next: Function): void;
+
+        /**
+        * Listen for connections.
+        *
+        * This method takes the same arguments
+        * as node's `http.Server#listen()`.
+        *
+        * HTTP and HTTPS:
+        *
+        * If you run your application both as HTTP
+        * and HTTPS you may wrap them individually,
+        * since your Connect "server" is really just
+        * a JavaScript `Function`.
+        *
+        *      var connect = require('connect')
+        *        , http = require('http')
+        *        , https = require('https');
+        *
+        *      var app = connect();
+        *
+        *      http.createServer(app).listen(80);
+        *      https.createServer(options, app).listen(443);
+        *
+        * @api public
+        */
+        listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
+        listen(port: number, hostname?: string, callback?: Function): http.Server;
+        listen(path: string, callback?: Function): http.Server;
+        listen(handle: any, listeningListener?: Function): http.Server;
+    }
 }
+
+export = createServer;
diff --git a/console-stamp/console-stamp.d.ts b/console-stamp/console-stamp.d.ts
index a798dc66cc..ff6571330d 100644
--- a/console-stamp/console-stamp.d.ts
+++ b/console-stamp/console-stamp.d.ts
@@ -3,44 +3,43 @@
 // Definitions by: Eric Byers <https://github.com/ericbyers/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'console-stamp' {
 
-	function consoleStamp(console:{}, options?: {
-		/**
-		 * A string with date format based on Javascript Date Format
-		 */
-		pattern?: string
 
-		/**
-		 * If true it will show the label (LOG | INFO | WARN | ERROR)
-		 */
-		label?: boolean;
+declare function consoleStamp(console: {}, options?: {
+    /**
+     * A string with date format based on Javascript Date Format
+     */
+    pattern?: string
 
-		/**
-		 * An array containing the methods to include in the patch
-		 */
-		include?: any;
+    /**
+     * If true it will show the label (LOG | INFO | WARN | ERROR)
+     */
+    label?: boolean;
 
-		/**
-		 * An array containing the methods to exclude in the patch)
-		 */
-		exclude?: any;
+    /**
+     * An array containing the methods to include in the patch
+     */
+    include?: any;
 
-		/**
-		 * Types can be String, Object (interpreted with util.inspect), or Function. See the test-metadata.js for examples.
-		 * Note that metadata can still be sent as the third parameter (as in vesion 1.6) as a backward compatibillity feature, but this is deprecated.
-		 */
-		metadata?: any;
+    /**
+     * An array containing the methods to exclude in the patch)
+     */
+    exclude?: any;
 
-		/**
-		 * An object representing a color theme. More info https://www.npmjs.com/package/colors
-		 */
-		colors?: {
-			stamp?: any;
-			label?: any;
-			metadata?: any;
-		};
-	}): void;
+    /**
+     * Types can be String, Object (interpreted with util.inspect), or Function. See the test-metadata.js for examples.
+     * Note that metadata can still be sent as the third parameter (as in vesion 1.6) as a backward compatibillity feature, but this is deprecated.
+     */
+    metadata?: any;
 
-	export = consoleStamp;
-}
+    /**
+     * An object representing a color theme. More info https://www.npmjs.com/package/colors
+     */
+    colors?: {
+        stamp?: any;
+        label?: any;
+        metadata?: any;
+    };
+}): void;
+
+export = consoleStamp;
diff --git a/consolidate/consolidate.d.ts b/consolidate/consolidate.d.ts
index ff54a83a8e..2d567ce25c 100644
--- a/consolidate/consolidate.d.ts
+++ b/consolidate/consolidate.d.ts
@@ -8,68 +8,67 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../bluebird/bluebird.d.ts" />
 
-declare module "consolidate" {
-	var cons: Consolidate;
 
-	export = cons;
+declare var cons: Consolidate;
 
-	interface Consolidate {
-		/**
- 		 * expose the instance of the engine
-	   */
-		requires: Object;
+export = cons;
 
-		/**
-		 * Clear the cache.
-		 *
-		 * @api public
-		 */
-		clearCache(): void;
-		// template engines
-		atpl: RendererInterface;
-		dot: RendererInterface;
-		dust: RendererInterface;
-		eco: RendererInterface;
-		ejs: RendererInterface;
-		ect: RendererInterface;
-		haml: RendererInterface;
-		// TODO figure out how to do haml-coffee
-		hamlet: RendererInterface;
-		handlebars: RendererInterface;
-		hogan: RendererInterface;
-		htmling: RendererInterface;
-		jade: RendererInterface;
-		jazz: RendererInterface;
-		jqtpl: RendererInterface;
-		just: RendererInterface;
-		liquid: RendererInterface;
-		liquor: RendererInterface;
-		lodash: RendererInterface;
-		mote: RendererInterface;
-		mustache: RendererInterface;
-		nunjucks: RendererInterface;
-		qejs: RendererInterface;
-		ractive: RendererInterface;
-		react: RendererInterface;
-		swig: RendererInterface;
-		templayed: RendererInterface;
-		toffee: RendererInterface;
-		underscore: RendererInterface;
-		walrus: RendererInterface;
-		whiskers: RendererInterface;
-	}
+interface Consolidate {
+    /**
+         * expose the instance of the engine
+   */
+    requires: Object;
 
-	interface RendererInterface {
-		render(path: String, fn: (err: Error, html: String) => any): any;
-
-		render(path: String, options: {cache?: boolean, [otherOptions: string]: any}, fn: (err: Error, html: String) => any): any;
-
-		render(path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
-
-		(path: String, fn: (err: Error, html: String) => any): any;
-
-		(path: String, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: String) => any): any;
-
-		(path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
-	}
+    /**
+     * Clear the cache.
+     *
+     * @api public
+     */
+    clearCache(): void;
+    // template engines
+    atpl: RendererInterface;
+    dot: RendererInterface;
+    dust: RendererInterface;
+    eco: RendererInterface;
+    ejs: RendererInterface;
+    ect: RendererInterface;
+    haml: RendererInterface;
+    // TODO figure out how to do haml-coffee
+    hamlet: RendererInterface;
+    handlebars: RendererInterface;
+    hogan: RendererInterface;
+    htmling: RendererInterface;
+    jade: RendererInterface;
+    jazz: RendererInterface;
+    jqtpl: RendererInterface;
+    just: RendererInterface;
+    liquid: RendererInterface;
+    liquor: RendererInterface;
+    lodash: RendererInterface;
+    mote: RendererInterface;
+    mustache: RendererInterface;
+    nunjucks: RendererInterface;
+    qejs: RendererInterface;
+    ractive: RendererInterface;
+    react: RendererInterface;
+    swig: RendererInterface;
+    templayed: RendererInterface;
+    toffee: RendererInterface;
+    underscore: RendererInterface;
+    walrus: RendererInterface;
+    whiskers: RendererInterface;
+}
+
+interface RendererInterface {
+    render(path: String, fn: (err: Error, html: String) => any): any;
+
+    render(path: String, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: String) => any): any;
+
+    render(path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
+
+    (path: String, fn: (err: Error, html: String) => any): any;
+
+    (path: String, options: { cache?: boolean, [otherOptions: string]: any }, fn: (err: Error, html: String) => any): any;
+
+    (path: String, options?: { cache?: boolean, [otherOptions: string]: any }): Promise<String>;
 }
diff --git a/constant-case/constant-case.d.ts b/constant-case/constant-case.d.ts
index 2bb635c763..7ae0536e74 100644
--- a/constant-case/constant-case.d.ts
+++ b/constant-case/constant-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "constant-case" {
-	function constantCase(string: string, locale?: string): string;
-	export = constantCase;
-}
+
+declare function constantCase(string: string, locale?: string): string;
+export = constantCase;
diff --git a/consul/consul.d.ts b/consul/consul.d.ts
index 4f46e6a5be..eddc611097 100644
--- a/consul/consul.d.ts
+++ b/consul/consul.d.ts
@@ -5,1030 +5,1029 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "consul" {
-
-	import {IncomingMessage as HttpIncomingMessage} from "http";
-
-	namespace Consul {
-
-		interface Thenable<T> {
-			then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-			then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
-			catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-		}
-
-		interface CommonOptions {
-			consistent?: boolean;
-			dc?: string;
-			stale?: boolean;
-			token?: string;
-			wait?: string;
-			wan?: boolean;
-
-			ctx?: NodeJS.EventEmitter;
-			timeout?: number;
-		}
-
-		interface Response extends HttpIncomingMessage {
-			body?: Object|string|Buffer;
-		}
-
-		interface Callback<TData> {
-			(err?: Error, data?: TData, res?: Response): any;
-		}
-
-		namespace Acl {
-
-			interface CreateOptions extends CommonOptions {
-				name?: string;
-				type?: string;
-				rules?: string;
-			}
-
-			interface UpdateOptions extends CommonOptions {
-				id: string;
-				name?: string;
-				type?: string;
-				rules?: string;
-			}
-
-			interface DestroyOptions extends CommonOptions {
-				id: string;
-			}
-
-			interface InfoOptions extends CommonOptions {
-				id: string;
-			}
-
-			interface GetOptions extends InfoOptions {}
-
-			interface CloneOptions extends CommonOptions {
-				id: string;
-			}
-
-			interface ListOptions extends CommonOptions {}
-		}
-
-		interface Acl {
-			consul: Consul;
-
-			/**
-			 * Creates a new token with policy
-			 */
-			create: {
-				<TData>(opts: Acl.CreateOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Acl.CreateOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Update the policy of a token
-			 */
-			update: {
-				<TData>(opts: Acl.UpdateOptions, callback: Callback<TData>): void;
-				<TData>(opts: Acl.UpdateOptions): Thenable<TData>;
-			}
-
-			/**
-			 * Destroys a given token
-			 */
-			destroy: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Acl.DestroyOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Acl.DestroyOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Queries the policy of a given token
-			 */
-			info: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Acl.InfoOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Acl.InfoOptions): Thenable<TData>;
-			};
-			get: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Acl.GetOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Acl.GetOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Creates a new token by cloning an existing token
-			 */
-			clone: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Acl.CloneOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Acl.CloneOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists all the active tokens
-			 */
-			list: {
-				<TData>(opts: Acl.ListOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Acl.ListOptions): Thenable<TData>;
-			};
-		}
-
-		interface AclStatic {
-			new (consul: Consul): Acl;
-		}
-
-		namespace Agent {
-
-			namespace Check {
-
-				interface ListOptions extends CommonOptions {}
-
-				interface RegisterOptions extends CommonOptions {
-					name: string;
-					id?: string;
-					serviceid?: string;
-					http?: string;
-					script?: string;
-					interval?: string;
-					ttl?: string;
-					notes?: string;
-					status?: string;
-				}
-
-				interface DeregisterOptions extends CommonOptions {
-					id: string;
-				}
-
-				interface PassOptions extends CommonOptions {
-					id: string;
-					note?: string;
-				}
-
-				interface WarnOptions extends CommonOptions {
-					id: string;
-					note?: string;
-				}
-
-				interface FailOptions extends CommonOptions {
-					id: string;
-					note?: string;
-				}
-			}
-
-			interface Check {
-				consul: Consul;
-
-				/**
-				 * Returns the checks the local agent is managing
-				 */
-				list: {
-					<TData>(opts: Check.ListOptions, callback: Callback<TData>): void;
-					<TData>(callback: Callback<TData>): void;
-					<TData>(opts?: Check.ListOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Registers a new local check
-				 */
-				register: {
-					<TData>(opts: Check.RegisterOptions, callback: Callback<TData>): void;
-					<TData>(opts: Check.RegisterOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Deregister a local check
-				 */
-				deregister: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Check.DeregisterOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Check.DeregisterOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Mark a local test as passing
-				 */
-				pass: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Check.PassOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Check.PassOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Mark a local test as warning
-				 */
-				warn: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Check.WarnOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Check.WarnOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Mark a local test as critical
-				 */
-				fail: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Check.FailOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Check.FailOptions): Thenable<TData>;
-				};
-			}
-
-			interface CheckStatic {
-				new (consul: Consul): Check;
-			}
-
-			namespace Service {
-
-				interface RegisterCheck {
-					http?: string;
-					script?: string;
-					interval?: string;
-					ttl?: string;
-					notes?: string;
-					status?: string;
-				}
-
-				interface ListOptions extends CommonOptions {}
-
-				interface RegisterOptions extends CommonOptions {
-					name: string;
-					id?: string;
-					tags?: string[];
-					address?: string;
-					port?: number;
-					check?: RegisterCheck;
-					checks?: RegisterCheck[];
-				}
-
-				interface DeregisterOptions extends CommonOptions {
-					id: string;
-				}
-
-				interface MaintenanceOptions extends CommonOptions {
-					id: string;
-					enable: boolean;
-					reason?: string;
-				}
-			}
-
-			interface Service {
-				consul: Consul;
-
-				/**
-				 * Returns the services local agent is managing
-				 */
-				list: {
-					<TData>(opts: Service.ListOptions, callback: Callback<TData>): void;
-					<TData>(callback: Callback<TData>): void;
-					<TData>(opts?: Service.ListOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Registers a new local service
-				 */
-				register: {
-					<TData>(name: string, callback: Callback<TData>): void;
-					<TData>(opts: Service.RegisterOptions, callback: Callback<TData>): void;
-					<TData>(name: string): Thenable<TData>;
-					<TData>(opts: Service.RegisterOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Deregister a local service
-				 */
-				deregister: {
-					<TData>(id: string, callback: Callback<TData>): void;
-					<TData>(opts: Service.DeregisterOptions, callback: Callback<TData>): void;
-					<TData>(id: string): Thenable<TData>;
-					<TData>(opts: Service.DeregisterOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Manages node maintenance mode
-				 */
-				maintenance: {
-					<TData>(opts: Service.MaintenanceOptions, callback: Callback<TData>): void;
-					<TData>(opts: Service.MaintenanceOptions): Thenable<TData>;
-				};
-			}
-
-			interface ServiceStatic {
-				new (consul: Consul): Service;
-			}
-
-			interface ChecksOptions extends Check.ListOptions {}
-
-			interface ServicesOptions extends Service.ListOptions {}
-
-			interface MembersOptions extends CommonOptions {
-				wan?: boolean;
-			}
-
-			interface SelfOptions extends CommonOptions {}
-
-			interface MaintenanceOptions extends CommonOptions {
-				enable: boolean;
-				reason?: string;
-			}
-
-			interface JoinOptions extends CommonOptions {
-				address: string;
-				wan?: boolean;
-			}
-
-			interface ForceLeaveOptions extends CommonOptions {
-				node: string;
-			}
-		}
-
-		interface Agent {
-			consul: Consul;
-			check: Agent.Check;
-			service: Agent.Service;
-
-			/**
-			 * Returns the checks the local agent is managing
-			 */
-			checks: {
-				<TData>(opts: Agent.ChecksOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Agent.ChecksOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the services local agent is managing
-			 */
-			services: {
-				<TData>(opts: Agent.ServicesOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Agent.ServicesOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the members as seen by the local consul agent
-			 */
-			members: {
-				<TData>(opts: Agent.MembersOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Agent.MembersOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the local node configuration
-			 */
-			self: {
-				<TData>(opts: Agent.SelfOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Agent.SelfOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Manages node maintenance mode
-			 */
-			maintenance: {
-				<TData>(enable: boolean, callback: Callback<TData>): void;
-				<TData>(opts: Agent.MaintenanceOptions, callback: Callback<TData>): void;
-				<TData>(enable: boolean): Thenable<TData>;
-				<TData>(opts: Agent.MaintenanceOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Trigger local agent to join a node
-			 */
-			join: {
-				<TData>(address: string, callback: Callback<TData>): void;
-				<TData>(opts: Agent.JoinOptions, callback: Callback<TData>): void;
-				<TData>(address: string): Thenable<TData>;
-				<TData>(opts: Agent.JoinOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Force remove node
-			 */
-			forceLeave: {
-				<TData>(node: string, callback: Callback<TData>): void;
-				<TData>(opts: Agent.ForceLeaveOptions, callback: Callback<TData>): void;
-				<TData>(node: string): Thenable<TData>;
-				<TData>(opts: Agent.ForceLeaveOptions): Thenable<TData>;
-			};
-		}
-
-		interface AgentStatic {
-			new (consul: Consul): Agent;
-
-			Check: Agent.CheckStatic;
-			Service: Agent.ServiceStatic;
-		}
-
-		namespace Catalog {
-
-			namespace Node {
-
-				interface ListOptions extends CommonOptions {
-					dc?: string;
-				}
-
-				interface ServicesOptions extends CommonOptions {
-					node: string;
-				}
-			}
-
-			interface Node {
-				consul: Consul;
-
-				/**
-				 * Lists nodes in a given DC
-				 */
-				list: {
-					<TData>(dc: string, callback: Callback<TData>): void;
-					<TData>(opts: Node.ListOptions, callback: Callback<TData>): void;
-					<TData>(callback: Callback<TData>): void;
-					<TData>(dc?: string): Thenable<TData>;
-					<TData>(opts?: Node.ListOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Lists the services provided by a node
-				 */
-				services: {
-					<TData>(node: string, callback: Callback<TData>): void;
-					<TData>(opts: Node.ServicesOptions, callback: Callback<TData>): void;
-					<TData>(node: string): Thenable<TData>;
-					<TData>(opts: Node.ServicesOptions): Thenable<TData>;
-				};
-			}
-
-			interface NodeStatic {
-				new(consul: Consul): Node;
-			}
-
-			namespace Service {
-
-				interface ListOptions extends CommonOptions {
-					dc?: string;
-				}
-
-				interface NodesOptions extends CommonOptions {
-					service: string;
-					dc?: string;
-					tag?: string;
-				}
-			}
-
-
-
-			interface Service {
-				consul: Consul;
-
-				/**
-				 * Lists services in a given DC
-				 */
-				list: {
-					<TData>(dc: string, callback: Callback<TData>): void;
-					<TData>(opts: Service.ListOptions, callback: Callback<TData>): void;
-					<TData>(callback: Callback<TData>): void;
-					<TData>(dc?: string): Thenable<TData>;
-					<TData>(opts?: Service.ListOptions): Thenable<TData>;
-				};
-
-				/**
-				 * Lists the nodes in a given service
-				 */
-				nodes: {
-					<TData>(service: string, callback: Callback<TData>): void;
-					<TData>(opts: Service.NodesOptions, callback: Callback<TData>): void;
-					<TData>(service: string): Thenable<TData>;
-					<TData>(opts: Service.NodesOptions): Thenable<TData>;
-				};
-			}
-
-			interface ServiceStatic {
-				new(consul: Consul): Service;
-			}
-
-			interface DatacentersOptions extends CommonOptions {}
-
-			interface NodesOptions extends Node.ListOptions {}
-
-			interface ServicesOptions extends Service.ListOptions {}
-		}
-
-		interface Catalog {
-			consul: Consul;
-			node: Catalog.Node;
-			service: Catalog.Service;
-
-			/**
-			 * Lists known datacenters
-			 */
-			datacenters: {
-				<TData>(opts: Catalog.DatacentersOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Catalog.DatacentersOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists nodes in a given DC
-			 */
-			nodes: {
-				<TData>(dc: string, callback: Callback<TData>): void;
-				<TData>(opts: Catalog.NodesOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(dc?: string): Thenable<TData>;
-				<TData>(opts?: Catalog.NodesOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists services in a given DC
-			 */
-			services: {
-				<TData>(dc: string, callback: Callback<TData>): void;
-				<TData>(opts: Catalog.ServicesOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(dc?: string): Thenable<TData>;
-				<TData>(opts?: Catalog.ServicesOptions): Thenable<TData>;
-			};
-		}
-
-		interface CatalogStatic {
-			new(consul: Consul): Catalog;
-
-			Node: Catalog.NodeStatic;
-			Service: Catalog.ServiceStatic;
-		}
-
-		namespace Event {
-
-			interface FireOptions extends CommonOptions {
-				name: string;
-				payload: string|Buffer;
-				node?: string;
-				service?: string;
-				tag?: string;
-			}
-
-			interface ListOptions extends CommonOptions {
-				name?: string;
-			}
-		}
-
-		interface Event {
-			consul: Consul;
-
-			/**
-			 * Fires a new user event
-			 */
-			fire: {
-				<TData>(name: string, payload: string|Buffer, callback: Callback<TData>): void;
-				<TData>(name: string, callback: Callback<TData>): void;
-				<TData>(opts: Event.FireOptions, callback: Callback<TData>): void;
-				<TData>(name: string, payload: string|Buffer): Thenable<TData>;
-				<TData>(name: string): Thenable<TData>;
-				<TData>(opts: Event.FireOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists the most recent events an agent has seen
-			 */
-			list: {
-				<TData>(name: string, callback: Callback<TData>): void;
-				<TData>(opts: Event.ListOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(name?: string): Thenable<TData>;
-				<TData>(opts?: Event.ListOptions): Thenable<TData>;
-			};
-		}
-
-		interface EventStatic {
-			new(consul: Consul): Event;
-		}
-
-		namespace Health {
-
-			interface NodeOptions extends CommonOptions {
-				node: string;
-				dc?: string;
-			}
-
-			interface ChecksOptions extends CommonOptions {
-				service: string;
-				dc?: string;
-			}
-
-			interface ServiceOptions extends CommonOptions {
-				service: string;
-				dc?: string;
-				tag?: string;
-				passing?: boolean;
-			}
-
-			interface StateOptions extends CommonOptions {
-				state: string;
-				dc?: string;
-			}
-		}
-
-		interface Health {
-			consul: Consul;
-
-			/**
-			 * Returns the health info of a node
-			 */
-			node: {
-				<TData>(node: string, callback: Callback<TData>): void;
-				<TData>(opts: Health.NodeOptions, callback: Callback<TData>): void;
-				<TData>(node: string): Thenable<TData>;
-				<TData>(opts: Health.NodeOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the checks of a service
-			 */
-			checks: {
-				<TData>(service: string, callback: Callback<TData>): void;
-				<TData>(opts: Health.ChecksOptions, callback: Callback<TData>): void;
-				<TData>(service: string): Thenable<TData>;
-				<TData>(opts: Health.ChecksOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the nodes and health info of a service
-			 */
-			service: {
-				<TData>(service: string, callback: Callback<TData>): void;
-				<TData>(opts: Health.ServiceOptions, callback: Callback<TData>): void;
-				<TData>(service: string): Thenable<TData>;
-				<TData>(opts: Health.ServiceOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the checks in a given state
-			 */
-			state: {
-				<TData>(state: string, callback: Callback<TData>): void;
-				<TData>(opts: Health.StateOptions, callback: Callback<TData>): void;
-				<TData>(state: string): Thenable<TData>;
-				<TData>(opts: Health.StateOptions): Thenable<TData>;
-			};
-		}
-
-		interface HealthStatic {
-			new(consul: Consul): Health;
-		}
-
-		namespace Kv {
-
-			interface GetOptions extends CommonOptions {
-				key: string;
-				dc?: string;
-				recurse?: boolean;
-				index?: string;
-				wait?: string;
-				raw?: boolean;
-				buffer?: boolean;
-			}
-
-			interface KeysOptions extends CommonOptions {
-				key: string;
-				dc?: string;
-				separator?: string;
-			}
-
-			interface SetOptions extends CommonOptions {
-				key: string;
-				value: string|Buffer;
-				dc?: string;
-				flags?: number;
-				cas?: string;
-				acquire?: string;
-				release?: string;
-			}
-
-			interface DelOptions extends CommonOptions {
-				key: string;
-				dc?: string;
-				recurse?: boolean;
-				cas?: string;
-			}
-
-			interface DeleteOptions extends DelOptions {}
-		}
-
-		interface Kv {
-			consul: Consul;
-
-			/**
-			 * Get
-			 */
-			get: {
-				<TData>(key: string, callback: Callback<TData>): void;
-				<TData>(opts: Kv.GetOptions, callback: Callback<TData>): void;
-				<TData>(key: string): Thenable<TData>;
-				<TData>(opts: Kv.GetOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Keys
-			 */
-			keys: {
-				<TData>(key: string, callback: Callback<TData>): void;
-				<TData>(opts: Kv.KeysOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(key?: string): Thenable<TData>;
-				<TData>(opts?: Kv.KeysOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Set
-			 */
-			set: {
-				<TData>(key: string, value: string|Buffer, opts: Kv.SetOptions, callback: Callback<TData>): void;
-				<TData>(key: string, value: string|Buffer, callback: Callback<TData>): void;
-				<TData>(opts: Kv.SetOptions, callback: Callback<TData>): void;
-				<TData>(key: string, value: string|Buffer, opts: Kv.SetOptions): Thenable<TData>;
-				<TData>(key: string, value: string|Buffer): Thenable<TData>;
-				<TData>(opts: Kv.SetOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Delete
-			 */
-			del: {
-				<TData>(key: string, callback: Callback<TData>): void;
-				<TData>(opts: Kv.DelOptions, callback: Callback<TData>): void;
-				<TData>(key: string): Thenable<TData>;
-				<TData>(opts: Kv.DelOptions): Thenable<TData>;
-			};
-			delete: {
-				<TData>(key: string, callback: Callback<TData>): void;
-				<TData>(opts: Kv.DeleteOptions, callback: Callback<TData>): void;
-				<TData>(key: string): Thenable<TData>;
-				<TData>(opts: Kv.DeleteOptions): Thenable<TData>;
-			};
-		}
-
-		interface KvStatic {
-			new(consul: Consul): Kv;
-		}
-
-		namespace Lock {
-
-			interface Options {
-				key: string;
-				session?: Object|string;
-				value?: string|Buffer;
-				lockwaittime?: string;
-				lockretrytime?: string;
-			}
-		}
-
-		interface Lock extends NodeJS.EventEmitter {
-			consul: Consul;
-
-			/**
-			 * Acquire lock
-			 */
-			acquire(): void;
-
-			/**
-			 * Release lock
-			 */
-			release(): void;
-		}
-
-		interface LockStatic {
-			new(consul: Consul, opts: Lock.Options): Lock;
-		}
-
-		namespace Session {
-
-			interface CreateOptions extends CommonOptions {
-				dc?: string;
-				lockdelay?: string;
-				name?: string;
-				node?: string;
-				checks?: string[];
-				behavior?: string;
-				ttl?: string;
-			}
-
-			interface DestroyOptions extends CommonOptions {
-				id: string;
-				dc?: string;
-			}
-
-			interface InfoOptions extends CommonOptions {
-				id: string;
-				dc?: string;
-			}
-
-			interface GetOptions extends InfoOptions {}
-
-			interface NodeOptions extends CommonOptions {
-				node: string;
-				dc?: string;
-			}
-
-			interface ListOptions extends CommonOptions {
-				dc?: string;
-			}
-
-			interface RenewOptions extends CommonOptions {
-				id: string;
-				dc?: string;
-			}
-		}
-
-
-		interface Session {
-			consul: Consul;
-
-			/**
-			 * Creates a new session
-			 */
-			create: {
-				<TData>(opts: Session.CreateOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Session.CreateOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Destroys a given session
-			 */
-			destroy: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.DestroyOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Session.DestroyOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Queries a given session
-			 */
-			info: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.InfoOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Session.InfoOptions): Thenable<TData>;
-			};
-			get: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.GetOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Session.GetOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists sessions belonging to a node
-			 */
-			node: {
-				<TData>(node: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.NodeOptions, callback: Callback<TData>): void;
-				<TData>(node: string): Thenable<TData>;
-				<TData>(opts: Session.NodeOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Lists all the active sessions
-			 */
-			list: {
-				<TData>(opts: Session.ListOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Session.ListOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Renews a TTL-based session
-			 */
-			renew: {
-				<TData>(id: string, callback: Callback<TData>): void;
-				<TData>(opts: Session.RenewOptions, callback: Callback<TData>): void;
-				<TData>(id: string): Thenable<TData>;
-				<TData>(opts: Session.RenewOptions): Thenable<TData>;
-			};
-		}
-
-		interface SessionStatic {
-			new(consul: Consul): Session;
-		}
-
-		namespace Status {
-
-			interface LeaderOptions extends CommonOptions {}
-
-			interface PeersOptions extends CommonOptions {}
-		}
-
-		interface Status {
-			consul: Consul;
-
-			/**
-			 * Returns the current Raft leader.
-			 */
-			leader: {
-				<TData>(opts: Status.LeaderOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Status.LeaderOptions): Thenable<TData>;
-			};
-
-			/**
-			 * Returns the current Raft peer set
-			 */
-			peers: {
-				<TData>(opts: Status.PeersOptions, callback: Callback<TData>): void;
-				<TData>(callback: Callback<TData>): void;
-				<TData>(opts?: Status.PeersOptions): Thenable<TData>;
-			};
-		}
-
-		interface StatusStatic {
-			new(consul: Consul): Status;
-		}
-
-		namespace Watch {
-
-			interface Options {
-				method: Function;
-				options?: CommonOptions;
-			}
-		}
-
-		interface Watch extends NodeJS.EventEmitter {
-			consul: Consul;
-
-			/**
-			 * Is running
-			 */
-			isRunning(): boolean;
-
-			/**
-			 * Update time
-			 */
-			updateTime(): number;
-
-			/**
-			 * End watch
-			 */
-			end(): void;
-		}
-
-		interface WatchStatic {
-			new(consul: Consul, opts: Watch.Options): Watch;
-		}
-
-		interface ConsulOptions {
-			host?: string;
-			port?: string;
-			secure?: boolean;
-			ca?: string[];
-			defaults?: CommonOptions;
-			promisify?: boolean|Function;
-		}
-
-		interface Consul {
-			acl: Acl;
-			agent: Agent;
-			catalog: Catalog;
-			event: Event;
-			health: Health;
-			kv: Kv;
-			session: Session;
-			status: Status;
-
-			/**
-			 * Lock helper.
-			 */
-			lock(opts: Lock.Options): Lock;
-
-			/**
-			 * Watch helper.
-			 */
-			watch(opts: Watch.Options): Watch;
-		}
-
-		interface ConsulStatic {
-			(opts?: ConsulOptions): Consul;
-			new (opts?: ConsulOptions): Consul;
-
-			Acl: AclStatic;
-			Agent: AgentStatic;
-			Catalog: CatalogStatic;
-			Event: EventStatic;
-			Health: HealthStatic;
-			Kv: KvStatic;
-			Lock: LockStatic;
-			Session: SessionStatic;
-			Status: StatusStatic;
-			Watch: WatchStatic;
-		}
-	}
-
-	let Consul: Consul.ConsulStatic;
-
-	export = Consul;
+
+
+import {IncomingMessage as HttpIncomingMessage} from "http";
+
+declare namespace Consul {
+
+    interface Thenable<T> {
+        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+        then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
+        catch<U>(onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
+    }
+
+    interface CommonOptions {
+        consistent?: boolean;
+        dc?: string;
+        stale?: boolean;
+        token?: string;
+        wait?: string;
+        wan?: boolean;
+
+        ctx?: NodeJS.EventEmitter;
+        timeout?: number;
+    }
+
+    interface Response extends HttpIncomingMessage {
+        body?: Object | string | Buffer;
+    }
+
+    interface Callback<TData> {
+        (err?: Error, data?: TData, res?: Response): any;
+    }
+
+    namespace Acl {
+
+        interface CreateOptions extends CommonOptions {
+            name?: string;
+            type?: string;
+            rules?: string;
+        }
+
+        interface UpdateOptions extends CommonOptions {
+            id: string;
+            name?: string;
+            type?: string;
+            rules?: string;
+        }
+
+        interface DestroyOptions extends CommonOptions {
+            id: string;
+        }
+
+        interface InfoOptions extends CommonOptions {
+            id: string;
+        }
+
+        interface GetOptions extends InfoOptions { }
+
+        interface CloneOptions extends CommonOptions {
+            id: string;
+        }
+
+        interface ListOptions extends CommonOptions { }
+    }
+
+    interface Acl {
+        consul: Consul;
+
+        /**
+         * Creates a new token with policy
+         */
+        create: {
+            <TData>(opts: Acl.CreateOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Acl.CreateOptions): Thenable<TData>;
+        };
+
+        /**
+         * Update the policy of a token
+         */
+        update: {
+            <TData>(opts: Acl.UpdateOptions, callback: Callback<TData>): void;
+            <TData>(opts: Acl.UpdateOptions): Thenable<TData>;
+        }
+
+        /**
+         * Destroys a given token
+         */
+        destroy: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Acl.DestroyOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Acl.DestroyOptions): Thenable<TData>;
+        };
+
+        /**
+         * Queries the policy of a given token
+         */
+        info: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Acl.InfoOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Acl.InfoOptions): Thenable<TData>;
+        };
+        get: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Acl.GetOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Acl.GetOptions): Thenable<TData>;
+        };
+
+        /**
+         * Creates a new token by cloning an existing token
+         */
+        clone: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Acl.CloneOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Acl.CloneOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists all the active tokens
+         */
+        list: {
+            <TData>(opts: Acl.ListOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Acl.ListOptions): Thenable<TData>;
+        };
+    }
+
+    interface AclStatic {
+        new (consul: Consul): Acl;
+    }
+
+    namespace Agent {
+
+        namespace Check {
+
+            interface ListOptions extends CommonOptions { }
+
+            interface RegisterOptions extends CommonOptions {
+                name: string;
+                id?: string;
+                serviceid?: string;
+                http?: string;
+                script?: string;
+                interval?: string;
+                ttl?: string;
+                notes?: string;
+                status?: string;
+            }
+
+            interface DeregisterOptions extends CommonOptions {
+                id: string;
+            }
+
+            interface PassOptions extends CommonOptions {
+                id: string;
+                note?: string;
+            }
+
+            interface WarnOptions extends CommonOptions {
+                id: string;
+                note?: string;
+            }
+
+            interface FailOptions extends CommonOptions {
+                id: string;
+                note?: string;
+            }
+        }
+
+        interface Check {
+            consul: Consul;
+
+            /**
+             * Returns the checks the local agent is managing
+             */
+            list: {
+                <TData>(opts: Check.ListOptions, callback: Callback<TData>): void;
+                <TData>(callback: Callback<TData>): void;
+                <TData>(opts?: Check.ListOptions): Thenable<TData>;
+            };
+
+            /**
+             * Registers a new local check
+             */
+            register: {
+                <TData>(opts: Check.RegisterOptions, callback: Callback<TData>): void;
+                <TData>(opts: Check.RegisterOptions): Thenable<TData>;
+            };
+
+            /**
+             * Deregister a local check
+             */
+            deregister: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Check.DeregisterOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Check.DeregisterOptions): Thenable<TData>;
+            };
+
+            /**
+             * Mark a local test as passing
+             */
+            pass: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Check.PassOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Check.PassOptions): Thenable<TData>;
+            };
+
+            /**
+             * Mark a local test as warning
+             */
+            warn: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Check.WarnOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Check.WarnOptions): Thenable<TData>;
+            };
+
+            /**
+             * Mark a local test as critical
+             */
+            fail: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Check.FailOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Check.FailOptions): Thenable<TData>;
+            };
+        }
+
+        interface CheckStatic {
+            new (consul: Consul): Check;
+        }
+
+        namespace Service {
+
+            interface RegisterCheck {
+                http?: string;
+                script?: string;
+                interval?: string;
+                ttl?: string;
+                notes?: string;
+                status?: string;
+            }
+
+            interface ListOptions extends CommonOptions { }
+
+            interface RegisterOptions extends CommonOptions {
+                name: string;
+                id?: string;
+                tags?: string[];
+                address?: string;
+                port?: number;
+                check?: RegisterCheck;
+                checks?: RegisterCheck[];
+            }
+
+            interface DeregisterOptions extends CommonOptions {
+                id: string;
+            }
+
+            interface MaintenanceOptions extends CommonOptions {
+                id: string;
+                enable: boolean;
+                reason?: string;
+            }
+        }
+
+        interface Service {
+            consul: Consul;
+
+            /**
+             * Returns the services local agent is managing
+             */
+            list: {
+                <TData>(opts: Service.ListOptions, callback: Callback<TData>): void;
+                <TData>(callback: Callback<TData>): void;
+                <TData>(opts?: Service.ListOptions): Thenable<TData>;
+            };
+
+            /**
+             * Registers a new local service
+             */
+            register: {
+                <TData>(name: string, callback: Callback<TData>): void;
+                <TData>(opts: Service.RegisterOptions, callback: Callback<TData>): void;
+                <TData>(name: string): Thenable<TData>;
+                <TData>(opts: Service.RegisterOptions): Thenable<TData>;
+            };
+
+            /**
+             * Deregister a local service
+             */
+            deregister: {
+                <TData>(id: string, callback: Callback<TData>): void;
+                <TData>(opts: Service.DeregisterOptions, callback: Callback<TData>): void;
+                <TData>(id: string): Thenable<TData>;
+                <TData>(opts: Service.DeregisterOptions): Thenable<TData>;
+            };
+
+            /**
+             * Manages node maintenance mode
+             */
+            maintenance: {
+                <TData>(opts: Service.MaintenanceOptions, callback: Callback<TData>): void;
+                <TData>(opts: Service.MaintenanceOptions): Thenable<TData>;
+            };
+        }
+
+        interface ServiceStatic {
+            new (consul: Consul): Service;
+        }
+
+        interface ChecksOptions extends Check.ListOptions { }
+
+        interface ServicesOptions extends Service.ListOptions { }
+
+        interface MembersOptions extends CommonOptions {
+            wan?: boolean;
+        }
+
+        interface SelfOptions extends CommonOptions { }
+
+        interface MaintenanceOptions extends CommonOptions {
+            enable: boolean;
+            reason?: string;
+        }
+
+        interface JoinOptions extends CommonOptions {
+            address: string;
+            wan?: boolean;
+        }
+
+        interface ForceLeaveOptions extends CommonOptions {
+            node: string;
+        }
+    }
+
+    interface Agent {
+        consul: Consul;
+        check: Agent.Check;
+        service: Agent.Service;
+
+        /**
+         * Returns the checks the local agent is managing
+         */
+        checks: {
+            <TData>(opts: Agent.ChecksOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Agent.ChecksOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the services local agent is managing
+         */
+        services: {
+            <TData>(opts: Agent.ServicesOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Agent.ServicesOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the members as seen by the local consul agent
+         */
+        members: {
+            <TData>(opts: Agent.MembersOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Agent.MembersOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the local node configuration
+         */
+        self: {
+            <TData>(opts: Agent.SelfOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Agent.SelfOptions): Thenable<TData>;
+        };
+
+        /**
+         * Manages node maintenance mode
+         */
+        maintenance: {
+            <TData>(enable: boolean, callback: Callback<TData>): void;
+            <TData>(opts: Agent.MaintenanceOptions, callback: Callback<TData>): void;
+            <TData>(enable: boolean): Thenable<TData>;
+            <TData>(opts: Agent.MaintenanceOptions): Thenable<TData>;
+        };
+
+        /**
+         * Trigger local agent to join a node
+         */
+        join: {
+            <TData>(address: string, callback: Callback<TData>): void;
+            <TData>(opts: Agent.JoinOptions, callback: Callback<TData>): void;
+            <TData>(address: string): Thenable<TData>;
+            <TData>(opts: Agent.JoinOptions): Thenable<TData>;
+        };
+
+        /**
+         * Force remove node
+         */
+        forceLeave: {
+            <TData>(node: string, callback: Callback<TData>): void;
+            <TData>(opts: Agent.ForceLeaveOptions, callback: Callback<TData>): void;
+            <TData>(node: string): Thenable<TData>;
+            <TData>(opts: Agent.ForceLeaveOptions): Thenable<TData>;
+        };
+    }
+
+    interface AgentStatic {
+        new (consul: Consul): Agent;
+
+        Check: Agent.CheckStatic;
+        Service: Agent.ServiceStatic;
+    }
+
+    namespace Catalog {
+
+        namespace Node {
+
+            interface ListOptions extends CommonOptions {
+                dc?: string;
+            }
+
+            interface ServicesOptions extends CommonOptions {
+                node: string;
+            }
+        }
+
+        interface Node {
+            consul: Consul;
+
+            /**
+             * Lists nodes in a given DC
+             */
+            list: {
+                <TData>(dc: string, callback: Callback<TData>): void;
+                <TData>(opts: Node.ListOptions, callback: Callback<TData>): void;
+                <TData>(callback: Callback<TData>): void;
+                <TData>(dc?: string): Thenable<TData>;
+                <TData>(opts?: Node.ListOptions): Thenable<TData>;
+            };
+
+            /**
+             * Lists the services provided by a node
+             */
+            services: {
+                <TData>(node: string, callback: Callback<TData>): void;
+                <TData>(opts: Node.ServicesOptions, callback: Callback<TData>): void;
+                <TData>(node: string): Thenable<TData>;
+                <TData>(opts: Node.ServicesOptions): Thenable<TData>;
+            };
+        }
+
+        interface NodeStatic {
+            new (consul: Consul): Node;
+        }
+
+        namespace Service {
+
+            interface ListOptions extends CommonOptions {
+                dc?: string;
+            }
+
+            interface NodesOptions extends CommonOptions {
+                service: string;
+                dc?: string;
+                tag?: string;
+            }
+        }
+
+
+
+        interface Service {
+            consul: Consul;
+
+            /**
+             * Lists services in a given DC
+             */
+            list: {
+                <TData>(dc: string, callback: Callback<TData>): void;
+                <TData>(opts: Service.ListOptions, callback: Callback<TData>): void;
+                <TData>(callback: Callback<TData>): void;
+                <TData>(dc?: string): Thenable<TData>;
+                <TData>(opts?: Service.ListOptions): Thenable<TData>;
+            };
+
+            /**
+             * Lists the nodes in a given service
+             */
+            nodes: {
+                <TData>(service: string, callback: Callback<TData>): void;
+                <TData>(opts: Service.NodesOptions, callback: Callback<TData>): void;
+                <TData>(service: string): Thenable<TData>;
+                <TData>(opts: Service.NodesOptions): Thenable<TData>;
+            };
+        }
+
+        interface ServiceStatic {
+            new (consul: Consul): Service;
+        }
+
+        interface DatacentersOptions extends CommonOptions { }
+
+        interface NodesOptions extends Node.ListOptions { }
+
+        interface ServicesOptions extends Service.ListOptions { }
+    }
+
+    interface Catalog {
+        consul: Consul;
+        node: Catalog.Node;
+        service: Catalog.Service;
+
+        /**
+         * Lists known datacenters
+         */
+        datacenters: {
+            <TData>(opts: Catalog.DatacentersOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Catalog.DatacentersOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists nodes in a given DC
+         */
+        nodes: {
+            <TData>(dc: string, callback: Callback<TData>): void;
+            <TData>(opts: Catalog.NodesOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(dc?: string): Thenable<TData>;
+            <TData>(opts?: Catalog.NodesOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists services in a given DC
+         */
+        services: {
+            <TData>(dc: string, callback: Callback<TData>): void;
+            <TData>(opts: Catalog.ServicesOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(dc?: string): Thenable<TData>;
+            <TData>(opts?: Catalog.ServicesOptions): Thenable<TData>;
+        };
+    }
+
+    interface CatalogStatic {
+        new (consul: Consul): Catalog;
+
+        Node: Catalog.NodeStatic;
+        Service: Catalog.ServiceStatic;
+    }
+
+    namespace Event {
+
+        interface FireOptions extends CommonOptions {
+            name: string;
+            payload: string | Buffer;
+            node?: string;
+            service?: string;
+            tag?: string;
+        }
+
+        interface ListOptions extends CommonOptions {
+            name?: string;
+        }
+    }
+
+    interface Event {
+        consul: Consul;
+
+        /**
+         * Fires a new user event
+         */
+        fire: {
+            <TData>(name: string, payload: string | Buffer, callback: Callback<TData>): void;
+            <TData>(name: string, callback: Callback<TData>): void;
+            <TData>(opts: Event.FireOptions, callback: Callback<TData>): void;
+            <TData>(name: string, payload: string | Buffer): Thenable<TData>;
+            <TData>(name: string): Thenable<TData>;
+            <TData>(opts: Event.FireOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists the most recent events an agent has seen
+         */
+        list: {
+            <TData>(name: string, callback: Callback<TData>): void;
+            <TData>(opts: Event.ListOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(name?: string): Thenable<TData>;
+            <TData>(opts?: Event.ListOptions): Thenable<TData>;
+        };
+    }
+
+    interface EventStatic {
+        new (consul: Consul): Event;
+    }
+
+    namespace Health {
+
+        interface NodeOptions extends CommonOptions {
+            node: string;
+            dc?: string;
+        }
+
+        interface ChecksOptions extends CommonOptions {
+            service: string;
+            dc?: string;
+        }
+
+        interface ServiceOptions extends CommonOptions {
+            service: string;
+            dc?: string;
+            tag?: string;
+            passing?: boolean;
+        }
+
+        interface StateOptions extends CommonOptions {
+            state: string;
+            dc?: string;
+        }
+    }
+
+    interface Health {
+        consul: Consul;
+
+        /**
+         * Returns the health info of a node
+         */
+        node: {
+            <TData>(node: string, callback: Callback<TData>): void;
+            <TData>(opts: Health.NodeOptions, callback: Callback<TData>): void;
+            <TData>(node: string): Thenable<TData>;
+            <TData>(opts: Health.NodeOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the checks of a service
+         */
+        checks: {
+            <TData>(service: string, callback: Callback<TData>): void;
+            <TData>(opts: Health.ChecksOptions, callback: Callback<TData>): void;
+            <TData>(service: string): Thenable<TData>;
+            <TData>(opts: Health.ChecksOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the nodes and health info of a service
+         */
+        service: {
+            <TData>(service: string, callback: Callback<TData>): void;
+            <TData>(opts: Health.ServiceOptions, callback: Callback<TData>): void;
+            <TData>(service: string): Thenable<TData>;
+            <TData>(opts: Health.ServiceOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the checks in a given state
+         */
+        state: {
+            <TData>(state: string, callback: Callback<TData>): void;
+            <TData>(opts: Health.StateOptions, callback: Callback<TData>): void;
+            <TData>(state: string): Thenable<TData>;
+            <TData>(opts: Health.StateOptions): Thenable<TData>;
+        };
+    }
+
+    interface HealthStatic {
+        new (consul: Consul): Health;
+    }
+
+    namespace Kv {
+
+        interface GetOptions extends CommonOptions {
+            key: string;
+            dc?: string;
+            recurse?: boolean;
+            index?: string;
+            wait?: string;
+            raw?: boolean;
+            buffer?: boolean;
+        }
+
+        interface KeysOptions extends CommonOptions {
+            key: string;
+            dc?: string;
+            separator?: string;
+        }
+
+        interface SetOptions extends CommonOptions {
+            key: string;
+            value: string | Buffer;
+            dc?: string;
+            flags?: number;
+            cas?: string;
+            acquire?: string;
+            release?: string;
+        }
+
+        interface DelOptions extends CommonOptions {
+            key: string;
+            dc?: string;
+            recurse?: boolean;
+            cas?: string;
+        }
+
+        interface DeleteOptions extends DelOptions { }
+    }
+
+    interface Kv {
+        consul: Consul;
+
+        /**
+         * Get
+         */
+        get: {
+            <TData>(key: string, callback: Callback<TData>): void;
+            <TData>(opts: Kv.GetOptions, callback: Callback<TData>): void;
+            <TData>(key: string): Thenable<TData>;
+            <TData>(opts: Kv.GetOptions): Thenable<TData>;
+        };
+
+        /**
+         * Keys
+         */
+        keys: {
+            <TData>(key: string, callback: Callback<TData>): void;
+            <TData>(opts: Kv.KeysOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(key?: string): Thenable<TData>;
+            <TData>(opts?: Kv.KeysOptions): Thenable<TData>;
+        };
+
+        /**
+         * Set
+         */
+        set: {
+            <TData>(key: string, value: string | Buffer, opts: Kv.SetOptions, callback: Callback<TData>): void;
+            <TData>(key: string, value: string | Buffer, callback: Callback<TData>): void;
+            <TData>(opts: Kv.SetOptions, callback: Callback<TData>): void;
+            <TData>(key: string, value: string | Buffer, opts: Kv.SetOptions): Thenable<TData>;
+            <TData>(key: string, value: string | Buffer): Thenable<TData>;
+            <TData>(opts: Kv.SetOptions): Thenable<TData>;
+        };
+
+        /**
+         * Delete
+         */
+        del: {
+            <TData>(key: string, callback: Callback<TData>): void;
+            <TData>(opts: Kv.DelOptions, callback: Callback<TData>): void;
+            <TData>(key: string): Thenable<TData>;
+            <TData>(opts: Kv.DelOptions): Thenable<TData>;
+        };
+        delete: {
+            <TData>(key: string, callback: Callback<TData>): void;
+            <TData>(opts: Kv.DeleteOptions, callback: Callback<TData>): void;
+            <TData>(key: string): Thenable<TData>;
+            <TData>(opts: Kv.DeleteOptions): Thenable<TData>;
+        };
+    }
+
+    interface KvStatic {
+        new (consul: Consul): Kv;
+    }
+
+    namespace Lock {
+
+        interface Options {
+            key: string;
+            session?: Object | string;
+            value?: string | Buffer;
+            lockwaittime?: string;
+            lockretrytime?: string;
+        }
+    }
+
+    interface Lock extends NodeJS.EventEmitter {
+        consul: Consul;
+
+        /**
+         * Acquire lock
+         */
+        acquire(): void;
+
+        /**
+         * Release lock
+         */
+        release(): void;
+    }
+
+    interface LockStatic {
+        new (consul: Consul, opts: Lock.Options): Lock;
+    }
+
+    namespace Session {
+
+        interface CreateOptions extends CommonOptions {
+            dc?: string;
+            lockdelay?: string;
+            name?: string;
+            node?: string;
+            checks?: string[];
+            behavior?: string;
+            ttl?: string;
+        }
+
+        interface DestroyOptions extends CommonOptions {
+            id: string;
+            dc?: string;
+        }
+
+        interface InfoOptions extends CommonOptions {
+            id: string;
+            dc?: string;
+        }
+
+        interface GetOptions extends InfoOptions { }
+
+        interface NodeOptions extends CommonOptions {
+            node: string;
+            dc?: string;
+        }
+
+        interface ListOptions extends CommonOptions {
+            dc?: string;
+        }
+
+        interface RenewOptions extends CommonOptions {
+            id: string;
+            dc?: string;
+        }
+    }
+
+
+    interface Session {
+        consul: Consul;
+
+        /**
+         * Creates a new session
+         */
+        create: {
+            <TData>(opts: Session.CreateOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Session.CreateOptions): Thenable<TData>;
+        };
+
+        /**
+         * Destroys a given session
+         */
+        destroy: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.DestroyOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Session.DestroyOptions): Thenable<TData>;
+        };
+
+        /**
+         * Queries a given session
+         */
+        info: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.InfoOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Session.InfoOptions): Thenable<TData>;
+        };
+        get: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.GetOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Session.GetOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists sessions belonging to a node
+         */
+        node: {
+            <TData>(node: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.NodeOptions, callback: Callback<TData>): void;
+            <TData>(node: string): Thenable<TData>;
+            <TData>(opts: Session.NodeOptions): Thenable<TData>;
+        };
+
+        /**
+         * Lists all the active sessions
+         */
+        list: {
+            <TData>(opts: Session.ListOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Session.ListOptions): Thenable<TData>;
+        };
+
+        /**
+         * Renews a TTL-based session
+         */
+        renew: {
+            <TData>(id: string, callback: Callback<TData>): void;
+            <TData>(opts: Session.RenewOptions, callback: Callback<TData>): void;
+            <TData>(id: string): Thenable<TData>;
+            <TData>(opts: Session.RenewOptions): Thenable<TData>;
+        };
+    }
+
+    interface SessionStatic {
+        new (consul: Consul): Session;
+    }
+
+    namespace Status {
+
+        interface LeaderOptions extends CommonOptions { }
+
+        interface PeersOptions extends CommonOptions { }
+    }
+
+    interface Status {
+        consul: Consul;
+
+        /**
+         * Returns the current Raft leader.
+         */
+        leader: {
+            <TData>(opts: Status.LeaderOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Status.LeaderOptions): Thenable<TData>;
+        };
+
+        /**
+         * Returns the current Raft peer set
+         */
+        peers: {
+            <TData>(opts: Status.PeersOptions, callback: Callback<TData>): void;
+            <TData>(callback: Callback<TData>): void;
+            <TData>(opts?: Status.PeersOptions): Thenable<TData>;
+        };
+    }
+
+    interface StatusStatic {
+        new (consul: Consul): Status;
+    }
+
+    namespace Watch {
+
+        interface Options {
+            method: Function;
+            options?: CommonOptions;
+        }
+    }
+
+    interface Watch extends NodeJS.EventEmitter {
+        consul: Consul;
+
+        /**
+         * Is running
+         */
+        isRunning(): boolean;
+
+        /**
+         * Update time
+         */
+        updateTime(): number;
+
+        /**
+         * End watch
+         */
+        end(): void;
+    }
+
+    interface WatchStatic {
+        new (consul: Consul, opts: Watch.Options): Watch;
+    }
+
+    interface ConsulOptions {
+        host?: string;
+        port?: string;
+        secure?: boolean;
+        ca?: string[];
+        defaults?: CommonOptions;
+        promisify?: boolean | Function;
+    }
+
+    interface Consul {
+        acl: Acl;
+        agent: Agent;
+        catalog: Catalog;
+        event: Event;
+        health: Health;
+        kv: Kv;
+        session: Session;
+        status: Status;
+
+        /**
+         * Lock helper.
+         */
+        lock(opts: Lock.Options): Lock;
+
+        /**
+         * Watch helper.
+         */
+        watch(opts: Watch.Options): Watch;
+    }
+
+    interface ConsulStatic {
+        (opts?: ConsulOptions): Consul;
+        new (opts?: ConsulOptions): Consul;
+
+        Acl: AclStatic;
+        Agent: AgentStatic;
+        Catalog: CatalogStatic;
+        Event: EventStatic;
+        Health: HealthStatic;
+        Kv: KvStatic;
+        Lock: LockStatic;
+        Session: SessionStatic;
+        Status: StatusStatic;
+        Watch: WatchStatic;
+    }
 }
+
+declare let Consul: Consul.ConsulStatic;
+
+export = Consul;
diff --git a/contentful-resolve-response/contentful-resolve-response.d.ts b/contentful-resolve-response/contentful-resolve-response.d.ts
index bd2daef9e6..ba04d42b5c 100644
--- a/contentful-resolve-response/contentful-resolve-response.d.ts
+++ b/contentful-resolve-response/contentful-resolve-response.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Anton Karsten <https://github.com/antonkarsten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'contentful-resolve-response' {
-    function resolveResponse(response: any): any;
-    export = resolveResponse;
-}
+
+declare function resolveResponse(response: any): any;
+export = resolveResponse;
diff --git a/contextjs/contextjs.d.ts b/contextjs/contextjs.d.ts
index 3ae8c54502..b36003e3dc 100644
--- a/contextjs/contextjs.d.ts
+++ b/contextjs/contextjs.d.ts
@@ -3,31 +3,30 @@
 // Definitions by: Kern Handa <https://github.com/kernhanda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "contextjs" {
-    interface MenuObject {
-        action?: (e: Event) => void;
-        divider?: boolean;
-        header?: string;
-        href?: string;
-        subMenu?: MenuObject[];
-        target?: string;
-        text?: string;
-    }
 
-    interface InitSettings {
-        above?: string | boolean;
-        compress?: boolean;
-        fadeSpeed?: number;
-        filter?: (e: Element) => void;
-        preventDoubleContext?: boolean;
-    }
-
-    namespace context {
-      function init(settings?: InitSettings): void;
-      function destroy(selector: any): void;
-      function attach(selector: any, menuObjects: MenuObject[]): void;
-      function settings(settings: InitSettings): void;
-    }
-
-    export = context;
+interface MenuObject {
+    action?: (e: Event) => void;
+    divider?: boolean;
+    header?: string;
+    href?: string;
+    subMenu?: MenuObject[];
+    target?: string;
+    text?: string;
 }
+
+interface InitSettings {
+    above?: string | boolean;
+    compress?: boolean;
+    fadeSpeed?: number;
+    filter?: (e: Element) => void;
+    preventDoubleContext?: boolean;
+}
+
+declare namespace context {
+    function init(settings?: InitSettings): void;
+    function destroy(selector: any): void;
+    function attach(selector: any, menuObjects: MenuObject[]): void;
+    function settings(settings: InitSettings): void;
+}
+
+export = context;
diff --git a/convert-source-map/convert-source-map.d.ts b/convert-source-map/convert-source-map.d.ts
index 76b31445fb..6ae6c712f4 100644
--- a/convert-source-map/convert-source-map.d.ts
+++ b/convert-source-map/convert-source-map.d.ts
@@ -3,25 +3,24 @@
 // Definitions by: Andrew Gaspar <https://github.com/AndrewGaspar/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "convert-source-map" {
-	export interface SourceMapConverter {
-		toObject(): any;
-		toJSON(space?: any): string;
-		toBase64(): string;
-		toComment(): string;
 
-		addProperty(key: string, value: any): SourceMapConverter;
-		setProperty(key: string, value: any): SourceMapConverter;
+export interface SourceMapConverter {
+    toObject(): any;
+    toJSON(space?: any): string;
+    toBase64(): string;
+    toComment(): string;
 
-		getProperty(key: string): any;
-	}
+    addProperty(key: string, value: any): SourceMapConverter;
+    setProperty(key: string, value: any): SourceMapConverter;
 
-	export function removeComments(src: string): string;
-	export var commentRegex: RegExp;
-
-	export function fromObject(obj: any): SourceMapConverter;
-	export function fromJSON(json: string): SourceMapConverter;
-	export function fromBase64(base64: string): SourceMapConverter;
-	export function fromComment(comment: string): SourceMapConverter;
-	export function fromSource(source: string): SourceMapConverter;
+    getProperty(key: string): any;
 }
+
+declare export function removeComments(src: string): string;
+declare export var commentRegex: RegExp;
+
+declare export function fromObject(obj: any): SourceMapConverter;
+declare export function fromJSON(json: string): SourceMapConverter;
+declare export function fromBase64(base64: string): SourceMapConverter;
+declare export function fromComment(comment: string): SourceMapConverter;
+declare export function fromSource(source: string): SourceMapConverter;
diff --git a/convict/convict.d.ts b/convict/convict.d.ts
index 05323de269..c99255828d 100644
--- a/convict/convict.d.ts
+++ b/convict/convict.d.ts
@@ -3,75 +3,73 @@
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "convict" {
-    namespace convict {
 
-        interface Format {
-            name?: string;
-            validate?: (val: any) => void;
-            coerce?: (val: any) => any;
-        }
+declare namespace convict {
 
-        interface Schema {
-            [name: string]: convict.Schema | {
-                default: any;
-                doc?: string;
-                /**
-                 * From the implementation:
-                 *
-                 *  format can be a:
-                 *   - predefine type, as seen below
-                 *   - an array of enumerated values, e.g. ["production", "development", "testing"]
-                 *   - built-in JavaScript type, i.e. Object, Array, String, Number, Boolean
-                 *   - or if omitted, the Object.prototype.toString.call of the default value
-                 *
-                 * The docs also state that any function that validates is ok too
-                 */
-                format?: string | Array<any> | Function;
-                env?: string;
-                arg?: string;
-            };
-        }
-
-        interface Config {
-            get(name: string): any;
-            default(name: string): any;
-            has(name: string): boolean;
-            set(name: string, value: any): void;
-            load(conf: Object): void;
-            loadFile(file: string): void;
-            loadFile(files: string[]): void;
-            validate(): void;
-            /**
-             * Exports all the properties (that is the keys and their current values) as a {JSON} {Object}
-             * @returns {Object} A {JSON} compliant {Object}
-             */
-            getProperties() : Object;
-            /**
-             * Exports the schema as a {JSON} {Object}
-             * @returns {Object} A {JSON} compliant {Object}
-             */
-            getSchema() : Object;
-
-            /**
-             * Exports all the properties (that is the keys and their current values) as a JSON string.
-             * @returns {String} a string representing this object
-             */
-            toString() : string;
-
-            /**
-             * Exports the schema as a JSON string.
-             * @returns {String} a string representing the schema of this {Config}
-             */
-            getSchemaString() : string;
-        }
+    interface Format {
+        name?: string;
+        validate?: (val: any) => void;
+        coerce?: (val: any) => any;
     }
-    interface convict {
-        addFormat(format: convict.Format): void;
-        addFormats(formats: { [name: string]: convict.Format }): void;
-        (config: convict.Schema): convict.Config;
+
+    interface Schema {
+        [name: string]: convict.Schema | {
+            default: any;
+            doc?: string;
+            /**
+             * From the implementation:
+             *
+             *  format can be a:
+             *   - predefine type, as seen below
+             *   - an array of enumerated values, e.g. ["production", "development", "testing"]
+             *   - built-in JavaScript type, i.e. Object, Array, String, Number, Boolean
+             *   - or if omitted, the Object.prototype.toString.call of the default value
+             *
+             * The docs also state that any function that validates is ok too
+             */
+            format?: string | Array<any> | Function;
+            env?: string;
+            arg?: string;
+        };
+    }
+
+    interface Config {
+        get(name: string): any;
+        default(name: string): any;
+        has(name: string): boolean;
+        set(name: string, value: any): void;
+        load(conf: Object): void;
+        loadFile(file: string): void;
+        loadFile(files: string[]): void;
+        validate(): void;
+        /**
+         * Exports all the properties (that is the keys and their current values) as a {JSON} {Object}
+         * @returns {Object} A {JSON} compliant {Object}
+         */
+        getProperties(): Object;
+        /**
+         * Exports the schema as a {JSON} {Object}
+         * @returns {Object} A {JSON} compliant {Object}
+         */
+        getSchema(): Object;
+
+        /**
+         * Exports all the properties (that is the keys and their current values) as a JSON string.
+         * @returns {String} a string representing this object
+         */
+        toString(): string;
+
+        /**
+         * Exports the schema as a JSON string.
+         * @returns {String} a string representing the schema of this {Config}
+         */
+        getSchemaString(): string;
     }
-    var convict : convict;
-    export = convict;
 }
-
+interface convict {
+    addFormat(format: convict.Format): void;
+    addFormats(formats: { [name: string]: convict.Format }): void;
+    (config: convict.Schema): convict.Config;
+}
+declare var convict: convict;
+export = convict;
diff --git a/cookie-parser/cookie-parser.d.ts b/cookie-parser/cookie-parser.d.ts
index b2ecb55613..2d5aad89db 100644
--- a/cookie-parser/cookie-parser.d.ts
+++ b/cookie-parser/cookie-parser.d.ts
@@ -5,9 +5,8 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "cookie-parser" {
-    import express = require('express');
-    function e(secret?: string, options?: any): express.RequestHandler;
-    namespace e{}
-    export = e;
-}
\ No newline at end of file
+
+import express = require('express');
+declare function e(secret?: string, options?: any): express.RequestHandler;
+declare namespace e { }
+export = e;
diff --git a/cookies/cookies.d.ts b/cookies/cookies.d.ts
index 23621ee2ae..95b0541a53 100644
--- a/cookies/cookies.d.ts
+++ b/cookies/cookies.d.ts
@@ -5,96 +5,95 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "cookies" {
-    import * as http from "http"
 
-    namespace cookies {
-        interface ICookies {
-            /**
-             * This extracts the cookie with the given name from the
-             * Cookie header in the request. If such a cookie exists,
-             * its value is returned. Otherwise, nothing is returned.
-             */
-            get(name: string): string;
-            /**
-             * This extracts the cookie with the given name from the
-             * Cookie header in the request. If such a cookie exists,
-             * its value is returned. Otherwise, nothing is returned.
-             */
-            get(name: string, opts: IOptions): string;
+import * as http from "http"
 
-            /**
-             * This sets the given cookie in the response and returns
-             * the current context to allow chaining.If the value is omitted,
-             * an outbound header with an expired date is used to delete the cookie.
-             */
-            set(name: string, value: string): ICookies;
-            /**
-             * This sets the given cookie in the response and returns
-             * the current context to allow chaining.If the value is omitted,
-             * an outbound header with an expired date is used to delete the cookie.
-             */
-            set(name: string, value: string, opts: IOptions): ICookies;
-        }
+declare namespace cookies {
+    interface ICookies {
+        /**
+         * This extracts the cookie with the given name from the
+         * Cookie header in the request. If such a cookie exists,
+         * its value is returned. Otherwise, nothing is returned.
+         */
+        get(name: string): string;
+        /**
+         * This extracts the cookie with the given name from the
+         * Cookie header in the request. If such a cookie exists,
+         * its value is returned. Otherwise, nothing is returned.
+         */
+        get(name: string, opts: IOptions): string;
 
-        interface IOptions {
-            /**
-             * a number representing the milliseconds from Date.now() for expiry
-             */
-            maxAge?: number;
-            /**
-             * a Date object indicating the cookie's expiration
-             * date (expires at the end of session by default).
-             */
-            expires?: Date;
-            /**
-             * a string indicating the path of the cookie (/ by default).
-             */
-            path?: string;
-            /**
-             * a string indicating the domain of the cookie (no default).
-             */
-            domain?: string;
-            /**
-             * a boolean indicating whether the cookie is only to be sent
-             * over HTTPS (false by default for HTTP, true by default for HTTPS).
-             */
-            secure?: boolean;
-            /**
-             * a boolean indicating whether the cookie is only to be sent
-             * over HTTPS (use this if you handle SSL not in your node process).
-             */
-            secureProxy?: boolean;
-            /**
-             * a boolean indicating whether the cookie is only to be sent over HTTP(S),
-             * and not made available to client JavaScript (true by default).
-             */
-            httpOnly?: boolean;
-            /**
-             * a boolean indicating whether the cookie is to be signed (false by default).
-             * If this is true, another cookie of the same name with the .sig suffix
-             * appended will also be sent, with a 27-byte url-safe base64 SHA1 value
-             * representing the hash of cookie-name=cookie-value against the first Keygrip key.
-             * This signature key is used to detect tampering the next time a cookie is received.
-             */
-            signed?: boolean;
-            /**
-             * a boolean indicating whether to overwrite previously set
-             * cookies of the same name (false by default). If this is true,
-             * all cookies set during the same request with the same
-             * name (regardless of path or domain) are filtered out of
-             * the Set-Cookie header when setting this cookie.
-             */
-            overwrite?: boolean;
-        }
+        /**
+         * This sets the given cookie in the response and returns
+         * the current context to allow chaining.If the value is omitted,
+         * an outbound header with an expired date is used to delete the cookie.
+         */
+        set(name: string, value: string): ICookies;
+        /**
+         * This sets the given cookie in the response and returns
+         * the current context to allow chaining.If the value is omitted,
+         * an outbound header with an expired date is used to delete the cookie.
+         */
+        set(name: string, value: string, opts: IOptions): ICookies;
     }
 
-    interface CookiesStatic {
-        new (request: http.IncomingMessage, response: http.ServerResponse): cookies.ICookies;
-        new (request: http.IncomingMessage, response: http.ServerResponse, keys?: Array<string>): cookies.ICookies;
+    interface IOptions {
+        /**
+         * a number representing the milliseconds from Date.now() for expiry
+         */
+        maxAge?: number;
+        /**
+         * a Date object indicating the cookie's expiration
+         * date (expires at the end of session by default).
+         */
+        expires?: Date;
+        /**
+         * a string indicating the path of the cookie (/ by default).
+         */
+        path?: string;
+        /**
+         * a string indicating the domain of the cookie (no default).
+         */
+        domain?: string;
+        /**
+         * a boolean indicating whether the cookie is only to be sent
+         * over HTTPS (false by default for HTTP, true by default for HTTPS).
+         */
+        secure?: boolean;
+        /**
+         * a boolean indicating whether the cookie is only to be sent
+         * over HTTPS (use this if you handle SSL not in your node process).
+         */
+        secureProxy?: boolean;
+        /**
+         * a boolean indicating whether the cookie is only to be sent over HTTP(S),
+         * and not made available to client JavaScript (true by default).
+         */
+        httpOnly?: boolean;
+        /**
+         * a boolean indicating whether the cookie is to be signed (false by default).
+         * If this is true, another cookie of the same name with the .sig suffix
+         * appended will also be sent, with a 27-byte url-safe base64 SHA1 value
+         * representing the hash of cookie-name=cookie-value against the first Keygrip key.
+         * This signature key is used to detect tampering the next time a cookie is received.
+         */
+        signed?: boolean;
+        /**
+         * a boolean indicating whether to overwrite previously set
+         * cookies of the same name (false by default). If this is true,
+         * all cookies set during the same request with the same
+         * name (regardless of path or domain) are filtered out of
+         * the Set-Cookie header when setting this cookie.
+         */
+        overwrite?: boolean;
     }
-
-    const cookies: CookiesStatic;
-
-    export = cookies
 }
+
+interface CookiesStatic {
+    new (request: http.IncomingMessage, response: http.ServerResponse): cookies.ICookies;
+    new (request: http.IncomingMessage, response: http.ServerResponse, keys?: Array<string>): cookies.ICookies;
+}
+
+declare const cookies: CookiesStatic;
+
+export = cookies
diff --git a/copy-paste/copy-paste.d.ts b/copy-paste/copy-paste.d.ts
index a8a844b5bf..00ec1aa127 100644
--- a/copy-paste/copy-paste.d.ts
+++ b/copy-paste/copy-paste.d.ts
@@ -3,44 +3,43 @@
 // Definitions by: Tobias Kahlert <https://github.com/SrTobi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'copy-paste' {
-    
-    export type CopyCallback = (err: Error) => void;
-    export type PasteCallback = (err: Error, content: string) => void;
-
-    /**
-     * Asynchronously replaces the current contents of the clip board with text.
-     * 
-     * @param {T} content Takes either a string, array, object, or readable stream.
-     * @return {T} Returns the same value passed in.
-     */
-    export function copy<T>(content: T): T;
-    
-    /**
-     * Asynchronously replaces the current contents of the clip board with text.
-     * 
-     * @param {T} content Takes either a string, array, object, or readable stream.
-     * @param {CopyCallback} callback will fire when the copy operation is complete.
-     * @return {T} Returns the same value passed in.
-     */
-    export function copy<T>(content: T, callback: CopyCallback): T;
 
 
-    /**
-     * Synchronously returns the current contents of the system clip board.
-     * 
-     * Note: The synchronous version of paste is not always availabled.
-     * An error message is shown if the synchronous version of paste is used on an unsupported platform.
-     * The asynchronous version of paste is always available.
-     * 
-     * @return {string} Returns the current contents of the system clip board.
-     */
-    export function paste(): string;
-    
-    /**
-     * Asynchronously returns the current contents of the system clip board.
-     * 
-     * @param {PasteCallback} callback The contents of the system clip board are passed to the callback as the second parameter.
-     */
-    export function paste(callback: PasteCallback): void;
-}
\ No newline at end of file
+export type CopyCallback = (err: Error) => void;
+export type PasteCallback = (err: Error, content: string) => void;
+
+/**
+ * Asynchronously replaces the current contents of the clip board with text.
+ * 
+ * @param {T} content Takes either a string, array, object, or readable stream.
+ * @return {T} Returns the same value passed in.
+ */
+declare export function copy<T>(content: T): T;
+
+/**
+ * Asynchronously replaces the current contents of the clip board with text.
+ * 
+ * @param {T} content Takes either a string, array, object, or readable stream.
+ * @param {CopyCallback} callback will fire when the copy operation is complete.
+ * @return {T} Returns the same value passed in.
+ */
+declare export function copy<T>(content: T, callback: CopyCallback): T;
+
+
+/**
+ * Synchronously returns the current contents of the system clip board.
+ * 
+ * Note: The synchronous version of paste is not always availabled.
+ * An error message is shown if the synchronous version of paste is used on an unsupported platform.
+ * The asynchronous version of paste is always available.
+ * 
+ * @return {string} Returns the current contents of the system clip board.
+ */
+declare export function paste(): string;
+
+/**
+ * Asynchronously returns the current contents of the system clip board.
+ * 
+ * @param {PasteCallback} callback The contents of the system clip board are passed to the callback as the second parameter.
+ */
+declare export function paste(callback: PasteCallback): void;
diff --git a/core-decorators/core-decorators.d.ts b/core-decorators/core-decorators.d.ts
index 30d3a6c170..18fcc95a27 100644
--- a/core-decorators/core-decorators.d.ts
+++ b/core-decorators/core-decorators.d.ts
@@ -3,134 +3,133 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "core-decorators" {
-    export interface ClassDecorator {
-      <TFunction extends Function>(target: TFunction): TFunction|void;
-    }
 
-    export interface ParameterDecorator {
-      (target: Object, propertyKey: string|symbol, parameterIndex: number): void;
-    }
-
-    export interface PropertyDecorator {
-        (target: Object, propertyKey: string|symbol): void;
-    }
-
-    export interface MethodDecorator {
-      <T>(target: Object, propertyKey: string|symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>|void;
-    }
-
-    export interface PropertyOrMethodDecorator extends MethodDecorator, PropertyDecorator {
-        (target: Object, propertyKey: string|symbol): void;
-    }
-
-    export interface Deprecate extends MethodDecorator {
-        (message?: string, option?: DeprecateOption): MethodDecorator;
-    }
-
-    export interface DeprecateOption {
-        url: string;
-    }
-
-    export interface ThrottleOptions {
-        /** allows to trigger function on the leading. */
-        leading?: boolean;
-        /** allows to trigger function on the trailing edge of the wait interval. */
-        trailing?: boolean;
-    }
-
-    export interface Console {
-        log(message?: any, ...optionalParams: any[]): void;
-        time(timerName?: string): void;
-        timeEnd(timerName?: string): void;
-    }
-
-    /**
-     * Forces invocations of this function to always have this refer to the class instance,
-     * even if the function is passed around or would otherwise lose its this context. e.g. var fn = context.method;
-     */
-    var autobind: Function;
-    /**
-     * Marks a property or method as not being writable.
-     */
-    var readonly: PropertyOrMethodDecorator;
-    /**
-     * Checks that the marked method indeed overrides a function with the same signature somewhere on the prototype chain.
-     */
-    var override: MethodDecorator;
-    /**
-     * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
-     */
-    var deprecate: Deprecate;
-    /**
-     * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
-     */
-    var deprecated: Deprecate;
-    /**
-     * Creates a new debounced function which will be invoked after wait milliseconds since the time it was invoked. Default timeout is 300 ms.
-     */
-    var debounce: (wait: number) => MethodDecorator;
-    /**
-     * Creates a new throttled function which will be invoked in every wait milliseconds. Default timeout is 300 ms.
-     */
-    var throttle: (wait: number, options?: ThrottleOptions) => MethodDecorator;
-    /**
-     * Suppresses any JavaScript console.warn() call while the decorated function is called. (i.e. on the stack)
-     */
-    var suppressWarnings: MethodDecorator;
-    /**
-     * Marks a property or method as not being enumerable.
-     */
-    var nonenumerable: PropertyOrMethodDecorator;
-    /**
-     * Marks a property or method as not being writable.
-     */
-    var nonconfigurable: PropertyOrMethodDecorator;
-    /**
-     * Initial implementation included, likely slow. WIP.
-     */
-    var memoize: MethodDecorator;
-    /**
-     * Immediately applies the provided function and arguments to the method, allowing you to wrap methods with arbitrary helpers like those provided by lodash.
-     * The first argument is the function to apply, all further arguments will be passed to that decorating function.
-     */
-    var decorate: (func: Function, ...args: any[]) => MethodDecorator;
-    /**
-     * Prevents a property initializer from running until the decorated property is actually looked up.
-     * Useful to prevent excess allocations that might otherwise not be used, but be careful not to over-optimize things.
-     */
-    var lazyInitialize: PropertyDecorator;
-    /**
-     * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
-     * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
-     */
-    var mixin: (...mixins: any[]) => ClassDecorator;
-    /**
-     * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
-     * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
-     */
-    var mixins: (...mixins: any[]) => ClassDecorator;
-    /**
-     * Uses console.time and console.timeEnd to provide function timings with a unique label whose default prefix is ClassName.method. Supply a first argument to override the prefix:
-     */
-    var time: (label: string, console?: Console) => MethodDecorator;
-
-    export {
-        autobind,
-        readonly,
-        override,
-        deprecate,
-        deprecated,
-        debounce,
-        throttle,
-        suppressWarnings,
-        nonenumerable,
-        nonconfigurable,
-        memoize,
-        decorate,
-        lazyInitialize,
-        mixin,
-        mixins,
-        time,
-    };
+export interface ClassDecorator {
+    <TFunction extends Function>(target: TFunction): TFunction | void;
 }
+
+export interface ParameterDecorator {
+    (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+}
+
+export interface PropertyDecorator {
+    (target: Object, propertyKey: string | symbol): void;
+}
+
+export interface MethodDecorator {
+    <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T> | void;
+}
+
+export interface PropertyOrMethodDecorator extends MethodDecorator, PropertyDecorator {
+    (target: Object, propertyKey: string | symbol): void;
+}
+
+export interface Deprecate extends MethodDecorator {
+    (message?: string, option?: DeprecateOption): MethodDecorator;
+}
+
+export interface DeprecateOption {
+    url: string;
+}
+
+export interface ThrottleOptions {
+    /** allows to trigger function on the leading. */
+    leading?: boolean;
+    /** allows to trigger function on the trailing edge of the wait interval. */
+    trailing?: boolean;
+}
+
+export interface Console {
+    log(message?: any, ...optionalParams: any[]): void;
+    time(timerName?: string): void;
+    timeEnd(timerName?: string): void;
+}
+
+/**
+ * Forces invocations of this function to always have this refer to the class instance,
+ * even if the function is passed around or would otherwise lose its this context. e.g. var fn = context.method;
+ */
+declare var autobind: Function;
+/**
+ * Marks a property or method as not being writable.
+ */
+declare var readonly: PropertyOrMethodDecorator;
+/**
+ * Checks that the marked method indeed overrides a function with the same signature somewhere on the prototype chain.
+ */
+declare var override: MethodDecorator;
+/**
+ * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
+ */
+declare var deprecate: Deprecate;
+/**
+ * Calls console.warn() with a deprecation message. Provide a custom message to override the default one. You can also provide an options hash with a url, for further reading.
+ */
+declare var deprecated: Deprecate;
+/**
+ * Creates a new debounced function which will be invoked after wait milliseconds since the time it was invoked. Default timeout is 300 ms.
+ */
+declare var debounce: (wait: number) => MethodDecorator;
+/**
+ * Creates a new throttled function which will be invoked in every wait milliseconds. Default timeout is 300 ms.
+ */
+declare var throttle: (wait: number, options?: ThrottleOptions) => MethodDecorator;
+/**
+ * Suppresses any JavaScript console.warn() call while the decorated function is called. (i.e. on the stack)
+ */
+declare var suppressWarnings: MethodDecorator;
+/**
+ * Marks a property or method as not being enumerable.
+ */
+declare var nonenumerable: PropertyOrMethodDecorator;
+/**
+ * Marks a property or method as not being writable.
+ */
+declare var nonconfigurable: PropertyOrMethodDecorator;
+/**
+ * Initial implementation included, likely slow. WIP.
+ */
+declare var memoize: MethodDecorator;
+/**
+ * Immediately applies the provided function and arguments to the method, allowing you to wrap methods with arbitrary helpers like those provided by lodash.
+ * The first argument is the function to apply, all further arguments will be passed to that decorating function.
+ */
+declare var decorate: (func: Function, ...args: any[]) => MethodDecorator;
+/**
+ * Prevents a property initializer from running until the decorated property is actually looked up.
+ * Useful to prevent excess allocations that might otherwise not be used, but be careful not to over-optimize things.
+ */
+declare var lazyInitialize: PropertyDecorator;
+/**
+ * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
+ * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
+ */
+declare var mixin: (...mixins: any[]) => ClassDecorator;
+/**
+ * Mixes in all property descriptors from the provided Plain Old JavaScript Objects (aka POJOs) as arguments.
+ * Mixins are applied in the order they are passed, but do not override descriptors already on the class, including those inherited traditionally.
+ */
+declare var mixins: (...mixins: any[]) => ClassDecorator;
+/**
+ * Uses console.time and console.timeEnd to provide function timings with a unique label whose default prefix is ClassName.method. Supply a first argument to override the prefix:
+ */
+declare var time: (label: string, console?: Console) => MethodDecorator;
+
+export {
+autobind,
+readonly,
+override,
+deprecate,
+deprecated,
+debounce,
+throttle,
+suppressWarnings,
+nonenumerable,
+nonconfigurable,
+memoize,
+decorate,
+lazyInitialize,
+mixin,
+mixins,
+time,
+};
diff --git a/cors/cors.d.ts b/cors/cors.d.ts
index eaf917fb1f..ddc601624c 100644
--- a/cors/cors.d.ts
+++ b/cors/cors.d.ts
@@ -5,20 +5,19 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "cors" {
-    import express = require('express');
 
-    namespace e {
-        interface CorsOptions  {
-            origin?: any;
-            methods?: any;
-            allowedHeaders?: any;
-            exposedHeaders?: any;
-            credentials?: boolean;
-            maxAge?: number;
-        }
+import express = require('express');
+
+declare namespace e {
+    interface CorsOptions {
+        origin?: any;
+        methods?: any;
+        allowedHeaders?: any;
+        exposedHeaders?: any;
+        credentials?: boolean;
+        maxAge?: number;
     }
-
-    function e(options?: e.CorsOptions): express.RequestHandler;
-    export = e;
 }
+
+declare function e(options?: e.CorsOptions): express.RequestHandler;
+export = e;
diff --git a/couchbase/couchbase.d.ts b/couchbase/couchbase.d.ts
index 351c9a806d..36dca55bea 100644
--- a/couchbase/couchbase.d.ts
+++ b/couchbase/couchbase.d.ts
@@ -6,1124 +6,1123 @@
 /// <reference path="../node/node.d.ts"/>
 
 
-declare module 'couchbase' {
 
-    import events = require('events');
+
+import events = require('events');
+
+/**
+ * Enumeration of all error codes. See libcouchbase documentation for more details on what these errors represent.
+ */
+declare enum errors {
+    /** Operation was successful. **/
+    success,
+
+    /** Authentication should continue. **/
+    authContinue,
+
+    /** Error authenticating. **/
+    authError,
+
+    /** The passed incr/decr delta was invalid. **/
+    deltaBadVal,
+
+    /** Object is too large to be stored on the cluster. **/
+    objectTooBig,
+
+    /** Operation was successful. **/
+    serverBusy,
+
+    /** Server is too busy to handle your request right now. **/
+    cLibInternal,
+
+    /** An invalid arguement was passed. **/
+    cLinInvalidArgument,
+
+    /** The server is out of memory. **/
+    cLibOutOfMemory,
+
+    /** An invalid range was specified. **/
+    invalidRange,
+
+    /** An unknown error occured within libcouchbase. **/
+    cLibGenericError,
+
+    /** A temporary error occured. Try again. **/
+    temporaryError,
+
+    /** The key already exists on the server. **/
+    keyAlreadyExists,
+
+    /** The key does not exist on the server. **/
+    keyNotFound,
+
+    /** Failed to open library. **/
+    failedToOpenLibrary,
+
+    /** Failed to find expected symbol in library. **/
+    failedToFindSymbol,
+
+    /** A network error occured. **/
+    networkError,
+
+    /** Operations were performed on the incorrect server. **/
+    wrongServer,
+
+    /** Operations were performed on the incorrect server. **/
+    notMyVBucket,
+
+    /** The document was not stored. **/
+    notSorted,
+
+    /** An unsupported operation was sent to the server. **/
+    notSupported,
+
+    /** An unknown command was sent to the server. **/
+    unknownCommand,
+
+    /** An unknown host was specified. **/
+    unknownHost,
+
+    /** A protocol error occured. **/
+    protocolError,
+
+    /** The operation timed out. **/
+    timedOut,
+
+    /** Error connecting to the server. **/
+    connectError,
+
+    /** The bucket you request was not found. **/
+    bukcketNotFound,
+
+    /** libcouchbase is out of memory. **/
+    clientOutOfMemory,
+
+    /** A temporary error occured in libcouchbase. Try again. **/
+    clientTemporaryError,
+
+    /** A bad handle was passed. **/
+    badHandle,
+
+    /** A server bug caused the operation to fail. **/
+    serverBug,
+
+    /** The host format specified is invalid. **/
+    invalidHostFormat,
+
+    /**  Not enough nodes to meet the operations durability requirements. **/
+    notEnoughNodes,
+
+    /** Duplicate items. **/
+    duplicateItems,
+
+    /** Key mapping failed and could not match a server. **/
+    noMatchingServerForKey,
+
+    /** A bad environment variable was specified. **/
+    badEnvironmentVariable,
+
+    /** Couchnode is out of memory. **/
+    outOfMemory,
+
+    /** Invalid arguements were passed. **/
+    invalidArguments,
+
+    /** An error occured while trying to schedule the operation. **/
+    schedulingError,
+
+    /** Not all operations completed successfully. **/
+    checkResults,
+
+    /** A generic error occured in Couchnode. **/
+    genericError,
+
+    /** The specified durability requirements could not be satisfied. **/
+    durabilityFailed,
+
+    /** An error occured during a RESTful operation. **/
+    restError
+}
+
+/**
+ * Represents a singular cluster containing your buckets.
+ */
+declare class Cluster {
+    /**
+     * Create a new instance of the Cluster class.
+     * @param cnstr The connection string for your cluster.
+     * @param options The options object.
+     */
+    constructor(cnstr?: string, options?: ClusterConstructorOptions);
 
     /**
-     * Enumeration of all error codes. See libcouchbase documentation for more details on what these errors represent.
+     * Creates a manager allowing the management of a Couchbase cluster.
      */
-    enum errors {
-        /** Operation was successful. **/
-        success,
+    manager(): ClusterManager;
 
-        /** Authentication should continue. **/
-        authContinue,
+    /**
+     * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
+     * @param name The name of the bucket to open.
+     */
+    openBucket(name?: string): Bucket;
 
-        /** Error authenticating. **/
-        authError,
 
-        /** The passed incr/decr delta was invalid. **/
-        deltaBadVal,
+    /**
+     * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
+     * @param name The name of the bucket to open.
+     * @param password Password for the bucket.
+     */
+    openBucket(name?: string, password?: string): Bucket;
 
-        /** Object is too large to be stored on the cluster. **/
-        objectTooBig,
+    /**
+     * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
+     * @param name The name of the bucket to open.
+     * @param callback Callback to invoke on connection success or failure.
+     */
+    openBucket(name?: string, callback?: Function): Bucket;
 
-        /** Operation was successful. **/
-        serverBusy,
+    /**
+     * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
+     * @param name The name of the bucket to open.
+     * @param password Password for the bucket.
+     * @param callback Callback to invoke on connection success or failure.
+     */
+    openBucket(name?: string, password?: string, callback?: Function): Bucket;
+}
 
-        /** Server is too busy to handle your request right now. **/
-        cLibInternal,
+interface ClusterConstructorOptions {
+    /**
+     * The path to the certificate to use for SSL connections
+     */
+    certpath: string;
+}
 
-        /** An invalid arguement was passed. **/
-        cLinInvalidArgument,
+interface CreateBucketOptions {
+    /**
+     * The bucket name
+     */
+    name?: string;
+    authType?: string,
+    bucketType?: string;
+    ramQuotaMB?: number;
+    replicaNumber?: number;
+}
 
-        /** The server is out of memory. **/
-        cLibOutOfMemory,
+/**
+ * Class for performing management operations against a cluster.
+ */
+interface ClusterManager {
+    /**
+     *
+     * @param name
+     * @param callback
+     */
+    createBucket(name: string, callback: Function): void;
 
-        /** An invalid range was specified. **/
-        invalidRange,
+    /**
+     *
+     * @param name
+     * @param opts
+     * @param callback
+     */
+    createBucket(name: string, opts: any, callback: Function): void;
 
-        /** An unknown error occured within libcouchbase. **/
-        cLibGenericError,
+    /**
+     *
+     * @param callback
+     */
+    listBuckets(callback: Function): void;
 
-        /** A temporary error occured. Try again. **/
-        temporaryError,
+    /**
+     *
+     * @param name
+     * @param callback
+     */
+    removeBucket(name: string, callback: Function): void;
+}
 
-        /** The key already exists on the server. **/
-        keyAlreadyExists,
+/**
+ * The virtual class thrown for all Couchnode errors.
+ */
+interface CouchbaseError extends Error {
+    /**
+     * The error code for this error.
+     */
+    code: errors;
+}
 
-        /** The key does not exist on the server. **/
-        keyNotFound,
+interface AppendOptions {
+    /**
+     * The CAS value to check. If the item on the server contains a different CAS value, the operation will fail. Note that if this option is undefined, no comparison will be performed.
+     */
+    cas?: Bucket.CAS;
 
-        /** Failed to open library. **/
-        failedToOpenLibrary,
+    /**
+     * Ensures this operation is persisted to this many nodes.
+     */
+    persist_to?: number;
 
-        /** Failed to find expected symbol in library. **/
-        failedToFindSymbol,
+    /**
+     * 	Ensures this operation is replicated to this many nodes.
+     */
+    replicate_to?: number;
+}
 
-        /** A network error occured. **/
-        networkError,
+interface PrependOptions extends AppendOptions { }
 
-        /** Operations were performed on the incorrect server. **/
-        wrongServer,
+interface RemoveOptions extends AppendOptions { }
 
-        /** Operations were performed on the incorrect server. **/
-        notMyVBucket,
+interface ReplaceOptions extends AppendOptions {
+    /**
+     * Set the initial expiration time for the document. A value of 0 represents never expiring.
+     */
+    expiry?: number;
+}
 
-        /** The document was not stored. **/
-        notSorted,
+interface UpsertOptions extends ReplaceOptions { }
 
-        /** An unsupported operation was sent to the server. **/
-        notSupported,
+interface TouchOptions {
+    /**
+     * 	Ensures this operation is persisted to this many nodes.
+     */
+    persist_to?: number;
 
-        /** An unknown command was sent to the server. **/
-        unknownCommand,
+    /**
+     * Ensures this operation is replicated to this many nodes.
+     */
+    replicate_to?: number;
+}
 
-        /** An unknown host was specified. **/
-        unknownHost,
+interface CounterOptions {
+    /**
+     * Sets the initial value for the document if it does not exist. Specifying a value of undefined will cause the operation to fail if the document does not exist, otherwise this value must be equal to or greater than 0.
+     */
+    initial?: number;
 
-        /** A protocol error occured. **/
-        protocolError,
+    /**
+     * Set the initial expiration time for the document. A value of 0 represents never expiring.
+     */
+    expiry?: number;
 
-        /** The operation timed out. **/
-        timedOut,
+    /**
+     * Ensures this operation is persisted to this many nodes
+     */
+    persist_to?: number;
 
-        /** Error connecting to the server. **/
-        connectError,
+    /**
+     * Ensures this operation is replicated to this many nodes
+     */
+    replicate_to?: number;
+}
 
-        /** The bucket you request was not found. **/
-        bukcketNotFound,
+interface GetAndLockOptions {
+    lockTime?: number;
+}
 
-        /** libcouchbase is out of memory. **/
-        clientOutOfMemory,
+interface GetReplicaOptions {
 
-        /** A temporary error occured in libcouchbase. Try again. **/
-        clientTemporaryError,
+    /**
+     * The index for which replica you wish to retrieve this value from, or if undefined, use the value from the first server that replies.
+     */
+    index?: number;
+}
 
-        /** A bad handle was passed. **/
-        badHandle,
+interface InsertOptions {
 
-        /** A server bug caused the operation to fail. **/
-        serverBug,
+    /**
+     * Set the initial expiration time for the document. A value of 0 represents never expiring.
+     */
+    expiry?: number;
 
-        /** The host format specified is invalid. **/
-        invalidHostFormat,
+    /**
+     * Ensures this operation is persisted to this many nodes.
+     */
+    persist_to?: number;
 
-        /**  Not enough nodes to meet the operations durability requirements. **/
-        notEnoughNodes,
+    /**
+     * 	Ensures this operation is replicated to this many nodes.
+     */
+    replicate_to?: number;
+}
 
-        /** Duplicate items. **/
-        duplicateItems,
+/**
+ * A class for performing management operations against a bucket. This class should not be instantiated directly, but instead through the use of the Bucket#manager method instead.
+ */
+interface BucketManager {
 
-        /** Key mapping failed and could not match a server. **/
-        noMatchingServerForKey,
+    /**
+     * Flushes the cluster, deleting all data stored within this bucket. Note that this method requires the Flush permission to be enabled on the bucket from the management console before it will work.
+     * @param callback The callback function.
+     */
+    flush(callback: Function): void;
 
-        /** A bad environment variable was specified. **/
-        badEnvironmentVariable,
+    /**
+     * Retrieves a specific design document from this bucket.
+     * @param name
+     * @param callback The callback function.
+     */
+    getDesignDocument(name: string, callback: Function): void;
 
-        /** Couchnode is out of memory. **/
-        outOfMemory,
+    /**
+     * Retrieves a list of all design documents registered to a bucket.
+     * @param callback The callback function.
+     */
+    getDesignDocuments(callback: Function): void;
 
-        /** Invalid arguements were passed. **/
-        invalidArguments,
+    /**
+     * Registers a design document to this bucket, failing if it already exists.
+     * @param name
+     * @param data
+     * @param callback The callback function.
+     * @returns {}
+     */
+    insertDesignDocument(name: string, data: any, callback: Function): void;
 
-        /** An error occured while trying to schedule the operation. **/
-        schedulingError,
+    /**
+     * Unregisters a design document from this bucket.
+     * @param name
+     * @param callback The callback function.
+     * @returns {}
+     */
+    removeDesignDocument(name: string, callback: Function): void;
 
-        /** Not all operations completed successfully. **/
-        checkResults,
+    /**
+     * Registers a design document to this bucket, overwriting any existing design document that was previously registered.
+     * @param name
+     * @param data
+     * @param callback The callback function.
+     * @returns {}
+     */
+    upsertDesignDocument(name: string, data: any, callback: Function): void;
+}
 
-        /** A generic error occured in Couchnode. **/
-        genericError,
+/**
+ * Class for dynamically construction of view queries. This class should never be constructed directly, instead you should use ViewQuery.from to construct this object.
+ */
+declare class ViewQuery {
+    /**
+     * Instantiates a ViewQuery object for the specified design document and view name.
+     * @param ddoc The design document to use.
+     * @param name The view to use.
+     */
+    static from(ddoc: string, name: string): ViewQuery;
 
-        /** The specified durability requirements could not be satisfied. **/
-        durabilityFailed,
+    /**
+     * Specifies the design document and view name to use for this query.
+     * @param ddoc The design document to use.
+     * @param name The view to use.
+     */
+    from(ddoc: string, name: string): ViewQuery;
 
-        /** An error occured during a RESTful operation. **/
-        restError
+    /**
+     * Allows you to specify custom view options that may not be available though the fluent interface defined by this class.
+     * @param opts
+     */
+    custom(opts: any): ViewQuery;
+
+    /**
+     * Flag to request a view request accross all nodes in the case of a development view.
+     * @param full_set
+     */
+    full_set(full_set: boolean): ViewQuery;
+
+    /**
+     * Specifies whether to preform grouping during view execution.
+     * @param group
+     */
+    group(group: boolean): ViewQuery;
+
+    /**
+     * Specifies the level at which to perform view grouping.
+     * @param group_level
+     */
+    group_level(group_level: number): ViewQuery;
+
+    /**
+     * Specifies a range of document id's to retrieve from the index.
+     * @param start
+     * @param end
+     */
+    id_range(start: any, end: any): ViewQuery;
+
+    /**
+     * Flag to request a view request include the full document value.
+     * @param include_docs
+     */
+    include_docs(include_docs: boolean): ViewQuery;
+
+    /**
+     * Specifies a specified key to retrieve from the index.
+     * @param key
+     */
+    key(key: any): ViewQuery;
+
+    /**
+     * Specifies a list of keys you wish to retrieve from the index.
+     * @param keys
+     */
+    keys(key: any[]): ViewQuery;
+
+    /**
+     * Specifies the maximum number of results to return.
+     * @param limit
+     */
+    limit(limit: number): ViewQuery;
+
+    /**
+     * Sets the error handling mode for this query.
+     * @param mode
+     */
+    on_error(mode: ViewQuery.ErrorMode): ViewQuery;
+
+    /**
+     * Specifies the desired ordering for the results.
+     * @param order
+     */
+    order(order: ViewQuery.Order): ViewQuery;
+
+    /**
+     * Specifies a range of keys to retrieve from the index. You may specify both a start and an end point and additionally specify whether or not the end value is inclusive or exclusive.
+     * @param start
+     * @param end
+     * @param inclusive_end
+     */
+    range(start: any | any[], end: any | any[], inclusive_end?: boolean): ViewQuery;
+
+    /**
+     * Specifies whether to execute the map-reduce reduce step.
+     * @param reduce
+     */
+    reduce(reduce: boolean): ViewQuery;
+
+    /**
+     * Specifies how many results to skip from the beginning of the result set.
+     * @param skip
+     */
+    skip(skip: number): ViewQuery;
+
+    /**
+     * Specifies how this query will affect view indexing, both before and after the query is executed.
+     * @param stale
+     */
+    stale(stale: ViewQuery.Update): ViewQuery;
+}
+
+declare namespace ViewQuery {
+    /**
+     * Enumeration for specifying on_error behaviour.
+     */
+    enum ErrorMode {
+        /**
+         * Continues querying when an error occurs.
+         */
+        CONTINUE,
+
+        /**
+         * Stops and errors query when an error occurs.
+         */
+        STOP
     }
 
     /**
-     * Represents a singular cluster containing your buckets.
+     * Enumeration for specifying view result ordering.
      */
-    class Cluster {
+    enum Order {
         /**
-         * Create a new instance of the Cluster class.
-         * @param cnstr The connection string for your cluster.
-         * @param options The options object.
+         * Orders with lower values first and higher values last.
          */
-        constructor(cnstr?: string, options?: ClusterConstructorOptions);
+        ASCENDING,
 
         /**
-         * Creates a manager allowing the management of a Couchbase cluster.
+         * Orders with higher values first and lower values last.
          */
-        manager(): ClusterManager;
-
-        /**
-         * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
-         * @param name The name of the bucket to open.
-         */
-        openBucket(name?: string): Bucket;
-
-
-        /**
-         * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
-         * @param name The name of the bucket to open.
-         * @param password Password for the bucket.
-         */
-        openBucket(name?: string, password?: string): Bucket;
-
-        /**
-         * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
-         * @param name The name of the bucket to open.
-         * @param callback Callback to invoke on connection success or failure.
-         */
-        openBucket(name?: string, callback?: Function): Bucket;
-
-        /**
-         * Open a bucket to perform operations. This will begin the handshake process immediately and operations will complete later. Subscribe to the connect event to be alerted when the connection is ready, though be aware operations can be successfully queued before this.
-         * @param name The name of the bucket to open.
-         * @param password Password for the bucket.
-         * @param callback Callback to invoke on connection success or failure.
-         */
-        openBucket(name?: string, password?: string, callback?: Function): Bucket;
-    }
-
-    interface ClusterConstructorOptions {
-        /**
-         * The path to the certificate to use for SSL connections
-         */
-        certpath: string;
-    }
-
-    interface CreateBucketOptions {
-        /**
-         * The bucket name
-         */
-        name?: string;
-        authType?: string,
-        bucketType?: string;
-        ramQuotaMB?: number;
-        replicaNumber?: number;
+        DESCENDING
     }
 
     /**
-     * Class for performing management operations against a cluster.
+     * Enumeration for specifying view update semantics.
      */
-    interface ClusterManager {
+    enum Update {
         /**
-         *
-         * @param name
-         * @param callback
+         * Causes the view to be fully indexed before results are retrieved.
          */
-        createBucket(name: string, callback: Function): void;
+        BEFORE,
 
         /**
-         *
-         * @param name
-         * @param opts
-         * @param callback
+         * Allows the index to stay in whatever state it is already in prior retrieval of the query results.
          */
-        createBucket(name: string, opts: any, callback: Function): void;
+        NONE,
 
         /**
-         *
-         * @param callback
+         * Forces the view to be indexed after the results of this query has been fetched.
          */
-        listBuckets(callback: Function): void;
+        AFTER
+    }
+}
+
+/**
+ * Class for dynamically construction of N1QL queries. This class should never be constructed directly, instead you should use the N1qlQuery.fromString static method to instantiate a N1qlStringQuery.
+ */
+declare class N1qlQuery {
+    /**
+     * Creates a query object directly from the passed query string.
+     * @param str
+     */
+    static fromString(str: string): N1qlStringQuery;
+
+    /**
+     * Returns the fully prepared string representation of this query.
+     */
+    toString(): string;
+}
+
+declare namespace N1qlQuery {
+    /**
+     * Enumeration for specifying N1QL consistency semantics.
+     */
+    enum Consistency {
+        /**
+         * 	This is the default (for single-statement requests).
+         */
+        NOT_BOUND,
 
         /**
-         *
-         * @param name
-         * @param callback
+         * This implements strong consistency per request.
          */
-        removeBucket(name: string, callback: Function): void;
+        REQUEST_PLUS,
+
+        /**
+         * This implements strong consistency per statement.
+         */
+        STATEMENT_PLUS
+    }
+}
+
+/**
+ * Class for holding a explicitly defined N1QL query string.
+ */
+declare class N1qlStringQuery extends N1qlQuery {
+    /**
+     * Specifies whether this query is adhoc or should be prepared.
+     * @param adhoc
+     */
+    adhoc(adhoc: boolean): N1qlStringQuery;
+
+    /**
+     * Specify the consistency level for this query.
+     * @param val
+     */
+    consistency(val: N1qlQuery.Consistency): N1qlStringQuery;
+
+    /**
+     * Returns the fully prepared object representation of this query.
+     */
+    toObject(): any;
+
+    /**
+     * Returns the fully prepared string representation of this query.
+     */
+    toString(): string;
+}
+
+/**
+ * Class for dynamically construction of spatial queries. This class should never be constructed directly, instead you should use SpatialQuery.from to construct this object.
+ */
+declare class SpatialQuery {
+    /**
+     * Instantiates a SpatialQuery object for the specified design document and view name.
+     * @param ddoc The design document to use.
+     * @param name 	The view to use.
+     */
+    static from(ddoc: string, name: string): SpatialQuery;
+
+    /**
+     * Specifies the design document and view name to use for this query.
+     * @param ddoc
+     * @param name
+     */
+    from(ddoc: string, name: string): SpatialQuery;
+
+    /**
+     * Specifies a bounding box to query the index for. This value must be an array of exactly 4 numbers which represents the left, top, right and bottom edges of the bounding box (in that order).
+     * @param bbox
+     */
+    bbox(bbox: number[]): SpatialQuery;
+
+    /**
+     * Allows you to specify custom view options that may not be available though the fluent interface defined by this class.
+     * @param opts
+     */
+    custom(opts: any): SpatialQuery;
+
+    /**
+     * Specifies the maximum number of results to return.
+     * @param limit
+     */
+    limit(limit: number): SpatialQuery;
+
+    /**
+     * Specifies how many results to skip from the beginning of the result set.
+     * @param skip
+     */
+    skip(skip: number): SpatialQuery;
+
+    /**
+     * Specifies how this query will affect view indexing, both before and after the query is executed.
+     * @param stale
+     */
+    stale(stale: SpatialQuery.Update): SpatialQuery;
+}
+
+declare namespace SpatialQuery {
+    /**
+     * Enumeration for specifying view update semantics.
+     */
+    enum Update {
+        /**
+         * Causes the view to be fully indexed before results are retrieved.
+         */
+        BEFORE,
+
+        /**
+         * Allows the index to stay in whatever state it is already in prior retrieval of the query results.
+         */
+        NONE,
+
+        /**
+         * 	Forces the view to be indexed after the results of this query has been fetched.
+         */
+        AFTER
+    }
+}
+
+/**
+ * The Bucket class represents a connection to a Couchbase bucket. Never instantiate this class directly. Instead use the Cluster#openBucket method instead.
+ */
+interface Bucket {
+    /**
+     * Returns the version of the Node.js library as a string.
+     */
+    clientVersion: string;
+
+    /**
+     * Gets or sets the config throttling in milliseconds. The config throttling is the time that Bucket will wait before forcing a configuration refresh. If no refresh occurs before this period while a configuration is marked invalid, an update will be triggered.
+     */
+    configThrottle: number;
+
+    /**
+     * Sets or gets the connection timeout in milliseconds. This is the timeout value used when connecting to the configuration port during the initial connection (in this case, use this as a key in the 'options' parameter in the constructor) and/or when Bucket attempts to reconnect in-situ (if the current connection has failed).
+     */
+    connectionTimeout: number;
+
+    /**
+     * Gets or sets the durability interval in milliseconds. The durability interval is the time that Bucket will wait between requesting new durability information during a durability poll.
+     */
+    durabilityInterval: number;
+
+    /**
+     * Gets or sets the durability timeout in milliseconds. The durability timeout is the time that Bucket will wait for a response from the server in regards to a durability request. If there are no responses received within this time frame, the request fails with an error.
+     */
+    durabilityTimeout: number;
+
+    /**
+     * Returns the libcouchbase version as a string. This information will usually be in the format of 2.4.0-fffffff representing the major, minor, patch and git-commit that the built libcouchbase is based upon.
+     */
+    lcbVersion: string;
+
+    /**
+     * Gets or sets the management timeout in milliseconds. The management timeout is the time that Bucket will wait for a response from the server for a management request. If the response is not received within this time frame, the request is failed out with an error.
+     */
+    managementTimeout: number;
+
+    /**
+     * Sets or gets the node connection timeout in msecs. This value is similar to Bucket#connectionTimeout, but defines the time to wait for a particular node to respond before trying the next one.
+     */
+    nodeConnectionTimeout: number;
+
+    /**
+     * Gets or sets the operation timeout in milliseconds. The operation timeout is the time that Bucket will wait for a response from the server for a CRUD operation. If the response is not received within this time frame, the operation is failed with an error.
+     */
+    operationTimeout: number;
+
+    /**
+     * Gets or sets the view timeout in milliseconds. The view timeout is the time that Bucket will wait for a response from the server for a view request. If the response is not received within this time frame, the request fails with an error.
+     */
+    viewTimeout: number;
+
+    /**
+     * Similar to Bucket#upsert, but instead of setting a new key, it appends data to the existing key. Note that this function only makes sense when the stored data is a string; 'appending' to a JSON document may result in parse errors when the document is later retrieved.
+     * @param key The target document key.
+     * @param fragment The document's contents to append.
+     * @param callback The callback function.
+     */
+    append(key: any | Buffer, fragment: any, callback: Bucket.OpCallback): void;
+
+    /**
+     *
+     * @param key The target document key.
+     * @param fragment The document's contents to append.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    append(key: any | Buffer, fragment: any, options: AppendOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Increments or decrements a key's numeric value.
+     * Note that JavaScript does not support 64-bit integers (while libcouchbase and the server do). You might receive an inaccurate value if the number is greater than 53-bits (JavaScript's maximum integer precision).
+     * @param key The target document key.
+     * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
+     * @param callback The callback function.
+     */
+    counter(key: any | Buffer, delta: number, callback: Bucket.OpCallback): void;
+
+    /**
+     *
+     * @param key The target document key.
+     * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    counter(key: any | Buffer, delta: number, options: CounterOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Shuts down this connection.
+     */
+    disconnect(): void;
+
+    /**
+     * Enables N1QL support on the client. A cbq-server URI must be passed. This method will be deprecated in the future in favor of automatic configuration through the connected cluster.
+     * @param hosts An array of host/port combinations which are N1QL servers attached to this cluster.
+     */
+    enableN1ql(hosts: string | string[]): void;
+
+    /**
+     * Retrieves a document.
+     * @param key The target document key.
+     * @param callback The callback function.
+     */
+    get(key: any | Buffer, callback: Bucket.OpCallback): void;
+
+    /**
+     * @param key The target document key.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    get(key: any | Buffer, options: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
+     * This function behaves identically to Bucket#get in that it will return the value. It differs in that the document is also locked. This ensures that attempts by other client instances to access this document while the lock is held will fail.
+     * Once locked, a document can be unlocked either by explicitly calling Bucket#unlock or by performing a storage operation (e.g. Bucket#upsert, Bucket#replace, Bucket::append) with the current CAS value. Note that any other lock operations on this key will fail while a document is locked.
+     * @param key The target document key.
+     * @param callback The callback function.
+     */
+    getAndLock(key: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
+     * This function behaves identically to Bucket#get in that it will return the value. It differs in that the document is also locked. This ensures that attempts by other client instances to access this document while the lock is held will fail.
+     * Once locked, a document can be unlocked either by explicitly calling Bucket#unlock or by performing a storage operation (e.g. Bucket#upsert, Bucket#replace, Bucket::append) with the current CAS value. Note that any other lock operations on this key will fail while a document is locked.
+     * @param key The target document key.
+     * @param options The options object.
+     * @param callback The callback function.
+     * @returns {}
+     */
+    getAndLock(key: any, options: GetAndLockOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Retrieves a document and updates the expiry of the item at the same time.
+     * @param key The target document key.
+     * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    getAndTouch(key: any | Buffer, expiry: number, options: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Retrieves a document and updates the expiry of the item at the same time.
+     * @param key The target document key.
+     * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
+     * @param callback The callback function.
+     */
+    getAndTouch(key: any | Buffer, expiry: number, callback: Bucket.OpCallback): void;
+
+    /**
+     * Retrieves a list of keys
+     * @param keys The target document keys.
+     * @param callback The callback function.
+     */
+    getMulti(key: any[] | Buffer[], callback: Bucket.MultiGetCallback): void;
+
+    /**
+     * Get a document from a replica server in your cluster.
+     * @param key The target document key.
+     * @param callback The callback function.
+     */
+    getReplica(key: any | Buffer, callback: Bucket.OpCallback): void;
+
+    /**
+    * Get a document from a replica server in your cluster.
+    * @param key The target document key.
+    * @param options The options object.
+    * @param callback The callback function.
+    */
+    getReplica(key: any | Buffer, options: GetReplicaOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Identical to Bucket#upsert but will fail if the document already exists.
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param callback The callback function.
+     */
+    insert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Identical to Bucket#upsert but will fail if the document already exists.
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    insert(key: any | Buffer, value: any, options: InsertOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Returns an instance of a BuckerManager for performing management operations against a bucket.
+     */
+    manager(): BucketManager;
+
+    /**
+     * Like Bucket#append, but prepends data to the existing value.
+     * @param key The target document key.
+     * @param fragment The document's contents to prepend.
+     * @param callback The callback function.
+     */
+    prepend(key: any, fragment: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Like Bucket#append, but prepends data to the existing value.
+     * @param key The target document key.
+     * @param fragment The document's contents to prepend.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    prepend(key: any, fragment: any, options: PrependOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
+     * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
+     * @param query The query to execute.
+     * @param callback The callback function.
+     */
+    query(query: ViewQuery | N1qlQuery, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
+
+    /**
+     * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
+     * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
+     * @param query The query to execute.
+     * @param params A list or map to do replacements on a N1QL query.
+     * @param callback The callback function.
+     */
+    query(query: ViewQuery | N1qlQuery, params: Object | Array<any>, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
+
+    /**
+     * Deletes a document on the server.
+     * @param key The target document key.
+     * @param callback The callback function.
+     */
+    remove(key: any | Buffer, callback: Bucket.OpCallback): void;
+
+    /**
+     * Deletes a document on the server.
+     * @param key The target document key.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    remove(key: any | Buffer, options: RemoveOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param callback The callback function.
+     */
+    replace(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    replace(key: any | Buffer, value: any, options: ReplaceOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Configures a custom set of transcoder functions for encoding and decoding values that are being stored or retreived from the server.
+     * @param encoder The function for encoding.
+     * @param decoder The function for decoding.
+     */
+    setTranscoder(encoder: Bucket.EncoderFunction, decoder: Bucket.DecoderFunction): void;
+
+    /**
+     * Update the document expiration time.
+     * @param key The target document key.
+     * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds). Values larger than 302460*60 seconds (30 days) are interpreted as absolute times (from the epoch).
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    touch(key: any | Buffer, expiry: number, options: TouchOptions, callback: Bucket.OpCallback): void;
+
+    /**
+     * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
+     * @param key The target document key.
+     * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
+     * @param callback The callback function.
+     */
+    unlock(key: any | Buffer, cas: Bucket.CAS, callback: Bucket.OpCallback): void;
+
+    /**
+     * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
+     * @param key The target document key.
+     * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    unlock(key: any | Buffer, cas: Bucket.CAS, options: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Stores a document to the bucket.
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param callback The callback function.
+     */
+    upsert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+
+    /**
+     * Stores a document to the bucket.
+     * @param key The target document key.
+     * @param value The document's contents.
+     * @param options The options object.
+     * @param callback The callback function.
+     */
+    upsert(key: any | Buffer, value: any, options: UpsertOptions, callback: Bucket.OpCallback): void;
+}
+
+declare namespace Bucket {
+
+    /**
+     * his is used as a callback from executed queries. It is a shortcut method that automatically subscribes to the rows and error events of the Bucket.ViewQueryResponse.
+     */
+    interface QueryCallback {
+        /**
+         * @param error The error for the operation. This can either be an Error object or a falsy value.
+         * @param rows The rows returned from the query.
+         * @param meta The metadata returned by the query.
+         */
+        (error: CouchbaseError, rows: any[], meta: Bucket.ViewQueryResponse.Meta): void;
     }
 
     /**
-     * The virtual class thrown for all Couchnode errors.
+     * Single-Key callbacks.
+     * This callback is passed to all of the single key functions.
+     * It returns a result objcet containing a combination of a CAS and a value, depending on which operation was invoked.
      */
-    interface CouchbaseError extends Error {
+    interface OpCallback {
         /**
-         * The error code for this error.
+         * @param error The error for the operation. This can either be an Error object or a value which evaluates to false (null, undefined, 0 or false).
+         * @param result The result of the operation that was executed. This usually contains at least a cas property, and on some operations will contain a value property as well.
          */
-        code: errors;
-    }
-
-    interface AppendOptions {
-        /**
-         * The CAS value to check. If the item on the server contains a different CAS value, the operation will fail. Note that if this option is undefined, no comparison will be performed.
-         */
-        cas?: Bucket.CAS;
-
-        /**
-         * Ensures this operation is persisted to this many nodes.
-         */
-        persist_to?: number;
-
-        /**
-         * 	Ensures this operation is replicated to this many nodes.
-         */
-        replicate_to?: number;
-    }
-
-    interface PrependOptions extends AppendOptions { }
-
-    interface RemoveOptions extends AppendOptions { }
-
-    interface ReplaceOptions extends AppendOptions {
-        /**
-         * Set the initial expiration time for the document. A value of 0 represents never expiring.
-         */
-        expiry?: number;
-    }
-
-    interface UpsertOptions extends ReplaceOptions { }
-
-    interface TouchOptions {
-        /**
-         * 	Ensures this operation is persisted to this many nodes.
-         */
-        persist_to?: number;
-
-        /**
-         * Ensures this operation is replicated to this many nodes.
-         */
-        replicate_to?: number;
-    }
-
-    interface CounterOptions {
-        /**
-         * Sets the initial value for the document if it does not exist. Specifying a value of undefined will cause the operation to fail if the document does not exist, otherwise this value must be equal to or greater than 0.
-         */
-        initial?: number;
-
-        /**
-         * Set the initial expiration time for the document. A value of 0 represents never expiring.
-         */
-        expiry?: number;
-
-        /**
-         * Ensures this operation is persisted to this many nodes
-         */
-        persist_to?: number;
-
-        /**
-         * Ensures this operation is replicated to this many nodes
-         */
-        replicate_to?: number;
-    }
-
-    interface GetAndLockOptions {
-        lockTime?: number;
-    }
-
-    interface GetReplicaOptions {
-
-        /**
-         * The index for which replica you wish to retrieve this value from, or if undefined, use the value from the first server that replies.
-         */
-        index?: number;
-    }
-
-    interface InsertOptions {
-
-        /**
-         * Set the initial expiration time for the document. A value of 0 represents never expiring.
-         */
-        expiry?: number;
-
-        /**
-         * Ensures this operation is persisted to this many nodes.
-         */
-        persist_to?: number;
-
-        /**
-         * 	Ensures this operation is replicated to this many nodes.
-         */
-        replicate_to?: number;
+        (error: CouchbaseError | number, result: any): void;
     }
 
     /**
-     * A class for performing management operations against a bucket. This class should not be instantiated directly, but instead through the use of the Bucket#manager method instead.
+     * Multi-Get Callback.
+     * This callback is used to return results from a getMulti operation.
      */
-    interface BucketManager {
-
+    interface MultiGetCallback {
         /**
-         * Flushes the cluster, deleting all data stored within this bucket. Note that this method requires the Flush permission to be enabled on the bucket from the management console before it will work.
-         * @param callback The callback function.
+         * @param error The number of keys that failed to be retrieved. The precise errors are available by checking the error property of the individual documents.
+         * @param results This is a map of keys to results. The result for each key will optionally contain an error if one occured, or if no error occured will contain the CAS and value of the document.
          */
-        flush(callback: Function): void;
-
-        /**
-         * Retrieves a specific design document from this bucket.
-         * @param name
-         * @param callback The callback function.
-         */
-        getDesignDocument(name: string, callback: Function): void;
-
-        /**
-         * Retrieves a list of all design documents registered to a bucket.
-         * @param callback The callback function.
-         */
-        getDesignDocuments(callback: Function): void;
-
-        /**
-         * Registers a design document to this bucket, failing if it already exists.
-         * @param name
-         * @param data
-         * @param callback The callback function.
-         * @returns {}
-         */
-        insertDesignDocument(name: string, data: any, callback: Function): void;
-
-        /**
-         * Unregisters a design document from this bucket.
-         * @param name
-         * @param callback The callback function.
-         * @returns {}
-         */
-        removeDesignDocument(name: string, callback: Function): void;
-
-        /**
-         * Registers a design document to this bucket, overwriting any existing design document that was previously registered.
-         * @param name
-         * @param data
-         * @param callback The callback function.
-         * @returns {}
-         */
-        upsertDesignDocument(name: string, data: any, callback: Function): void;
+        (error: number, results: any[]): void;
     }
 
     /**
-     * Class for dynamically construction of view queries. This class should never be constructed directly, instead you should use ViewQuery.from to construct this object.
+     * Transcoder Encoding Function.
+     * This function will receive a value when a storage operation is invoked that needs to encode user-provided data for storage into Couchbase. It expects to be returned a Buffer object to store along with an integer representing any flag metadata relating to how to decode the key later using the matching DecoderFunction.
      */
-    class ViewQuery {
-        /**
-         * Instantiates a ViewQuery object for the specified design document and view name.
-         * @param ddoc The design document to use.
-         * @param name The view to use.
-         */
-        static from(ddoc: string, name: string): ViewQuery;
-
-        /**
-         * Specifies the design document and view name to use for this query.
-         * @param ddoc The design document to use.
-         * @param name The view to use.
-         */
-        from(ddoc: string, name: string): ViewQuery;
-
-        /**
-         * Allows you to specify custom view options that may not be available though the fluent interface defined by this class.
-         * @param opts
-         */
-        custom(opts: any): ViewQuery;
-
-        /**
-         * Flag to request a view request accross all nodes in the case of a development view.
-         * @param full_set
-         */
-        full_set(full_set: boolean): ViewQuery;
-
-        /**
-         * Specifies whether to preform grouping during view execution.
-         * @param group
-         */
-        group(group: boolean): ViewQuery;
-
-        /**
-         * Specifies the level at which to perform view grouping.
-         * @param group_level
-         */
-        group_level(group_level: number): ViewQuery;
-
-        /**
-         * Specifies a range of document id's to retrieve from the index.
-         * @param start
-         * @param end
-         */
-        id_range(start: any, end: any): ViewQuery;
-
-        /**
-         * Flag to request a view request include the full document value.
-         * @param include_docs
-         */
-        include_docs(include_docs: boolean): ViewQuery;
-
-        /**
-         * Specifies a specified key to retrieve from the index.
-         * @param key
-         */
-        key(key: any): ViewQuery;
-
-        /**
-         * Specifies a list of keys you wish to retrieve from the index.
-         * @param keys
-         */
-        keys(key: any[]): ViewQuery;
-
-        /**
-         * Specifies the maximum number of results to return.
-         * @param limit
-         */
-        limit(limit: number): ViewQuery;
-
-        /**
-         * Sets the error handling mode for this query.
-         * @param mode
-         */
-        on_error(mode: ViewQuery.ErrorMode): ViewQuery;
-
-        /**
-         * Specifies the desired ordering for the results.
-         * @param order
-         */
-        order(order: ViewQuery.Order): ViewQuery;
-
-        /**
-         * Specifies a range of keys to retrieve from the index. You may specify both a start and an end point and additionally specify whether or not the end value is inclusive or exclusive.
-         * @param start
-         * @param end
-         * @param inclusive_end
-         */
-        range(start: any | any[], end: any | any[], inclusive_end?: boolean): ViewQuery;
-
-        /**
-         * Specifies whether to execute the map-reduce reduce step.
-         * @param reduce
-         */
-        reduce(reduce: boolean): ViewQuery;
-
-        /**
-         * Specifies how many results to skip from the beginning of the result set.
-         * @param skip
-         */
-        skip(skip: number): ViewQuery;
-
-        /**
-         * Specifies how this query will affect view indexing, both before and after the query is executed.
-         * @param stale
-         */
-        stale(stale: ViewQuery.Update): ViewQuery;
-    }
-
-    namespace ViewQuery {
-        /**
-         * Enumeration for specifying on_error behaviour.
-         */
-        enum ErrorMode {
-            /**
-             * Continues querying when an error occurs.
-             */
-            CONTINUE,
-
-            /**
-             * Stops and errors query when an error occurs.
-             */
-            STOP
-        }
-
-        /**
-         * Enumeration for specifying view result ordering.
-         */
-        enum Order {
-            /**
-             * Orders with lower values first and higher values last.
-             */
-            ASCENDING,
-
-            /**
-             * Orders with higher values first and lower values last.
-             */
-            DESCENDING
-        }
-
-        /**
-         * Enumeration for specifying view update semantics.
-         */
-        enum Update {
-            /**
-             * Causes the view to be fully indexed before results are retrieved.
-             */
-            BEFORE,
-
-            /**
-             * Allows the index to stay in whatever state it is already in prior retrieval of the query results.
-             */
-            NONE,
-
-            /**
-             * Forces the view to be indexed after the results of this query has been fetched.
-             */
-            AFTER
-        }
-    }
-
-    /**
-     * Class for dynamically construction of N1QL queries. This class should never be constructed directly, instead you should use the N1qlQuery.fromString static method to instantiate a N1qlStringQuery.
-     */
-    class N1qlQuery {
-        /**
-         * Creates a query object directly from the passed query string.
-         * @param str
-         */
-        static fromString(str: string): N1qlStringQuery;
-
-        /**
-         * Returns the fully prepared string representation of this query.
-         */
-        toString(): string;
-    }
-
-    namespace N1qlQuery {
-        /**
-         * Enumeration for specifying N1QL consistency semantics.
-         */
-        enum Consistency {
-            /**
-             * 	This is the default (for single-statement requests).
-             */
-            NOT_BOUND,
-
-            /**
-             * This implements strong consistency per request.
-             */
-            REQUEST_PLUS,
-
-            /**
-             * This implements strong consistency per statement.
-             */
-            STATEMENT_PLUS
-        }
-    }
-
-    /**
-     * Class for holding a explicitly defined N1QL query string.
-     */
-    class N1qlStringQuery extends N1qlQuery {
-        /**
-         * Specifies whether this query is adhoc or should be prepared.
-         * @param adhoc
-         */
-        adhoc(adhoc: boolean): N1qlStringQuery;
-
-        /**
-         * Specify the consistency level for this query.
-         * @param val
-         */
-        consistency(val: N1qlQuery.Consistency): N1qlStringQuery;
-
-        /**
-         * Returns the fully prepared object representation of this query.
-         */
-        toObject(): any;
-
-        /**
-         * Returns the fully prepared string representation of this query.
-         */
-        toString(): string;
-    }
-
-    /**
-     * Class for dynamically construction of spatial queries. This class should never be constructed directly, instead you should use SpatialQuery.from to construct this object.
-     */
-    class SpatialQuery {
-        /**
-         * Instantiates a SpatialQuery object for the specified design document and view name.
-         * @param ddoc The design document to use.
-         * @param name 	The view to use.
-         */
-        static from(ddoc: string, name: string): SpatialQuery;
-
-        /**
-         * Specifies the design document and view name to use for this query.
-         * @param ddoc
-         * @param name
-         */
-        from(ddoc: string, name: string): SpatialQuery;
-
-        /**
-         * Specifies a bounding box to query the index for. This value must be an array of exactly 4 numbers which represents the left, top, right and bottom edges of the bounding box (in that order).
-         * @param bbox
-         */
-        bbox(bbox: number[]): SpatialQuery;
-
-        /**
-         * Allows you to specify custom view options that may not be available though the fluent interface defined by this class.
-         * @param opts
-         */
-        custom(opts: any): SpatialQuery;
-
-        /**
-         * Specifies the maximum number of results to return.
-         * @param limit
-         */
-        limit(limit: number): SpatialQuery;
-
-        /**
-         * Specifies how many results to skip from the beginning of the result set.
-         * @param skip
-         */
-        skip(skip: number): SpatialQuery;
-
-        /**
-         * Specifies how this query will affect view indexing, both before and after the query is executed.
-         * @param stale
-         */
-        stale(stale: SpatialQuery.Update): SpatialQuery;
-    }
-
-    namespace SpatialQuery {
-        /**
-         * Enumeration for specifying view update semantics.
-         */
-        enum Update {
-            /**
-             * Causes the view to be fully indexed before results are retrieved.
-             */
-            BEFORE,
-
-            /**
-             * Allows the index to stay in whatever state it is already in prior retrieval of the query results.
-             */
-            NONE,
-
-            /**
-             * 	Forces the view to be indexed after the results of this query has been fetched.
-             */
-            AFTER
-        }
-    }
-
-    /**
-     * The Bucket class represents a connection to a Couchbase bucket. Never instantiate this class directly. Instead use the Cluster#openBucket method instead.
-     */
-    interface Bucket {
-        /**
-         * Returns the version of the Node.js library as a string.
-         */
-        clientVersion: string;
-
-        /**
-         * Gets or sets the config throttling in milliseconds. The config throttling is the time that Bucket will wait before forcing a configuration refresh. If no refresh occurs before this period while a configuration is marked invalid, an update will be triggered.
-         */
-        configThrottle: number;
-
-        /**
-         * Sets or gets the connection timeout in milliseconds. This is the timeout value used when connecting to the configuration port during the initial connection (in this case, use this as a key in the 'options' parameter in the constructor) and/or when Bucket attempts to reconnect in-situ (if the current connection has failed).
-         */
-        connectionTimeout: number;
-
-        /**
-         * Gets or sets the durability interval in milliseconds. The durability interval is the time that Bucket will wait between requesting new durability information during a durability poll.
-         */
-        durabilityInterval: number;
-
-        /**
-         * Gets or sets the durability timeout in milliseconds. The durability timeout is the time that Bucket will wait for a response from the server in regards to a durability request. If there are no responses received within this time frame, the request fails with an error.
-         */
-        durabilityTimeout: number;
-
-        /**
-         * Returns the libcouchbase version as a string. This information will usually be in the format of 2.4.0-fffffff representing the major, minor, patch and git-commit that the built libcouchbase is based upon.
-         */
-        lcbVersion: string;
-
-        /**
-         * Gets or sets the management timeout in milliseconds. The management timeout is the time that Bucket will wait for a response from the server for a management request. If the response is not received within this time frame, the request is failed out with an error.
-         */
-        managementTimeout: number;
-
-        /**
-         * Sets or gets the node connection timeout in msecs. This value is similar to Bucket#connectionTimeout, but defines the time to wait for a particular node to respond before trying the next one.
-         */
-        nodeConnectionTimeout: number;
-
-        /**
-         * Gets or sets the operation timeout in milliseconds. The operation timeout is the time that Bucket will wait for a response from the server for a CRUD operation. If the response is not received within this time frame, the operation is failed with an error.
-         */
-        operationTimeout: number;
-
-        /**
-         * Gets or sets the view timeout in milliseconds. The view timeout is the time that Bucket will wait for a response from the server for a view request. If the response is not received within this time frame, the request fails with an error.
-         */
-        viewTimeout: number;
-
-        /**
-         * Similar to Bucket#upsert, but instead of setting a new key, it appends data to the existing key. Note that this function only makes sense when the stored data is a string; 'appending' to a JSON document may result in parse errors when the document is later retrieved.
-         * @param key The target document key.
-         * @param fragment The document's contents to append.
-         * @param callback The callback function.
-         */
-        append(key: any | Buffer, fragment: any, callback: Bucket.OpCallback): void;
-
-        /**
-         *
-         * @param key The target document key.
-         * @param fragment The document's contents to append.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        append(key: any | Buffer, fragment: any, options: AppendOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Increments or decrements a key's numeric value.
-         * Note that JavaScript does not support 64-bit integers (while libcouchbase and the server do). You might receive an inaccurate value if the number is greater than 53-bits (JavaScript's maximum integer precision).
-         * @param key The target document key.
-         * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
-         * @param callback The callback function.
-         */
-        counter(key: any | Buffer, delta: number, callback: Bucket.OpCallback): void;
-
-        /**
-         *
-         * @param key The target document key.
-         * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        counter(key: any | Buffer, delta: number, options: CounterOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Shuts down this connection.
-         */
-        disconnect(): void;
-
-        /**
-         * Enables N1QL support on the client. A cbq-server URI must be passed. This method will be deprecated in the future in favor of automatic configuration through the connected cluster.
-         * @param hosts An array of host/port combinations which are N1QL servers attached to this cluster.
-         */
-        enableN1ql(hosts: string | string[]): void;
-
-        /**
-         * Retrieves a document.
-         * @param key The target document key.
-         * @param callback The callback function.
-         */
-        get(key: any | Buffer, callback: Bucket.OpCallback): void;
-
-        /**
-         * @param key The target document key.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        get(key: any | Buffer, options: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
-         * This function behaves identically to Bucket#get in that it will return the value. It differs in that the document is also locked. This ensures that attempts by other client instances to access this document while the lock is held will fail.
-         * Once locked, a document can be unlocked either by explicitly calling Bucket#unlock or by performing a storage operation (e.g. Bucket#upsert, Bucket#replace, Bucket::append) with the current CAS value. Note that any other lock operations on this key will fail while a document is locked.
-         * @param key The target document key.
-         * @param callback The callback function.
-         */
-        getAndLock(key: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
-         * This function behaves identically to Bucket#get in that it will return the value. It differs in that the document is also locked. This ensures that attempts by other client instances to access this document while the lock is held will fail.
-         * Once locked, a document can be unlocked either by explicitly calling Bucket#unlock or by performing a storage operation (e.g. Bucket#upsert, Bucket#replace, Bucket::append) with the current CAS value. Note that any other lock operations on this key will fail while a document is locked.
-         * @param key The target document key.
-         * @param options The options object.
-         * @param callback The callback function.
-         * @returns {}
-         */
-        getAndLock(key: any, options: GetAndLockOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Retrieves a document and updates the expiry of the item at the same time.
-         * @param key The target document key.
-         * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        getAndTouch(key: any | Buffer, expiry: number, options: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Retrieves a document and updates the expiry of the item at the same time.
-         * @param key The target document key.
-         * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
-         * @param callback The callback function.
-         */
-        getAndTouch(key: any | Buffer, expiry: number, callback: Bucket.OpCallback): void;
-
-        /**
-         * Retrieves a list of keys
-         * @param keys The target document keys.
-         * @param callback The callback function.
-         */
-        getMulti(key: any[] | Buffer[], callback: Bucket.MultiGetCallback): void;
-
-        /**
-         * Get a document from a replica server in your cluster.
-         * @param key The target document key.
-         * @param callback The callback function.
-         */
-        getReplica(key: any | Buffer, callback: Bucket.OpCallback): void;
-
-        /**
-        * Get a document from a replica server in your cluster.
-        * @param key The target document key.
-        * @param options The options object.
-        * @param callback The callback function.
-        */
-        getReplica(key: any | Buffer, options: GetReplicaOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Identical to Bucket#upsert but will fail if the document already exists.
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param callback The callback function.
-         */
-        insert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Identical to Bucket#upsert but will fail if the document already exists.
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        insert(key: any | Buffer, value: any, options: InsertOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Returns an instance of a BuckerManager for performing management operations against a bucket.
-         */
-        manager(): BucketManager;
-
-        /**
-         * Like Bucket#append, but prepends data to the existing value.
-         * @param key The target document key.
-         * @param fragment The document's contents to prepend.
-         * @param callback The callback function.
-         */
-        prepend(key: any, fragment: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Like Bucket#append, but prepends data to the existing value.
-         * @param key The target document key.
-         * @param fragment The document's contents to prepend.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        prepend(key: any, fragment: any, options: PrependOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
-         * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
-         * @param query The query to execute.
-         * @param callback The callback function.
-         */
-        query(query: ViewQuery | N1qlQuery, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
-
-        /**
-         * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
-         * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
-         * @param query The query to execute.
-         * @param params A list or map to do replacements on a N1QL query.
-         * @param callback The callback function.
-         */
-        query(query: ViewQuery | N1qlQuery, params: Object | Array<any>, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
-
-        /**
-         * Deletes a document on the server.
-         * @param key The target document key.
-         * @param callback The callback function.
-         */
-        remove(key: any | Buffer, callback: Bucket.OpCallback): void;
-
-        /**
-         * Deletes a document on the server.
-         * @param key The target document key.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        remove(key: any | Buffer, options: RemoveOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param callback The callback function.
-         */
-        replace(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        replace(key: any | Buffer, value: any, options: ReplaceOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Configures a custom set of transcoder functions for encoding and decoding values that are being stored or retreived from the server.
-         * @param encoder The function for encoding.
-         * @param decoder The function for decoding.
-         */
-        setTranscoder(encoder: Bucket.EncoderFunction, decoder: Bucket.DecoderFunction): void;
-
-        /**
-         * Update the document expiration time.
-         * @param key The target document key.
-         * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds). Values larger than 302460*60 seconds (30 days) are interpreted as absolute times (from the epoch).
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        touch(key: any | Buffer, expiry: number, options: TouchOptions, callback: Bucket.OpCallback): void;
-
-        /**
-         * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
-         * @param key The target document key.
-         * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
-         * @param callback The callback function.
-         */
-        unlock(key: any | Buffer, cas: Bucket.CAS, callback: Bucket.OpCallback): void;
-
-        /**
-         * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
-         * @param key The target document key.
-         * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        unlock(key: any | Buffer, cas: Bucket.CAS, options: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Stores a document to the bucket.
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param callback The callback function.
-         */
-        upsert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
-
-        /**
-         * Stores a document to the bucket.
-         * @param key The target document key.
-         * @param value The document's contents.
-         * @param options The options object.
-         * @param callback The callback function.
-         */
-        upsert(key: any | Buffer, value: any, options: UpsertOptions, callback: Bucket.OpCallback): void;
-    }
-
-    namespace Bucket {
-
-        /**
-         * his is used as a callback from executed queries. It is a shortcut method that automatically subscribes to the rows and error events of the Bucket.ViewQueryResponse.
-         */
-        interface QueryCallback {
-            /**
-             * @param error The error for the operation. This can either be an Error object or a falsy value.
-             * @param rows The rows returned from the query.
-             * @param meta The metadata returned by the query.
-             */
-            (error: CouchbaseError, rows: any[], meta: Bucket.ViewQueryResponse.Meta): void;
-        }
-
-        /**
-         * Single-Key callbacks.
-         * This callback is passed to all of the single key functions.
-         * It returns a result objcet containing a combination of a CAS and a value, depending on which operation was invoked.
-         */
-        interface OpCallback {
-            /**
-             * @param error The error for the operation. This can either be an Error object or a value which evaluates to false (null, undefined, 0 or false).
-             * @param result The result of the operation that was executed. This usually contains at least a cas property, and on some operations will contain a value property as well.
-             */
-            (error: CouchbaseError | number, result: any): void;
-        }
-
-        /**
-         * Multi-Get Callback.
-         * This callback is used to return results from a getMulti operation.
-         */
-        interface MultiGetCallback {
-            /**
-             * @param error The number of keys that failed to be retrieved. The precise errors are available by checking the error property of the individual documents.
-             * @param results This is a map of keys to results. The result for each key will optionally contain an error if one occured, or if no error occured will contain the CAS and value of the document.
-             */
-            (error: number, results: any[]): void;
-        }
-
+    interface EncoderFunction {
         /**
          * Transcoder Encoding Function.
          * This function will receive a value when a storage operation is invoked that needs to encode user-provided data for storage into Couchbase. It expects to be returned a Buffer object to store along with an integer representing any flag metadata relating to how to decode the key later using the matching DecoderFunction.
+         * @param value The value needing encoding.
          */
-        interface EncoderFunction {
+        (value: any): Bucket.TranscoderDoc;
+    }
+
+    /**
+     * Transcoder Decoding Function.
+     * This function will receive an object containing a Buffer value and an integer value representing any flags metadata whenever a retrieval operation is executed. It is expected that this function will return a value representing the original value stored and encoded with its matching EncoderFunction.
+     */
+    interface DecoderFunction {
+        /**
+         *
+         * @param doc The data from Couchbase to decode.
+         */
+        (doc: Bucket.TranscoderDoc): any
+    }
+
+    /**
+     * The CAS value is a special object that indicates the current state of the item on the server. Each time an object is mutated on the server, the value is changed. CAS objects can be used in conjunction with mutation operations to ensure that the value on the server matches the local value retrieved by the client. This is useful when doing document updates on the server as you can ensure no changes were applied by other clients while you were in the process of mutating the document locally.
+     * In the Node.js SDK, the CAS is represented as an opaque value. As such,y ou cannot generate CAS objects, but should rather use the values returned from a Bucket.OpCallback.
+     */
+    interface CAS {
+
+    }
+
+    /**
+     * An event emitter allowing you to bind to various query result set events.
+     */
+    interface N1qlQueryResponse extends events.EventEmitter {
+
+    }
+
+    namespace N1qlQueryResponse {
+        /**
+         * The meta-information available from a view query response.
+         */
+        interface Meta {
             /**
-             * Transcoder Encoding Function.
-             * This function will receive a value when a storage operation is invoked that needs to encode user-provided data for storage into Couchbase. It expects to be returned a Buffer object to store along with an integer representing any flag metadata relating to how to decode the key later using the matching DecoderFunction.
-             * @param value The value needing encoding.
+             * The identifier for this query request.
              */
-            (value: any): Bucket.TranscoderDoc;
+            requestID: number;
         }
+    }
 
+    /**
+     * A class used in relation to transcoders.
+     */
+    class TranscoderDoc {
+        value: Buffer;
+        flags: number;
+    }
+
+    /**
+     * An event emitter allowing you to bind to various query result set events.
+     */
+    interface ViewQueryResponse extends events.EventEmitter {
+
+    }
+
+    namespace ViewQueryResponse {
         /**
-         * Transcoder Decoding Function.
-         * This function will receive an object containing a Buffer value and an integer value representing any flags metadata whenever a retrieval operation is executed. It is expected that this function will return a value representing the original value stored and encoded with its matching EncoderFunction.
+         * The meta-information available from a view query response.
          */
-        interface DecoderFunction {
+        interface Meta {
             /**
-             *
-             * @param doc The data from Couchbase to decode.
+             * The total number of rows available in the index of the view that was queried.
              */
-            (doc: Bucket.TranscoderDoc): any
-        }
-
-        /**
-         * The CAS value is a special object that indicates the current state of the item on the server. Each time an object is mutated on the server, the value is changed. CAS objects can be used in conjunction with mutation operations to ensure that the value on the server matches the local value retrieved by the client. This is useful when doing document updates on the server as you can ensure no changes were applied by other clients while you were in the process of mutating the document locally.
-         * In the Node.js SDK, the CAS is represented as an opaque value. As such,y ou cannot generate CAS objects, but should rather use the values returned from a Bucket.OpCallback.
-         */
-        interface CAS {
-
-        }
-
-        /**
-         * An event emitter allowing you to bind to various query result set events.
-         */
-        interface N1qlQueryResponse extends events.EventEmitter {
-
-        }
-
-        namespace N1qlQueryResponse {
-            /**
-             * The meta-information available from a view query response.
-             */
-            interface Meta {
-                /**
-                 * The identifier for this query request.
-                 */
-                requestID: number;
-            }
-        }
-
-        /**
-         * A class used in relation to transcoders.
-         */
-        class TranscoderDoc {
-            value: Buffer;
-            flags: number;
-        }
-
-        /**
-         * An event emitter allowing you to bind to various query result set events.
-         */
-        interface ViewQueryResponse extends events.EventEmitter {
-
-        }
-
-        namespace ViewQueryResponse {
-            /**
-             * The meta-information available from a view query response.
-             */
-            interface Meta {
-                /**
-                 * The total number of rows available in the index of the view that was queried.
-                 */
-                total_rows: number;
-            }
+            total_rows: number;
         }
     }
 }
diff --git a/cradle/cradle.d.ts b/cradle/cradle.d.ts
index 22a2fcf58e..9812979921 100644
--- a/cradle/cradle.d.ts
+++ b/cradle/cradle.d.ts
@@ -3,120 +3,119 @@
 // Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "cradle" {
-    interface Options {
-        host?: string;
-        hostname?: string;
-        cache?: boolean;
-        raw?: boolean;
-        forceSave?: boolean;
-        auth?: string | {
-            username: string;
-            password: string;
-        }
-        ca?: string;
-        secure?: boolean;
-        retries?: number;
-        retryTimeout?: number;
-        maxSockets?: number;
-    }
 
-    interface Callback {
-        (error: any, response: any): void;
+interface Options {
+    host?: string;
+    hostname?: string;
+    cache?: boolean;
+    raw?: boolean;
+    forceSave?: boolean;
+    auth?: string | {
+        username: string;
+        password: string;
     }
-
-    interface ErrorCallback {
-        (error: any): void;
-    }
-
-    export class Connection {
-        constructor(uri?: string, port?: number, options?: Options);
-        database(name: string): Database;
-        databases(Callback: Callback): void;
-        config(callback: Callback): void;
-        info(callback: Callback): void;
-        stats(callback: Callback): void;
-        activeTasks(callback: Callback): void;
-        uuids(callback: Callback): void;
-        uuids(count: number, callback: Callback): void;
-        replicate(options: {
-            source: string | {
-                url: string;
-            };
-            target: string | {
-                url: string;
-            };
-            cancel?: boolean;
-            continuous?: boolean;
-            create_target?: boolean;
-            doc_ids?: string[];
-            filter?: string;
-            proxy?: string;
-            query_params?: any;
-        }, callback: Callback): void;
-    }
-
-    export interface ChangesOptions {
-        since: number;
-    }
-
-    export class Database {
-        name: string;
-        get(id: string, callback: (error: any, document: any) => void): void;
-        get<T>(id: string, callback: (error: any, document: T) => void): void;
-        get(id: string, rev: string, callback: (error: any, document: any) => void): void;
-        get<T>(id: string, rev: string, callback: (error: any, document: T) => void): void;
-        get(ids: string[], callback: Callback): void;
-        save(document: any, callback: Callback): void;
-        save(id: string, document: any, callback: Callback): void;
-        save(id: string, revision: string, document: any,
-            callback: Callback): void;
-        save<T>(document: T, callback: Callback): void;
-        save<T>(id: string, document: T, callback: Callback): void;
-        save<T>(id: string, revision: string, document: T,
-            callback: Callback): void;
-        save(documents: any[], callback: Callback): void;
-        merge(id: string, document: any, callback: Callback): void;
-        merge<T>(id: string, document: T, callback: Callback): void;
-        remove(id: string, revision: string, callback: Callback): void;
-        update(name: string, id: string, queryObject: any, documentBody: any,
-            callback: Callback): void;
-        view(name: string, callback: Callback): void;
-        view(name: string, options: {
-            group?: boolean;
-            reduce?: boolean;
-            key?: string;
-            startkey?: any;
-            endkey?: any;
-            include_docs?: boolean;
-            limit?: number;
-            descending?: boolean;
-        }, callback: Callback): void;
-        temporaryView(view: any, callback: Callback): void;
-        create(callback: ErrorCallback): void;
-        exists(callback: (error: any, exists: boolean) => void): void;
-        destroy(callback: ErrorCallback): void;
-        changes(options: ChangesOptions): any;
-        changes(callback: (error: any, list: any[]) => void): void;
-        changes(options: ChangesOptions, callback: (error: any,
-            list: any[]) => void): void;
-        saveAttachment(idAndRevData: {
-            id: string;
-            rev: string;
-        }, attachmentData: any, callback: Callback): void;
-        getAttachment(id: string, attachmentName: string,
-            callback: Callback): void;
-        removeAttachment(id: string, attachmentName: string,
-            callback: Callback): void;
-        info(callback: Callback): void;
-        all(callback: Callback): void;
-        all(options: any, callback: Callback): void;
-        compact(callback: Callback): void;
-        compact(design: string, callback: Callback): void;
-        viewCleanup(callback: Callback): void;
-        replicate(target: string, callback: Callback): void;
-        replicate(target: string, options: any, callback: Callback): void;
-    }
-
-    export function setup(options: Options): void;
+    ca?: string;
+    secure?: boolean;
+    retries?: number;
+    retryTimeout?: number;
+    maxSockets?: number;
 }
+
+interface Callback {
+    (error: any, response: any): void;
+}
+
+interface ErrorCallback {
+    (error: any): void;
+}
+
+declare export class Connection {
+    constructor(uri?: string, port?: number, options?: Options);
+    database(name: string): Database;
+    databases(Callback: Callback): void;
+    config(callback: Callback): void;
+    info(callback: Callback): void;
+    stats(callback: Callback): void;
+    activeTasks(callback: Callback): void;
+    uuids(callback: Callback): void;
+    uuids(count: number, callback: Callback): void;
+    replicate(options: {
+        source: string | {
+            url: string;
+        };
+        target: string | {
+            url: string;
+        };
+        cancel?: boolean;
+        continuous?: boolean;
+        create_target?: boolean;
+        doc_ids?: string[];
+        filter?: string;
+        proxy?: string;
+        query_params?: any;
+    }, callback: Callback): void;
+}
+
+export interface ChangesOptions {
+    since: number;
+}
+
+declare export class Database {
+    name: string;
+    get(id: string, callback: (error: any, document: any) => void): void;
+    get<T>(id: string, callback: (error: any, document: T) => void): void;
+    get(id: string, rev: string, callback: (error: any, document: any) => void): void;
+    get<T>(id: string, rev: string, callback: (error: any, document: T) => void): void;
+    get(ids: string[], callback: Callback): void;
+    save(document: any, callback: Callback): void;
+    save(id: string, document: any, callback: Callback): void;
+    save(id: string, revision: string, document: any,
+        callback: Callback): void;
+    save<T>(document: T, callback: Callback): void;
+    save<T>(id: string, document: T, callback: Callback): void;
+    save<T>(id: string, revision: string, document: T,
+        callback: Callback): void;
+    save(documents: any[], callback: Callback): void;
+    merge(id: string, document: any, callback: Callback): void;
+    merge<T>(id: string, document: T, callback: Callback): void;
+    remove(id: string, revision: string, callback: Callback): void;
+    update(name: string, id: string, queryObject: any, documentBody: any,
+        callback: Callback): void;
+    view(name: string, callback: Callback): void;
+    view(name: string, options: {
+        group?: boolean;
+        reduce?: boolean;
+        key?: string;
+        startkey?: any;
+        endkey?: any;
+        include_docs?: boolean;
+        limit?: number;
+        descending?: boolean;
+    }, callback: Callback): void;
+    temporaryView(view: any, callback: Callback): void;
+    create(callback: ErrorCallback): void;
+    exists(callback: (error: any, exists: boolean) => void): void;
+    destroy(callback: ErrorCallback): void;
+    changes(options: ChangesOptions): any;
+    changes(callback: (error: any, list: any[]) => void): void;
+    changes(options: ChangesOptions, callback: (error: any,
+        list: any[]) => void): void;
+    saveAttachment(idAndRevData: {
+        id: string;
+        rev: string;
+    }, attachmentData: any, callback: Callback): void;
+    getAttachment(id: string, attachmentName: string,
+        callback: Callback): void;
+    removeAttachment(id: string, attachmentName: string,
+        callback: Callback): void;
+    info(callback: Callback): void;
+    all(callback: Callback): void;
+    all(options: any, callback: Callback): void;
+    compact(callback: Callback): void;
+    compact(design: string, callback: Callback): void;
+    viewCleanup(callback: Callback): void;
+    replicate(target: string, callback: Callback): void;
+    replicate(target: string, options: any, callback: Callback): void;
+}
+
+declare export function setup(options: Options): void;
diff --git a/create-error/create-error.d.ts b/create-error/create-error.d.ts
index a92048ee1d..95d1fd4e7b 100644
--- a/create-error/create-error.d.ts
+++ b/create-error/create-error.d.ts
@@ -3,19 +3,18 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'create-error' {
-  // FIXME See Global type references https://github.com/Microsoft/TypeScript/issues/983
-  type Err = Error;
 
-  namespace createError {
+// FIXME See Global type references https://github.com/Microsoft/TypeScript/issues/983
+type Err = Error;
+
+declare namespace createError {
     interface Error<T extends Err> extends Err {
-      new (message?: string, obj?: any): T;
+        new (message?: string, obj?: any): T;
     }
-  }
-
-  function createError(): createError.Error<Error>;
-  function createError<T extends createError.Error<Error>>(name: string, properties?: any): T;
-  function createError<T extends createError.Error<Error>>(Target: createError.Error<Error>, name?: string, properties?: any): T;
-
-  export = createError;
 }
+
+declare function createError(): createError.Error<Error>;
+declare function createError<T extends createError.Error<Error>>(name: string, properties?: any): T;
+declare function createError<T extends createError.Error<Error>>(Target: createError.Error<Error>, name?: string, properties?: any): T;
+
+export = createError;
diff --git a/credential/credential.d.ts b/credential/credential.d.ts
index 2934a090d4..4027305a01 100644
--- a/credential/credential.d.ts
+++ b/credential/credential.d.ts
@@ -3,16 +3,14 @@
 // Definitions by: Phú <https://github.com/phuvo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'credential' {
 
-	type HashCallback = (err: Error, hash: string) => void;
-	type VerifyCallback = (err: Error, isValid: boolean) => void;
 
-	namespace credential {
-		function hash(password: string, callback: HashCallback): void;
-		function verify(hash: string, password: string, callback: VerifyCallback): void;
-	}
-
-	export = credential;
+type HashCallback = (err: Error, hash: string) => void;
+type VerifyCallback = (err: Error, isValid: boolean) => void;
 
+declare namespace credential {
+    function hash(password: string, callback: HashCallback): void;
+    function verify(hash: string, password: string, callback: VerifyCallback): void;
 }
+
+export = credential;
diff --git a/cron/cron.d.ts b/cron/cron.d.ts
index 2eb532cf56..491b790d2e 100644
--- a/cron/cron.d.ts
+++ b/cron/cron.d.ts
@@ -3,25 +3,22 @@
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "cron" {
 
-  interface CronJobStatic {
-    new(cronTime: string|Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any): CronJob;
-    new(options: {
-      cronTime: string|Date; onTick: () => void; onComplete?: () => void; start?: boolean; timeZone?: string; context?: any
+
+interface CronJobStatic {
+    new (cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any): CronJob;
+    new (options: {
+        cronTime: string | Date; onTick: () => void; onComplete?: () => void; start?: boolean; timeZone?: string; context?: any
     }): CronJob;
-  }
-  interface CronJob {
+}
+interface CronJob {
     start(): void;
     stop(): void;
-  }
-  export var CronJob: CronJobStatic;
-
-  interface CronTimeStatic {
-    new(time: string|Date): CronTime;
-  }
-  interface CronTime {}
-  export var CronTime: CronTimeStatic;
-
 }
+declare export var CronJob: CronJobStatic;
 
+interface CronTimeStatic {
+    new (time: string | Date): CronTime;
+}
+interface CronTime { }
+declare export var CronTime: CronTimeStatic;
diff --git a/cross-storage/cross-storage.d.ts b/cross-storage/cross-storage.d.ts
index 05e1b0ac1f..f8e620ba29 100644
--- a/cross-storage/cross-storage.d.ts
+++ b/cross-storage/cross-storage.d.ts
@@ -3,21 +3,21 @@
 // Definitions by: Daniel Chao <http://dchao.co/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "cross-storage" {
-  interface CrossStorageClientOptions {
+
+interface CrossStorageClientOptions {
     timeout?: number;
     promise?: any;
     frameId?: string;
-  }
+}
 
-  type CrossStorageMethod = "get" | "set" | "del" | "getKeys" | "clear";
+type CrossStorageMethod = "get" | "set" | "del" | "getKeys" | "clear";
 
-  interface SubDomain {
+interface SubDomain {
     origin: RegExp;
     allow: CrossStorageMethod[];
-  }
+}
 
-  export class CrossStorageClient {
+declare export class CrossStorageClient {
 
     /**
      * Constructs a new cross storage client given the url to a hub. By default, an iframe is created 
@@ -27,33 +27,33 @@ declare module "cross-storage" {
      * install its listeners. If the promise key is supplied the constructor for a Promise, that Promise 
      * library will be used instead of the default window.Promise.
      */
-    constructor (hubUrl: string, opts: CrossStorageClientOptions)
+    constructor(hubUrl: string, opts: CrossStorageClientOptions)
 
     /**
      * Returns a promise that is fulfilled when a connection has been established with the cross storage 
      * hub. Its use is required to avoid sending any requests prior to initialization being complete.
      */
-    onConnect (): Promise<void>;
+    onConnect(): Promise<void>;
 
     /**
      * Sets a key to the specified value, optionally accepting a ttl to passively expire the key after a 
      * number of milliseconds. Returns a promise that is fulfilled on success, or rejected if any errors 
      * setting the key occurred, or the request timed out.
      */
-    set (key: string, value: any, ttl?: number): Promise<void>;
+    set(key: string, value: any, ttl?: number): Promise<void>;
     /**
      * Accepts one or more keys for which to retrieve their values. Returns a promise that is settled on 
      * hub response or timeout. On success, it is fulfilled with the value of the key if only passed a 
      * single argument. Otherwise it's resolved with an array of values. On failure, it is rejected with 
      * the corresponding error message.
      */
-    get (key: string): Promise<any>;
-    get (...keys: string[]): Promise<any[]>;
+    get(key: string): Promise<any>;
+    get(...keys: string[]): Promise<any[]>;
 
     /**
      * Accepts one or more keys for deletion. Returns a promise that is settled on hub response or timeout.
      */
-    del (...keys: string[]): Promise<void>;
+    del(...keys: string[]): Promise<void>;
 
     /**
      * Returns a promise that, when resolved, passes an array of keys currently in storage.
@@ -70,9 +70,9 @@ declare module "cross-storage" {
      * being invoked.
      */
     close(): void;
-  }
+}
 
-  export class CrossStorageHub {
+declare export class CrossStorageHub {
     /**
      * Accepts an array of objects with two keys: origin and allow. The value of origin is expected to be 
      * a RegExp, and allow, an array of strings. The cross storage hub is then initialized to accept requests 
@@ -80,7 +80,5 @@ declare module "cross-storage" {
      * include any of: get, set, del, getKeys and clear. A 'ready' message is sent to the parent window once 
      * complete.
      */
-    static init (subdomains: SubDomain[]): void;
-  }
-
+    static init(subdomains: SubDomain[]): void;
 }
diff --git a/cson/cson.d.ts b/cson/cson.d.ts
index 0150273c0c..e87aaff320 100644
--- a/cson/cson.d.ts
+++ b/cson/cson.d.ts
@@ -3,30 +3,29 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "cson" {
-	// Create Strings
-	export function stringify(data: Object, opts?: Object, indent?: any): string;
-	export function createCSONString(data: Object, opts?: Object, next?: any): string;
-	export function createJSONString(data: Object, opts?: Object, next?: any): string;
-	export function createString(data: Object, opts?: Object, next?: any): string;
 
-	// Parse Strings
-	export function parse(data: string, opts?: Object, next?: any): Object;
-	export function parseCSONString(data: string, opts?: Object, next?: any): Object;
-	export function parseJSONString(data: string, opts?: Object, next?: any): Object;
-	export function parseCSString(data: string, opts?: Object, next?: any): Object;
-	export function parseJSString(data: string, opts?: Object, next?: any): Object;
-	export function parseString(data: string, opts?: Object, next?:any): Object;
+// Create Strings
+declare export function stringify(data: Object, opts?: Object, indent?: any): string;
+declare export function createCSONString(data: Object, opts?: Object, next?: any): string;
+declare export function createJSONString(data: Object, opts?: Object, next?: any): string;
+declare export function createString(data: Object, opts?: Object, next?: any): string;
 
-	// Parse Files
-	export function load(filePath: string, opts?: Object, next?: any): Object;
-	export function parseCSONFile(filePath: string, opts?: Object, next?: any): Object;
-	export function parseJSONFile(filePath: string, opts?: Object, next?: any): Object;
-	export function parseCSFile(filePath: string, opts?: Object, next?: any): Object;
-	export function parseJSFile(filePath: string, opts?: Object, next?: any): Object;
+// Parse Strings
+declare export function parse(data: string, opts?: Object, next?: any): Object;
+declare export function parseCSONString(data: string, opts?: Object, next?: any): Object;
+declare export function parseJSONString(data: string, opts?: Object, next?: any): Object;
+declare export function parseCSString(data: string, opts?: Object, next?: any): Object;
+declare export function parseJSString(data: string, opts?: Object, next?: any): Object;
+declare export function parseString(data: string, opts?: Object, next?: any): Object;
 
-	// Require Files
-	export function requireCSFile(filePath: string, opts?: Object, next?: any): Object;
-	export function requireJSFile(filePath: string, opts?: Object, next?: any): Object;
-	export function requireFile(filePath: string, opts?: Object, next?: any): Object;
-}
+// Parse Files
+declare export function load(filePath: string, opts?: Object, next?: any): Object;
+declare export function parseCSONFile(filePath: string, opts?: Object, next?: any): Object;
+declare export function parseJSONFile(filePath: string, opts?: Object, next?: any): Object;
+declare export function parseCSFile(filePath: string, opts?: Object, next?: any): Object;
+declare export function parseJSFile(filePath: string, opts?: Object, next?: any): Object;
+
+// Require Files
+declare export function requireCSFile(filePath: string, opts?: Object, next?: any): Object;
+declare export function requireJSFile(filePath: string, opts?: Object, next?: any): Object;
+declare export function requireFile(filePath: string, opts?: Object, next?: any): Object;
diff --git a/css/css.d.ts b/css/css.d.ts
index acea1acf0e..2dabf77799 100644
--- a/css/css.d.ts
+++ b/css/css.d.ts
@@ -6,253 +6,251 @@
 /**
  * CSS parser / stringifier for Node.js
  */
-declare module "css" {
 
-	/**
-	 * css.parse options
-	 */
-	interface ParserOptions {
-		/** Silently fail on parse errors */
-		silent?: boolean;
-		/** The path to the file containing css. Makes errors and source maps more helpful, by letting them know where code comes from. */
-		source?: string;
-	}
 
-	/**
-	 * css.stringify options
-	 */
-	interface StringifyOptions {
-		/** The string used to indent the output. Defaults to two spaces. */
-		indent?: string;
-		/** Omit comments and extraneous whitespace. */
-		compress?: boolean;
-		/** Return a sourcemap along with the CSS output. 
-		 * Using the source option of css.parse is strongly recommended 
-		 * when creating a source map. Specify sourcemap: 'generator' 
-		 * to return the SourceMapGenerator object instead of serializing the source map. 
-		 */
-		sourcemap?: string;
-		/** (enabled by default, specify false to disable)
-		 *  Reads any source maps referenced by the input files 
-		 * when generating the output source map. When enabled, 
-		 * file system access may be required for reading the referenced source maps. 
-		 */
-		inputSourcemaps?: boolean;
-	}
+/**
+ * css.parse options
+ */
+interface ParserOptions {
+    /** Silently fail on parse errors */
+    silent?: boolean;
+    /** The path to the file containing css. Makes errors and source maps more helpful, by letting them know where code comes from. */
+    source?: string;
+}
 
-	/**
-	 * Error thrown during parsing.
-	 */
-	interface ParserError {
-		/** The full error message with the source position. */
-		message?: string;
-		/** The error message without position. */
-		reason?: string;
-		/** The value of options.source if passed to css.parse. Otherwise undefined. */
-		filename?: string;
-		line?: number;
-		column?: number;
-		/** The portion of code that couldn't be parsed. */
-		source?: string;
-	}
+/**
+ * css.stringify options
+ */
+interface StringifyOptions {
+    /** The string used to indent the output. Defaults to two spaces. */
+    indent?: string;
+    /** Omit comments and extraneous whitespace. */
+    compress?: boolean;
+    /** Return a sourcemap along with the CSS output. 
+     * Using the source option of css.parse is strongly recommended 
+     * when creating a source map. Specify sourcemap: 'generator' 
+     * to return the SourceMapGenerator object instead of serializing the source map. 
+     */
+    sourcemap?: string;
+    /** (enabled by default, specify false to disable)
+     *  Reads any source maps referenced by the input files 
+     * when generating the output source map. When enabled, 
+     * file system access may be required for reading the referenced source maps. 
+     */
+    inputSourcemaps?: boolean;
+}
 
-	// ---------------------------------------------------------------------------------
-	// AST Tree
-	// ---------------------------------------------------------------------------------
+/**
+ * Error thrown during parsing.
+ */
+interface ParserError {
+    /** The full error message with the source position. */
+    message?: string;
+    /** The error message without position. */
+    reason?: string;
+    /** The value of options.source if passed to css.parse. Otherwise undefined. */
+    filename?: string;
+    line?: number;
+    column?: number;
+    /** The portion of code that couldn't be parsed. */
+    source?: string;
+}
 
-	/**
-	 * Information about a position in the code.
-	 * The line and column numbers are 1-based: The first line is 1 and the first column of a line is 1 (not 0).
-	 */
-	interface Position {
-		line?: number;
-		column?: number;
-	}
+// ---------------------------------------------------------------------------------
+// AST Tree
+// ---------------------------------------------------------------------------------
 
-	/**
-	 * Base AST Tree Node.
-	 */
-	interface Node {
-		/** The possible values are the ones listed in the Types section on https://github.com/reworkcss/css page. */
-		type?: string;
-		/** A reference to the parent node, or null if the node has no parent. */
-		parent?: Node;
-		/** Information about the position in the source string that corresponds to the node. */
-		position?: {
-			start?: Position;
-			end?: Position;
-			/** The value of options.source if passed to css.parse. Otherwise undefined. */
-			source?: string;
-			/** The full source string passed to css.parse. */
-			content?: string;
-		};
-	}
+/**
+ * Information about a position in the code.
+ * The line and column numbers are 1-based: The first line is 1 and the first column of a line is 1 (not 0).
+ */
+interface Position {
+    line?: number;
+    column?: number;
+}
 
-	interface Rule extends Node {
-		/** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
-		selectors?: Array<string>;
-		/** Array of nodes with the types declaration and comment. */
-		declarations?: Array<Declaration|Comment>;
-	}
+/**
+ * Base AST Tree Node.
+ */
+interface Node {
+    /** The possible values are the ones listed in the Types section on https://github.com/reworkcss/css page. */
+    type?: string;
+    /** A reference to the parent node, or null if the node has no parent. */
+    parent?: Node;
+    /** Information about the position in the source string that corresponds to the node. */
+    position?: {
+        start?: Position;
+        end?: Position;
+        /** The value of options.source if passed to css.parse. Otherwise undefined. */
+        source?: string;
+        /** The full source string passed to css.parse. */
+        content?: string;
+    };
+}
 
-	interface Declaration extends Node {
-		/** The property name, trimmed from whitespace and comments. May not be empty. */
-		property?: string;
-		/** The value of the property, trimmed from whitespace and comments. Empty values are allowed. */
-		value?: string;
-	}
+interface Rule extends Node {
+    /** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
+    selectors?: Array<string>;
+    /** Array of nodes with the types declaration and comment. */
+    declarations?: Array<Declaration | Comment>;
+}
 
-	/** 
-	 * A rule-level or declaration-level comment. Comments inside selectors, properties and values etc. are lost.
-	 */
-	interface Comment extends Node {
-		comment?: string;
-	}
+interface Declaration extends Node {
+    /** The property name, trimmed from whitespace and comments. May not be empty. */
+    property?: string;
+    /** The value of the property, trimmed from whitespace and comments. Empty values are allowed. */
+    value?: string;
+}
 
-	/** 
-	 * The @charset at-rule. 
-	 */
-	interface Charset {
-		/** The part following @charset. */
-		charset?: string;
-	}
+/** 
+ * A rule-level or declaration-level comment. Comments inside selectors, properties and values etc. are lost.
+ */
+interface Comment extends Node {
+    comment?: string;
+}
 
-	/**
-	 * The @custom-media at-rule 
-	 */
-	interface CustomMedia {
-		/** The ---prefixed name. */
-		name?: string;
-		/** The part following the name. */
-		media?: string;
-	}
+/** 
+ * The @charset at-rule. 
+ */
+interface Charset {
+    /** The part following @charset. */
+    charset?: string;
+}
 
-	/**
-	 * The @document at-rule.
-	 */
-	interface Document {
-		/** The part following @document. */
-		document?: string;
-		/** The vendor prefix in @document, or undefined if there is none. */
-		vendor?: string;
-		/** Array of nodes with the types rule, comment and any of the at-rule types. */
-		rules?: Array<Rule|Comment|AtRule>;
-	}
+/**
+ * The @custom-media at-rule 
+ */
+interface CustomMedia {
+    /** The ---prefixed name. */
+    name?: string;
+    /** The part following the name. */
+    media?: string;
+}
 
-	/**
-	 * The @font-face at-rule.
-	 */
-	interface FontFace {
-		/** Array of nodes with the types declaration and comment. */
-		declarations?: Array<Declaration|Comment>;
-	}
+/**
+ * The @document at-rule.
+ */
+interface Document {
+    /** The part following @document. */
+    document?: string;
+    /** The vendor prefix in @document, or undefined if there is none. */
+    vendor?: string;
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules?: Array<Rule | Comment | AtRule>;
+}
 
-	/**
-	 * The @host at-rule.
-	 */
-	interface Host {
-		/** Array of nodes with the types rule, comment and any of the at-rule types. */
-		rules?: Array<Rule|Comment|AtRule>;
-	}
+/**
+ * The @font-face at-rule.
+ */
+interface FontFace {
+    /** Array of nodes with the types declaration and comment. */
+    declarations?: Array<Declaration | Comment>;
+}
 
-	/**
-	 * The @import at-rule.
-	 */
-	interface Import {
-		/** The part following @import. */
-		import?: string;
-	}
+/**
+ * The @host at-rule.
+ */
+interface Host {
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules?: Array<Rule | Comment | AtRule>;
+}
 
-	/**
-	 * The @keyframes at-rule.
-	 */
-	interface KeyFrames {
-		/** The name of the keyframes rule. */
-		name?: string;
-		/** The vendor prefix in @keyframes, or undefined if there is none. */
-		vendor?: string;
-		/** Array of nodes with the types keyframe and comment. */
-		keyframes?: Array<KeyFrame|Comment>;
-	}
+/**
+ * The @import at-rule.
+ */
+interface Import {
+    /** The part following @import. */
+    import?: string;
+}
 
-	interface KeyFrame {
-		/** The list of "selectors" of the keyframe rule, split on commas. Each “selector� is trimmed from whitespace. */
-		values?: Array<string>;
-		/** Array of nodes with the types declaration and comment. */
-		declarations?: Array<Declaration|Comment>;
-	}
+/**
+ * The @keyframes at-rule.
+ */
+interface KeyFrames {
+    /** The name of the keyframes rule. */
+    name?: string;
+    /** The vendor prefix in @keyframes, or undefined if there is none. */
+    vendor?: string;
+    /** Array of nodes with the types keyframe and comment. */
+    keyframes?: Array<KeyFrame | Comment>;
+}
 
-	/**
-	 * The @media at-rule.
-	 */
-	interface Media {
-		/** The part following @media. */
-		media?: string;
-		/** Array of nodes with the types rule, comment and any of the at-rule types. */
-		rules?: Array<Rule|Comment|AtRule>;
-	}
+interface KeyFrame {
+    /** The list of "selectors" of the keyframe rule, split on commas. Each “selector� is trimmed from whitespace. */
+    values?: Array<string>;
+    /** Array of nodes with the types declaration and comment. */
+    declarations?: Array<Declaration | Comment>;
+}
 
-	/**
-	 * The @namespace at-rule.
-	 */
-	interface Namespace {
-		/** The part following @namespace. */
-		namespace?: string;
-	}
+/**
+ * The @media at-rule.
+ */
+interface Media {
+    /** The part following @media. */
+    media?: string;
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules?: Array<Rule | Comment | AtRule>;
+}
 
-	/**
-	 * The @page at-rule.
-	 */
-	interface Page {
-		/** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
-		selectors?: Array<string>;
-		/** Array of nodes with the types declaration and comment. */
-		declarations?: Array<Declaration|Comment>;
-	}
+/**
+ * The @namespace at-rule.
+ */
+interface Namespace {
+    /** The part following @namespace. */
+    namespace?: string;
+}
 
-	/**
-	 * The @supports at-rule.
-	 */
-	interface Supports {
-		/** The part following @supports. */
-		supports?: string;
-		/** Array of nodes with the types rule, comment and any of the at-rule types. */
-		rules?: Array<Rule|Comment|AtRule>;
-	}
+/**
+ * The @page at-rule.
+ */
+interface Page {
+    /** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
+    selectors?: Array<string>;
+    /** Array of nodes with the types declaration and comment. */
+    declarations?: Array<Declaration | Comment>;
+}
 
-	/** All at-rules. */
-	type AtRule = Charset|CustomMedia|Document|FontFace|Host|Import|KeyFrames|Media|Namespace|Page|Supports;
+/**
+ * The @supports at-rule.
+ */
+interface Supports {
+    /** The part following @supports. */
+    supports?: string;
+    /** Array of nodes with the types rule, comment and any of the at-rule types. */
+    rules?: Array<Rule | Comment | AtRule>;
+}
 
-	/** 
-	 * The root node returned by css.parse. 
-	 */
-	interface Stylesheet extends Node {
-		stylesheet?: {
-			/** Array of nodes with the types rule, comment and any of the at-rule types. */
-			rules?: Array<Rule|Comment|AtRule>;
-			/** Array of Errors. Errors collected during parsing when option silent is true. */
-			parsingErrors?: Array<ParserError>
-		};
-	}
+/** All at-rules. */
+type AtRule = Charset | CustomMedia | Document | FontFace | Host | Import | KeyFrames | Media | Namespace | Page | Supports;
 
-	// ---------------------------------------------------------------------------------
+/** 
+ * The root node returned by css.parse. 
+ */
+interface Stylesheet extends Node {
+    stylesheet?: {
+        /** Array of nodes with the types rule, comment and any of the at-rule types. */
+        rules?: Array<Rule | Comment | AtRule>;
+        /** Array of Errors. Errors collected during parsing when option silent is true. */
+        parsingErrors?: Array<ParserError>
+    };
+}
 
-	/**
-	 * Accepts a CSS string and returns an AST object.
-	 * 
-	 * @param {string} code - CSS code.
-	 * @param {ParserOptions} options - CSS parser options.
-	 * @return {Stylesheet} AST object built using provides CSS code.
-	 */
-	function parse(code: string, options?: ParserOptions): Stylesheet;
+// ---------------------------------------------------------------------------------
 
-	/**
-	 * Accepts an AST object (as css.parse produces) and returns a CSS string.
-	 * 
-	 * @param {Stylesheet} stylesheet - AST tree.
-	 * @param {StringifyOptions} options - AST tree to string serializaiton options.
-	 * @return {string} CSS code.
-	 */
-	function stringify(stylesheet: Stylesheet, options?: StringifyOptions): string;
+/**
+ * Accepts a CSS string and returns an AST object.
+ * 
+ * @param {string} code - CSS code.
+ * @param {ParserOptions} options - CSS parser options.
+ * @return {Stylesheet} AST object built using provides CSS code.
+ */
+declare function parse(code: string, options?: ParserOptions): Stylesheet;
 
-}
\ No newline at end of file
+/**
+ * Accepts an AST object (as css.parse produces) and returns a CSS string.
+ * 
+ * @param {Stylesheet} stylesheet - AST tree.
+ * @param {StringifyOptions} options - AST tree to string serializaiton options.
+ * @return {string} CSS code.
+ */
+declare function stringify(stylesheet: Stylesheet, options?: StringifyOptions): string;
diff --git a/csv-stringify/csv-stringify.d.ts b/csv-stringify/csv-stringify.d.ts
index a1cc16a15b..a097cb4a26 100644
--- a/csv-stringify/csv-stringify.d.ts
+++ b/csv-stringify/csv-stringify.d.ts
@@ -5,79 +5,78 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "csv-stringify" {
 
-	namespace stringify {
-		interface StringifyOpts {
-			/**
-			 * List of fields, applied when transform returns an object, order matters, read the transformer documentation for additionnal information, columns are auto discovered when the user write object, see the "header" option on how to print columns names on the first line.
-			 */
-			columns?: string[];
-			/**
-			 * Set the field delimiter, one character only, defaults to a comma.
-			 */
-			delimiter?: string;
-			/**
-			 * Add the value of "options.rowDelimiter" on the last line, default to true.
-			 */
-			eof?: boolean;
-			/**
-			 * Defaults to the escape read option.
-			 */
-			escape?: boolean;
-			/**
-			 * Display the column names on the first line if the columns option is provided or discovered.
-			 */
-			header?: boolean;
-			/**
-			 * String used to delimit record rows or a special value; special values are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
-			 */
-			lineBreaks?: string;
-			/**
-			 * Defaults to the quote read option.
-			 */
-			quote?: string;
-			/**
-			 * Boolean, default to false, quote all the non-empty fields even if not required.
-			 */
-			quoted?: boolean;
-			/**
-			 * Boolean, no default, quote empty fields? If specified, overrides quotedString for empty strings.
-			 */
-			quotedEmpty?: boolean;
-			/**
-			 * Boolean, default to false, quote all fields of type string even if not required.
-			 */
-			quotedString?: boolean;
-			/**
-			 * String used to delimit record rows or a special value; special values are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
-			 */
-			rowDelimiter?: string;
 
-		}
+declare namespace stringify {
+    interface StringifyOpts {
+        /**
+         * List of fields, applied when transform returns an object, order matters, read the transformer documentation for additionnal information, columns are auto discovered when the user write object, see the "header" option on how to print columns names on the first line.
+         */
+        columns?: string[];
+        /**
+         * Set the field delimiter, one character only, defaults to a comma.
+         */
+        delimiter?: string;
+        /**
+         * Add the value of "options.rowDelimiter" on the last line, default to true.
+         */
+        eof?: boolean;
+        /**
+         * Defaults to the escape read option.
+         */
+        escape?: boolean;
+        /**
+         * Display the column names on the first line if the columns option is provided or discovered.
+         */
+        header?: boolean;
+        /**
+         * String used to delimit record rows or a special value; special values are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
+         */
+        lineBreaks?: string;
+        /**
+         * Defaults to the quote read option.
+         */
+        quote?: string;
+        /**
+         * Boolean, default to false, quote all the non-empty fields even if not required.
+         */
+        quoted?: boolean;
+        /**
+         * Boolean, no default, quote empty fields? If specified, overrides quotedString for empty strings.
+         */
+        quotedEmpty?: boolean;
+        /**
+         * Boolean, default to false, quote all fields of type string even if not required.
+         */
+        quotedString?: boolean;
+        /**
+         * String used to delimit record rows or a special value; special values are 'auto', 'unix', 'mac', 'windows', 'unicode'; defaults to 'auto' (discovered in source or 'unix' if no source is specified).
+         */
+        rowDelimiter?: string;
 
-		interface Stringifier extends NodeJS.ReadWriteStream {
+    }
 
-			// Stringifier stream takes array of strings
-			write(line: string[]): boolean;
+    interface Stringifier extends NodeJS.ReadWriteStream {
 
-			// repeat declarations from NodeJS.WritableStream to avoid compile error
-			write(buffer: Buffer, cb?: Function): boolean;
-			write(str: string, cb?: Function): boolean;
-			write(str: string, encoding?: string, cb?: Function): boolean;
-		}
-	}
+        // Stringifier stream takes array of strings
+        write(line: string[]): boolean;
 
-	/**
-	 * Callback version: string in --> callback with string out
-	 */
-	function stringify(input: any[][], opts: stringify.StringifyOpts, callback: (error: Error, output: string) => void): void;
-	function stringify(input: any[][], callback: (error: Error, output: string) => void): void;
-
-	/**
-	 * Streaming stringifier
-	 */
-	function stringify(opts: stringify.StringifyOpts): stringify.Stringifier;
-
-	export = stringify;
+        // repeat declarations from NodeJS.WritableStream to avoid compile error
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, cb?: Function): boolean;
+    }
 }
+
+/**
+ * Callback version: string in --> callback with string out
+ */
+declare function stringify(input: any[][], opts: stringify.StringifyOpts, callback: (error: Error, output: string) => void): void;
+declare function stringify(input: any[][], callback: (error: Error, output: string) => void): void;
+
+/**
+ * Streaming stringifier
+ */
+declare function stringify(opts: stringify.StringifyOpts): stringify.Stringifier;
+
+export = stringify;
diff --git a/cuid/cuid.d.ts b/cuid/cuid.d.ts
index a5b9429800..d7979eefcd 100644
--- a/cuid/cuid.d.ts
+++ b/cuid/cuid.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Dave Keen <http://www.keendevelopment.ch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'cuid' {
-	function cuid(): string;
-	
-	export = cuid
-}
+
+declare function cuid(): string;
+
+export = cuid
diff --git a/custom-error-generator/custom-error-generator.d.ts b/custom-error-generator/custom-error-generator.d.ts
index b6c3872bda..50c3e14338 100644
--- a/custom-error-generator/custom-error-generator.d.ts
+++ b/custom-error-generator/custom-error-generator.d.ts
@@ -3,9 +3,8 @@
 // Definitions by: Thierry Miceli <https://github.com/thmiceli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "custom-error-generator" {
-    function createError(name: string, parameters?: Object, Constructor?: any): any;
-    namespace createError {
-    }
-    export = createError;
+
+declare function createError(name: string, parameters?: Object, Constructor?: any): any;
+declare namespace createError {
 }
+export = createError;
diff --git a/data-driven/data-driven.d.ts b/data-driven/data-driven.d.ts
index 82c307daa8..fc21425b54 100644
--- a/data-driven/data-driven.d.ts
+++ b/data-driven/data-driven.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Adam Babcock <https://github.com/mrhen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "data-driven" {
-	function data_driven<T>(data:T[], callback:()=>any):any;
-    export = data_driven
-}
+
+declare function data_driven<T>(data: T[], callback: () => any): any;
+export = data_driven
diff --git a/debounce/debounce.d.ts b/debounce/debounce.d.ts
index 7aa24601a7..43b1630689 100644
--- a/debounce/debounce.d.ts
+++ b/debounce/debounce.d.ts
@@ -3,9 +3,8 @@
 // Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "debounce" {
-	// Overload on boolean constants would allow us to narrow further,
-	// but it is not implemented for TypeScript yet
-	function f<A extends Function>(f: A, interval?: number, immediate?: boolean): A
-	export default f;
-}
+
+// Overload on boolean constants would allow us to narrow further,
+// but it is not implemented for TypeScript yet
+declare function f<A extends Function>(f: A, interval?: number, immediate?: boolean): A
+export default f;
diff --git a/decamelize/decamelize.d.ts b/decamelize/decamelize.d.ts
index 2209d1e856..5ee1f76f35 100644
--- a/decamelize/decamelize.d.ts
+++ b/decamelize/decamelize.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Sam Verschueren <https://github.com/samverschueren>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "decamelize" {
-	function decamelize(input: string, separator?: string): string;
-	namespace decamelize {}
-	export = decamelize;
-}
\ No newline at end of file
+
+declare function decamelize(input: string, separator?: string): string;
+declare namespace decamelize { }
+export = decamelize;
diff --git a/deep-equal/deep-equal.d.ts b/deep-equal/deep-equal.d.ts
index 0afb0f402b..eef762a4ea 100644
--- a/deep-equal/deep-equal.d.ts
+++ b/deep-equal/deep-equal.d.ts
@@ -3,16 +3,15 @@
 // Definitions by: remojansen <https://github.com/remojansen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "deep-equal" {
 
-    interface DeepEqualOptions {
-        strict: boolean;
-    }
 
-    let deepEqual: (
-		actual: Object,
-		expected: Object,
-		opts?: DeepEqualOptions) => boolean;
+interface DeepEqualOptions {
+    strict: boolean;
+}
 
-    export = deepEqual;
-}
\ No newline at end of file
+declare let deepEqual: (
+    actual: Object,
+    expected: Object,
+    opts?: DeepEqualOptions) => boolean;
+
+export = deepEqual;
diff --git a/deep-extend/deep-extend.d.ts b/deep-extend/deep-extend.d.ts
index 164e337a95..a23daa519b 100644
--- a/deep-extend/deep-extend.d.ts
+++ b/deep-extend/deep-extend.d.ts
@@ -3,13 +3,12 @@
 // Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'deep-extend' {
-	/*
-	 * Recursive object extending.
-	 */
-	function deepExtend<T, U>(target: T, source: U): T & U;
-	function deepExtend<T, U, V>(target: T, source1: U, source2: V): T & U & V;
-	function deepExtend<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
-	function deepExtend(target: any, ...sources: any[]): any;
-	export = deepExtend;
-}
+
+/*
+ * Recursive object extending.
+ */
+declare function deepExtend<T, U>(target: T, source: U): T & U;
+declare function deepExtend<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+declare function deepExtend<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+declare function deepExtend(target: any, ...sources: any[]): any;
+export = deepExtend;
diff --git a/del/del.d.ts b/del/del.d.ts
index 6ed59efa39..714dc2f936 100644
--- a/del/del.d.ts
+++ b/del/del.d.ts
@@ -5,24 +5,23 @@
 
 /// <reference path="../glob/glob.d.ts"/>
 
-declare module "del" {
-    import glob = require("glob");
 
-    function Del(pattern: string): Promise<string[]>;
-    function Del(pattern: string, options: Del.Options): Promise<string[]>;
+import glob = require("glob");
 
-    function Del(patterns: string[]): Promise<string[]>;
-    function Del(patterns: string[], options: Del.Options): Promise<string[]>;
+declare function Del(pattern: string): Promise<string[]>;
+declare function Del(pattern: string, options: Del.Options): Promise<string[]>;
 
-    namespace Del {
-        function sync(pattern: string, options?: Options): string[];
-        function sync(patterns: string[], options?: Options): string[];
+declare function Del(patterns: string[]): Promise<string[]>;
+declare function Del(patterns: string[], options: Del.Options): Promise<string[]>;
 
-        interface Options extends glob.IOptions {
-            force?: boolean;
-            dryRun?: boolean;
-        }
+declare namespace Del {
+    function sync(pattern: string, options?: Options): string[];
+    function sync(patterns: string[], options?: Options): string[];
+
+    interface Options extends glob.IOptions {
+        force?: boolean;
+        dryRun?: boolean;
     }
-
-    export = Del;
 }
+
+export = Del;
diff --git a/denodeify/denodeify.d.ts b/denodeify/denodeify.d.ts
index f2e27f4bd5..d5283bf777 100644
--- a/denodeify/denodeify.d.ts
+++ b/denodeify/denodeify.d.ts
@@ -3,32 +3,31 @@
 // Definitions by: joaomoreno <https://github.com/joaomoreno/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "denodeify" {
-	function _<R>(fn: _.F0<R>, transformer?: _.M): () => Promise<R>;
-	function _<A,R>(fn: _.F1<A,R>, transformer?: _.M): (a:A) => Promise<R>;
-	function _<A,B,R>(fn: _.F2<A,B,R>, transformer?: _.M): (a:A, b:B) => Promise<R>;
-	function _<A,B,C,R>(fn: _.F3<A,B,C,R>, transformer?: _.M): (a:A, b:B, c:C) => Promise<R>;
-	function _<A,B,C,D,R>(fn: _.F4<A,B,C,D,R>, transformer?: _.M): (a:A, b:B, c:C, d:D) => Promise<R>;
-	function _<A,B,C,D,E,R>(fn: _.F5<A,B,C,D,E,R>, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E) => Promise<R>;
-	function _<A,B,C,D,E,F,R>(fn: _.F6<A,B,C,D,E,F,R>, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F) => Promise<R>;
-	function _<A,B,C,D,E,F,G,R>(fn: _.F7<A,B,C,D,E,F,G,R>, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F, g:G) => Promise<R>;
-	function _<A,B,C,D,E,F,G,H,R>(fn: _.F8<A,B,C,D,E,F,G,H,R>, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F, g:G, h:H) => Promise<R>;
-	function _(fn: _.F, transformer?: _.M): (...args: any[]) => Promise<any>;
 
-	module _ {
-		type Callback<R> = (err: Error, result: R) => any;
-		type F0<R> = (cb: Callback<R>) => any;
-		type F1<A,R> = (a:A, cb: Callback<R>) => any;
-		type F2<A,B,R> = (a:A, b:B, cb: Callback<R>) => any;
-		type F3<A,B,C,R> = (a:A, b:B, c:C, cb: Callback<R>) => any;
-		type F4<A,B,C,D,R> = (a:A, b:B, c:C, d:D, cb: Callback<R>) => any;
-		type F5<A,B,C,D,E,R> = (a:A, b:B, c:C, d:D, e:E, cb: Callback<R>) => any;
-		type F6<A,B,C,D,E,F,R> = (a:A, b:B, c:C, d:D, e:E, f:F, cb: Callback<R>) => any;
-		type F7<A,B,C,D,E,F,G,R> = (a:A, b:B, c:C, d:D, e:E, f:F, g:G, cb: Callback<R>) => any;
-		type F8<A,B,C,D,E,F,G,H,R> = (a:A, b:B, c:C, d:D, e:E, f:F, g:G, h:H, cb: Callback<R>) => any;
-		type F = (...args: any[]) => any;
-		type M = (err: Error, ...args: any[]) => any[];
-	}
+declare function _<R>(fn: _.F0<R>, transformer?: _.M): () => Promise<R>;
+declare function _<A, R>(fn: _.F1<A, R>, transformer?: _.M): (a: A) => Promise<R>;
+declare function _<A, B, R>(fn: _.F2<A, B, R>, transformer?: _.M): (a: A, b: B) => Promise<R>;
+declare function _<A, B, C, R>(fn: _.F3<A, B, C, R>, transformer?: _.M): (a: A, b: B, c: C) => Promise<R>;
+declare function _<A, B, C, D, R>(fn: _.F4<A, B, C, D, R>, transformer?: _.M): (a: A, b: B, c: C, d: D) => Promise<R>;
+declare function _<A, B, C, D, E, R>(fn: _.F5<A, B, C, D, E, R>, transformer?: _.M): (a: A, b: B, c: C, d: D, e: E) => Promise<R>;
+declare function _<A, B, C, D, E, F, R>(fn: _.F6<A, B, C, D, E, F, R>, transformer?: _.M): (a: A, b: B, c: C, d: D, e: E, f: F) => Promise<R>;
+declare function _<A, B, C, D, E, F, G, R>(fn: _.F7<A, B, C, D, E, F, G, R>, transformer?: _.M): (a: A, b: B, c: C, d: D, e: E, f: F, g: G) => Promise<R>;
+declare function _<A, B, C, D, E, F, G, H, R>(fn: _.F8<A, B, C, D, E, F, G, H, R>, transformer?: _.M): (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H) => Promise<R>;
+declare function _(fn: _.F, transformer?: _.M): (...args: any[]) => Promise<any>;
 
-	export = _;
+declare module _ {
+    type Callback<R> = (err: Error, result: R) => any;
+    type F0<R> = (cb: Callback<R>) => any;
+    type F1<A, R> = (a: A, cb: Callback<R>) => any;
+    type F2<A, B, R> = (a: A, b: B, cb: Callback<R>) => any;
+    type F3<A, B, C, R> = (a: A, b: B, c: C, cb: Callback<R>) => any;
+    type F4<A, B, C, D, R> = (a: A, b: B, c: C, d: D, cb: Callback<R>) => any;
+    type F5<A, B, C, D, E, R> = (a: A, b: B, c: C, d: D, e: E, cb: Callback<R>) => any;
+    type F6<A, B, C, D, E, F, R> = (a: A, b: B, c: C, d: D, e: E, f: F, cb: Callback<R>) => any;
+    type F7<A, B, C, D, E, F, G, R> = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, cb: Callback<R>) => any;
+    type F8<A, B, C, D, E, F, G, H, R> = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H, cb: Callback<R>) => any;
+    type F = (...args: any[]) => any;
+    type M = (err: Error, ...args: any[]) => any[];
 }
+
+export = _;
diff --git a/depd/depd.d.ts b/depd/depd.d.ts
index 674bb21f32..499cd99b88 100644
--- a/depd/depd.d.ts
+++ b/depd/depd.d.ts
@@ -4,14 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare module 'depd' {
-    function depd(namespace: string): Deprecate;
 
-    interface Deprecate {
-        (message: string): void;
-        function(fn: Function, message?: string): Function;
-        property(obj: Object, prop: string, message: string): void;
-    }
+declare function depd(namespace: string): Deprecate;
 
-    export = depd;
-}
\ No newline at end of file
+interface Deprecate {
+    (message: string): void;
+    function(fn: Function, message?: string): Function;
+    property(obj: Object, prop: string, message: string): void;
+}
+
+export = depd;
diff --git a/detect-indent/detect-indent.d.ts b/detect-indent/detect-indent.d.ts
index eb666199c6..15e82d0015 100644
--- a/detect-indent/detect-indent.d.ts
+++ b/detect-indent/detect-indent.d.ts
@@ -3,11 +3,9 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'detect-indent' {
-	interface DetectIndent {
-		(dir: string, alt?: string): string;
-	}
-	var _: DetectIndent;
-	export = _;
-}
 
+interface DetectIndent {
+    (dir: string, alt?: string): string;
+}
+declare var _: DetectIndent;
+export = _;
diff --git a/diff-match-patch/diff-match-patch.d.ts b/diff-match-patch/diff-match-patch.d.ts
index 028fe9d65c..a57d4b2edf 100644
--- a/diff-match-patch/diff-match-patch.d.ts
+++ b/diff-match-patch/diff-match-patch.d.ts
@@ -3,37 +3,36 @@
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "diff-match-patch" {
-    type Diff = [number, string];
 
-    export class diff_match_patch {
-        static new (): diff_match_patch;
+type Diff = [number, string];
 
-        Diff_Timeout: number;
-        Diff_EditCost: number;
-        Match_Threshold: number;
-        Match_Distance: number;
-        Patch_DeleteThreshold: number;
-        Patch_Margin: number;
-        Match_MaxBits: number;
+declare export class diff_match_patch {
+    static new(): diff_match_patch;
 
-        diff_main(text1: string, text2: string, opt_checklines?: boolean, opt_deadline?: number): Diff[];
-        diff_commonPrefix(text1: string, text2: string): number;
-        diff_commonSuffix(text1: string, text2: string): number;
-        diff_cleanupSemantic(diffs: Diff[]): void;
-        diff_cleanupSemanticLossless(diffs: Diff[]): void;
-        diff_cleanupEfficiency(diffs: Diff[]): void;
-        diff_cleanupMerge(diffs: Diff[]): void;
-        diff_xIndex(diffs: Diff[], loc: number): number;
-        diff_prettyHtml(diffs: Diff[]): string;
-        diff_text1(diffs: Diff[]): string;
-        diff_text2(diffs: Diff[]): string;
-        diff_levenshtein(diffs: Diff[]): number;
-        diff_toDelta(diffs: Diff[]): string;
-        diff_fromDelta(text1: string, delta: string): Diff[];
-    }
+    Diff_Timeout: number;
+    Diff_EditCost: number;
+    Match_Threshold: number;
+    Match_Distance: number;
+    Patch_DeleteThreshold: number;
+    Patch_Margin: number;
+    Match_MaxBits: number;
 
-    export var DIFF_DELETE: number;
-    export var DIFF_INSERT: number;
-    export var DIFF_EQUAL: number;
+    diff_main(text1: string, text2: string, opt_checklines?: boolean, opt_deadline?: number): Diff[];
+    diff_commonPrefix(text1: string, text2: string): number;
+    diff_commonSuffix(text1: string, text2: string): number;
+    diff_cleanupSemantic(diffs: Diff[]): void;
+    diff_cleanupSemanticLossless(diffs: Diff[]): void;
+    diff_cleanupEfficiency(diffs: Diff[]): void;
+    diff_cleanupMerge(diffs: Diff[]): void;
+    diff_xIndex(diffs: Diff[], loc: number): number;
+    diff_prettyHtml(diffs: Diff[]): string;
+    diff_text1(diffs: Diff[]): string;
+    diff_text2(diffs: Diff[]): string;
+    diff_levenshtein(diffs: Diff[]): number;
+    diff_toDelta(diffs: Diff[]): string;
+    diff_fromDelta(text1: string, delta: string): Diff[];
 }
+
+declare export var DIFF_DELETE: number;
+declare export var DIFF_INSERT: number;
+declare export var DIFF_EQUAL: number;
diff --git a/documentdb/documentdb.d.ts b/documentdb/documentdb.d.ts
index 1d901179a6..053fe988bd 100644
--- a/documentdb/documentdb.d.ts
+++ b/documentdb/documentdb.d.ts
@@ -3,413 +3,412 @@
 // Definitions by: Noel Abrahams <https://github.com/NoelAbrahams>, Brett Gutstein <https://github.com/brettferdosi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/documentdb
 
-declare module 'documentdb' {
 
-    /** The feed options and query methods.*/
-    interface FeedOptions {
 
-        /** Max number of items to be returned in the enumeration operation. */
-        maxItemCount?: number;
+/** The feed options and query methods.*/
+interface FeedOptions {
 
-        /** Opaque token for continuing the enumeration. */
-        continuation?: string;
+    /** Max number of items to be returned in the enumeration operation. */
+    maxItemCount?: number;
 
-        /** Token for use with Session consistency. */
-        sessionToken?: string;
-    }
+    /** Opaque token for continuing the enumeration. */
+    continuation?: string;
 
-    /** Options that can be specified for a request issued to the DocumentDB servers. */
-    interface RequestOptions {
+    /** Token for use with Session consistency. */
+    sessionToken?: string;
+}
 
-        /** Indicates what is the pre trigger to be invoked before the operation. */
-        preTriggerInclude?: string;
+/** Options that can be specified for a request issued to the DocumentDB servers. */
+interface RequestOptions {
 
-        /** Indicates what is the post trigger to be invoked after the operation. */
-        postTriggerInclude?: string;
+    /** Indicates what is the pre trigger to be invoked before the operation. */
+    preTriggerInclude?: string;
 
-        /** Conditions Associated with the request. */
-        accessCondition?: {
+    /** Indicates what is the post trigger to be invoked after the operation. */
+    postTriggerInclude?: string;
 
-            /** Conditional HTTP method header type.*/
-            type: string;
+    /** Conditions Associated with the request. */
+    accessCondition?: {
 
-            /** Conditional HTTP method header value.*/
-            condition: string
-        };
+        /** Conditional HTTP method header type.*/
+        type: string;
 
-        /** Specifies indexing directives (index, do not index ..etc).*/
-        indexingDirective?: string;
+        /** Conditional HTTP method header value.*/
+        condition: string
+    };
 
-        /** Consistency level required by the client. */
-        consistencyLevel?: string;
+    /** Specifies indexing directives (index, do not index ..etc).*/
+    indexingDirective?: string;
 
-        /** Token for use with Session consistency.*/
-        sessionToken?: string;
+    /** Consistency level required by the client. */
+    consistencyLevel?: string;
 
-        /** Expiry time (in seconds) for resource token associated with permission (applicable only for requests on permissions).*/
-        resourceTokenExpirySeconds?: number;
+    /** Token for use with Session consistency.*/
+    sessionToken?: string;
 
-        /** Disables the automatic id generation. If id is missing in the body and this option is true, an error will be returned. */
-        disableAutomaticIdGeneration?: boolean;
-    }
-    
-    /** The Sql query parameter. */
-    interface SqlParameter {
-        /** The name of the parameter. */
-        name: string;
-        
-        /** The value of the parameter. */
-        value: any;
-    }
-    
-    /** The Sql query specification. */
-    interface SqlQuerySpec {
-        /** The body of the query. */
-        query: string;
-        
-        /** The array of SqlParameters. */
-        parameters: SqlParameter[];
-    }
-    
-    /** Represents the error object returned from a failed query. */
-    interface QueryError {
+    /** Expiry time (in seconds) for resource token associated with permission (applicable only for requests on permissions).*/
+    resourceTokenExpirySeconds?: number;
 
-        /** The response code corresponding to the error. */
-        code: number;
+    /** Disables the automatic id generation. If id is missing in the body and this option is true, an error will be returned. */
+    disableAutomaticIdGeneration?: boolean;
+}
 
-        /** A string representing the error information. */
-        body: string; //{ code: string; message: string; };
-    }
+/** The Sql query parameter. */
+interface SqlParameter {
+    /** The name of the parameter. */
+    name: string;
+
+    /** The value of the parameter. */
+    value: any;
+}
+
+/** The Sql query specification. */
+interface SqlQuerySpec {
+    /** The body of the query. */
+    query: string;
+
+    /** The array of SqlParameters. */
+    parameters: SqlParameter[];
+}
+
+/** Represents the error object returned from a failed query. */
+interface QueryError {
+
+    /** The response code corresponding to the error. */
+    code: number;
+
+    /** A string representing the error information. */
+    body: string; //{ code: string; message: string; };
+}
+
+/**
+* The callback to execute after the request execution.
+* @param error            -       Will contain error information if an error occurs, undefined otherwise.
+* @param resource         -       An object that represents the requested resource (Db, collection, document ... etc) if no error happens.
+* @param responseHeaders  -       An object that contain the response headers.
+*/
+interface RequestCallback<TResult> {
+    (error: QueryError, resource: TResult, responseHeaders: any): void;
+}
+
+/** Represents the result returned from a query. */
+interface QueryIterator<TResultRow> {
+
+    toArray(callback: (error: QueryError, result: TResultRow[]) => void): void;
+}
+
+/** Reprents an object with a unique identifier. */
+interface UniqueId {
+
+    /** The user-defined unique identifier for a document or other DocumentDB object (database, collection, procedure...) */
+    id: string;
+}
+
+/** Represents the common meta data for all DocumentDB objects. */
+interface AbstractMeta extends UniqueId {
+
+    /** The self link.*/
+    _self: string;
+
+    /** The time the object was created.*/
+    _ts: string;
+
+    _rid?: string;
+    _etag?: string;
+
+    _attachments?: string;
+}
+
+/** Represents a custom document for storing in DocumentDB  */
+interface NewDocument<TContent> extends UniqueId {
+
+    /** A custom property for containing the actual JSON object representing the document. 
+      * Define a custom property in order to disambiguate the JSON document from the metadata added by Azure.
+      * This property is optional and the name is application-specific.
+      */
+    //doc: TContent;
+}
+
+/** Represents a document retrieved from storage. 
+  * This differs from a new document by the properties in AbstractMeta, which are added by the system.
+  */
+interface RetrievedDocument<TContent> extends NewDocument<TContent>, AbstractMeta {
+
+}
+
+/** Represents the meta data for a database. */
+interface DatabaseMeta extends AbstractMeta {
+}
+
+/** Represents the meta data for a collection. */
+interface CollectionMeta extends AbstractMeta {
+}
+
+/** Represents the meta data for a stored procedure. */
+interface ProcedureMeta extends AbstractMeta {
+    body: string;
+}
+
+/** Represents the meta data for a trigger. */
+interface TriggerMeta extends AbstractMeta {
+    body: string;
+    triggerType: string;
+    triggerOperation: string;
+}
+
+/** An object that is used for authenticating requests and must contains one of the options. */
+export interface AuthOptions {
+
+    /** The authorization master key to use to create the client. */
+    masterKey?: string;
+
+    /** An object that contains resources tokens. Keys for the object are resource Ids and values are the resource tokens.*/
+    resourceTokens?: any;
+
+    /** An array of {@link Permission} objects. */
+    permissionFeed?: any[];
+}
+
+/** Represents a DocumentDB stored procecedure. */
+export interface Procedure extends UniqueId {
+
+    /** The function representing the stored procedure. */
+    body(...params: any[]): void;
+}
+
+/** Represents a DocumentDB trigger. */
+export interface Trigger extends UniqueId {
+    /** The type of the trigger. Should be either 'pre' or 'post'. */
+    triggerType: string;
+
+    /** The trigger operation. Should be one of 'all', 'create', 'update', 'delete', or 'replace'. */
+    triggerOperation: string;
+
+    /** The function representing the trigger. */
+    body(...params: any[]): void;
+}
+
+/** Represents DocumentDB collection. */
+export interface Collection extends UniqueId {
+
+    indexingPolicy?: IndexingPolicy;
+}
+
+/** The Indexing Path
+* <p> Indexing paths hints to optimize indexing. <br>
+*     Indexing paths allow tradeoff between indexing storage and query performance
+* </p>
+*/
+interface IndexingPath {
+
+    /** The indexing type(range or hash) {@link IndexType}.*/
+    IndexType: string;
+
+    /** Path to be indexed.*/
+    Path: string;
+
+    /** Precision for this particular Index type for numeric data. */
+    NumericPrecision: number;
+
+    /** Precision for this particular Index type for string data. */
+    StringPrecision: number;
+}
+
+/**  The Indexing Policy represents the indexing policy configuration for a collection. */
+interface IndexingPolicy {
+
+    /** Specifies whether automatic indexing is enabled for a collection.
+        <p>In automatic indexing, documents can be explicitly excluded from indexing using {@link RequestOptions}.
+         In manual indexing, documents can be explicitly included. </p> */
+    automatic: boolean;
+
+    /** The indexing mode (consistent or lazy) {@link IndexingMode}. */
+    indexingMode: string;
+
+    /** An array of {@link IndexingPath} represents The paths to be incuded for indexing. */
+    IncludedPath: IndexingPath[];
+
+    /** An array of strings representing the paths to be excluded from indexing. */
+    ExcludedPaths: string[];
+}
+
+/** Provides a client-side logical representation of the Azure DocumentDB database account. This client is used to configure and execute requests against the service.
+  */
+declare export class DocumentClient {
+    /**
+     * Constructs a DocumentClient.
+     * @param urlConnection           - The service endpoint to use to create the client.
+     * @param auth                    - An object that is used for authenticating requests and must contains one of the options.
+     * @param [connectionPolicy]      - An instance of {@link ConnectionPolicy} class. This parameter is optional and the default connectionPolicy will be used if omitted.
+     * @param [consistencyLevel]      - An optional parameter that represents the consistency level. It can take any value from {@link ConsistencyLevel}.
+    */
+    constructor(urlConnection: string, auth: AuthOptions, connectionPolicy?: any, consistencyLevel?: string);
+
+    /** Send a request for creating a database. 
+     * <p>
+     *  A database manages users, permissions and a set of collections.  <br>
+     *  Each Azure DocumentDB Database Account is able to support multiple independent named databases, with the database being the logical container for data. <br>
+     *  Each Database consists of one or more collections, each of which in turn contain one or more documents. Since databases are an an administrative resource, the Service Master Key will be required in order to access and successfully complete any action using the User APIs. <br>
+     * </p>
+     * @param body      - A json object that represents The database to be created.
+     * @param [options] - The request options.
+     * @param callback  - The callback for the request.
+    */
+    public createDatabase(body: UniqueId, options: RequestOptions, callback: RequestCallback<DatabaseMeta>): void;
 
     /**
-    * The callback to execute after the request execution.
-    * @param error            -       Will contain error information if an error occurs, undefined otherwise.
-    * @param resource         -       An object that represents the requested resource (Db, collection, document ... etc) if no error happens.
-    * @param responseHeaders  -       An object that contain the response headers.
+     * Creates a collection.
+     * <p>
+     * A collection is a named logical container for documents. <br>
+     * A database may contain zero or more named collections and each collection consists of zero or more JSON documents. <br>
+     * Being schema-free, the documents in a collection do not need to share the same structure or fields. <br>
+     * Since collections are application resources, they can be authorized using either the master key or resource keys. <br>
+     * </p>
+     * @param databaseLink  - The self-link of the database.
+     * @param body          - Represents the body of the collection.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request.
+     */
+    public createCollection(databaseLink: string, body: Collection, options: RequestOptions, callback: RequestCallback<CollectionMeta>): void;
+
+    /**
+     * Create a StoredProcedure.
+     * <p>
+     * DocumentDB allows stored procedures to be executed in the storage tier, directly against a document collection. The script <br>
+     * gets executed under ACID transactions on the primary storage partition of the specified collection. For additional details, <br>
+     * refer to the server-side JavaScript API documentation. 
+     * </p>
+     * @param collectionLink    - The self-link of the collection.
+     * @param procedure         - Represents the body of the stored procedure.
+     * @param [options]         - The request options.
+     * @param callback          - The callback for the request.
+     */
+    public createStoredProcedure(collectionLink: string, procedure: Procedure, options: RequestOptions, callback: RequestCallback<ProcedureMeta>): void;
+
+    /**
+     * Create a trigger.
+     * <p>
+     * DocumentDB supports pre and post triggers defined in JavaScript to be executed on creates, updates and deletes. <br>
+     * For additional details, refer to the server-side JavaScript API documentation.
+     * </p>
+     * @param collectionLink  - The self-link of the collection.
+     * @param trigger         - Represents the body of the trigger.
+     * @param [options]       - The request options.
+     * @param callback        - The callback for the request.
+     */
+    public createTrigger(collectionLink: string, trigger: Trigger, options: RequestOptions, callback: RequestCallback<TriggerMeta>): void;
+
+    /**
+     * Create a document.
+     * <p> 
+     * There is no set schema for JSON documents. They may contain any number of custom properties as well as an optional list of attachments. <br>
+     * A Document is an application resource and can be authorized using the master key or resource keys
+     * </p>
+     * @param collectionLink    - The self-link of the collection.
+     * @param document          - Represents the body of the document. Can contain any number of user defined properties.
+     * @param [options]         - The request options.
+     * @param callback 			- The callback for the request.
+     */
+    public createDocument<TDocument>(collectionSelfLink: string, document: NewDocument<TDocument>, options: RequestOptions, callback: RequestCallback<RetrievedDocument<TDocument>>): void;
+
+    /**
+     * Execute the StoredProcedure represented by the object.
+     * @param procedureLink - The self-link of the stored procedure.
+     * @param [params]      - Represents the parameters of the stored procedure.
+     * @param callback      - The callback for the request.
+     */
+    public executeStoredProcedure<TDocument>(procedureLink: string, params: any[], callback: RequestCallback<TDocument>): void;
+
+    /** Lists all databases that satisfy a query. 
+     * @param query     - A SQL query string.
+     * @param [options] - The feed options.
+     * @returns         - An instance of QueryIterator to handle reading feed.
+     */
+    public queryDatabases(query: string | SqlQuerySpec): QueryIterator<DatabaseMeta>;
+
+    /**
+     * Query the collections for the database.
+     * @param databaseLink  - The self-link of the database.
+     * @param query         - A SQL query string.
+     * @param [options]     - Represents the feed options.
+     * @returns             - An instance of queryIterator to handle reading feed.
+     */
+    public queryCollections(databaseLink: string, query: string | SqlQuerySpec): QueryIterator<CollectionMeta>;
+
+    /**
+     * Query the storedProcedures for the collection.
+     * @param collectionLink    - The self-link of the collection.
+     * @param query             - A SQL query string.
+     * @param [options]         - Represents the feed options.
+     * @returns                 - An instance of queryIterator to handle reading feed.
+     */
+    public queryStoredProcedures(collectionLink: string, query: string | SqlQuerySpec): QueryIterator<ProcedureMeta>;
+
+    /**
+    * Query the documents for the collection.
+    * @param collectionLink - The self-link of the collection.
+    * @param query          - A SQL query string.
+    * @param [options]      - Represents the feed options.
+    * @returns              - An instance of queryIterator to handle reading feed.
     */
-    interface RequestCallback<TResult> {
-        (error: QueryError, resource: TResult, responseHeaders: any): void;
-    }
+    public queryDocuments<TDocument>(collectionLink: string, query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<RetrievedDocument<TDocument>>;
 
-    /** Represents the result returned from a query. */
-    interface QueryIterator<TResultRow> {
+    /**
+     * Query the triggers for the collection.
+     * @param {string} collectionLink         - The self-link of the collection.
+     * @param {SqlQuerySpec | string} query   - A SQL query.
+     * @param {FeedOptions} [options]         - Represents the feed options.
+     * @returns {QueryIterator}               - An instance of queryIterator to handle reading feed.
+     */
+    public queryTriggers(collectionLink: string, query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<TriggerMeta>;
 
-        toArray(callback: (error: QueryError, result: TResultRow[]) => void): void;
-    }
-
-    /** Reprents an object with a unique identifier. */
-    interface UniqueId {
-
-        /** The user-defined unique identifier for a document or other DocumentDB object (database, collection, procedure...) */
-        id: string;
-    }
-
-    /** Represents the common meta data for all DocumentDB objects. */
-    interface AbstractMeta extends UniqueId {
-
-        /** The self link.*/
-        _self: string;
-
-        /** The time the object was created.*/
-        _ts: string;
-
-        _rid?: string;
-        _etag?: string;
-
-        _attachments?: string;
-    }
-
-    /** Represents a custom document for storing in DocumentDB  */
-    interface NewDocument<TContent> extends UniqueId {
-
-        /** A custom property for containing the actual JSON object representing the document. 
-          * Define a custom property in order to disambiguate the JSON document from the metadata added by Azure.
-          * This property is optional and the name is application-specific.
-          */
-        //doc: TContent;
-    }
-
-    /** Represents a document retrieved from storage. 
-      * This differs from a new document by the properties in AbstractMeta, which are added by the system.
-      */
-    interface RetrievedDocument<TContent> extends NewDocument<TContent>, AbstractMeta {
-
-    }
-
-    /** Represents the meta data for a database. */
-    interface DatabaseMeta extends AbstractMeta {
-    }
-
-    /** Represents the meta data for a collection. */
-    interface CollectionMeta extends AbstractMeta {
-    }
-
-    /** Represents the meta data for a stored procedure. */
-    interface ProcedureMeta extends AbstractMeta {
-        body: string;
-    }
-    
-    /** Represents the meta data for a trigger. */
-    interface TriggerMeta extends AbstractMeta {
-        body: string;
-        triggerType: string;
-        triggerOperation: string;
-    }
-
-    /** An object that is used for authenticating requests and must contains one of the options. */
-    export interface AuthOptions {
-
-        /** The authorization master key to use to create the client. */
-        masterKey?: string;
-
-        /** An object that contains resources tokens. Keys for the object are resource Ids and values are the resource tokens.*/
-        resourceTokens?: any;
-
-        /** An array of {@link Permission} objects. */
-        permissionFeed?: any[];
-    }
-
-    /** Represents a DocumentDB stored procecedure. */
-    export interface Procedure extends UniqueId {
-
-        /** The function representing the stored procedure. */
-        body(...params: any[]): void;
-    }
-    
-    /** Represents a DocumentDB trigger. */
-    export interface Trigger extends UniqueId {
-        /** The type of the trigger. Should be either 'pre' or 'post'. */
-        triggerType: string;
-        
-        /** The trigger operation. Should be one of 'all', 'create', 'update', 'delete', or 'replace'. */
-        triggerOperation: string;
-        
-        /** The function representing the trigger. */
-        body(...params: any[]): void;
-    }
-
-    /** Represents DocumentDB collection. */
-    export interface Collection extends UniqueId {
-
-        indexingPolicy?: IndexingPolicy;
-    }
-
-    /** The Indexing Path
-    * <p> Indexing paths hints to optimize indexing. <br>
-    *     Indexing paths allow tradeoff between indexing storage and query performance
-    * </p>
+    /**
+     * Delete the document object.
+     * @param documentLink  - The self-link of the document.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request. 
     */
-    interface IndexingPath {
+    public deleteDocument(documentLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
 
-        /** The indexing type(range or hash) {@link IndexType}.*/
-        IndexType: string;
+    /**
+     * Delete the database object.
+     * @param databaseLink  - The self-link of the database.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request. 
+    */
+    public deleteDatabase(databaseLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
 
-        /** Path to be indexed.*/
-        Path: string;
+    /**
+     * Delete the collection object.
+     * @param collectionLink    - The self-link of the collection.
+     * @param [options]         - The request options.
+     * @param callback          - The callback for the request. 
+    */
+    public deleteCollection(collectionLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
 
-        /** Precision for this particular Index type for numeric data. */
-        NumericPrecision: number;
+    /**
+     * Delete the StoredProcedure object.
+     * @param procedureLink - The self-link of the stored procedure.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request.
+    */
+    public deleteStoredProcedure(procedureLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
 
-        /** Precision for this particular Index type for string data. */
-        StringPrecision: number;
-    }
+    /**
+     * Replace the document object.
+     * @param {string} documentLink      - The self-link of the document.
+     * @param {object} document          - Represent the new document body.
+     * @param {RequestOptions} [options] - The request options.
+     * @param {RequestCallback} callback - The callback for the request.
+     */
+    public replaceDocument<TDocument>(documentLink: string, document: NewDocument<TDocument>, options: RequestOptions, callback: RequestCallback<RetrievedDocument<TDocument>>): void;
 
-    /**  The Indexing Policy represents the indexing policy configuration for a collection. */
-    interface IndexingPolicy {
-
-        /** Specifies whether automatic indexing is enabled for a collection.
-            <p>In automatic indexing, documents can be explicitly excluded from indexing using {@link RequestOptions}.
-             In manual indexing, documents can be explicitly included. </p> */
-        automatic: boolean;
-
-        /** The indexing mode (consistent or lazy) {@link IndexingMode}. */
-        indexingMode: string;
-
-        /** An array of {@link IndexingPath} represents The paths to be incuded for indexing. */
-        IncludedPath: IndexingPath[];
-
-        /** An array of strings representing the paths to be excluded from indexing. */
-        ExcludedPaths: string[];
-    }
-
-    /** Provides a client-side logical representation of the Azure DocumentDB database account. This client is used to configure and execute requests against the service.
-      */
-    export class DocumentClient {
-        /**
-         * Constructs a DocumentClient.
-         * @param urlConnection           - The service endpoint to use to create the client.
-         * @param auth                    - An object that is used for authenticating requests and must contains one of the options.
-         * @param [connectionPolicy]      - An instance of {@link ConnectionPolicy} class. This parameter is optional and the default connectionPolicy will be used if omitted.
-         * @param [consistencyLevel]      - An optional parameter that represents the consistency level. It can take any value from {@link ConsistencyLevel}.
-        */
-        constructor(urlConnection: string, auth: AuthOptions, connectionPolicy?: any, consistencyLevel?: string);
-
-        /** Send a request for creating a database. 
-         * <p>
-         *  A database manages users, permissions and a set of collections.  <br>
-         *  Each Azure DocumentDB Database Account is able to support multiple independent named databases, with the database being the logical container for data. <br>
-         *  Each Database consists of one or more collections, each of which in turn contain one or more documents. Since databases are an an administrative resource, the Service Master Key will be required in order to access and successfully complete any action using the User APIs. <br>
-         * </p>
-         * @param body      - A json object that represents The database to be created.
-         * @param [options] - The request options.
-         * @param callback  - The callback for the request.
-        */
-        public createDatabase(body: UniqueId, options: RequestOptions, callback: RequestCallback<DatabaseMeta>): void;
-
-        /**
-         * Creates a collection.
-         * <p>
-         * A collection is a named logical container for documents. <br>
-         * A database may contain zero or more named collections and each collection consists of zero or more JSON documents. <br>
-         * Being schema-free, the documents in a collection do not need to share the same structure or fields. <br>
-         * Since collections are application resources, they can be authorized using either the master key or resource keys. <br>
-         * </p>
-         * @param databaseLink  - The self-link of the database.
-         * @param body          - Represents the body of the collection.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request.
-         */
-        public createCollection(databaseLink: string, body: Collection, options: RequestOptions, callback: RequestCallback<CollectionMeta>): void;
-
-        /**
-         * Create a StoredProcedure.
-         * <p>
-         * DocumentDB allows stored procedures to be executed in the storage tier, directly against a document collection. The script <br>
-         * gets executed under ACID transactions on the primary storage partition of the specified collection. For additional details, <br>
-         * refer to the server-side JavaScript API documentation. 
-         * </p>
-         * @param collectionLink    - The self-link of the collection.
-         * @param procedure         - Represents the body of the stored procedure.
-         * @param [options]         - The request options.
-         * @param callback          - The callback for the request.
-         */
-        public createStoredProcedure(collectionLink: string, procedure: Procedure, options: RequestOptions, callback: RequestCallback<ProcedureMeta>): void;
-        
-        /**
-         * Create a trigger.
-         * <p>
-         * DocumentDB supports pre and post triggers defined in JavaScript to be executed on creates, updates and deletes. <br>
-         * For additional details, refer to the server-side JavaScript API documentation.
-         * </p>
-         * @param collectionLink  - The self-link of the collection.
-         * @param trigger         - Represents the body of the trigger.
-         * @param [options]       - The request options.
-         * @param callback        - The callback for the request.
-         */
-        public createTrigger(collectionLink: string, trigger: Trigger, options: RequestOptions, callback: RequestCallback<TriggerMeta>): void;
-
-        /**
-         * Create a document.
-         * <p> 
-         * There is no set schema for JSON documents. They may contain any number of custom properties as well as an optional list of attachments. <br>
-         * A Document is an application resource and can be authorized using the master key or resource keys
-         * </p>
-         * @param collectionLink    - The self-link of the collection.
-         * @param document          - Represents the body of the document. Can contain any number of user defined properties.
-         * @param [options]         - The request options.
-         * @param callback 			- The callback for the request.
-         */
-        public createDocument<TDocument>(collectionSelfLink: string, document: NewDocument<TDocument>, options: RequestOptions, callback: RequestCallback<RetrievedDocument<TDocument>>): void;
-
-        /**
-         * Execute the StoredProcedure represented by the object.
-         * @param procedureLink - The self-link of the stored procedure.
-         * @param [params]      - Represents the parameters of the stored procedure.
-         * @param callback      - The callback for the request.
-         */
-        public executeStoredProcedure<TDocument>(procedureLink: string, params: any[], callback: RequestCallback<TDocument>): void;
-
-        /** Lists all databases that satisfy a query. 
-         * @param query     - A SQL query string.
-         * @param [options] - The feed options.
-         * @returns         - An instance of QueryIterator to handle reading feed.
-         */
-        public queryDatabases(query: string | SqlQuerySpec): QueryIterator<DatabaseMeta>;
-
-        /**
-         * Query the collections for the database.
-         * @param databaseLink  - The self-link of the database.
-         * @param query         - A SQL query string.
-         * @param [options]     - Represents the feed options.
-         * @returns             - An instance of queryIterator to handle reading feed.
-         */
-        public queryCollections(databaseLink: string, query: string | SqlQuerySpec): QueryIterator<CollectionMeta>;
-
-        /**
-         * Query the storedProcedures for the collection.
-         * @param collectionLink    - The self-link of the collection.
-         * @param query             - A SQL query string.
-         * @param [options]         - Represents the feed options.
-         * @returns                 - An instance of queryIterator to handle reading feed.
-         */
-        public queryStoredProcedures(collectionLink: string, query: string | SqlQuerySpec): QueryIterator<ProcedureMeta>;
-
-        /**
-        * Query the documents for the collection.
-        * @param collectionLink - The self-link of the collection.
-        * @param query          - A SQL query string.
-        * @param [options]      - Represents the feed options.
-        * @returns              - An instance of queryIterator to handle reading feed.
-        */
-        public queryDocuments<TDocument>(collectionLink: string, query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<RetrievedDocument<TDocument>>;
-
-        /**
-         * Query the triggers for the collection.
-         * @param {string} collectionLink         - The self-link of the collection.
-         * @param {SqlQuerySpec | string} query   - A SQL query.
-         * @param {FeedOptions} [options]         - Represents the feed options.
-         * @returns {QueryIterator}               - An instance of queryIterator to handle reading feed.
-         */
-        public queryTriggers(collectionLink: string, query: string | SqlQuerySpec, options?: FeedOptions): QueryIterator<TriggerMeta>;
-        
-        /**
-         * Delete the document object.
-         * @param documentLink  - The self-link of the document.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request. 
-        */
-        public deleteDocument(documentLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
-
-        /**
-         * Delete the database object.
-         * @param databaseLink  - The self-link of the database.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request. 
-        */
-        public deleteDatabase(databaseLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
-
-        /**
-         * Delete the collection object.
-         * @param collectionLink    - The self-link of the collection.
-         * @param [options]         - The request options.
-         * @param callback          - The callback for the request. 
-        */
-        public deleteCollection(collectionLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
-
-        /**
-         * Delete the StoredProcedure object.
-         * @param procedureLink - The self-link of the stored procedure.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request.
-        */
-        public deleteStoredProcedure(procedureLink: string, options: RequestOptions, callback: RequestCallback<void>): void;
-        
-        /**
-         * Replace the document object.
-         * @param {string} documentLink      - The self-link of the document.
-         * @param {object} document          - Represent the new document body.
-         * @param {RequestOptions} [options] - The request options.
-         * @param {RequestCallback} callback - The callback for the request.
-         */
-        public replaceDocument<TDocument>(documentLink: string, document: NewDocument<TDocument>, options: RequestOptions, callback: RequestCallback<RetrievedDocument<TDocument>>): void;
-        
-        /**
-         * Replace the StoredProcedure object.
-         * @param procedureLink - The self-link of the stored procedure.
-         * @param procedure     - Represent the new procedure body.
-         * @param [options]     - The request options.
-         * @param callback      - The callback for the request.
-         */
-        public replaceStoredProcedure(procedureLink: string, procedure: Procedure, options: RequestOptions, callback: RequestCallback<ProcedureMeta>): void;
-    }
-}
\ No newline at end of file
+    /**
+     * Replace the StoredProcedure object.
+     * @param procedureLink - The self-link of the stored procedure.
+     * @param procedure     - Represent the new procedure body.
+     * @param [options]     - The request options.
+     * @param callback      - The callback for the request.
+     */
+    public replaceStoredProcedure(procedureLink: string, procedure: Procedure, options: RequestOptions, callback: RequestCallback<ProcedureMeta>): void;
+}
diff --git a/dot-case/dot-case.d.ts b/dot-case/dot-case.d.ts
index 93921f56e2..8f11ee3b3c 100644
--- a/dot-case/dot-case.d.ts
+++ b/dot-case/dot-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "dot-case" {
-	function dotCase(string: string, locale?: string): string;
-	export = dotCase;
-}
+
+declare function dotCase(string: string, locale?: string): string;
+export = dotCase;
diff --git a/dot-prop/dot-prop.d.ts b/dot-prop/dot-prop.d.ts
index 9ad2eb1a9d..0d765bedbc 100644
--- a/dot-prop/dot-prop.d.ts
+++ b/dot-prop/dot-prop.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Verschueren <https://github.com/samverschueren>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "dot-prop" {
-	export function get(object: any, path: string): any;
-	export function set(object: any, path: string, value: any): void;
-}
+
+declare export function get(object: any, path: string): any;
+declare export function set(object: any, path: string, value: any): void;
diff --git a/draft-js/draft-js.d.ts b/draft-js/draft-js.d.ts
index ac5eb21f33..7ab650acde 100644
--- a/draft-js/draft-js.d.ts
+++ b/draft-js/draft-js.d.ts
@@ -2,276 +2,274 @@
 // Project: https://github.com/facebook/draft-js
 // Definitions by: Pavel Evsegneev <https://github.com/Ahineya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "draft-js" {
-    namespace Draft {
-        interface IEditor {
-            new(): Editor
-        }
 
-        interface EditorState {
-            getCurrentContent(): ContentState,
-            getSelection(): SelectionState,
-            getCurrentInlineStyle(): any,
-            getBlockTree(): any,
-
-            createEmpty(decorator?: any): EditorState,
-            createWithContent(contentState: ContentState, decorator?: any): EditorState,
-            create(config: any): EditorState,
-            push(editorState: EditorState, contentState: ContentState, actionType: string): EditorState,
-            undo(editorState: EditorState): EditorState,
-            redo(editorState: EditorState): EditorState,
-            acceptSelection(editorState: EditorState, selectionState: SelectionState): EditorState,
-            forceSelection(editorState: EditorState, selectionState: SelectionState): EditorState,
-
-            moveFocusToEnd(editorState: EditorState): EditorState
-        }
-
-        interface CompositeDecorator {
-            getDecorations(): Array<any>,
-            getComponentForKey(): any,
-            getPropsForKey(): any
-        }
-
-        interface Entity {
-            create(type: string, mutability: string, data?: Object): EntityInstance,
-            add(instance: EntityInstance): string,
-            get(key: string): EntityInstance,
-            mergeData(key: string, toMerge: any): EntityInstance,
-            replaceData(key: string, newData: any): EntityInstance
-        }
-
-        interface EntityInstance {
-            getData(): any,
-            getKey(): string,
-            getMutability(): string
-        }
-
-        interface BlockMapBuilder {
-            createFromArray(blocks: Array<ContentBlock>): BlockMap
-        }
-
-        interface CharacterMetadata {
-            create(config?: any): CharacterMetadata,
-
-            applyStyle(record: CharacterMetadata,
-                       style: string): CharacterMetadata,
-
-            removeStyle(record: CharacterMetadata,
-                        style: string): CharacterMetadata,
-
-            applyEntity(record: CharacterMetadata,
-                        entityKey?: string): CharacterMetadata,
-
-            getStyle(): any,
-            hasStyle(style: string): boolean,
-
-            getEntity(): string
-        }
-
-        interface IContentBlock {
-            new(draftContentBlock: any): ContentBlock;
-        }
-        interface ContentBlock {
-            key: string,
-            type: string,
-            text: string,
-            characterList: any,
-            depth: number,
-
-            getKey(): string,
-            getType(): string,
-            getText(): string,
-            getCharacterList(): any,
-            getLength(): number,
-            getDepth(): number,
-            getInlineStyleAt(offset: number): any,
-            getEntityAt(offset: number): string,
-            findStyleRanges(filterFn: Function, callback: Function): void,
-            findEntityRanges(filterFn: Function, callback: Function): void
-
-        }
-
-        interface ContentState {
-            createFromText(text: string): ContentState,
-            createFromBlockArray(blocks: Array<ContentBlock>): ContentState,
-
-            getBlockMap(): BlockMap,
-            getSelectionBefore(): SelectionState,
-            getSelectionAfter(): SelectionState,
-
-            getBlockForKey(key: string): ContentBlock,
-            getKeyBefore(key: string): string,
-            getKeyAfter(key: string): string,
-
-            getBlockBefore(key: string): ContentBlock,
-            getBlockAfter(key: string): ContentBlock,
-
-            getBlocksAsArray(): Array<ContentBlock>,
-
-            getPlainText(): string,
-            hasText(): boolean,
-
-            set(key: string, value: any): ContentState,
-            toJS(): any
-        }
-
-        interface ISelectionState {
-            new(draftSelectionState: any): SelectionState;
-            createEmpty(blockKey: string): SelectionState;
-        }
-
-        interface SelectionState {
-            getStartKey(): string,
-            getStartOffset(): number,
-            getEndKey(): string,
-            getEndOffset(): number,
-            getAnchorKey(): string,
-            getAnchorOffset(): number,
-            getFocusKey(): string,
-            getFocusOffset(): number,
-
-            getIsBackward(): boolean,
-            getHasFocus(): boolean,
-            isCollapsed(): boolean,
-
-            hasEdgeWithin(blockKey: string, start: number, end: number): boolean,
-            serialize(): string,
-
-            get(key: string): any,
-            set(key: string, value: any): SelectionState
-        }
-
-        interface BlockMap {
-            get(key: string): ContentBlock,
-            set(key: string, value: any): BlockMap,
-            delete(key: string): BlockMap,
-            find(cb: any): ContentBlock
-        }
-
-        interface Modifier {
-            replaceText(contentState: ContentState,
-                        rangeToReplace: SelectionState,
-                        text: string,
-                        inlineStyle?: any,
-                        entityKey?: string): ContentState,
-
-            insertText(contentState: ContentState,
-                       targetRange: SelectionState,
-                       text: string,
-                       inlineStyle?: any,
-                       entityKey?: string): ContentState,
-
-            moveText(contentState: ContentState,
-                     removalRange: SelectionState,
-                     targetRange: SelectionState): ContentState,
-
-            replaceWithFragment(contentState: ContentState,
-                                targetRange: SelectionState,
-                                fragment: BlockMap): ContentState,
-
-            removeRange(contentState: ContentState,
-                        rangeToRemove: SelectionState,
-                        removalDirection: string): ContentState,
-
-            splitBlock(contentState: ContentState,
-                       selectionState: SelectionState): ContentState,
-
-            applyInlineStyle(contentState: ContentState,
-                             selectionState: SelectionState,
-                             inlineStyle: string): ContentState,
-
-            removeInlineStyle(contentState: ContentState,
-                              selectionState: SelectionState,
-                              inlineStyle: string): ContentState,
-
-            setBlockType(contentState: ContentState,
-                         selectionState: SelectionState,
-                         blockType: string): ContentState,
-
-            applyEntity(contentState: ContentState,
-                        selectionState: SelectionState,
-                        entityKey: string): ContentState
-        }
-
-        interface RichUtils {
-            currentBlockContainsLink(editorState: EditorState): boolean,
-            getCurrentBlockType(editor: EditorState): string,
-            handleKeyCommand(editorState: EditorState, command: string): any,
-            insertSoftNewline(editorState: EditorState): EditorState,
-            onBackspace(editorState: EditorState): EditorState,
-            onDelete(editorState: EditorState): EditorState,
-            onTab(event: Event, editorState: EditorState, maxDepth: number): EditorState,
-            toggleBlockType(editorState: EditorState, blockType: string): EditorState,
-            toggleCode(editorState: EditorState): EditorState,
-            toggleLink(editorState: EditorState, targetSelection: SelectionState, entityKey: string): EditorState,
-            tryToRemoveBlockStyle(editorState: EditorState): EditorState
-        }
-
-        interface EditorProps {
-            editorState: EditorState,
-            onChange(editorState: EditorState): void,
-
-            placeholder?: string,
-            textAlignment?: any,
-            blockRendererFn?: (ContentBlock: ContentBlock) => any,
-            blockStyleFn?: (ContentBlock: ContentBlock) => string,
-            customStyleMap?: any,
-
-            readOnly?: boolean,
-            spellCheck?: boolean,
-            stripPastedStyles?: boolean,
-
-            handleReturn?: (e: any) => boolean,
-            handleKeyCommand?: (command: string) => boolean,
-            handleBeforeInput?: (chars: string) => boolean,
-            handlePastedFiles?: (files: Array<Blob>) => boolean,
-            handleDroppedFiles?: (selection: SelectionState, files: Array<Blob>) => boolean,
-            handleDrop?: (selection: SelectionState, dataTransfer: any, isInternal: any) => boolean,
-
-            onEscape?: (e: any) => void,
-            onTab?: (e: any) => void,
-            onUpArrow?: (e: any) => void,
-            onDownArrow?: (e: any) => void,
-
-            suppressContentEditableWarning?: any,
-
-            onBlur?: (e: any) => void,
-            onFocus?: (e: any) => void
-        }
-
-        interface Editor {
-            props: EditorProps
-            state: any,
-            refs: any,
-            context: any,
-            setState(): any,
-            render(): any,
-            forceUpdate(): any
-        }
-
-        var Editor: IEditor;
-        var EditorState: EditorState;
-
-        var CompositeDecorator: CompositeDecorator;
-        var Entity: Entity;
-        var EntityInstance: EntityInstance;
-
-        var BlockMapBuilder: BlockMapBuilder;
-        var CharacterMetadata: CharacterMetadata;
-        var ContentBlock: IContentBlock;
-        var ContentState: ContentState;
-        var SelectionState: ISelectionState;
-
-        var Modifier: Modifier;
-        var RichUtils: RichUtils;
-
-        function convertFromRaw(rawState: any): Array<ContentBlock>;
-
-        function convertToRaw(contentState: ContentState): any;
-
-        function genKey(): string
+declare namespace Draft {
+    interface IEditor {
+        new (): Editor
     }
 
-    export = Draft;
+    interface EditorState {
+        getCurrentContent(): ContentState,
+        getSelection(): SelectionState,
+        getCurrentInlineStyle(): any,
+        getBlockTree(): any,
 
+        createEmpty(decorator?: any): EditorState,
+        createWithContent(contentState: ContentState, decorator?: any): EditorState,
+        create(config: any): EditorState,
+        push(editorState: EditorState, contentState: ContentState, actionType: string): EditorState,
+        undo(editorState: EditorState): EditorState,
+        redo(editorState: EditorState): EditorState,
+        acceptSelection(editorState: EditorState, selectionState: SelectionState): EditorState,
+        forceSelection(editorState: EditorState, selectionState: SelectionState): EditorState,
+
+        moveFocusToEnd(editorState: EditorState): EditorState
+    }
+
+    interface CompositeDecorator {
+        getDecorations(): Array<any>,
+        getComponentForKey(): any,
+        getPropsForKey(): any
+    }
+
+    interface Entity {
+        create(type: string, mutability: string, data?: Object): EntityInstance,
+        add(instance: EntityInstance): string,
+        get(key: string): EntityInstance,
+        mergeData(key: string, toMerge: any): EntityInstance,
+        replaceData(key: string, newData: any): EntityInstance
+    }
+
+    interface EntityInstance {
+        getData(): any,
+        getKey(): string,
+        getMutability(): string
+    }
+
+    interface BlockMapBuilder {
+        createFromArray(blocks: Array<ContentBlock>): BlockMap
+    }
+
+    interface CharacterMetadata {
+        create(config?: any): CharacterMetadata,
+
+        applyStyle(record: CharacterMetadata,
+            style: string): CharacterMetadata,
+
+        removeStyle(record: CharacterMetadata,
+            style: string): CharacterMetadata,
+
+        applyEntity(record: CharacterMetadata,
+            entityKey?: string): CharacterMetadata,
+
+        getStyle(): any,
+        hasStyle(style: string): boolean,
+
+        getEntity(): string
+    }
+
+    interface IContentBlock {
+        new (draftContentBlock: any): ContentBlock;
+    }
+    interface ContentBlock {
+        key: string,
+        type: string,
+        text: string,
+        characterList: any,
+        depth: number,
+
+        getKey(): string,
+        getType(): string,
+        getText(): string,
+        getCharacterList(): any,
+        getLength(): number,
+        getDepth(): number,
+        getInlineStyleAt(offset: number): any,
+        getEntityAt(offset: number): string,
+        findStyleRanges(filterFn: Function, callback: Function): void,
+        findEntityRanges(filterFn: Function, callback: Function): void
+
+    }
+
+    interface ContentState {
+        createFromText(text: string): ContentState,
+        createFromBlockArray(blocks: Array<ContentBlock>): ContentState,
+
+        getBlockMap(): BlockMap,
+        getSelectionBefore(): SelectionState,
+        getSelectionAfter(): SelectionState,
+
+        getBlockForKey(key: string): ContentBlock,
+        getKeyBefore(key: string): string,
+        getKeyAfter(key: string): string,
+
+        getBlockBefore(key: string): ContentBlock,
+        getBlockAfter(key: string): ContentBlock,
+
+        getBlocksAsArray(): Array<ContentBlock>,
+
+        getPlainText(): string,
+        hasText(): boolean,
+
+        set(key: string, value: any): ContentState,
+        toJS(): any
+    }
+
+    interface ISelectionState {
+        new (draftSelectionState: any): SelectionState;
+        createEmpty(blockKey: string): SelectionState;
+    }
+
+    interface SelectionState {
+        getStartKey(): string,
+        getStartOffset(): number,
+        getEndKey(): string,
+        getEndOffset(): number,
+        getAnchorKey(): string,
+        getAnchorOffset(): number,
+        getFocusKey(): string,
+        getFocusOffset(): number,
+
+        getIsBackward(): boolean,
+        getHasFocus(): boolean,
+        isCollapsed(): boolean,
+
+        hasEdgeWithin(blockKey: string, start: number, end: number): boolean,
+        serialize(): string,
+
+        get(key: string): any,
+        set(key: string, value: any): SelectionState
+    }
+
+    interface BlockMap {
+        get(key: string): ContentBlock,
+        set(key: string, value: any): BlockMap,
+        delete(key: string): BlockMap,
+        find(cb: any): ContentBlock
+    }
+
+    interface Modifier {
+        replaceText(contentState: ContentState,
+            rangeToReplace: SelectionState,
+            text: string,
+            inlineStyle?: any,
+            entityKey?: string): ContentState,
+
+        insertText(contentState: ContentState,
+            targetRange: SelectionState,
+            text: string,
+            inlineStyle?: any,
+            entityKey?: string): ContentState,
+
+        moveText(contentState: ContentState,
+            removalRange: SelectionState,
+            targetRange: SelectionState): ContentState,
+
+        replaceWithFragment(contentState: ContentState,
+            targetRange: SelectionState,
+            fragment: BlockMap): ContentState,
+
+        removeRange(contentState: ContentState,
+            rangeToRemove: SelectionState,
+            removalDirection: string): ContentState,
+
+        splitBlock(contentState: ContentState,
+            selectionState: SelectionState): ContentState,
+
+        applyInlineStyle(contentState: ContentState,
+            selectionState: SelectionState,
+            inlineStyle: string): ContentState,
+
+        removeInlineStyle(contentState: ContentState,
+            selectionState: SelectionState,
+            inlineStyle: string): ContentState,
+
+        setBlockType(contentState: ContentState,
+            selectionState: SelectionState,
+            blockType: string): ContentState,
+
+        applyEntity(contentState: ContentState,
+            selectionState: SelectionState,
+            entityKey: string): ContentState
+    }
+
+    interface RichUtils {
+        currentBlockContainsLink(editorState: EditorState): boolean,
+        getCurrentBlockType(editor: EditorState): string,
+        handleKeyCommand(editorState: EditorState, command: string): any,
+        insertSoftNewline(editorState: EditorState): EditorState,
+        onBackspace(editorState: EditorState): EditorState,
+        onDelete(editorState: EditorState): EditorState,
+        onTab(event: Event, editorState: EditorState, maxDepth: number): EditorState,
+        toggleBlockType(editorState: EditorState, blockType: string): EditorState,
+        toggleCode(editorState: EditorState): EditorState,
+        toggleLink(editorState: EditorState, targetSelection: SelectionState, entityKey: string): EditorState,
+        tryToRemoveBlockStyle(editorState: EditorState): EditorState
+    }
+
+    interface EditorProps {
+        editorState: EditorState,
+        onChange(editorState: EditorState): void,
+
+        placeholder?: string,
+        textAlignment?: any,
+        blockRendererFn?: (ContentBlock: ContentBlock) => any,
+        blockStyleFn?: (ContentBlock: ContentBlock) => string,
+        customStyleMap?: any,
+
+        readOnly?: boolean,
+        spellCheck?: boolean,
+        stripPastedStyles?: boolean,
+
+        handleReturn?: (e: any) => boolean,
+        handleKeyCommand?: (command: string) => boolean,
+        handleBeforeInput?: (chars: string) => boolean,
+        handlePastedFiles?: (files: Array<Blob>) => boolean,
+        handleDroppedFiles?: (selection: SelectionState, files: Array<Blob>) => boolean,
+        handleDrop?: (selection: SelectionState, dataTransfer: any, isInternal: any) => boolean,
+
+        onEscape?: (e: any) => void,
+        onTab?: (e: any) => void,
+        onUpArrow?: (e: any) => void,
+        onDownArrow?: (e: any) => void,
+
+        suppressContentEditableWarning?: any,
+
+        onBlur?: (e: any) => void,
+        onFocus?: (e: any) => void
+    }
+
+    interface Editor {
+        props: EditorProps
+        state: any,
+        refs: any,
+        context: any,
+        setState(): any,
+        render(): any,
+        forceUpdate(): any
+    }
+
+    var Editor: IEditor;
+    var EditorState: EditorState;
+
+    var CompositeDecorator: CompositeDecorator;
+    var Entity: Entity;
+    var EntityInstance: EntityInstance;
+
+    var BlockMapBuilder: BlockMapBuilder;
+    var CharacterMetadata: CharacterMetadata;
+    var ContentBlock: IContentBlock;
+    var ContentState: ContentState;
+    var SelectionState: ISelectionState;
+
+    var Modifier: Modifier;
+    var RichUtils: RichUtils;
+
+    function convertFromRaw(rawState: any): Array<ContentBlock>;
+
+    function convertToRaw(contentState: ContentState): any;
+
+    function genKey(): string
 }
+
+export = Draft;
diff --git a/dts-bundle/dts-bundle.d.ts b/dts-bundle/dts-bundle.d.ts
index 501e0da200..fc3cde458b 100644
--- a/dts-bundle/dts-bundle.d.ts
+++ b/dts-bundle/dts-bundle.d.ts
@@ -3,21 +3,20 @@
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "dts-bundle" {
-    interface Options {
-        name: string;
-        main: string;
-        baseDir?: string;
-        exclude?: RegExp;
-        externals?: boolean;
-        indent?: string;
-        newLine?: string;
-        out?: string;
-        prefix?: string;
-        removeSource?: boolean;
-        separator?: string;
-        verbose?: boolean;
-    }
 
-    export function bundle(opts: Options): void;
-}
\ No newline at end of file
+interface Options {
+    name: string;
+    main: string;
+    baseDir?: string;
+    exclude?: RegExp;
+    externals?: boolean;
+    indent?: string;
+    newLine?: string;
+    out?: string;
+    prefix?: string;
+    removeSource?: boolean;
+    separator?: string;
+    verbose?: boolean;
+}
+
+declare export function bundle(opts: Options): void;
diff --git a/dustjs-linkedin/dustjs-linkedin.d.ts b/dustjs-linkedin/dustjs-linkedin.d.ts
index 70bd288a39..b81ebcdd5f 100644
--- a/dustjs-linkedin/dustjs-linkedin.d.ts
+++ b/dustjs-linkedin/dustjs-linkedin.d.ts
@@ -13,156 +13,155 @@
 // Fell free to include other methods. If possible let me know about.
 //
 
-declare module "dustjs-linkedin" {
+
+
+/**
+* A template compiled into a js function.
+*/
+export interface Template {
+    (chk: Chunk, ctx: Context): Chunk;
+}
+
+export interface Chunk {
+    /**
+    * Writes data to this chunk's buffer. 
+    */
+    write(data: string): Chunk;
 
     /**
-    * A template compiled into a js function.
+    * Writes data to this chunk's buffer and marks it as flushable. This method must be called on any chunks created via chunk.map. Do not call this method on a handler's main chunk -- dust.render and dust.stream take care of this for you.
     */
-    export interface Template {
-        (chk: Chunk, ctx: Context): Chunk;
-    }
-
-    export interface Chunk {
-        /**
-        * Writes data to this chunk's buffer. 
-        */
-        write(data: string): Chunk;
-
-        /**
-        * Writes data to this chunk's buffer and marks it as flushable. This method must be called on any chunks created via chunk.map. Do not call this method on a handler's main chunk -- dust.render and dust.stream take care of this for you.
-        */
-        end(data: string): Chunk;
-
-        /**
-        * Creates a new chunk and passes it to callback. Use map to wrap asynchronous functions and to partition the template for streaming.
-        */
-        map(callback: (chunk: Chunk) => any): Chunk;
-
-        /**
-        * Convenience method to apply filters to a stream.
-        */
-        tap(callback: (value: any) => any): Chunk;
-
-        /**
-        * Removes the head tap function from the list.
-        */
-        untap(): Chunk;
-
-        /**
-        * Renders a template block, such as a default block or an else block.
-        */
-        render(body: any, context: Context): Chunk;
-
-        /**
-        * Sets an error on this chunk and immediately flushes the output.
-        */
-        setError(err: any): Chunk;
-    }
-
-    export interface Context {
-        /**
-        * Retrieves the value at key from the context stack.
-        */
-        get (key: string): any;
-
-        /**
-        * Pushes an arbitrary value onto the context stack and returns a new context instance. Specify index and/or length to enable enumeration helpers.
-        */
-        push(head: any, idx?: number, len?: number): Context;
-
-        /**
-        * Returns a new context instance consisting only of the value at head, plus any previously defined global object.
-        */
-        rebase(head: any): Context;
-
-        /**
-        * Returns the head of the context stack.
-        */
-        current(): any;
-    }
-
-    export interface Stream {
-        flush(): void;
-        emit(evt: string, data: any): void;
-
-        /*
-        * Registers an event listener. Streams accept a single listener for a given event.
-        * @param evt the event. Possible values are data, end, error (maybe more, look in the source).
-        */
-        on(evt: string, callback: (data?: any) => any);
-
-        pipe(stream: Stream): Stream;
-    }
+    end(data: string): Chunk;
 
     /**
-    * register a template into the cache.
-    * @param name the unique template name. 
-    * @param tmpl the template function. 
+    * Creates a new chunk and passes it to callback. Use map to wrap asynchronous functions and to partition the template for streaming.
     */
-    export function register(name: string, tmpl: Template): void;
+    map(callback: (chunk: Chunk) => any): Chunk;
 
     /**
-    * compile a template body into a string of JavaScript source code
-    * @param source the template string
-    * @param name the name used to register the compiled template into the internal cache. See render().
-    * @strip strip whitespaces from the output. Defaults to false.
+    * Convenience method to apply filters to a stream.
     */
-    export function compile(source: string, name: string, strip?: boolean): string;
+    tap(callback: (value: any) => any): Chunk;
 
     /**
-    * Compiles source directly into a JavaScript function that takes a context and an optional callback (see dust.renderSource). Registers the template under [name] if this argument is supplied.
-    * @param source the template string
-    * @param name the template name (optional). 
+    * Removes the head tap function from the list.
     */
-    export function compileFn(source: string, name?: string): Template;
+    untap(): Chunk;
 
     /**
-    * Evaluates a compiled source string. 
+    * Renders a template block, such as a default block or an else block.
     */
-    export function loadSource(compiled: string): Template;
+    render(body: any, context: Context): Chunk;
 
     /**
-    * Renders the named template and calls callback on completion.context may be a plain object or an instance of dust.Context.
-    * @param name the template name.
-    * @param context a plain object or an instance of dust.Context.
+    * Sets an error on this chunk and immediately flushes the output.
     */
-    export function render(name: string, context: any, callback: (err: any, out: string) => any);
-    export function render(name: string, context: Context, callback: (err: any, out: string) => any);
+    setError(err: any): Chunk;
+}
+
+export interface Context {
+    /**
+    * Retrieves the value at key from the context stack.
+    */
+    get(key: string): any;
 
     /**
-    * Compiles and renders source, invoking callback on completion. If no callback is supplied this function returns a Stream object. Use this function when precompilation is not required.
-    * @param source the template string.
-    * @param context a plain object or an instance of dust.Context.
-    * @param callback (optional). If supplied the callback will be called passing the result string. If omitted, renderSource() will return a dust.Stream object.
+    * Pushes an arbitrary value onto the context stack and returns a new context instance. Specify index and/or length to enable enumeration helpers.
     */
-    export function renderSource(source: string, context: any): Stream;
-    export function renderSource(source: string, context: Context): Stream;
-    export function renderSource(source: string, context: any, callback: (err: any, out: string) => any): void;
-    export function renderSource(source: string, context: Context, callback: (err: any, out: string) => any): void;
+    push(head: any, idx?: number, len?: number): Context;
 
     /**
-    * Streams the named template. context may be a plain object or an instance of dust.Context. Returns an instance of dust.Stream.
-    * @param name the template name.
-    * @param context a plain object or an instance of dust.Context.
+    * Returns a new context instance consisting only of the value at head, plus any previously defined global object.
     */
-    export function stream(name: string, context: any): Stream;
-    export function stream(name: string, context: Context): Stream;
+    rebase(head: any): Context;
 
     /**
-    * Manufactures a dust.Context instance with its global object set to object.
-    * @param global a plain object or an instance of dust.Context.
+    * Returns the head of the context stack.
     */
-    export function makeBase(global: any): Context;
-    export function makeBase(global: Context): Context;
+    current(): any;
+}
 
-    export function escapeHtml(html: string): string;
-    export function escapeJs(js: string): string;
+export interface Stream {
+    flush(): void;
+    emit(evt: string, data: any): void;
 
-    var helpers: {
-        [key: string]: (chk: Chunk, ctx: Context, bodies?: any, params?: any) => any;
-    };
+    /*
+    * Registers an event listener. Streams accept a single listener for a given event.
+    * @param evt the event. Possible values are data, end, error (maybe more, look in the source).
+    */
+    on(evt: string, callback: (data?: any) => any);
 
-    var filters: {
-        [key: string]: (value: string) => string;
-    };
-}
\ No newline at end of file
+    pipe(stream: Stream): Stream;
+}
+
+/**
+* register a template into the cache.
+* @param name the unique template name. 
+* @param tmpl the template function. 
+*/
+declare export function register(name: string, tmpl: Template): void;
+
+/**
+* compile a template body into a string of JavaScript source code
+* @param source the template string
+* @param name the name used to register the compiled template into the internal cache. See render().
+* @strip strip whitespaces from the output. Defaults to false.
+*/
+declare export function compile(source: string, name: string, strip?: boolean): string;
+
+/**
+* Compiles source directly into a JavaScript function that takes a context and an optional callback (see dust.renderSource). Registers the template under [name] if this argument is supplied.
+* @param source the template string
+* @param name the template name (optional). 
+*/
+declare export function compileFn(source: string, name?: string): Template;
+
+/**
+* Evaluates a compiled source string. 
+*/
+declare export function loadSource(compiled: string): Template;
+
+/**
+* Renders the named template and calls callback on completion.context may be a plain object or an instance of dust.Context.
+* @param name the template name.
+* @param context a plain object or an instance of dust.Context.
+*/
+declare export function render(name: string, context: any, callback: (err: any, out: string) => any);
+declare export function render(name: string, context: Context, callback: (err: any, out: string) => any);
+
+/**
+* Compiles and renders source, invoking callback on completion. If no callback is supplied this function returns a Stream object. Use this function when precompilation is not required.
+* @param source the template string.
+* @param context a plain object or an instance of dust.Context.
+* @param callback (optional). If supplied the callback will be called passing the result string. If omitted, renderSource() will return a dust.Stream object.
+*/
+declare export function renderSource(source: string, context: any): Stream;
+declare export function renderSource(source: string, context: Context): Stream;
+declare export function renderSource(source: string, context: any, callback: (err: any, out: string) => any): void;
+declare export function renderSource(source: string, context: Context, callback: (err: any, out: string) => any): void;
+
+/**
+* Streams the named template. context may be a plain object or an instance of dust.Context. Returns an instance of dust.Stream.
+* @param name the template name.
+* @param context a plain object or an instance of dust.Context.
+*/
+declare export function stream(name: string, context: any): Stream;
+declare export function stream(name: string, context: Context): Stream;
+
+/**
+* Manufactures a dust.Context instance with its global object set to object.
+* @param global a plain object or an instance of dust.Context.
+*/
+declare export function makeBase(global: any): Context;
+declare export function makeBase(global: Context): Context;
+
+declare export function escapeHtml(html: string): string;
+declare export function escapeJs(js: string): string;
+
+declare var helpers: {
+    [key: string]: (chk: Chunk, ctx: Context, bodies?: any, params?: any) => any;
+};
+
+declare var filters: {
+    [key: string]: (value: string) => string;
+};
diff --git a/easy-api-request/easy-api-request.d.ts b/easy-api-request/easy-api-request.d.ts
index 46accbb37c..a3378b312e 100644
--- a/easy-api-request/easy-api-request.d.ts
+++ b/easy-api-request/easy-api-request.d.ts
@@ -9,107 +9,106 @@
 /// <reference path="../bunyan/bunyan.d.ts" />
 /// <reference path="../express/express.d.ts" />
 
-declare module "easy-api-request" {
-    import stream = require('stream');
-    import http = require('http');
-    import request = require('request');
-    import bunyan = require('bunyan');
-    import express = require('express');
 
-    export function create(opts: {
-        name: any;
-        config: {
-            url: string;
-            internal?: boolean;
-            headers?: string[];
-            cookies?: string[];
-            replyCookies?: string[];
-            jSend?: boolean;
-            opts?: Object;
-        };
-    }): void;
+import stream = require('stream');
+import http = require('http');
+import request = require('request');
+import bunyan = require('bunyan');
+import express = require('express');
 
-    import Q = require('q');
-    interface Result {
-        response: http.IncomingMessage;
-        body: any;
-        err?: any;
-        data?: any;
-    }
-    class BaseRequest {
-        protected base: request.Request;
-        protected req: express.Request;
-        protected log: bunyan.Logger;
-        protected replyCookies: string[];
-        protected jSend: boolean;
-        constructor(opts: any);
-        _parseOptions(args: IArguments, type: string): {
-            opts: any;
-            cb: any;
-        };
-        _do(args: IArguments, type?: string): any;
-        _request(opts?: any, cb?:any): any;
+declare export function create(opts: {
+    name: any;
+    config: {
+        url: string;
+        internal?: boolean;
+        headers?: string[];
+        cookies?: string[];
+        replyCookies?: string[];
+        jSend?: boolean;
+        opts?: Object;
+    };
+}): void;
 
-        get(url?: any, opts?: any, cb?: any): any;
-        post(url?: any, opts?: any, cb?: any): any;
-        patch(url?: any, opts?: any, cb?: any): any;
-        del(url?: any, opts?: any, cb?: any): any;
-    }
-
-    class StreamRequest extends BaseRequest {
-        _request(opts: Object): stream.Stream;
-
-        get(url: string, params: Object): stream.Stream;
-        get(opts: Object): stream.Stream;
-        get(url: string): stream.Stream;
-
-        post(url: string, params: Object): stream.Stream;
-        post(opts: Object): stream.Stream;
-        post(url: string): stream.Stream;
-
-        patch(url: string, params: Object): stream.Stream;
-        patch(opts: Object): stream.Stream;
-        patch(url: string): stream.Stream;
-
-        del(url: string, params: Object): stream.Stream;
-        del(opts: Object): stream.Stream;
-        del(url: string): stream.Stream;
-    }
-
-    class CBPromiseRequest extends BaseRequest {
-        _request(opts: Object): stream.Stream;
-
-        get(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
-        get(url: string, cb:(err?:any, resp?: Result) => void): void;
-        get(opts: Object, cb:(err?:any, resp?: Result) => void): void;
-        get(url: string, params: Object): Q.Promise<Result>;
-        get(opts: Object): Q.Promise<Result>;
-        get(url: string): Q.Promise<Result>;
-
-        post(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
-        post(url: string, cb:(err?:any, resp?: Result) => void): void;
-        post(opts: Object, cb:(err?:any, resp?: Result) => void): void;
-        post(url: string, params: Object): Q.Promise<Result>;
-        post(opts: Object): Q.Promise<Result>;
-        post(url: string): Q.Promise<Result>;
-
-        patch(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
-        patch(url: string, cb:(err?:any, resp?: Result) => void): void;
-        patch(opts: Object, cb:(err?:any, resp?: Result) => void): void;
-        patch(url: string, params: Object): Q.Promise<Result>;
-        patch(opts: Object): Q.Promise<Result>;
-        patch(url: string): Q.Promise<Result>;
-
-        del(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
-        del(url: string, cb:(err?:any, resp?: Result) => void): void;
-        del(opts: Object, cb:(err?:any, resp?: Result) => void): void;
-        del(url: string, params: Object): Q.Promise<Result>;
-        del(opts: Object): Q.Promise<Result>;
-        del(url: string): Q.Promise<Result>;
-    }
-
-    export interface RequestMaker {
-        (): CBPromiseRequest;
-        (stream: boolean): StreamRequest | CBPromiseRequest;
-    }
+import Q = require('q');
+interface Result {
+    response: http.IncomingMessage;
+    body: any;
+    err?: any;
+    data?: any;
+}
+declare class BaseRequest {
+    protected base: request.Request;
+    protected req: express.Request;
+    protected log: bunyan.Logger;
+    protected replyCookies: string[];
+    protected jSend: boolean;
+    constructor(opts: any);
+    _parseOptions(args: IArguments, type: string): {
+        opts: any;
+        cb: any;
+    };
+    _do(args: IArguments, type?: string): any;
+    _request(opts?: any, cb?: any): any;
+
+    get(url?: any, opts?: any, cb?: any): any;
+    post(url?: any, opts?: any, cb?: any): any;
+    patch(url?: any, opts?: any, cb?: any): any;
+    del(url?: any, opts?: any, cb?: any): any;
+}
+
+declare class StreamRequest extends BaseRequest {
+    _request(opts: Object): stream.Stream;
+
+    get(url: string, params: Object): stream.Stream;
+    get(opts: Object): stream.Stream;
+    get(url: string): stream.Stream;
+
+    post(url: string, params: Object): stream.Stream;
+    post(opts: Object): stream.Stream;
+    post(url: string): stream.Stream;
+
+    patch(url: string, params: Object): stream.Stream;
+    patch(opts: Object): stream.Stream;
+    patch(url: string): stream.Stream;
+
+    del(url: string, params: Object): stream.Stream;
+    del(opts: Object): stream.Stream;
+    del(url: string): stream.Stream;
+}
+
+declare class CBPromiseRequest extends BaseRequest {
+    _request(opts: Object): stream.Stream;
+
+    get(url: string, params: Object, cb: (err?: any, resp?: Result) => void): void;
+    get(url: string, cb: (err?: any, resp?: Result) => void): void;
+    get(opts: Object, cb: (err?: any, resp?: Result) => void): void;
+    get(url: string, params: Object): Q.Promise<Result>;
+    get(opts: Object): Q.Promise<Result>;
+    get(url: string): Q.Promise<Result>;
+
+    post(url: string, params: Object, cb: (err?: any, resp?: Result) => void): void;
+    post(url: string, cb: (err?: any, resp?: Result) => void): void;
+    post(opts: Object, cb: (err?: any, resp?: Result) => void): void;
+    post(url: string, params: Object): Q.Promise<Result>;
+    post(opts: Object): Q.Promise<Result>;
+    post(url: string): Q.Promise<Result>;
+
+    patch(url: string, params: Object, cb: (err?: any, resp?: Result) => void): void;
+    patch(url: string, cb: (err?: any, resp?: Result) => void): void;
+    patch(opts: Object, cb: (err?: any, resp?: Result) => void): void;
+    patch(url: string, params: Object): Q.Promise<Result>;
+    patch(opts: Object): Q.Promise<Result>;
+    patch(url: string): Q.Promise<Result>;
+
+    del(url: string, params: Object, cb: (err?: any, resp?: Result) => void): void;
+    del(url: string, cb: (err?: any, resp?: Result) => void): void;
+    del(opts: Object, cb: (err?: any, resp?: Result) => void): void;
+    del(url: string, params: Object): Q.Promise<Result>;
+    del(opts: Object): Q.Promise<Result>;
+    del(url: string): Q.Promise<Result>;
+}
+
+export interface RequestMaker {
+    (): CBPromiseRequest;
+    (stream: boolean): StreamRequest | CBPromiseRequest;
 }
diff --git a/easy-table/easy-table-0.2.0.d.ts b/easy-table/easy-table-0.2.0.d.ts
index 46fc170c16..1aaf7df01a 100644
--- a/easy-table/easy-table-0.2.0.d.ts
+++ b/easy-table/easy-table-0.2.0.d.ts
@@ -3,39 +3,38 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "easy-table" {
-	class EasyTable {
-		constructor();
 
-		cell(label: string, value: any, printer?: EasyTable.CellPrinter, width?: number):void;
-		newRow(): void;
-		toString(): string;
-		printTransposed(): string;
-		print(): string;
-		sort(fields: string): void;
-		sort(comparer: (a: any, b: any) => number): void;
-		total(label: string, accumulator: EasyTable.Accumulator, totalPrinter: EasyTable.CellPrinter): void;
-	}
+declare class EasyTable {
+    constructor();
 
-	namespace EasyTable {
-		function printArray(array: any[], cellPrinter?: CellPrinter, tablePrinter?: Printer): string;
-		function printObject(object: any, cellPrinter?: CellPrinter, tablePrinter?: Printer): string;
-
-		//printer helpers
-		function Number(length: number): CellPrinter;
-		function RightPadder(char: string): CellPrinter;
-		function LeftPadder(char: string): CellPrinter;
-
-		interface CellPrinter extends Function {
-			(obj: any, cell: (label: string, value: any, width?: number) => void):string;
-		}
-		interface Printer extends Function {
-			(table: EasyTable):string;
-		}
-		interface Accumulator extends Function {
-			(sum: number, val: number, index: number, length: number):number;
-		}
-	}
-
-	export = EasyTable;
+    cell(label: string, value: any, printer?: EasyTable.CellPrinter, width?: number): void;
+    newRow(): void;
+    toString(): string;
+    printTransposed(): string;
+    print(): string;
+    sort(fields: string): void;
+    sort(comparer: (a: any, b: any) => number): void;
+    total(label: string, accumulator: EasyTable.Accumulator, totalPrinter: EasyTable.CellPrinter): void;
 }
+
+declare namespace EasyTable {
+    function printArray(array: any[], cellPrinter?: CellPrinter, tablePrinter?: Printer): string;
+    function printObject(object: any, cellPrinter?: CellPrinter, tablePrinter?: Printer): string;
+
+    //printer helpers
+    function Number(length: number): CellPrinter;
+    function RightPadder(char: string): CellPrinter;
+    function LeftPadder(char: string): CellPrinter;
+
+    interface CellPrinter extends Function {
+        (obj: any, cell: (label: string, value: any, width?: number) => void): string;
+    }
+    interface Printer extends Function {
+        (table: EasyTable): string;
+    }
+    interface Accumulator extends Function {
+        (sum: number, val: number, index: number, length: number): number;
+    }
+}
+
+export = EasyTable;
diff --git a/easy-table/easy-table.d.ts b/easy-table/easy-table.d.ts
index ff5bf0928a..f75d74861b 100644
--- a/easy-table/easy-table.d.ts
+++ b/easy-table/easy-table.d.ts
@@ -3,221 +3,219 @@
 // Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "easy-table"
-{
-	class EasyTable {
 
-		/**
-		 * String to separate columns
-		 */
-		public separator: string;
+declare class EasyTable {
 
-		/**
-		 * Default printer
-		 */
-		public static string(value: any): string;
+    /**
+     * String to separate columns
+     */
+    public separator: string;
 
-		/**
-		 * Create a printer which right aligns the content by padding with `ch` on the left
-		 *
-		 * @param {String} ch
-		 * @returns {Function}
-		 */
-		public static leftPadder<T>(ch: string): CellPrinter<T>;
+    /**
+     * Default printer
+     */
+    public static string(value: any): string;
 
-		public static padLeft: CellPrinter<string>;
+    /**
+     * Create a printer which right aligns the content by padding with `ch` on the left
+     *
+     * @param {String} ch
+     * @returns {Function}
+     */
+    public static leftPadder<T>(ch: string): CellPrinter<T>;
 
-		/**
-		 * Create a printer which pads with `ch` on the right
-		 *
-		 * @param {String} ch
-		 * @returns {Function}
-		 */
-		public static rightPadder<T>(ch: string): CellPrinter<T>;
+    public static padLeft: CellPrinter<string>;
 
-		// public static padRight: CellPrinter<string>;
+    /**
+     * Create a printer which pads with `ch` on the right
+     *
+     * @param {String} ch
+     * @returns {Function}
+     */
+    public static rightPadder<T>(ch: string): CellPrinter<T>;
 
-		/**
-		 * Create a printer for numbers
-		 *
-		 * Will do right alignment and optionally fix the number of digits after decimal point
-		 *
-		 * @param {Number} [digits] - Number of digits for fixpoint notation
-		 * @returns {Function}
-		 */
-		public static number(digits?: number): CellPrinter<number>;
+    // public static padRight: CellPrinter<string>;
 
-		public constructor();
+    /**
+     * Create a printer for numbers
+     *
+     * Will do right alignment and optionally fix the number of digits after decimal point
+     *
+     * @param {Number} [digits] - Number of digits for fixpoint notation
+     * @returns {Function}
+     */
+    public static number(digits?: number): CellPrinter<number>;
 
-		/**
-		 * Push the current row to the table and start a new one
-		 *
-		 * @returns {Table} `this`
-		 */
-		public newRow(): EasyTable;
+    public constructor();
 
-		/**
-		 * Write cell in the current row
-		 *
-		 * @param {String} col          - Column name
-		 * @param {Any} val             - Cell value
-		 * @param {Function} [printer]  - Printer function to format the value
-		 * @returns {Table} `this`
-		 */
-		public cell<T>(col: string, val: T, printer?: CellPrinter<T>): EasyTable;
+    /**
+     * Push the current row to the table and start a new one
+     *
+     * @returns {Table} `this`
+     */
+    public newRow(): EasyTable;
 
-		/**
-		 * Get list of columns in printing order
-		 *
-		 * @returns {string[]}
-		 */
-		public columns(): string[];
+    /**
+     * Write cell in the current row
+     *
+     * @param {String} col          - Column name
+     * @param {Any} val             - Cell value
+     * @param {Function} [printer]  - Printer function to format the value
+     * @returns {Table} `this`
+     */
+    public cell<T>(col: string, val: T, printer?: CellPrinter<T>): EasyTable;
 
-		/**
-		 * Format just rows, i.e. print the table without headers and totals
-		 *
-		 * @returns {String} String representaion of the table
-		 */
-		public print(): string;
+    /**
+     * Get list of columns in printing order
+     *
+     * @returns {string[]}
+     */
+    public columns(): string[];
 
-		/**
-		 * Format the table
-		 *
-		 * @returns {String}
-		 */
-		public toString(): string;
+    /**
+     * Format just rows, i.e. print the table without headers and totals
+     *
+     * @returns {String} String representaion of the table
+     */
+    public print(): string;
 
-		/**
-		 * Push delimeter row to the table (with each cell filled with dashs during printing)
-		 *
-		 * @param {String[]} [cols]
-		 * @returns {Table} `this`
-		 */
-		public pushDelimeter(cols?: string[]): EasyTable;
+    /**
+     * Format the table
+     *
+     * @returns {String}
+     */
+    public toString(): string;
 
-		/**
-		 * Compute all totals and yield the results to `cb`
-		 *
-		 * @param {Function} cb - Callback function with signature `(column, value, printer)`
-		 */
-		public forEachTotal<T>(cb: (column: string, value: T, printer: CellPrinter<T>) => void): void;
+    /**
+     * Push delimeter row to the table (with each cell filled with dashs during printing)
+     *
+     * @param {String[]} [cols]
+     * @returns {Table} `this`
+     */
+    public pushDelimeter(cols?: string[]): EasyTable;
 
-		/**
-		 * Format the table so that each row represents column and each column represents row
-		 *
-		 * @param {IPrintColumnOptions} [opts]
-		 * @returns {String}
-		 */
-		public printTransposed<T>(opts?: PrintColumnOptions<T>): string;
+    /**
+     * Compute all totals and yield the results to `cb`
+     *
+     * @param {Function} cb - Callback function with signature `(column, value, printer)`
+     */
+    public forEachTotal<T>(cb: (column: string, value: T, printer: CellPrinter<T>) => void): void;
 
-		/**
-		 * Sort the table
-		 *
-		 * @param {Function|string[]} [cmp] - Either compare function or a list of columns to sort on
-		 * @returns {Table} `this`
-		 */
-		public sort(cmp?: string[]): EasyTable;
-		/**
-		 * Sort the table
-		 *
-		 * @param {Function|string[]} [cmp] - Either compare function or a list of columns to sort on
-		 * @returns {Table} `this`
-		 */
-		public sort<T>(cmp?: CompareFunction<T>): EasyTable;
+    /**
+     * Format the table so that each row represents column and each column represents row
+     *
+     * @param {IPrintColumnOptions} [opts]
+     * @returns {String}
+     */
+    public printTransposed<T>(opts?: PrintColumnOptions<T>): string;
 
-		/**
-		 * Add a total for the column
-		 *
-		 * @param {String} col - column name
-		 * @param {Object} [opts]
-		 * @returns {Table} `this`
-		 */
-		public total<T>(col: string, opts?: TotalOptions<T>): EasyTable;
-		/**
-		 * Predefined helpers for totals
-		 */
-		public static aggr: Aggregators;
+    /**
+     * Sort the table
+     *
+     * @param {Function|string[]} [cmp] - Either compare function or a list of columns to sort on
+     * @returns {Table} `this`
+     */
+    public sort(cmp?: string[]): EasyTable;
+    /**
+     * Sort the table
+     *
+     * @param {Function|string[]} [cmp] - Either compare function or a list of columns to sort on
+     * @returns {Table} `this`
+     */
+    public sort<T>(cmp?: CompareFunction<T>): EasyTable;
 
-		/**
-		 * Print the array or object
-		 *
-		 * @param {Array|Object} obj - Object to print
-		 * @param {Function|Object} [format] - Format options
-		 * @param {Function} [cb] - Table post processing and formating
-		 * @returns {String}
-		 */
-		public static print<T>(obj: T | T[], format?: FormatFunction<T> | FormatObject, cb?: TablePostProcessing): string;
+    /**
+     * Add a total for the column
+     *
+     * @param {String} col - column name
+     * @param {Object} [opts]
+     * @returns {Table} `this`
+     */
+    public total<T>(col: string, opts?: TotalOptions<T>): EasyTable;
+    /**
+     * Predefined helpers for totals
+     */
+    public static aggr: Aggregators;
 
-		/**
-		 * Same as `Table.print()` but yields the result to `console.log()`
-		 */
-		public static log<T>(obj: T | T[], format?: FormatFunction<T> | FormatObject, cb?: TablePostProcessing): void;
-		/**
-		 * Same as `.toString()` but yields the result to `console.log()`
-		 */
-		public log(): void;
-	}
+    /**
+     * Print the array or object
+     *
+     * @param {Array|Object} obj - Object to print
+     * @param {Function|Object} [format] - Format options
+     * @param {Function} [cb] - Table post processing and formating
+     * @returns {String}
+     */
+    public static print<T>(obj: T | T[], format?: FormatFunction<T> | FormatObject, cb?: TablePostProcessing): string;
 
-	type CellPrinter<T> = (val: T, width: number) => string;
-	type CompareFunction<T> = (a: T, b: T) => number;
-	type ReduceFunction<T> = (acc: T, val: T, idx: number, length: number) => T;
-	type FormatFunction<T> = (obj: T, cell: (name: string, val: any) => void) => void;
-	type TablePostProcessing = (result: EasyTable) => string;
-
-	interface PrintColumnOptions<T> {
-		/**
-		 * Column separation string
-		 */
-		separator?: string;
-		/**
-		 * Printer to format column names
-		 */
-		namePrinter?: CellPrinter<T>;
-	}
-
-	interface Aggregators {
-		/**
-		 * Create a printer which formats the value with `printer`,
-		 * adds the `prefix` to it and right aligns the whole thing
-		 *
-		 * @param {String} prefix
-		 * @param {Function} printer
-		 * @returns {printer}
-		 */
-		printer<T>(prefix: string, printer: CellPrinter<T>): CellPrinter<T>;
-		/**
-		 * Sum reduction
-		 */
-		sum: any;
-		/**
-		 * Average reduction
-		 */
-		avg: any;
-	}
-
-	interface TotalOptions<T> {
-		/**
-		 * reduce(acc, val, idx, length) function to compute the total value
-		 */
-		reduce?: ReduceFunction<T>;
-		/**
-		 * Printer to format the total cell
-		 */
-		printer?: CellPrinter<T>;
-		/**
-		 * Initial value for reduction
-		 */
-		init?: T;
-	}
-
-	interface FormatObject {
-		[key: string]: ColumnFormat<any>;
-	}
-
-	interface ColumnFormat<T> {
-		name?: string;
-		printer?: CellPrinter<T>
-	}
-
-	export = EasyTable;
+    /**
+     * Same as `Table.print()` but yields the result to `console.log()`
+     */
+    public static log<T>(obj: T | T[], format?: FormatFunction<T> | FormatObject, cb?: TablePostProcessing): void;
+    /**
+     * Same as `.toString()` but yields the result to `console.log()`
+     */
+    public log(): void;
 }
+
+type CellPrinter<T> = (val: T, width: number) => string;
+type CompareFunction<T> = (a: T, b: T) => number;
+type ReduceFunction<T> = (acc: T, val: T, idx: number, length: number) => T;
+type FormatFunction<T> = (obj: T, cell: (name: string, val: any) => void) => void;
+type TablePostProcessing = (result: EasyTable) => string;
+
+interface PrintColumnOptions<T> {
+    /**
+     * Column separation string
+     */
+    separator?: string;
+    /**
+     * Printer to format column names
+     */
+    namePrinter?: CellPrinter<T>;
+}
+
+interface Aggregators {
+    /**
+     * Create a printer which formats the value with `printer`,
+     * adds the `prefix` to it and right aligns the whole thing
+     *
+     * @param {String} prefix
+     * @param {Function} printer
+     * @returns {printer}
+     */
+    printer<T>(prefix: string, printer: CellPrinter<T>): CellPrinter<T>;
+    /**
+     * Sum reduction
+     */
+    sum: any;
+    /**
+     * Average reduction
+     */
+    avg: any;
+}
+
+interface TotalOptions<T> {
+    /**
+     * reduce(acc, val, idx, length) function to compute the total value
+     */
+    reduce?: ReduceFunction<T>;
+    /**
+     * Printer to format the total cell
+     */
+    printer?: CellPrinter<T>;
+    /**
+     * Initial value for reduction
+     */
+    init?: T;
+}
+
+interface FormatObject {
+    [key: string]: ColumnFormat<any>;
+}
+
+interface ColumnFormat<T> {
+    name?: string;
+    printer?: CellPrinter<T>
+}
+
+export = EasyTable;
diff --git a/easy-xapi-supertest/easy-xapi-supertest.d.ts b/easy-xapi-supertest/easy-xapi-supertest.d.ts
index 5a8525e0a4..995f2fa581 100644
--- a/easy-xapi-supertest/easy-xapi-supertest.d.ts
+++ b/easy-xapi-supertest/easy-xapi-supertest.d.ts
@@ -5,25 +5,24 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "easy-xapi-supertest" {
-    import express = require('express');
 
-    export interface BodyAgent {
-        send(data: Object): any;
-        attach(arg1: any, arg2?: any): any;
-    }
+import express = require('express');
 
-    export interface Agent {
-        get(url:string): any;
-        delete(url:string): any;
-        post(url:string): BodyAgent;
-        patch(url:string): BodyAgent;
-        put(url:string): BodyAgent;
-    }
-
-    interface getAgent {
-        (...args:any[]): Agent
-    }
-
-    export function getAgentFactory(app: express.Application, transform?: Function): getAgent;
+export interface BodyAgent {
+    send(data: Object): any;
+    attach(arg1: any, arg2?: any): any;
 }
+
+export interface Agent {
+    get(url: string): any;
+    delete(url: string): any;
+    post(url: string): BodyAgent;
+    patch(url: string): BodyAgent;
+    put(url: string): BodyAgent;
+}
+
+interface getAgent {
+    (...args: any[]): Agent
+}
+
+declare export function getAgentFactory(app: express.Application, transform?: Function): getAgent;
diff --git a/easy-xapi-utils/easy-xapi-utils.d.ts b/easy-xapi-utils/easy-xapi-utils.d.ts
index b49a7d37f5..3af9fec5ff 100644
--- a/easy-xapi-utils/easy-xapi-utils.d.ts
+++ b/easy-xapi-utils/easy-xapi-utils.d.ts
@@ -7,10 +7,9 @@
 /// <reference path="../easy-jsend/easy-jsend.d.ts" />
 /// <reference path="../easy-x-headers/easy-x-headers.d.ts" />
 
-declare module "easy-xapi-utils" {
-    import express = require('express');
 
-    export function isLoggedIn(role?: string): express.RequestHandler;
-    export function isLoggedOut(): express.RequestHandler;
-    export function hasRole(role: string): express.RequestHandler;
-}
+import express = require('express');
+
+declare export function isLoggedIn(role?: string): express.RequestHandler;
+declare export function isLoggedOut(): express.RequestHandler;
+declare export function hasRole(role: string): express.RequestHandler;
diff --git a/ejs-locals/ejs-locals.d.ts b/ejs-locals/ejs-locals.d.ts
index 2cf598b266..6398ee199f 100644
--- a/ejs-locals/ejs-locals.d.ts
+++ b/ejs-locals/ejs-locals.d.ts
@@ -3,9 +3,8 @@
 // Definitions by: jt000 <https://github.com/jt000>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "ejs-locals" {
 
-    function ejsLocals(): Function;
 
-    export = ejsLocals;
-}
\ No newline at end of file
+declare function ejsLocals(): Function;
+
+export = ejsLocals;
diff --git a/ejs/ejs.d.ts b/ejs/ejs.d.ts
index 6e2347fbc5..e77656a418 100644
--- a/ejs/ejs.d.ts
+++ b/ejs/ejs.d.ts
@@ -4,88 +4,87 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare module "ejs" {
-    namespace Ejs {
-        type Data = { [name: string]: any };
-        type Dependencies = string[];
-        var cache: Cache;
-        var localsName: string;
-        function resolveInclude(name: string, filename: string): string;
-        function compile(template: string, opts?: Options): (TemplateFunction);
-        function render(template: string, data?: Data, opts?: Options): string;
-        function renderFile(path: string, data?: Data, opts?: Options, cb?: Function): any;// TODO RenderFileCallback return type
-        function clearCache(): any;
 
-        function TemplateFunction(data: Data): any;
-        interface TemplateFunction {
-            dependencies: Dependencies;
-        }
-        interface Options {
-            cache?: any;
-            filename?: string;
-            context?: any;
-            compileDebug?: boolean;
-            client?: boolean;
-            delimiter?: string;
-            debug?: any;
-            _with?: boolean;
-        }
-        class Template {
-            constructor(text: string, opts: Options);
-            opts: Options;
-            templateText: string;
-            mode: string;
-            truncate: boolean;
-            currentLine: number;
-            source: string;
-            dependencies: Dependencies;
-            createRegex(): RegExp;
-            compile(): TemplateFunction;
-            generateSource(): any;
-            parseTemplateText(): string[];
-            scanLine(line: string): any;
-
-        }
-        namespace Template {
-            interface MODES {
-                EVAL: string;
-                ESCAPED: string;
-                RAW: string;
-                COMMENT: string;
-                LITERAL: string;
-            }
-        }
-        function escapeRegexChars(s: string): string;
-        function escapeXML(markup: string): string;
-        function shallowCopy<T1>(to: T1, fro: any): T1;
-        interface Cache {
-            _data: { [name: string]: any };
-            set(key: string, val: any): any;
-            get(key: string): any;
-        }
-        var cache: Cache;
-        function resolve(from1: string, to: string): string;
-        function resolve(from1: string, from2: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, to: string): string;
-        function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, from9: string, to: string): string;
-        function resolve(...args: string[]): string;
-        function normalize(path: string): string;
-        function isAbsolute(path: string): boolean;
-        function join(...args: string[]): string;
-        function relative(from: string, to: string): string;
-        var sep: string;
-        var delimiter: string;
-        function dirname(path: string): string;
-        function basename(path: string): string;
-        function extname(path: string): string;
-        function filter(xs: any, f: any): any; // TODO WHUT?
+declare namespace Ejs {
+    type Data = { [name: string]: any };
+    type Dependencies = string[];
+    var cache: Cache;
+    var localsName: string;
+    function resolveInclude(name: string, filename: string): string;
+    function compile(template: string, opts?: Options): (TemplateFunction);
+    function render(template: string, data?: Data, opts?: Options): string;
+    function renderFile(path: string, data?: Data, opts?: Options, cb?: Function): any;// TODO RenderFileCallback return type
+    function clearCache(): any;
 
+    function TemplateFunction(data: Data): any;
+    interface TemplateFunction {
+        dependencies: Dependencies;
+    }
+    interface Options {
+        cache?: any;
+        filename?: string;
+        context?: any;
+        compileDebug?: boolean;
+        client?: boolean;
+        delimiter?: string;
+        debug?: any;
+        _with?: boolean;
+    }
+    class Template {
+        constructor(text: string, opts: Options);
+        opts: Options;
+        templateText: string;
+        mode: string;
+        truncate: boolean;
+        currentLine: number;
+        source: string;
+        dependencies: Dependencies;
+        createRegex(): RegExp;
+        compile(): TemplateFunction;
+        generateSource(): any;
+        parseTemplateText(): string[];
+        scanLine(line: string): any;
 
     }
-    export = Ejs;
+    namespace Template {
+        interface MODES {
+            EVAL: string;
+            ESCAPED: string;
+            RAW: string;
+            COMMENT: string;
+            LITERAL: string;
+        }
+    }
+    function escapeRegexChars(s: string): string;
+    function escapeXML(markup: string): string;
+    function shallowCopy<T1>(to: T1, fro: any): T1;
+    interface Cache {
+        _data: { [name: string]: any };
+        set(key: string, val: any): any;
+        get(key: string): any;
+    }
+    var cache: Cache;
+    function resolve(from1: string, to: string): string;
+    function resolve(from1: string, from2: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, to: string): string;
+    function resolve(from1: string, from2: string, from3: string, from4: string, from5: string, from6: string, from7: string, from8: string, from9: string, to: string): string;
+    function resolve(...args: string[]): string;
+    function normalize(path: string): string;
+    function isAbsolute(path: string): boolean;
+    function join(...args: string[]): string;
+    function relative(from: string, to: string): string;
+    var sep: string;
+    var delimiter: string;
+    function dirname(path: string): string;
+    function basename(path: string): string;
+    function extname(path: string): string;
+    function filter(xs: any, f: any): any; // TODO WHUT?
+
+
 }
+export = Ejs;
diff --git a/electron-json-storage/electron-json-storage.d.ts b/electron-json-storage/electron-json-storage.d.ts
index 0ea790638f..8a622ab459 100644
--- a/electron-json-storage/electron-json-storage.d.ts
+++ b/electron-json-storage/electron-json-storage.d.ts
@@ -3,11 +3,10 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "electron-json-storage" {
-	export function get(key: string, callback: (error: any, data: Object) => void): void;
-	export function set(key: string, json: Object, callback: (error: any) => void): void;
-	export function has(key: string, callback: (error: any, hasKey: boolean) => void): void;
-	export function keys(callback: (error: any, keys: string[]) => void): void;
-	export function remove(key: string, callback: (error: any) => void): void;
-	export function clear(callback: (error: any) => void): void;
-}
+
+declare export function get(key: string, callback: (error: any, data: Object) => void): void;
+declare export function set(key: string, json: Object, callback: (error: any) => void): void;
+declare export function has(key: string, callback: (error: any, hasKey: boolean) => void): void;
+declare export function keys(callback: (error: any, keys: string[]) => void): void;
+declare export function remove(key: string, callback: (error: any) => void): void;
+declare export function clear(callback: (error: any) => void): void;
diff --git a/element-resize-event/element-resize-event.d.ts b/element-resize-event/element-resize-event.d.ts
index 3152568f8a..e500d2e7f9 100644
--- a/element-resize-event/element-resize-event.d.ts
+++ b/element-resize-event/element-resize-event.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "element-resize-event" {
-	function elementResizeEvent(domNode: Element, callback: () => void): void;
-	export = elementResizeEvent;
-}
+
+declare function elementResizeEvent(domNode: Element, callback: () => void): void;
+export = elementResizeEvent;
diff --git a/email-addresses/email-addresses.d.ts b/email-addresses/email-addresses.d.ts
index c8cd74d1a0..f8ff9455d7 100644
--- a/email-addresses/email-addresses.d.ts
+++ b/email-addresses/email-addresses.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: John Grimsey <https://github.com/johngrimsey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "email-addresses" {
-    function parseOneAddress(opts: any): any;
-    function parseAddressList(opts: any): any;
-}
+
+declare function parseOneAddress(opts: any): any;
+declare function parseAddressList(opts: any): any;
diff --git a/email-validator/email-validator.d.ts b/email-validator/email-validator.d.ts
index 299ebb19f6..cfb077eb53 100644
--- a/email-validator/email-validator.d.ts
+++ b/email-validator/email-validator.d.ts
@@ -3,6 +3,5 @@
 // Definitions by: Paul Lessing <https://github.com/paullessing>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "email-validator" {
-    export function validate(email: String): boolean;
-}
+
+declare export function validate(email: String): boolean;
diff --git a/encoding-japanese/encoding-japanese.d.ts b/encoding-japanese/encoding-japanese.d.ts
index 0392926694..40740871cf 100644
--- a/encoding-japanese/encoding-japanese.d.ts
+++ b/encoding-japanese/encoding-japanese.d.ts
@@ -5,45 +5,43 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "encoding-japanese" {
-	export type Encoding =
-		"UTF32"   | "UTF16"   | "UTF16BE" |
-		"UTF16LE" | "BINARY"  | "ASCII"   |
-		"JIS"     | "UTF8"    | "EUCJP"   |
-		"SJIS"    | "UNICODE" | "AUTO";
-	type RawType = string | Uint8Array | number[] | Buffer;
 
-	interface ConvertOptions {
-		to: Encoding;
-		from?: Encoding;
-		type?: "string" | "arraybuffer" | "array";
-		bom?: boolean | string;
-	}
+export type Encoding =
+    "UTF32" | "UTF16" | "UTF16BE" |
+    "UTF16LE" | "BINARY" | "ASCII" |
+    "JIS" | "UTF8" | "EUCJP" |
+    "SJIS" | "UNICODE" | "AUTO";
+type RawType = string | Uint8Array | number[] | Buffer;
 
-	export function detect(data: RawType, encodings?: Encoding | Encoding[]): Encoding;
-	export function convert(data: RawType, to: Encoding, from?: Encoding): number[];
-	export function convert(data: RawType, options: ConvertOptions): string | ArrayBuffer | number[];
-	export function urlEncode(data: number[] | Uint8Array): string;
-	export function urlDecode(data: string): number[];
-	export function base64Encode(data: number[] | Uint8Array): string;
-	export function base64Decode(data: string): number[];
-	export function codeToString(data: number[] | Uint8Array): string;
-	export function stringToCode(data: string): number[];
-	export function toHankakuCase(data: number[]): number[];
-	export function toHankakuCase(data: string): string;
-	export function toZenkakuCase(data: number[]): number[];
-	export function toZenkakuCase(data: string): string;
-	export function toHiraganaCase(data: number[]): number[];
-	export function toHiraganaCase(data: string): string;
-	export function toKatakanaCase(data: number[]): number[];
-	export function toKatakanaCase(data: string): string;
-	export function toHankanaCase(data: number[]): number[];
-	export function toHankanaCase(data: string): string;
-	export function toZenkanaCase(data: number[]): number[];
-	export function toZenkanaCase(data: string): string;
-	export function toHankakuSpace(data: number[]): number[];
-	export function toHankakuSpace(data: string): string;
-	export function toZenkakuSpace(data: number[]): number[];
-	export function toZenkakuSpace(data: string): string;
+interface ConvertOptions {
+    to: Encoding;
+    from?: Encoding;
+    type?: "string" | "arraybuffer" | "array";
+    bom?: boolean | string;
 }
 
+declare export function detect(data: RawType, encodings?: Encoding | Encoding[]): Encoding;
+declare export function convert(data: RawType, to: Encoding, from?: Encoding): number[];
+declare export function convert(data: RawType, options: ConvertOptions): string | ArrayBuffer | number[];
+declare export function urlEncode(data: number[] | Uint8Array): string;
+declare export function urlDecode(data: string): number[];
+declare export function base64Encode(data: number[] | Uint8Array): string;
+declare export function base64Decode(data: string): number[];
+declare export function codeToString(data: number[] | Uint8Array): string;
+declare export function stringToCode(data: string): number[];
+declare export function toHankakuCase(data: number[]): number[];
+declare export function toHankakuCase(data: string): string;
+declare export function toZenkakuCase(data: number[]): number[];
+declare export function toZenkakuCase(data: string): string;
+declare export function toHiraganaCase(data: number[]): number[];
+declare export function toHiraganaCase(data: string): string;
+declare export function toKatakanaCase(data: number[]): number[];
+declare export function toKatakanaCase(data: string): string;
+declare export function toHankanaCase(data: number[]): number[];
+declare export function toHankanaCase(data: string): string;
+declare export function toZenkanaCase(data: number[]): number[];
+declare export function toZenkanaCase(data: string): string;
+declare export function toHankakuSpace(data: number[]): number[];
+declare export function toHankakuSpace(data: string): string;
+declare export function toZenkakuSpace(data: number[]): number[];
+declare export function toZenkakuSpace(data: string): string;
diff --git a/enzyme/enzyme.d.ts b/enzyme/enzyme.d.ts
index 9047fbf728..b4fe19737e 100644
--- a/enzyme/enzyme.d.ts
+++ b/enzyme/enzyme.d.ts
@@ -5,407 +5,406 @@
 
 ///<reference path="../react/react.d.ts" />
 
-declare module "enzyme" {
 
-    import {ReactElement, Component, StatelessComponent, ComponentClass, HTMLAttributes} from "react";
 
-    export class ElementClass extends Component<any, any> {
-    }
+import {ReactElement, Component, StatelessComponent, ComponentClass, HTMLAttributes} from "react";
+
+declare export class ElementClass extends Component<any, any> {
+}
+
+/**
+ * Many methods in Enzyme's API accept a selector as an argument. Selectors in Enzyme can fall into one of the
+ * following three categories:
+ *
+ *  1. A Valid CSS Selector
+ *  2. A React Component Constructor
+ *  3. A React Component's displayName
+ */
+export type EnzymeSelector = String | typeof ElementClass;
+
+interface CommonWrapper<P, S> {
+    /**
+     * Find every node in the render tree that matches the provided selector.
+     * @param selector The selector to match.
+     */
+    find<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    find<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    find(selector: string): CommonWrapper<HTMLAttributes, any>;
 
     /**
-     * Many methods in Enzyme's API accept a selector as an argument. Selectors in Enzyme can fall into one of the
-     * following three categories:
+     * Finds every node in the render tree that returns true for the provided predicate function.
+     * @param predicate
+     */
+    findWhere(predicate: (wrapper: CommonWrapper<any, any>) => Boolean): CommonWrapper<any, any>;
+
+    /**
+     * Removes nodes in the current wrapper that do not match the provided selector.
+     * @param selector The selector to match.
+     */
+    filter<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    filter<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    filter(selector: string): CommonWrapper<HTMLAttributes, any>;
+
+    /**
+     * Returns a new wrapper with only the nodes of the current wrapper that, when passed into the provided predicate function, return true.
+     * @param predicate
+     */
+    filterWhere(predicate: (wrapper: this) => Boolean): this;
+
+    /**
+     * Returns whether or not the current wrapper has a node anywhere in it's render tree that looks like the one passed in.
+     * @param node
+     */
+    contains(node: ReactElement<any>): Boolean;
+
+    /**
+     * Returns whether or not the current node has a className prop including the passed in class name.
+     * @param className
+     */
+    hasClass(className: String): Boolean;
+
+    /**
+     * Returns whether or not the current node matches a provided selector.
+     * @param selector
+     */
+    is(selector: EnzymeSelector): Boolean;
+
+    /**
+     * Returns a new wrapper with only the nodes of the current wrapper that don't match the provided selector.
+     * This method is effectively the negation or inverse of filter.
+     * @param selector
+     */
+    not(selector: EnzymeSelector): this;
+
+    /**
+     * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
+     * can be provided and it will filter the children by this selector.
+     * @param [selector]
+     */
+    children<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    children<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    children(selector: string): CommonWrapper<HTMLAttributes, any>;
+    children(): CommonWrapper<any, any>;
+
+    /**
+     * Returns a wrapper around all of the parents/ancestors of the wrapper. Does not include the node in the
+     * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
      *
-     *  1. A Valid CSS Selector
-     *  2. A React Component Constructor
-     *  3. A React Component's displayName
+     * Note: can only be called on a wrapper of a single node.
+     * @param [selector]
      */
-    export type EnzymeSelector = String | typeof ElementClass;
-
-    interface CommonWrapper<P, S> {
-        /**
-         * Find every node in the render tree that matches the provided selector.
-         * @param selector The selector to match.
-         */
-        find<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        find<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        find(selector: string): CommonWrapper<HTMLAttributes, any>;
-
-        /**
-         * Finds every node in the render tree that returns true for the provided predicate function.
-         * @param predicate
-         */
-        findWhere(predicate: (wrapper: CommonWrapper<any, any>) => Boolean): CommonWrapper<any, any>;
-
-        /**
-         * Removes nodes in the current wrapper that do not match the provided selector.
-         * @param selector The selector to match.
-         */
-        filter<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        filter<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        filter(selector: string): CommonWrapper<HTMLAttributes, any>;
-
-        /**
-         * Returns a new wrapper with only the nodes of the current wrapper that, when passed into the provided predicate function, return true.
-         * @param predicate
-         */
-        filterWhere(predicate: (wrapper: this) => Boolean): this;
-
-        /**
-         * Returns whether or not the current wrapper has a node anywhere in it's render tree that looks like the one passed in.
-         * @param node
-         */
-        contains(node: ReactElement<any>): Boolean;
-
-        /**
-         * Returns whether or not the current node has a className prop including the passed in class name.
-         * @param className
-         */
-        hasClass(className: String): Boolean;
-
-        /**
-         * Returns whether or not the current node matches a provided selector.
-         * @param selector
-         */
-        is(selector: EnzymeSelector): Boolean;
-
-        /**
-         * Returns a new wrapper with only the nodes of the current wrapper that don't match the provided selector.
-         * This method is effectively the negation or inverse of filter.
-         * @param selector
-         */
-        not(selector: EnzymeSelector): this;
-
-        /**
-         * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
-         * can be provided and it will filter the children by this selector.
-         * @param [selector]
-         */
-        children<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        children<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        children(selector: string): CommonWrapper<HTMLAttributes, any>;
-        children(): CommonWrapper<any, any>;
-
-        /**
-         * Returns a wrapper around all of the parents/ancestors of the wrapper. Does not include the node in the
-         * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         * @param [selector]
-         */
-        parents<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        parents<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        parents(selector: string): CommonWrapper<HTMLAttributes, any>;
-        parents(): CommonWrapper<any, any>;
-
-        /**
-         * Returns a wrapper with the direct parent of the node in the current wrapper.
-         */
-        parent(): CommonWrapper<any, any>;
-
-        /**
-         * Returns a wrapper of the first element that matches the selector by traversing up through the current node's
-         * ancestors in the tree, starting with itself.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         * @param selector
-         */
-        closest<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
-        closest<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
-        closest(selector: string): CommonWrapper<HTMLAttributes, any>;
-
-        /**
-         * Returns a string of the rendered text of the current render tree. This function should be looked at with
-         * skepticism if being used to test what the actual HTML output of the component will be. If that is what you
-         * would like to test, use enzyme's render function instead.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         */
-        text(): String;
-
-        /**
-         * Returns a string of the rendered HTML markup of the current render tree.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         */
-        html(): String;
-
-        /**
-         * Returns the node at a given index of the current wrapper.
-         * @param index
-         */
-        get(index: number): ReactElement<any>;
-
-        /**
-         * Returns a wrapper around the node at a given index of the current wrapper.
-         * @param index
-         */
-        at(index: number): this;
-
-        /**
-         * Reduce the set of matched nodes to the first in the set.
-         */
-        first(): this;
-
-        /**
-         * Reduce the set of matched nodes to the last in the set.
-         */
-        last(): this;
-
-        /**
-         * Returns the state hash for the root node of the wrapper. Optionally pass in a prop name and it will return just that value.
-         * @param [key]
-         */
-        state(key?: String): any;
-
-        /**
-         * Returns the props hash for the current node of the wrapper.
-         *
-         * NOTE: can only be called on a wrapper of a single node.
-         */
-        props(): P;
-
-        /**
-         * Returns the prop value for the node of the current wrapper with the provided key.
-         *
-         * NOTE: can only be called on a wrapper of a single node.
-         * @param key
-         */
-        prop(key: String): any;
-
-        /**
-         * Simulate events.
-         * Returns itself.
-         * @param event
-         * @param args?
-         */
-        simulate(event: string, ...args: any[]): this;
-
-        /**
-         * A method to invoke setState() on the root component instance similar to how you might in the definition of
-         * the component, and re-renders. This method is useful for testing your component in hard to achieve states,
-         * however should be used sparingly. If possible, you should utilize your component's external API in order to
-         * get it into whatever state you want to test, in order to be as accurate of a test as possible. This is not
-         * always practical, however.
-         * Returns itself.
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         * @param state
-         */
-        setState(state: S): this;
-
-        /**
-         * A method that sets the props of the root component, and re-renders. Useful for when you are wanting to test
-         * how the component behaves over time with changing props. Calling this, for instance, will call the
-         * componentWillReceiveProps lifecycle method.
-         *
-         * Similar to setState, this method accepts a props object and will merge it in with the already existing props.
-         * Returns itself.
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         * @param state
-         */
-        setProps(props: P): this;
-
-        /**
-         * A method that sets the context of the root component, and re-renders. Useful for when you are wanting to
-         * test how the component behaves over time with changing contexts.
-         * Returns itself.
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         * @param state
-         */
-        setContext(context: Object): this;
-
-        /**
-         * Gets the instance of the component being rendered as the root node passed into shallow().
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         */
-        instance(): Component<P, S>;
-
-        /**
-         * Forces a re-render. Useful to run before checking the render output if something external may be updating
-         * the state of the component somewhere.
-         * Returns itself.
-         *
-         * NOTE: can only be called on a wrapper instance that is also the root instance.
-         */
-        update(): this;
-
-        /**
-         * Returns an html-like string of the wrapper for debugging purposes. Useful to print out to the console when
-         * tests are not passing when you expect them to.
-         */
-        debug(): String;
-
-        /**
-         * Returns the type of the current node of this wrapper. If it's a composite component, this will be the
-         * component constructor. If it's native DOM node, it will be a string of the tag name.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         */
-        type(): String | Function;
-
-        /**
-         * Iterates through each node of the current wrapper and executes the provided function with a wrapper around
-         * the corresponding node passed in as the first argument.
-         *
-         * Returns itself.
-         * @param fn A callback to be run for every node in the collection. Should expect a ShallowWrapper as the first
-         *              argument, and will be run with a context of the original instance.
-         */
-        forEach(fn: (wrapper: this) => any): this;
-
-        /**
-         * Maps the current array of nodes to another array. Each node is passed in as a ShallowWrapper to the map
-         * function.
-         * Returns an array of the returned values from the mapping function..
-         * @param fn A mapping function to be run for every node in the collection, the results of which will be mapped
-         *              to the returned array. Should expect a ShallowWrapper as the first argument, and will be run
-         *              with a context of the original instance.
-         */
-        map<V>(fn: (wrapper: this) => V): V[];
-
-        /**
-         * Applies the provided reducing function to every node in the wrapper to reduce to a single value. Each node
-         * is passed in as a ShallowWrapper, and is processed from left to right.
-         * @param fn
-         * @param initialValue
-         */
-        reduce<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R[];
-
-        /**
-         * Applies the provided reducing function to every node in the wrapper to reduce to a single value.
-         * Each node is passed in as a ShallowWrapper, and is processed from right to left.
-         * @param fn
-         * @param initialValue
-         */
-        reduceRight<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R[];
-
-        /**
-         * Returns whether or not any of the nodes in the wrapper match the provided selector.
-         * @param selector
-         */
-        some(selector: EnzymeSelector): Boolean;
-
-        /**
-         * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
-         * @param fn
-         */
-        someWhere(fn: (wrapper: this) => Boolean): Boolean;
-
-        /**
-         * Returns whether or not all of the nodes in the wrapper match the provided selector.
-         * @param selector
-         */
-        every(selector: EnzymeSelector): Boolean;
-
-        /**
-         * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
-         * @param fn
-         */
-        everyWhere(fn: (wrapper: this) => Boolean): Boolean;
-
-        length: number;
-    }
-
-    export interface ShallowWrapper<P, S> extends CommonWrapper<P, S> {
-        shallow(): ShallowWrapper<P, S>;
-        render(): CheerioWrapper<P, S>;
-
-        /**
-         * Find every node in the render tree that matches the provided selector.
-         * @param selector The selector to match.
-         */
-        find<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        find<P2>(statelessComponent: (props: P2) => JSX.Element): ShallowWrapper<P2, {}>;
-        find(selector: string): ShallowWrapper<HTMLAttributes, any>;
-
-        /**
-         * Removes nodes in the current wrapper that do not match the provided selector.
-         * @param selector The selector to match.
-         */
-        filter<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        filter<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
-        filter(selector: string): ShallowWrapper<HTMLAttributes, any>;
-
-        /**
-         * Finds every node in the render tree that returns true for the provided predicate function.
-         * @param predicate
-         */
-        findWhere(predicate: (wrapper: CommonWrapper<any, any>) => Boolean): ShallowWrapper<any, any>;
-
-        /**
-         * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
-         * can be provided and it will filter the children by this selector.
-         * @param [selector]
-         */
-        children<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        children<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
-        children(selector: string): ShallowWrapper<HTMLAttributes, any>;
-        children(): ShallowWrapper<any, any>;
-
-        /**
-         * Returns a wrapper around all of the parents/ancestors of the wrapper. Does not include the node in the
-         * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         * @param [selector]
-         */
-        parents<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        parents<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
-        parents(selector: string): ShallowWrapper<HTMLAttributes, any>;
-        parents(): ShallowWrapper<any, any>;
-
-        /**
-         * Returns a wrapper of the first element that matches the selector by traversing up through the current node's
-         * ancestors in the tree, starting with itself.
-         *
-         * Note: can only be called on a wrapper of a single node.
-         * @param selector
-         */
-        closest<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-        closest<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
-        closest(selector: string): ShallowWrapper<HTMLAttributes, any>;
-
-        /**
-         * Returns a wrapper with the direct parent of the node in the current wrapper.
-         */
-        parent(): ShallowWrapper<any, any>;
-    }
-
-    export interface ReactWrapper<P, S> extends CommonWrapper<P, S> {
-
-    }
-
-    export interface CheerioWrapper<P, S> extends CommonWrapper<P, S> {
-
-    }
+    parents<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    parents<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    parents(selector: string): CommonWrapper<HTMLAttributes, any>;
+    parents(): CommonWrapper<any, any>;
 
     /**
-     * Shallow rendering is useful to constrain yourself to testing a component as a unit, and to ensure that
-     * your tests aren't indirectly asserting on behavior of child components.
-     * @param node
-     * @param [options]
+     * Returns a wrapper with the direct parent of the node in the current wrapper.
      */
-    export function shallow<P, S>(node: ReactElement<P>, options?: any): ShallowWrapper<P, S>;
+    parent(): CommonWrapper<any, any>;
 
     /**
-     * Mounts and renders a react component into the document and provides a testing wrapper around it.
-     * @param node
-     * @param [options]
+     * Returns a wrapper of the first element that matches the selector by traversing up through the current node's
+     * ancestors in the tree, starting with itself.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     * @param selector
      */
-    export function mount<P, S>(node: ReactElement<P>, options?: any): ReactWrapper<P, S>;
+    closest<P2>(component: ComponentClass<P2>): CommonWrapper<P2, any>;
+    closest<P2>(statelessComponent: StatelessComponent<P2>): CommonWrapper<P2, {}>;
+    closest(selector: string): CommonWrapper<HTMLAttributes, any>;
 
     /**
-     * Render react components to static HTML and analyze the resulting HTML structure.
-     * @param node
-     * @param [options]
+     * Returns a string of the rendered text of the current render tree. This function should be looked at with
+     * skepticism if being used to test what the actual HTML output of the component will be. If that is what you
+     * would like to test, use enzyme's render function instead.
+     *
+     * Note: can only be called on a wrapper of a single node.
      */
-    export function render<P, S>(node: ReactElement<P>, options?: any): CheerioWrapper<P, S>;
+    text(): String;
 
-    export function describeWithDOM(description: String, fn: Function): void;
+    /**
+     * Returns a string of the rendered HTML markup of the current render tree.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     */
+    html(): String;
 
-    export function spyLifecycle(component: typeof Component): void;
-}
\ No newline at end of file
+    /**
+     * Returns the node at a given index of the current wrapper.
+     * @param index
+     */
+    get(index: number): ReactElement<any>;
+
+    /**
+     * Returns a wrapper around the node at a given index of the current wrapper.
+     * @param index
+     */
+    at(index: number): this;
+
+    /**
+     * Reduce the set of matched nodes to the first in the set.
+     */
+    first(): this;
+
+    /**
+     * Reduce the set of matched nodes to the last in the set.
+     */
+    last(): this;
+
+    /**
+     * Returns the state hash for the root node of the wrapper. Optionally pass in a prop name and it will return just that value.
+     * @param [key]
+     */
+    state(key?: String): any;
+
+    /**
+     * Returns the props hash for the current node of the wrapper.
+     *
+     * NOTE: can only be called on a wrapper of a single node.
+     */
+    props(): P;
+
+    /**
+     * Returns the prop value for the node of the current wrapper with the provided key.
+     *
+     * NOTE: can only be called on a wrapper of a single node.
+     * @param key
+     */
+    prop(key: String): any;
+
+    /**
+     * Simulate events.
+     * Returns itself.
+     * @param event
+     * @param args?
+     */
+    simulate(event: string, ...args: any[]): this;
+
+    /**
+     * A method to invoke setState() on the root component instance similar to how you might in the definition of
+     * the component, and re-renders. This method is useful for testing your component in hard to achieve states,
+     * however should be used sparingly. If possible, you should utilize your component's external API in order to
+     * get it into whatever state you want to test, in order to be as accurate of a test as possible. This is not
+     * always practical, however.
+     * Returns itself.
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     * @param state
+     */
+    setState(state: S): this;
+
+    /**
+     * A method that sets the props of the root component, and re-renders. Useful for when you are wanting to test
+     * how the component behaves over time with changing props. Calling this, for instance, will call the
+     * componentWillReceiveProps lifecycle method.
+     *
+     * Similar to setState, this method accepts a props object and will merge it in with the already existing props.
+     * Returns itself.
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     * @param state
+     */
+    setProps(props: P): this;
+
+    /**
+     * A method that sets the context of the root component, and re-renders. Useful for when you are wanting to
+     * test how the component behaves over time with changing contexts.
+     * Returns itself.
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     * @param state
+     */
+    setContext(context: Object): this;
+
+    /**
+     * Gets the instance of the component being rendered as the root node passed into shallow().
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     */
+    instance(): Component<P, S>;
+
+    /**
+     * Forces a re-render. Useful to run before checking the render output if something external may be updating
+     * the state of the component somewhere.
+     * Returns itself.
+     *
+     * NOTE: can only be called on a wrapper instance that is also the root instance.
+     */
+    update(): this;
+
+    /**
+     * Returns an html-like string of the wrapper for debugging purposes. Useful to print out to the console when
+     * tests are not passing when you expect them to.
+     */
+    debug(): String;
+
+    /**
+     * Returns the type of the current node of this wrapper. If it's a composite component, this will be the
+     * component constructor. If it's native DOM node, it will be a string of the tag name.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     */
+    type(): String | Function;
+
+    /**
+     * Iterates through each node of the current wrapper and executes the provided function with a wrapper around
+     * the corresponding node passed in as the first argument.
+     *
+     * Returns itself.
+     * @param fn A callback to be run for every node in the collection. Should expect a ShallowWrapper as the first
+     *              argument, and will be run with a context of the original instance.
+     */
+    forEach(fn: (wrapper: this) => any): this;
+
+    /**
+     * Maps the current array of nodes to another array. Each node is passed in as a ShallowWrapper to the map
+     * function.
+     * Returns an array of the returned values from the mapping function..
+     * @param fn A mapping function to be run for every node in the collection, the results of which will be mapped
+     *              to the returned array. Should expect a ShallowWrapper as the first argument, and will be run
+     *              with a context of the original instance.
+     */
+    map<V>(fn: (wrapper: this) => V): V[];
+
+    /**
+     * Applies the provided reducing function to every node in the wrapper to reduce to a single value. Each node
+     * is passed in as a ShallowWrapper, and is processed from left to right.
+     * @param fn
+     * @param initialValue
+     */
+    reduce<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R[];
+
+    /**
+     * Applies the provided reducing function to every node in the wrapper to reduce to a single value.
+     * Each node is passed in as a ShallowWrapper, and is processed from right to left.
+     * @param fn
+     * @param initialValue
+     */
+    reduceRight<R>(fn: (prevVal: R, wrapper: this, index: number) => R, initialValue?: R): R[];
+
+    /**
+     * Returns whether or not any of the nodes in the wrapper match the provided selector.
+     * @param selector
+     */
+    some(selector: EnzymeSelector): Boolean;
+
+    /**
+     * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
+     * @param fn
+     */
+    someWhere(fn: (wrapper: this) => Boolean): Boolean;
+
+    /**
+     * Returns whether or not all of the nodes in the wrapper match the provided selector.
+     * @param selector
+     */
+    every(selector: EnzymeSelector): Boolean;
+
+    /**
+     * Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
+     * @param fn
+     */
+    everyWhere(fn: (wrapper: this) => Boolean): Boolean;
+
+    length: number;
+}
+
+export interface ShallowWrapper<P, S> extends CommonWrapper<P, S> {
+    shallow(): ShallowWrapper<P, S>;
+    render(): CheerioWrapper<P, S>;
+
+    /**
+     * Find every node in the render tree that matches the provided selector.
+     * @param selector The selector to match.
+     */
+    find<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    find<P2>(statelessComponent: (props: P2) => JSX.Element): ShallowWrapper<P2, {}>;
+    find(selector: string): ShallowWrapper<HTMLAttributes, any>;
+
+    /**
+     * Removes nodes in the current wrapper that do not match the provided selector.
+     * @param selector The selector to match.
+     */
+    filter<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    filter<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
+    filter(selector: string): ShallowWrapper<HTMLAttributes, any>;
+
+    /**
+     * Finds every node in the render tree that returns true for the provided predicate function.
+     * @param predicate
+     */
+    findWhere(predicate: (wrapper: CommonWrapper<any, any>) => Boolean): ShallowWrapper<any, any>;
+
+    /**
+     * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector
+     * can be provided and it will filter the children by this selector.
+     * @param [selector]
+     */
+    children<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    children<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
+    children(selector: string): ShallowWrapper<HTMLAttributes, any>;
+    children(): ShallowWrapper<any, any>;
+
+    /**
+     * Returns a wrapper around all of the parents/ancestors of the wrapper. Does not include the node in the
+     * current wrapper. Optionally, a selector can be provided and it will filter the parents by this selector.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     * @param [selector]
+     */
+    parents<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    parents<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
+    parents(selector: string): ShallowWrapper<HTMLAttributes, any>;
+    parents(): ShallowWrapper<any, any>;
+
+    /**
+     * Returns a wrapper of the first element that matches the selector by traversing up through the current node's
+     * ancestors in the tree, starting with itself.
+     *
+     * Note: can only be called on a wrapper of a single node.
+     * @param selector
+     */
+    closest<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
+    closest<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, {}>;
+    closest(selector: string): ShallowWrapper<HTMLAttributes, any>;
+
+    /**
+     * Returns a wrapper with the direct parent of the node in the current wrapper.
+     */
+    parent(): ShallowWrapper<any, any>;
+}
+
+export interface ReactWrapper<P, S> extends CommonWrapper<P, S> {
+
+}
+
+export interface CheerioWrapper<P, S> extends CommonWrapper<P, S> {
+
+}
+
+/**
+ * Shallow rendering is useful to constrain yourself to testing a component as a unit, and to ensure that
+ * your tests aren't indirectly asserting on behavior of child components.
+ * @param node
+ * @param [options]
+ */
+declare export function shallow<P, S>(node: ReactElement<P>, options?: any): ShallowWrapper<P, S>;
+
+/**
+ * Mounts and renders a react component into the document and provides a testing wrapper around it.
+ * @param node
+ * @param [options]
+ */
+declare export function mount<P, S>(node: ReactElement<P>, options?: any): ReactWrapper<P, S>;
+
+/**
+ * Render react components to static HTML and analyze the resulting HTML structure.
+ * @param node
+ * @param [options]
+ */
+declare export function render<P, S>(node: ReactElement<P>, options?: any): CheerioWrapper<P, S>;
+
+declare export function describeWithDOM(description: String, fn: Function): void;
+
+declare export function spyLifecycle(component: typeof Component): void;
diff --git a/errorhandler/errorhandler.d.ts b/errorhandler/errorhandler.d.ts
index bb1674c1e5..247383ca14 100644
--- a/errorhandler/errorhandler.d.ts
+++ b/errorhandler/errorhandler.d.ts
@@ -5,28 +5,27 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "errorhandler" {
-    import * as express from 'express';
 
-    function errorHandler(options?: errorHandler.Options): express.ErrorRequestHandler;
+import * as express from 'express';
 
-    namespace errorHandler {
-        interface LoggingCallback {
-            (err: Error, str: string, req: express.Request, res: express.Response): void;
-        }
+declare function errorHandler(options?: errorHandler.Options): express.ErrorRequestHandler;
 
-        interface Options {
-            /**
-             * Defaults to true.
-             *
-             * Possible values:
-             *   true       : Log errors using console.error(str).
-             *   false      : Only send the error back in the response.
-             *   A function : pass the error to a function for handling.
-             */
-            log: boolean | LoggingCallback;
-        }
+declare namespace errorHandler {
+    interface LoggingCallback {
+        (err: Error, str: string, req: express.Request, res: express.Response): void;
     }
 
-    export = errorHandler;
+    interface Options {
+        /**
+         * Defaults to true.
+         *
+         * Possible values:
+         *   true       : Log errors using console.error(str).
+         *   false      : Only send the error back in the response.
+         *   A function : pass the error to a function for handling.
+         */
+        log: boolean | LoggingCallback;
+    }
 }
+
+export = errorHandler;
diff --git a/escape-html/escape-html.d.ts b/escape-html/escape-html.d.ts
index f3b57e005a..fc81a2179a 100644
--- a/escape-html/escape-html.d.ts
+++ b/escape-html/escape-html.d.ts
@@ -3,9 +3,8 @@
 // Definitions by: Elisée MAURER <https://github.com/elisee/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "escape-html" {
-  function escapeHTML(text: string): string;
-  namespace escapeHTML {}
 
-  export = escapeHTML;
-}
+declare function escapeHTML(text: string): string;
+declare namespace escapeHTML { }
+
+export = escapeHTML;
diff --git a/escape-latex/escape-latex.d.ts b/escape-latex/escape-latex.d.ts
index 5835bad0d9..3f29741aae 100644
--- a/escape-latex/escape-latex.d.ts
+++ b/escape-latex/escape-latex.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Oliver Schneider <https://github.com/olsio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'escape-latex' {
-    function lescape(texString: string): string;
-    export = lescape;
-}
\ No newline at end of file
+
+declare function lescape(texString: string): string;
+export = lescape;
diff --git a/escape-string-regexp/escape-string-regexp.d.ts b/escape-string-regexp/escape-string-regexp.d.ts
index 6e04533087..4e3ac47458 100644
--- a/escape-string-regexp/escape-string-regexp.d.ts
+++ b/escape-string-regexp/escape-string-regexp.d.ts
@@ -3,10 +3,8 @@
 // Definitions by: kruncher <https://github.com/kruncher/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "escape-string-regexp" {
 
-  function escapeStringRegexp(str: string): string;
 
-  export = escapeStringRegexp;
+declare function escapeStringRegexp(str: string): string;
 
-}
+export = escapeStringRegexp;
diff --git a/event-loop-lag/event-loop-lag.d.ts b/event-loop-lag/event-loop-lag.d.ts
index fa1b1d8215..81ac388ee1 100644
--- a/event-loop-lag/event-loop-lag.d.ts
+++ b/event-loop-lag/event-loop-lag.d.ts
@@ -3,12 +3,11 @@
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "event-loop-lag" {
-	
-	/**
-	 * Accepts a number of milliseconds representing how often to refresh the event loop lag measurement and returns a function you can call to receive the latest lag measurement in milliseconds.
-	 */
-	function lag(interval: number): () => number;
-	
-	export = lag;	
-}
+
+
+/**
+ * Accepts a number of milliseconds representing how often to refresh the event loop lag measurement and returns a function you can call to receive the latest lag measurement in milliseconds.
+ */
+declare function lag(interval: number): () => number;
+
+export = lag;
diff --git a/event-stream/event-stream.d.ts b/event-stream/event-stream.d.ts
index 85d676d339..e53066e16f 100644
--- a/event-stream/event-stream.d.ts
+++ b/event-stream/event-stream.d.ts
@@ -5,138 +5,136 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'event-stream'
-{
-    import * as stream from 'stream';
 
-    /**
-     * Create a through stream from an asynchronous function
-     * 
-     * @param asyncFunction
-     */
-    export function map(asyncFunction: Function): stream.Stream;
+import * as stream from 'stream';
 
-    /**
-     * Same as map, but the callback is called synchronously. Based on es.through
-     * @param syncFunction
-     */
-    export function mapSync(syncFunction: Function): stream.Stream;
+/**
+ * Create a through stream from an asynchronous function
+ * 
+ * @param asyncFunction
+ */
+declare export function map(asyncFunction: Function): stream.Stream;
 
-    /**
-     * Break up a stream and reassemble it so that each line is a chunk. matcher may be a String, or a RegExp
-     * 
-     * @param matcher
-     */
-    export function split(matcher: string | RegExp): stream.Stream;
+/**
+ * Same as map, but the callback is called synchronously. Based on es.through
+ * @param syncFunction
+ */
+declare export function mapSync(syncFunction: Function): stream.Stream;
 
-    /**
-     * Create a through stream that emits separator between each chunk, just like Array#join
-     * 
-     * @param separator
-     */
-    export function join(separator: string): stream.Stream;
+/**
+ * Break up a stream and reassemble it so that each line is a chunk. matcher may be a String, or a RegExp
+ * 
+ * @param matcher
+ */
+declare export function split(matcher: string | RegExp): stream.Stream;
 
-    /**
-     * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
-     * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
-     * Counts how many streams were passed to it and emits end only when all streams emitted end.
-     * 
-     * @param stream
-     */
-    export function concat(...stream: stream.Stream[]): stream.Stream;
+/**
+ * Create a through stream that emits separator between each chunk, just like Array#join
+ * 
+ * @param separator
+ */
+declare export function join(separator: string): stream.Stream;
 
-    /**
-     * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
-     * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
-     * Counts how many streams were passed to it and emits end only when all streams emitted end.
-     * 
-     * @param stream
-     */
-    export function concat(streamArray:stream.Stream[]): stream.Stream;
+/**
+ * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
+ * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
+ * Counts how many streams were passed to it and emits end only when all streams emitted end.
+ * 
+ * @param stream
+ */
+declare export function concat(...stream: stream.Stream[]): stream.Stream;
 
-    /**
-     * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
-     * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
-     * Counts how many streams were passed to it and emits end only when all streams emitted end.
-     * 
-     * @param stream
-     */
-    export function merge(...stream: stream.Stream[]): stream.Stream;
+/**
+ * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
+ * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
+ * Counts how many streams were passed to it and emits end only when all streams emitted end.
+ * 
+ * @param stream
+ */
+declare export function concat(streamArray: stream.Stream[]): stream.Stream;
 
-    /**
-     * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
-     * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
-     * Counts how many streams were passed to it and emits end only when all streams emitted end.
-     * 
-     * @param stream
-     */
-    export function merge(streamArray: stream.Stream[]): stream.Stream;
+/**
+ * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
+ * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
+ * Counts how many streams were passed to it and emits end only when all streams emitted end.
+ * 
+ * @param stream
+ */
+declare export function merge(...stream: stream.Stream[]): stream.Stream;
 
-    /**
-     * Replace all occurrences of from with to
-     * @param from
-     * @param to
-     */
-    export function replace(from: string | RegExp, to: string | RegExp): stream.Stream;
+/**
+ * Merges streams into one and returns it. Incoming data will be emitted as soon it comes into - no ordering will be applied
+ * (for example: data1 data1 data2 data1 data2 - where data1 and data2 is data from two streams).
+ * Counts how many streams were passed to it and emits end only when all streams emitted end.
+ * 
+ * @param stream
+ */
+declare export function merge(streamArray: stream.Stream[]): stream.Stream;
 
-    /**
-     * Convenience function for parsing JSON chunks. For newline separated JSON, use with es.split.
-     * By default it logs parsing errors by console.error; for another behaviour, transforms created by es.parse({error: true})
-     * will emit error events for exceptions thrown from JSON.parse, unmodified.
-     */
-    export function parse(): any;
+/**
+ * Replace all occurrences of from with to
+ * @param from
+ * @param to
+ */
+declare export function replace(from: string | RegExp, to: string | RegExp): stream.Stream;
 
-    /**
-     * convert javascript objects into lines of text. The text will have whitespace escaped and have a \n appended, so it will be compatible with es.parse
-     */
-    export function stringify(): stream.Stream;
+/**
+ * Convenience function for parsing JSON chunks. For newline separated JSON, use with es.split.
+ * By default it logs parsing errors by console.error; for another behaviour, transforms created by es.parse({error: true})
+ * will emit error events for exceptions thrown from JSON.parse, unmodified.
+ */
+declare export function parse(): any;
 
-    /**
-     * create a readable stream (that respects pause) from an async function.
-     * 
-     * @param asyncFunction
-     */
-    export function readable(asyncFunction: Function): stream.Stream;
+/**
+ * convert javascript objects into lines of text. The text will have whitespace escaped and have a \n appended, so it will be compatible with es.parse
+ */
+declare export function stringify(): stream.Stream;
 
-    /**
-     * Create a readable stream from an Array.
-     * 
-     * @param array
-     */
-    export function readArray(array: any[]): stream.Stream;
+/**
+ * create a readable stream (that respects pause) from an async function.
+ * 
+ * @param asyncFunction
+ */
+declare export function readable(asyncFunction: Function): stream.Stream;
 
-    /**
-     * create a writeable stream from a callback
-     * 
-     * @param callback
-     */
-    export function writeArray(callback: Function): stream.Stream;
+/**
+ * Create a readable stream from an Array.
+ * 
+ * @param array
+ */
+declare export function readArray(array: any[]): stream.Stream;
 
-    /**
-     * A stream that buffers all chunks when paused
-     */
-    export function pause(): stream.Stream | void;
+/**
+ * create a writeable stream from a callback
+ * 
+ * @param callback
+ */
+declare export function writeArray(callback: Function): stream.Stream;
 
-    /**
-     * Takes a writable stream and a readable stream and makes them appear as a readable writable stream.
-     * 
-     * @param writeStream
-     * @param readStream
-     */
-    export function duplex(writeStream: stream.Writable, readStream: stream.Readable): stream.Stream;
+/**
+ * A stream that buffers all chunks when paused
+ */
+declare export function pause(): stream.Stream | void;
 
-    /**
-     * Create a through stream from a child process
-     * 
-     * @param child_process
-     */
-    export function child(child_process: any): stream.Stream;
+/**
+ * Takes a writable stream and a readable stream and makes them appear as a readable writable stream.
+ * 
+ * @param writeStream
+ * @param readStream
+ */
+declare export function duplex(writeStream: stream.Writable, readStream: stream.Readable): stream.Stream;
 
-    /**
-     * waits for stream to emit 'end'. joins chunks of a stream into a single string or buffer.
-     * Takes an optional callback, which will be passed the complete string/buffer when it receives the 'end' event.
-     * 
-     * @param callback
-     */
-    export function wait(callback: Function): stream.Stream;
-}
\ No newline at end of file
+/**
+ * Create a through stream from a child process
+ * 
+ * @param child_process
+ */
+declare export function child(child_process: any): stream.Stream;
+
+/**
+ * waits for stream to emit 'end'. joins chunks of a stream into a single string or buffer.
+ * Takes an optional callback, which will be passed the complete string/buffer when it receives the 'end' event.
+ * 
+ * @param callback
+ */
+declare export function wait(callback: Function): stream.Stream;
diff --git a/evernote/evernote.d.ts b/evernote/evernote.d.ts
index d8a2fe0ac4..8e4dafaeaa 100644
--- a/evernote/evernote.d.ts
+++ b/evernote/evernote.d.ts
@@ -5,6318 +5,6317 @@
 
 /// <reference path="../thrift/thrift.d.ts"/>
 
-declare module "evernote" {
-    import { Thrift } from "thrift";
 
-    namespace Evernote {
-        interface Callback<T> {
-            (err: EDAMUserException|EDAMSystemException|EDAMNotFoundException, v: T): void
-        }
-
-        interface ClientConfig {
-            consumerKey?: string
-            consumerSecret?: string
-            sandbox?: boolean
-            token?: string
-            serviceHost?: string
-            additionalHeaders?: { [k: string]: string }
-            secret?: string
-        }
-
-        class Client {
-            static "new": (config: ClientConfig) => Client
-            constructor(config: ClientConfig);
-            getNoteStore(): NoteStoreClient;
-            getUserStore(): UserStoreClient;
-        }
-
-
-        /**
-         * Numeric codes indicating the type of error that occurred on the
-         * service.
-         * <dl>
-         *     <dt>UNKNOWN</dt>
-         *         <dd>No information available about the error</dd>
-         *     <dt>BAD_DATA_FORMAT</dt>
-         *         <dd>The format of the request data was incorrect</dd>
-         *     <dt>PERMISSION_DENIED</dt>
-         *         <dd>Not permitted to perform action</dd>
-         *     <dt>INTERNAL_ERROR</dt>
-         *         <dd>Unexpected problem with the service</dd>
-         *     <dt>DATA_REQUIRED</dt>
-         *         <dd>A required parameter/field was absent</dd>
-         *     <dt>LIMIT_REACHED</dt>
-         *         <dd>Operation denied due to data model limit</dd>
-         *     <dt>QUOTA_REACHED</dt>
-         *         <dd>Operation denied due to user storage limit</dd>
-         *     <dt>INVALID_AUTH</dt>
-         *         <dd>Username and/or password incorrect</dd>
-         *     <dt>AUTH_EXPIRED</dt>
-         *         <dd>Authentication token expired</dd>
-         *     <dt>DATA_CONFLICT</dt>
-         *         <dd>Change denied due to data model conflict</dd>
-         *     <dt>ENML_VALIDATION</dt>
-         *         <dd>Content of submitted note was malformed</dd>
-         *     <dt>SHARD_UNAVAILABLE</dt>
-         *         <dd>Service shard with account data is temporarily down</dd>
-         *     <dt>LEN_TOO_SHORT</dt>
-         *         <dd>Operation denied due to data model limit, where something such
-         *                 as a string length was too short</dd>
-         *     <dt>LEN_TOO_LONG</dt>
-         *         <dd>Operation denied due to data model limit, where something such
-         *                 as a string length was too long</dd>
-         *     <dt>TOO_FEW</dt>
-         *         <dd>Operation denied due to data model limit, where there were
-         *                 too few of something.</dd>
-         *     <dt>TOO_MANY</dt>
-         *         <dd>Operation denied due to data model limit, where there were
-         *                 too many of something.</dd>
-         *     <dt>UNSUPPORTED_OPERATION</dt>
-         *         <dd>Operation denied because it is currently unsupported.</dd>
-         *     <dt>TAKEN_DOWN</dt>
-         *         <dd>Operation denied because access to the corresponding object is
-         *                 prohibited in response to a take-down notice.</dd>
-         *     <dt>RATE_LIMIT_REACHED</dt>
-         *         <dd>Operation denied because the calling application has reached
-         *                 its hourly API call limit for this user.</dd>
-         * </dl>
-         */
-        enum EDAMErrorCode {
-            'UNKNOWN' = 1,
-            'BAD_DATA_FORMAT' = 2,
-            'PERMISSION_DENIED' = 3,
-            'INTERNAL_ERROR' = 4,
-            'DATA_REQUIRED' = 5,
-            'LIMIT_REACHED' = 6,
-            'QUOTA_REACHED' = 7,
-            'INVALID_AUTH' = 8,
-            'AUTH_EXPIRED' = 9,
-            'DATA_CONFLICT' = 10,
-            'ENML_VALIDATION' = 11,
-            'SHARD_UNAVAILABLE' = 12,
-            'LEN_TOO_SHORT' = 13,
-            'LEN_TOO_LONG' = 14,
-            'TOO_FEW' = 15,
-            'TOO_MANY' = 16,
-            'UNSUPPORTED_OPERATION' = 17,
-            'TAKEN_DOWN' = 18,
-            'RATE_LIMIT_REACHED' = 19,
-        }
-
-        /**
-         * This exception is thrown by EDAM procedures when a call fails as a result of
-         * a problem that a caller may be able to resolve.    For example, if the user
-         * attempts to add a note to their account which would exceed their storage
-         * quota, this type of exception may be thrown to indicate the source of the
-         * error so that they can choose an alternate action.
-         *
-         * This exception would not be used for internal system errors that do not
-         * reflect user actions, but rather reflect a problem within the service that
-         * the user cannot resolve.
-         *
-         * errorCode:    The numeric code indicating the type of error that occurred.
-         *     must be one of the values of EDAMErrorCode.
-         *
-         * parameter:    If the error applied to a particular input parameter, this will
-         *     indicate which parameter.
-         */
-        class EDAMUserException extends Thrift.TException {
-            errorCode: EDAMErrorCode;
-            parameter: string;
-
-            constructor(args?: { errorCode: EDAMErrorCode; parameter?: string; });
-        }
-
-        /**
-         * This exception is thrown by EDAM procedures when a call fails as a result of
-         * a problem in the service that could not be changed through caller action.
-         *
-         * errorCode:    The numeric code indicating the type of error that occurred.
-         *     must be one of the values of EDAMErrorCode.
-         *
-         * message:    This may contain additional information about the error
-         *
-         * rateLimitDuration:    Indicates the minimum number of seconds that an application should
-         *     expect subsequent API calls for this user to fail. The application should not retry
-         *     API requests for the user until at least this many seconds have passed. Present only
-         *     when errorCode is RATE_LIMIT_REACHED,
-         */
-        class EDAMSystemException extends Thrift.TException {
-            errorCode: EDAMErrorCode;
-            message: string;
-            rateLimitDuration: number;
-
-            constructor(args?: { errorCode: EDAMErrorCode; message?: string; rateLimitDuration?: number; });
-        }
-
-        /**
-         * This exception is thrown by EDAM procedures when a caller asks to perform
-         * an operation on an object that does not exist.    This may be thrown based on an invalid
-         * primary identifier (e.g. a bad GUID), or when the caller refers to an object
-         * by another unique identifier (e.g. a User's email address).
-         *
-         * identifier:    A description of the object that was not found on the server.
-         *     For example, "Note.notebookGuid" when a caller attempts to create a note in a
-         *     notebook that does not exist in the user's account.
-         *
-         * key:    The value passed from the client in the identifier, which was not
-         *     found. For example, the GUID that was not found.
-         */
-        class EDAMNotFoundException extends Thrift.TException {
-            identifier: string;
-            key: string;
-
-            constructor(args?: { identifier?: string; key?: string; });
-        }
-        /**
-         * Minimum length of any string-based attribute, in Unicode chars
-         */
-        var EDAM_ATTRIBUTE_LEN_MIN: number;
-
-        /**
-         * Maximum length of any string-based attribute, in Unicode chars
-         */
-        var EDAM_ATTRIBUTE_LEN_MAX: number;
-
-        /**
-         * Any string-based attribute must match the provided regular expression.
-         * This excludes all Unicode line endings and control characters.
-         */
-        var EDAM_ATTRIBUTE_REGEX: string;
-
-        /**
-         * The maximum number of values that can be stored in a list-based attribute
-         * (e.g. see UserAttributes.recentMailedAddresses)
-         */
-        var EDAM_ATTRIBUTE_LIST_MAX: number;
-
-        /**
-         * The maximum number of entries that can be stored in a map-based attribute
-         * such as applicationData fields in Resources and Notes.
-         */
-        var EDAM_ATTRIBUTE_MAP_MAX: number;
-
-        /**
-         * The minimum length of a GUID generated by the Evernote service
-         */
-        var EDAM_GUID_LEN_MIN: number;
-
-        /**
-         * The maximum length of a GUID generated by the Evernote service
-         */
-        var EDAM_GUID_LEN_MAX: number;
-
-        /**
-         * GUIDs generated by the Evernote service will match the provided pattern
-         */
-        var EDAM_GUID_REGEX: string;
-
-        /**
-         * The minimum length of any email address
-         */
-        var EDAM_EMAIL_LEN_MIN: number;
-
-        /**
-         * The maximum length of any email address
-         */
-        var EDAM_EMAIL_LEN_MAX: number;
-
-        /**
-         * A regular expression that matches the part of an email address before
-         * the '@' symbol.
-         */
-        var EDAM_EMAIL_LOCAL_REGEX: string;
-
-        /**
-         * A regular expression that matches the part of an email address after
-         * the '@' symbol.
-         */
-        var EDAM_EMAIL_DOMAIN_REGEX: string;
-
-        /**
-         * A regular expression that must match any email address given to Evernote.
-         * Email addresses must comply with RFC 2821 and 2822.
-         */
-        var EDAM_EMAIL_REGEX: string;
-
-        /**
-         * A regular expression that must match any VAT ID given to Evernote.
-         * ref http://en.wikipedia.org/wiki/VAT_identification_number
-         * ref http://my.safaribooksonline.com/book/programming/regular-expressions/9780596802837/4dot-validation-and-formatting/id2995136
-         */
-        var EDAM_VAT_REGEX: string;
-
-        /**
-         * The minimum length of a timezone specification string
-         */
-        var EDAM_TIMEZONE_LEN_MIN: number;
-
-        /**
-         * The maximum length of a timezone specification string
-         */
-        var EDAM_TIMEZONE_LEN_MAX: number;
-
-        /**
-         * Any timezone string given to Evernote must match the provided pattern.
-         * This permits either a locale-based standard timezone or a GMT offset.
-         * E.g.:<ul>
-         *        <li>America/Los_Angeles</li>
-         *        <li>GMT+08:00</li>
-         * </ul>
-         */
-        var EDAM_TIMEZONE_REGEX: string;
-
-        /**
-         * The minimum length of any MIME type string given to Evernote
-         */
-        var EDAM_MIME_LEN_MIN: number;
-
-        /**
-         * The maximum length of any MIME type string given to Evernote
-         */
-        var EDAM_MIME_LEN_MAX: number;
-
-        /**
-         * Any MIME type string given to Evernote must match the provided pattern.
-         * E.g.:    image/gif
-         */
-        var EDAM_MIME_REGEX: string;
-
-        /**
-         * Canonical MIME type string for GIF image resources
-         */
-        var EDAM_MIME_TYPE_GIF: string;
-
-        /**
-         * Canonical MIME type string for JPEG image resources
-         */
-        var EDAM_MIME_TYPE_JPEG: string;
-
-        /**
-         * Canonical MIME type string for PNG image resources
-         */
-        var EDAM_MIME_TYPE_PNG: string;
-
-        /**
-         * Canonical MIME type string for WAV audio resources
-         */
-        var EDAM_MIME_TYPE_WAV: string;
-
-        /**
-         * Canonical MIME type string for MP3 audio resources
-         */
-        var EDAM_MIME_TYPE_MP3: string;
-
-        /**
-         * Canonical MIME type string for AMR audio resources
-         */
-        var EDAM_MIME_TYPE_AMR: string;
-
-        /**
-         * Canonical MIME type string for AAC audio resources
-         */
-        var EDAM_MIME_TYPE_AAC: string;
-
-        /**
-         * Canonical MIME type string for MP4 audio resources
-         */
-        var EDAM_MIME_TYPE_M4A: string;
-
-        /**
-         * Canonical MIME type string for MP4 video resources
-         */
-        var EDAM_MIME_TYPE_MP4_VIDEO: string;
-
-        /**
-         * Canonical MIME type string for Evernote Ink resources
-         */
-        var EDAM_MIME_TYPE_INK: string;
-
-        /**
-         * Canonical MIME type string for PDF resources
-         */
-        var EDAM_MIME_TYPE_PDF: string;
-
-        /**
-         * MIME type used for attachments of an unspecified type
-         */
-        var EDAM_MIME_TYPE_DEFAULT: string;
-
-        /**
-         * The set of resource MIME types that are expected to be handled
-         * correctly by all of the major Evernote client applications.
-         */
-        var EDAM_MIME_TYPES: string[];
-
-        /**
-         * The set of MIME types that Evernote will parse and index for
-         * searching. With exception of images, and PDFs, which are
-         * handled in a different way.
-         */
-        var EDAM_INDEXABLE_RESOURCE_MIME_TYPES: string[];
-
-        /**
-         * The minimum length of a user search query string in Unicode chars
-         */
-        var EDAM_SEARCH_QUERY_LEN_MIN: number;
-
-        /**
-         * The maximum length of a user search query string in Unicode chars
-         */
-        var EDAM_SEARCH_QUERY_LEN_MAX: number;
-
-        /**
-         * Search queries must match the provided pattern.    This is used for
-         * both ad-hoc queries and SavedSearch.query fields.
-         * This excludes all control characters and line/paragraph separators.
-         */
-        var EDAM_SEARCH_QUERY_REGEX: string;
-
-        /**
-         * The exact length of a MD5 hash checksum, in binary bytes.
-         * This is the exact length that must be matched for any binary hash
-         * value.
-         */
-        var EDAM_HASH_LEN: number;
-
-        /**
-         * The minimum length of an Evernote username
-         */
-        var EDAM_USER_USERNAME_LEN_MIN: number;
-
-        /**
-         * The maximum length of an Evernote username
-         */
-        var EDAM_USER_USERNAME_LEN_MAX: number;
-
-        /**
-         * Any Evernote User.username field must match this pattern.    This
-         * restricts usernames to a format that could permit use as a domain
-         * name component.    E.g. "username.whatever.evernote.com"
-         */
-        var EDAM_USER_USERNAME_REGEX: string;
-
-        /**
-         * Minimum length of the User.name field
-         */
-        var EDAM_USER_NAME_LEN_MIN: number;
-
-        /**
-         * Maximum length of the User.name field
-         */
-        var EDAM_USER_NAME_LEN_MAX: number;
-
-        /**
-         * The User.name field must match this pattern, which excludes line
-         * endings and control characters.
-         */
-        var EDAM_USER_NAME_REGEX: string;
-
-        /**
-         * The minimum length of a Tag.name, in Unicode characters
-         */
-        var EDAM_TAG_NAME_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Tag.name, in Unicode characters
-         */
-        var EDAM_TAG_NAME_LEN_MAX: number;
-
-        /**
-         * All Tag.name fields must match this pattern.
-         * This excludes control chars, commas or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_TAG_NAME_REGEX: string;
-
-        /**
-         * The minimum length of a Note.title, in Unicode characters
-         */
-        var EDAM_NOTE_TITLE_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Note.title, in Unicode characters
-         */
-        var EDAM_NOTE_TITLE_LEN_MAX: number;
-
-        /**
-         * All Note.title fields must match this pattern.
-         * This excludes control chars or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_NOTE_TITLE_REGEX: string;
-
-        /**
-         * Minimum length of a Note.content field.
-         * Note.content fields must comply with the ENML DTD.
-         */
-        var EDAM_NOTE_CONTENT_LEN_MIN: number;
-
-        /**
-         * Maximum length of a Note.content field
-         * Note.content fields must comply with the ENML DTD.
-         */
-        var EDAM_NOTE_CONTENT_LEN_MAX: number;
-
-        /**
-         * Minimum length of an application name, which is the key in an
-         * applicationData LazyMap found in entities such as Resources and
-         * Notes.
-         */
-        var EDAM_APPLICATIONDATA_NAME_LEN_MIN: number;
-
-        /**
-         * Maximum length of an application name, which is the key in an
-         * applicationData LazyMap found in entities such as Resources and
-         * Notes.
-         */
-        var EDAM_APPLICATIONDATA_NAME_LEN_MAX: number;
-
-        /**
-         * Minimum length of an applicationData value in a LazyMap, found
-         * in entities such as Resources and Notes.
-         */
-        var EDAM_APPLICATIONDATA_VALUE_LEN_MIN: number;
-
-        /**
-         * Maximum length of an applicationData value in a LazyMap, found
-         * in entities such as Resources and Notes.    Note, however, that
-         * the sum of the size of hte key and value is constrained by
-         * EDAM_APPLICATIONDATA_ENTRY_LEN_MAX, so the maximum length, in
-         * practice, depends upon the key value being used.
-         */
-        var EDAM_APPLICATIONDATA_VALUE_LEN_MAX: number;
-
-        /**
-         * The total length of an entry in an applicationData LazyMap, which
-         * is the sum of the length of the key and the value for the entry.
-         */
-        var EDAM_APPLICATIONDATA_ENTRY_LEN_MAX: number;
-
-        /**
-         * An application name must match this regex.    An application
-         * name is the key portion of an entry in an applicationData
-         * map as found in entities such as Resources and Notes.
-         * Note that even if both the name and value regexes match,
-         * it is still necessary to check the sum of the lengths
-         * against EDAM_APPLICATIONDATA_ENTRY_LEN_MAX.
-         */
-        var EDAM_APPLICATIONDATA_NAME_REGEX: string;
-
-        /**
-         * An applicationData map value must match this regex.
-         * Note that even if both the name and value regexes match,
-         * it is still necessary to check the sum of the lengths
-         * against EDAM_APPLICATIONDATA_ENTRY_LEN_MAX.
-         */
-        var EDAM_APPLICATIONDATA_VALUE_REGEX: string;
-
-        /**
-         * The minimum length of a Notebook.name, in Unicode characters
-         */
-        var EDAM_NOTEBOOK_NAME_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Notebook.name, in Unicode characters
-         */
-        var EDAM_NOTEBOOK_NAME_LEN_MAX: number;
-
-        /**
-         * All Notebook.name fields must match this pattern.
-         * This excludes control chars or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_NOTEBOOK_NAME_REGEX: string;
-
-        /**
-         * The minimum length of a Notebook.stack, in Unicode characters
-         */
-        var EDAM_NOTEBOOK_STACK_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Notebook.stack, in Unicode characters
-         */
-        var EDAM_NOTEBOOK_STACK_LEN_MAX: number;
-
-        /**
-         * All Notebook.stack fields must match this pattern.
-         * This excludes control chars or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_NOTEBOOK_STACK_REGEX: string;
-
-        /**
-         * The minimum length of a public notebook URI component
-         */
-        var EDAM_PUBLISHING_URI_LEN_MIN: number;
-
-        /**
-         * The maximum length of a public notebook URI component
-         */
-        var EDAM_PUBLISHING_URI_LEN_MAX: number;
-
-        /**
-         * A public notebook URI component must match the provided pattern
-         */
-        var EDAM_PUBLISHING_URI_REGEX: string;
-
-        /**
-         * The set of strings that may not be used as a publishing URI
-         */
-        var EDAM_PUBLISHING_URI_PROHIBITED: string[];
-
-        /**
-         * The minimum length of a Publishing.publicDescription field.
-         */
-        var EDAM_PUBLISHING_DESCRIPTION_LEN_MIN: number;
-
-        /**
-         * The maximum length of a Publishing.publicDescription field.
-         */
-        var EDAM_PUBLISHING_DESCRIPTION_LEN_MAX: number;
-
-        /**
-         * Any public notebook's Publishing.publicDescription field must match
-         * this pattern.
-         * No control chars or line/paragraph separators, and can't start or
-         * end with whitespace.
-         */
-        var EDAM_PUBLISHING_DESCRIPTION_REGEX: string;
-
-        /**
-         * The minimum length of a SavedSearch.name field
-         */
-        var EDAM_SAVED_SEARCH_NAME_LEN_MIN: number;
-
-        /**
-         * The maximum length of a SavedSearch.name field
-         */
-        var EDAM_SAVED_SEARCH_NAME_LEN_MAX: number;
-
-        /**
-         * SavedSearch.name fields must match this pattern.
-         * No control chars or line/paragraph separators, and can't start or
-         * end with whitespace.
-         */
-        var EDAM_SAVED_SEARCH_NAME_REGEX: string;
-
-        /**
-         * The minimum length of an Evernote user password
-         */
-        var EDAM_USER_PASSWORD_LEN_MIN: number;
-
-        /**
-         * The maximum length of an Evernote user password
-         */
-        var EDAM_USER_PASSWORD_LEN_MAX: number;
-
-        /**
-         * Evernote user passwords must match this regular expression
-         */
-        var EDAM_USER_PASSWORD_REGEX: string;
-
-        /**
-         * The maximum length of an Evernote Business URI
-         */
-        var EDAM_BUSINESS_URI_LEN_MAX: number;
-
-        /**
-         * The maximum number of Tags per Note
-         */
-        var EDAM_NOTE_TAGS_MAX: number;
-
-        /**
-         * The maximum number of Resources per Note
-         */
-        var EDAM_NOTE_RESOURCES_MAX: number;
-
-        /**
-         * Maximum number of Tags per account
-         */
-        var EDAM_USER_TAGS_MAX: number;
-
-        /**
-         * Maximum number of Tags per business account.
-         */
-        var EDAM_BUSINESS_TAGS_MAX: number;
-
-        /**
-         * Maximum number of SavedSearches per account
-         */
-        var EDAM_USER_SAVED_SEARCHES_MAX: number;
-
-        /**
-         * Maximum number of Notes per user
-         */
-        var EDAM_USER_NOTES_MAX: number;
-
-        /**
-         * Maximum number of Notes per business account
-         */
-        var EDAM_BUSINESS_NOTES_MAX: number;
-
-        /**
-         * Maximum number of Notebooks per user
-         */
-        var EDAM_USER_NOTEBOOKS_MAX: number;
-
-        /**
-         * Maximum number of Notebooks in a business account
-         */
-        var EDAM_BUSINESS_NOTEBOOKS_MAX: number;
-
-        /**
-         * Maximum number of recent email addresses that are maintained
-         * (see UserAttributes.recentMailedAddresses)
-         */
-        var EDAM_USER_RECENT_MAILED_ADDRESSES_MAX: number;
-
-        /**
-         * The number of emails of any type that can be sent by a user with a Free
-         * account from the service per day.    If an email is sent to two different
-         * recipients, this counts as two emails.
-         */
-        var EDAM_USER_MAIL_LIMIT_DAILY_FREE: number;
-
-        /**
-         * The number of emails of any type that can be sent by a user with a Premium
-         * account from the service per day.    If an email is sent to two different
-         * recipients, this counts as two emails.
-         */
-        var EDAM_USER_MAIL_LIMIT_DAILY_PREMIUM: number;
-
-        /**
-         * The number of bytes of new data that may be uploaded to a Free user's
-         * account each month.
-         */
-        var EDAM_USER_UPLOAD_LIMIT_FREE: number;
-
-        /**
-         * The number of bytes of new data that may be uploaded to a Premium user's
-         * account each month.
-         */
-        var EDAM_USER_UPLOAD_LIMIT_PREMIUM: number;
-
-        /**
-         * The number of bytes of new data that may be uploaded to a Business user's
-         * personal account each month. Note that content uploaded into the Business
-         * notebooks by the user does not count against this limit.
-         */
-        var EDAM_USER_UPLOAD_LIMIT_BUSINESS: number;
-
-        /**
-         * Maximum total size of a Note that can be added to a Free account.
-         * The size of a note is calculated as:
-         * ENML content length (in Unicode characters) plus the sum of all resource
-         * sizes (in bytes).
-         */
-        var EDAM_NOTE_SIZE_MAX_FREE: number;
-
-        /**
-         * Maximum total size of a Note that can be added to a Premium account.
-         * The size of a note is calculated as:
-         * ENML content length (in Unicode characters) plus the sum of all resource
-         * sizes (in bytes).
-         */
-        var EDAM_NOTE_SIZE_MAX_PREMIUM: number;
-
-        /**
-         * Maximum size of a resource, in bytes, for Free accounts
-         */
-        var EDAM_RESOURCE_SIZE_MAX_FREE: number;
-
-        /**
-         * Maximum size of a resource, in bytes, for Premium accounts
-         */
-        var EDAM_RESOURCE_SIZE_MAX_PREMIUM: number;
-
-        /**
-         * Maximum number of linked notebooks per account, for a free
-         * account.
-         */
-        var EDAM_USER_LINKED_NOTEBOOK_MAX: number;
-
-        /**
-         * Maximum number of linked notebooks per account, for a premium
-         * account.    Users who are part of an active business are also
-         * covered under "premium".
-         */
-        var EDAM_USER_LINKED_NOTEBOOK_MAX_PREMIUM: number;
-
-        /**
-         * Maximum number of shared notebooks per notebook
-         */
-        var EDAM_NOTEBOOK_SHARED_NOTEBOOK_MAX: number;
-
-        /**
-         * The minimum length of the content class attribute of a note.
-         */
-        var EDAM_NOTE_CONTENT_CLASS_LEN_MIN: number;
-
-        /**
-         * The maximum length of the content class attribute of a note.
-         */
-        var EDAM_NOTE_CONTENT_CLASS_LEN_MAX: number;
-
-        /**
-         * The regular expression that the content class of a note must match
-         * to be valid.
-         */
-        var EDAM_NOTE_CONTENT_CLASS_REGEX: string;
-
-        /**
-         * The content class prefix used for all notes created by Evernote Hello.
-         * This prefix can be used to assemble individual content class strings,
-         * or can be used to create a wildcard search to get all notes created by
-         * Hello. When performing a wildcard search via filtered sync chunks or
-         * search strings, the * character must be appended to this constant.
-         */
-        var EDAM_HELLO_APP_CONTENT_CLASS_PREFIX: string;
-
-        /**
-         * The content class prefix used for all notes created by Evernote Food.
-         * This prefix can be used to assemble individual content class strings,
-         * or can be used to create a wildcard search to get all notes created by
-         * Food. When performing a wildcard search via filtered sync chunks or
-         * search strings, the * character must be appended to this constant.
-         */
-        var EDAM_FOOD_APP_CONTENT_CLASS_PREFIX: string;
-
-        /**
-         * The content class prefix used for structured notes created by Evernote
-         * Hello that represents an encounter with a person. When performing a
-         * wildcard search via filtered sync chunks or search strings, the *
-         * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_HELLO_ENCOUNTER: string;
-
-        /**
-         * The content class prefix used for structured notes created by Evernote
-         * Hello that represents the user's profile. When performing a
-         * wildcard search via filtered sync chunks or search strings, the *
-         * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_HELLO_PROFILE: string;
-
-        /**
-         * The content class prefix used for structured notes created by
-         * Evernote Food that captures the experience of a particular meal.
-         * When performing a wildcard search via filtered sync chunks or search
-         * strings, the * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_FOOD_MEAL: string;
-
-        /**
-         * The content class prefix used for structured notes created by Evernote
-         * Skitch. When performing a wildcard search via filtered sync chunks
-         * or search strings, the * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_SKITCH_PREFIX: string;
-
-        /**
-         * The content class value used for structured image notes created by Evernote
-         * Skitch.
-         */
-        var EDAM_CONTENT_CLASS_SKITCH: string;
-
-        /**
-         * The content class value used for structured PDF notes created by Evernote
-         * Skitch.
-         */
-        var EDAM_CONTENT_CLASS_SKITCH_PDF: string;
-
-        /**
-         * The content class prefix used for structured notes created by Evernote
-         * Penultimate. When performing a wildcard search via filtered sync chunks
-         * or search strings, the * character must be appended to this constant.
-         */
-        var EDAM_CONTENT_CLASS_PENULTIMATE_PREFIX: string;
-
-        /**
-         * The content class value used for structured notes created by Evernote
-         * Penultimate that represents a Penultimate notebook.
-         */
-        var EDAM_CONTENT_CLASS_PENULTIMATE_NOTEBOOK: string;
-
-        /**
-         * The minimum length of the plain text in a findRelated query, assuming that
-         * plaintext is being provided.
-         */
-        var EDAM_RELATED_PLAINTEXT_LEN_MIN: number;
-
-        /**
-         * The maximum length of the plain text in a findRelated query, assuming that
-         * plaintext is being provided.
-         */
-        var EDAM_RELATED_PLAINTEXT_LEN_MAX: number;
-
-        /**
-         * The maximum number of notes that will be returned from a findRelated()
-         * query.
-         */
-        var EDAM_RELATED_MAX_NOTES: number;
-
-        /**
-         * The maximum number of notebooks that will be returned from a findRelated()
-         * query.
-         */
-        var EDAM_RELATED_MAX_NOTEBOOKS: number;
-
-        /**
-         * The maximum number of tags that will be returned from a findRelated() query.
-         */
-        var EDAM_RELATED_MAX_TAGS: number;
-
-        /**
-         * The minimum length, in Unicode characters, of a description for a business
-         * notebook.
-         */
-        var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MIN: number;
-
-        /**
-         * The maximum length, in Unicode characters, of a description for a business
-         * notebook.
-         */
-        var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MAX: number;
-
-        /**
-         * All business notebook descriptions must match this pattern.
-         * This excludes control chars or line/paragraph separators.
-         * The string may not begin or end with whitespace.
-         */
-        var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_REGEX: string;
-
-        /**
-         * The maximum length of a business phone number.
-         */
-        var EDAM_BUSINESS_PHONE_NUMBER_LEN_MAX: number;
-
-        /**
-         * Minimum length of a preference name
-         */
-        var EDAM_PREFERENCE_NAME_LEN_MIN: number;
-
-        /**
-         * Maximum length of a preference name
-         */
-        var EDAM_PREFERENCE_NAME_LEN_MAX: number;
-
-        /**
-         * Minimum length of a preference value
-         */
-        var EDAM_PREFERENCE_VALUE_LEN_MIN: number;
-
-        /**
-         * Maximum length of a preference value
-         */
-        var EDAM_PREFERENCE_VALUE_LEN_MAX: number;
-
-        /**
-         * Maximum number of name/value pairs allowed
-         */
-        var EDAM_MAX_PREFERENCES: number;
-
-        /**
-         * Maximum number of values per preference name
-         */
-        var EDAM_MAX_VALUES_PER_PREFERENCE: number;
-
-        /**
-         * A preference name must match this regex.
-         */
-        var EDAM_PREFERENCE_NAME_REGEX: string;
-
-        /**
-         * A preference value must match this regex.
-         */
-        var EDAM_PREFERENCE_VALUE_REGEX: string;
-
-        /**
-         * The name of the preferences entry that contains shortcuts.
-         */
-        var EDAM_PREFERENCE_SHORTCUTS: string;
-
-        /**
-         * The maximum number of shortcuts that a user may have.
-         */
-        var EDAM_PREFERENCE_SHORTCUTS_MAX_VALUES: number;
-
-        /**
-         * Maximum length of the device identifier string associated with long sessions.
-         */
-        var EDAM_DEVICE_ID_LEN_MAX: number;
-
-        /**
-         * Regular expression for device identifier strings associated with long sessions.
-         */
-        var EDAM_DEVICE_ID_REGEX: string;
-
-        /**
-         * Maximum length of the device description string associated with long sessions.
-         */
-        var EDAM_DEVICE_DESCRIPTION_LEN_MAX: number;
-
-        /**
-         * Regular expression for device description strings associated with long sessions.
-         */
-        var EDAM_DEVICE_DESCRIPTION_REGEX: string;
-
-        /**
-         * Maximum number of search suggestions that can be returned
-         */
-        var EDAM_SEARCH_SUGGESTIONS_MAX: number;
-
-        /**
-         * Maximum length of the search suggestion prefix
-         */
-        var EDAM_SEARCH_SUGGESTIONS_PREFIX_LEN_MAX: number;
-
-        /**
-         * Minimum length of the search suggestion prefix
-         */
-        var EDAM_SEARCH_SUGGESTIONS_PREFIX_LEN_MIN: number;
-        class NoteStoreClient {
-            seqid: number;
-
-            /**
-             * Asks the NoteStore to provide information about the status of the user
-             * account corresponding to the provided authentication token.
-             */
-            getSyncState(cb: Callback<SyncState>): void;
-
-            /**
-             * Asks the NoteStore to provide information about the status of the user
-             * account corresponding to the provided authentication token.
-             * This version of 'getSyncState' allows the client to upload coarse-
-             * grained usage metrics to the service.
-             *
-             * @param clientMetrics    see the documentation of the ClientUsageMetrics
-             *     structure for an explanation of the fields that clients can pass to
-             *     the service.
-             */
-            getSyncStateWithMetrics(clientMetrics: ClientUsageMetrics, cb: Callback<SyncState>): void;
-
-            /**
-             * Asks the NoteStore to provide the state of the account in order of
-             * last modification.    This request retrieves one block of the server's
-             * state so that a client can make several small requests against a large
-             * account rather than getting the entire state in one big message.
-             * This call gives fine-grained control of the data that will
-             * be received by a client by omitting data elements that a client doesn't
-             * need. This may reduce network traffic and sync times.
-             *
-             * @param afterUSN
-             *     The client can pass this value to ask only for objects that
-             *     have been updated after a certain point.    This allows the client to
-             *     receive updates after its last checkpoint rather than doing a full
-             *     synchronization on every pass.    The default value of "0" indicates
-             *     that the client wants to get objects from the start of the account.
-             *
-             * @param maxEntries
-             *     The maximum number of modified objects that should be
-             *     returned in the result SyncChunk.    This can be used to limit the size
-             *     of each individual message to be friendly for network transfer.
-             *
-             * @param filter
-             *     The caller must set some of the flags in this structure to specify which
-             *     data types should be returned during the synchronization.    See
-             *     the SyncChunkFilter structure for information on each flag.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "afterUSN" - if negative
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "maxEntries" - if less than 1
-             *     </li>
-             * </ul>
-             */
-            getFilteredSyncChunk(afterUSN: number, maxEntries: number, filter: SyncChunkFilter, cb: Callback<SyncState>): void;
-
-            /**
-             * Asks the NoteStore to provide information about the status of a linked
-             * notebook that has been shared with the caller, or that is public to the
-             * world.
-             * This will return a result that is similar to getSyncState, but may omit
-             * SyncState.uploaded if the caller doesn't have permission to write to
-             * the linked notebook.
-             *
-             * This function must be called on the shard that owns the referenced
-             * notebook.    (I.e. the shardId in /shard/shardId/edam/note must be the
-             * same as LinkedNotebook.shardId.)
-             *
-             * @param authenticationToken
-             *     This should be an authenticationToken for the guest who has received
-             *     the invitation to the share.    (I.e. this should not be the result of
-             *     NoteStore.authenticateToSharedNotebook)
-             *
-             * @param linkedNotebook
-             *     This structure should contain identifying information and permissions
-             *     to access the notebook in question.
-             */
-            getLinkedNotebookSyncState(linkedNotebook: LinkedNotebook, cb: Callback<SyncState>): void;
-
-            /**
-             * Asks the NoteStore to provide information about the contents of a linked
-             * notebook that has been shared with the caller, or that is public to the
-             * world.
-             * This will return a result that is similar to getSyncChunk, but will only
-             * contain entries that are visible to the caller.    I.e. only that particular
-             * Notebook will be visible, along with its Notes, and Tags on those Notes.
-             *
-             * This function must be called on the shard that owns the referenced
-             * notebook.    (I.e. the shardId in /shard/shardId/edam/note must be the
-             * same as LinkedNotebook.shardId.)
-             *
-             * @param authenticationToken
-             *     This should be an authenticationToken for the guest who has received
-             *     the invitation to the share.    (I.e. this should not be the result of
-             *     NoteStore.authenticateToSharedNotebook)
-             *
-             * @param linkedNotebook
-             *     This structure should contain identifying information and permissions
-             *     to access the notebook in question.    This must contain the valid fields
-             *     for either a shared notebook (e.g. shareKey)
-             *     or a public notebook (e.g. username, uri)
-             *
-             * @param afterUSN
-             *     The client can pass this value to ask only for objects that
-             *     have been updated after a certain point.    This allows the client to
-             *     receive updates after its last checkpoint rather than doing a full
-             *     synchronization on every pass.    The default value of "0" indicates
-             *     that the client wants to get objects from the start of the account.
-             *
-             * @param maxEntries
-             *     The maximum number of modified objects that should be
-             *     returned in the result SyncChunk.    This can be used to limit the size
-             *     of each individual message to be friendly for network transfer.
-             *     Applications should not request more than 256 objects at a time,
-             *     and must handle the case where the service returns less than the
-             *     requested number of objects in a given request even though more
-             *     objects are available on the service.
-             *
-             * @param fullSyncOnly
-             *     If true, then the client only wants initial data for a full sync.
-             *     In this case, the service will not return any expunged objects,
-             *     and will not return any Resources, since these are also provided
-             *     in their corresponding Notes.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "afterUSN" - if negative
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "maxEntries" - if less than 1
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "LinkedNotebook" - if the provided information doesn't match any
-             *         valid notebook
-             *     </li>
-             *     <li> "LinkedNotebook.uri" - if the provided public URI doesn't match any
-             *         valid notebook
-             *     </li>
-             *     <li> "SharedNotebook.id" - if the provided information indicates a
-             *            shared notebook that no longer exists
-             *     </li>
-             * </ul>
-             */
-            getLinkedNotebookSyncChunk(linkedNotebook: LinkedNotebook, afterUSN: number, maxEntries: number, fullSyncOnly: boolean, cb: Callback<SyncChunk>): void;
-
-            /**
-             * Returns a list of all of the notebooks in the account.
-             */
-            listNotebooks(cb: Callback<Notebook[]>): void;
-
-            /**
-             * Returns the current state of the notebook with the provided GUID.
-             * The notebook may be active or deleted (but not expunged).
-             *
-             * @param guid
-             *     The GUID of the notebook to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Notebook.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Notebook" - private notebook, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - tag not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNotebook(guid: string, cb: Callback<Notebook>): void;
-
-            /**
-             * Returns the notebook that should be used to store new notes in the
-             * user's account when no other notebooks are specified.
-             */
-            getDefaultNotebook(cb: Callback<Notebook>): void;
-
-            /**
-             * Asks the service to make a notebook with the provided name.
-             *
-             * @param notebook
-             *     The desired fields for the notebook must be provided on this
-             *     object.    The name of the notebook must be set, and either the 'active'
-             *     or 'defaultNotebook' fields may be set by the client at creation.
-             *     If a notebook exists in the account with the same name (via
-             *     case-insensitive compare), this will throw an EDAMUserException.
-             *
-             * @return
-             *     The newly created Notebook.    The server-side GUID will be
-             *     saved in this object's 'guid' field.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Notebook.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Notebook.stack" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Publishing.uri" - if publishing set but bad uri
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Publishing.publicDescription" - if too long
-             *     </li>
-             *     <li> DATA_CONFLICT "Notebook.name" - name already in use
-             *     </li>
-             *     <li> DATA_CONFLICT "Publishing.uri" - if URI already in use
-             *     </li>
-             *     <li> DATA_REQUIRED "Publishing.uri" - if publishing set but uri missing
-             *     </li>
-             *     <li> LIMIT_REACHED "Notebook" - at max number of notebooks
-             *     </li>
-             * </ul>
-             */
-            createNotebook(notebook: Notebook, cb: Callback<Notebook>): void;
-
-            /**
-             * Submits notebook changes to the service.    The provided data must include
-             * the notebook's guid field for identification.
-             *
-             * @param notebook
-             *     The notebook object containing the requested changes.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Notebook.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Notebook.stack" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Publishing.uri" - if publishing set but bad uri
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Publishing.publicDescription" - if too long
-             *     </li>
-             *     <li> DATA_CONFLICT "Notebook.name" - name already in use
-             *     </li>
-             *     <li> DATA_CONFLICT "Publishing.uri" - if URI already in use
-             *     </li>
-             *     <li> DATA_REQUIRED "Publishing.uri" - if publishing set but uri missing
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            updateNotebook(notebook: Notebook, cb: Callback<number>): void;
-
-            /**
-             * Permanently removes the notebook from the user's account.
-             * After this action, the notebook is no longer available for undeletion, etc.
-             * If the notebook contains any Notes, they will be moved to the current
-             * default notebook and moved into the trash (i.e. Note.active=false).
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The GUID of the notebook to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Notebook.guid" - if the parameter is missing
-             *     </li>
-             *     <li> LIMIT_REACHED "Notebook" - trying to expunge the last Notebook
-             *     </li>
-             *     <li> PERMISSION_DENIED "Notebook" - private notebook, user doesn't own
-             *     </li>
-             * </ul>
-             */
-            expungeNotebook(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Returns a list of the tags in the account.    Evernote does not support
-             * the undeletion of tags, so this will only include active tags.
-             */
-            listTags(cb: Callback<Tag[]>): void;
-
-            /**
-             * Returns a list of the tags that are applied to at least one note within
-             * the provided notebook.    If the notebook is public, the authenticationToken
-             * may be ignored.
-             *
-             * @param notebookGuid
-             *        the GUID of the notebook to use to find tags
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - notebook not found by GUID
-             *     </li>
-             * </ul>
-             */
-            listTagsByNotebook(notebookGuid: string, cb: Callback<Tag[]>): void;
-
-            /**
-             * Returns the current state of the Tag with the provided GUID.
-             *
-             * @param guid
-             *     The GUID of the tag to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Tag" - private Tag, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.guid" - tag not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getTag(guid: string, cb: Callback<Tag>): void;
-
-            /**
-             * Asks the service to make a tag with a set of information.
-             *
-             * @param tag
-             *     The desired list of fields for the tag are specified in this
-             *     object.    The caller must specify the tag name, and may provide
-             *     the parentGUID.
-             *
-             * @return
-             *     The newly created Tag.    The server-side GUID will be
-             *     saved in this object.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Tag.parentGuid" - malformed GUID
-             *     </li>
-             *     <li> DATA_CONFLICT "Tag.name" - name already in use
-             *     </li>
-             *     <li> LIMIT_REACHED "Tag" - at max number of tags
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.parentGuid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            createTag(tag: Tag, cb: Callback<Tag>): void;
-
-            /**
-             * Submits tag changes to the service.    The provided data must include
-             * the tag's guid field for identification.    The service will apply
-             * updates to the following tag fields:    name, parentGuid
-             *
-             * @param tag
-             *     The tag object containing the requested changes.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Tag.parentGuid" - malformed GUID
-             *     </li>
-             *     <li> DATA_CONFLICT "Tag.name" - name already in use
-             *     </li>
-             *     <li> DATA_CONFLICT "Tag.parentGuid" - can't set parent: circular
-             *     </li>
-             *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.guid" - tag not found, by GUID
-             *     </li>
-             *     <li> "Tag.parentGuid" - parent not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            updateTag(tag: Tag, cb: Callback<number>): void;
-
-            /**
-             * Removes the provided tag from every note that is currently tagged with
-             * this tag.    If this operation is successful, the tag will still be in
-             * the account, but it will not be tagged on any notes.
-             *
-             * This function is not indended for use by full synchronizing clients, since
-             * it does not provide enough result information to the client to reconcile
-             * the local state without performing a follow-up sync from the service.    This
-             * is intended for "thin clients" that need to efficiently support this as
-             * a UI operation.
-             *
-             * @param guid
-             *     The GUID of the tag to remove from all notes.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.guid" - if the guid parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.guid" - tag not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            untagAll(guid: string, cb: Callback<void>): void;
-
-            /**
-             * Permanently deletes the tag with the provided GUID, if present.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The GUID of the tag to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Tag.guid" - if the guid parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Tag.guid" - tag not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            expungeTag(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Returns a list of the searches in the account.    Evernote does not support
-             * the undeletion of searches, so this will only include active searches.
-             */
-            listSearches(cb: Callback<SavedSearch[]>): void;
-
-            /**
-             * Returns the current state of the search with the provided GUID.
-             *
-             * @param guid
-             *     The GUID of the search to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "SavedSearch" - private Tag, user doesn't own
-             *     </li>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SavedSearch.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getSearch(guid: string, cb: Callback<SavedSearch>): void;
-
-            /**
-             * Asks the service to make a saved search with a set of information.
-             *
-             * @param search
-             *     The desired list of fields for the search are specified in this
-             *     object. The caller must specify the name and query for the
-             *     search, and may optionally specify a search scope.
-             *     The SavedSearch.format field is ignored by the service.
-             *
-             * @return
-             *     The newly created SavedSearch.    The server-side GUID will be
-             *     saved in this object.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.query" - invalid length
-             *     </li>
-             *     <li> DATA_CONFLICT "SavedSearch.name" - name already in use
-             *     </li>
-             *     <li> LIMIT_REACHED "SavedSearch" - at max number of searches
-             *     </li>
-             * </ul>
-             */
-            createSearch(search: SavedSearch, cb: Callback<SavedSearch>): void;
-
-            /**
-             * Submits search changes to the service. The provided data must include
-             * the search's guid field for identification. The service will apply
-             * updates to the following search fields: name, query, and scope.
-             *
-             * @param search
-             *     The search object containing the requested changes.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.query" - invalid length
-             *     </li>
-             *     <li> DATA_CONFLICT "SavedSearch.name" - name already in use
-             *     </li>
-             *     <li> PERMISSION_DENIED "SavedSearch" - user doesn't own tag
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SavedSearch.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            updateSearch(search: SavedSearch, cb: Callback<number>): number;
-
-            /**
-             * Permanently deletes the saved search with the provided GUID, if present.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The GUID of the search to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "SavedSearch.guid" - if the guid parameter is empty
-             *     </li>
-             *     <li> PERMISSION_DENIED "SavedSearch" - user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SavedSearch.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            expungeSearch(guid: string, cb: Callback<number>): void;
-
-            /**
-             * DEPRECATED. Use findNotesMetadata.
-             */
-            findNotes(filter: NoteFilter, offset: number, maxNotes: number, cb: Callback<NoteList>): void;
-
-            /**
-             * Finds the position of a note within a sorted subset of all of the user's
-             * notes. This may be useful for thin clients that are displaying a paginated
-             * listing of a large account, which need to know where a particular note
-             * sits in the list without retrieving all notes first.
-             *
-             * @param authenticationToken
-             *     Must be a valid token for the user's account unless the NoteFilter
-             *     'notebookGuid' is the GUID of a public notebook.
-             *
-             * @param filter
-             *     The list of criteria that will constrain the notes to be returned.
-             *
-             * @param guid
-             *     The GUID of the note to be retrieved.
-             *
-             * @return
-             *     If the note with the provided GUID is found within the matching note
-             *     list, this will return the offset of that note within that list (where
-             *     the first offset is 0).    If the note is not found within the set of
-             *     notes, this will return -1.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "offset" - not between 0 and EDAM_USER_NOTES_MAX
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "maxNotes" - not between 0 and EDAM_USER_NOTES_MAX
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
-             *     </li>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            findNoteOffset(filter: NoteFilter, guid: string, cb: Callback<number>): void;
-
-            /**
-             * Used to find the high-level information about a set of the notes from a
-             * user's account based on various criteria specified via a NoteFilter object.
-             * <p/>
-             * Web applications that wish to periodically check for new content in a user's
-             * Evernote account should consider using webhooks instead of polling this API.
-             * See http://dev.evernote.com/documentation/cloud/chapters/polling_notification.php
-             * for more information.
-             *
-             * @param authenticationToken
-             *     Must be a valid token for the user's account unless the NoteFilter
-             *     'notebookGuid' is the GUID of a public notebook.
-             *
-             * @param filter
-             *     The list of criteria that will constrain the notes to be returned.
-             *
-             * @param offset
-             *     The numeric index of the first note to show within the sorted
-             *     results.    The numbering scheme starts with "0".    This can be used for
-             *     pagination.
-             *
-             * @param maxNotes
-             *     The mximum notes to return in this query.    The service will return a set
-             *     of notes that is no larger than this number, but may return fewer notes
-             *     if needed.    The NoteList.totalNotes field in the return value will
-             *     indicate whether there are more values available after the returned set.
-             *
-             * @param resultSpec
-             *     This specifies which information should be returned for each matching
-             *     Note. The fields on this structure can be used to eliminate data that
-             *     the client doesn't need, which will reduce the time and bandwidth
-             *     to receive and process the reply.
-             *
-             * @return
-             *     The list of notes that match the criteria.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "offset" - not between 0 and EDAM_USER_NOTES_MAX
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "maxNotes" - not between 0 and EDAM_USER_NOTES_MAX
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            findNotesMetadata(filter: NoteFilter, offset: number, maxNotes: number, resultSpec: NotesMetadataResultSpec, cb: Callback<NotesMetadataList>): void;
-
-            /**
-             * This function is used to determine how many notes are found for each
-             * notebook and tag in the user's account, given a current set of filter
-             * parameters that determine the current selection.    This function will
-             * return a structure that gives the note count for each notebook and tag
-             * that has at least one note under the requested filter.    Any notebook or
-             * tag that has zero notes in the filtered set will not be listed in the
-             * reply to this function (so they can be assumed to be 0).
-             *
-             * @param authenticationToken
-             *     Must be a valid token for the user's account unless the NoteFilter
-             *     'notebookGuid' is the GUID of a public notebook.
-             *
-             * @param filter
-             *     The note selection filter that is currently being applied.    The note
-             *     counts are to be calculated with this filter applied to the total set
-             *     of notes in the user's account.
-             *
-             * @param withTrash
-             *     If true, then the NoteCollectionCounts.trashCount will be calculated
-             *     and supplied in the reply. Otherwise, the trash value will be omitted.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuids" - if any are malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
-             *     </li>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            findNoteCounts(filter: NoteFilter, withTrash: boolean, cb: Callback<NoteCollectionCounts>): void;
-
-            /**
-             * Returns the current state of the note in the service with the provided
-             * GUID.    The ENML contents of the note will only be provided if the
-             * 'withContent' parameter is true.    The service will include the meta-data
-             * for each resource in the note, but the binary contents of the resources
-             * and their recognition data will be omitted.
-             * If the Note is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).    The applicationData
-             * fields are returned as keysOnly.
-             *
-             * @param guid
-             *     The GUID of the note to be retrieved.
-             *
-             * @param withContent
-             *     If true, the note will include the ENML contents of its
-             *     'content' field.
-             *
-             * @param withResourcesData
-             *     If true, any Resource elements in this Note will include the binary
-             *     contents of their 'data' field's body.
-             *
-             * @param withResourcesRecognition
-             *     If true, any Resource elements will include the binary contents of the
-             *     'recognition' field's body if recognition data is present.
-             *
-             * @param withResourcesAlternateData
-             *     If true, any Resource elements in this Note will include the binary
-             *     contents of their 'alternateData' fields' body, if an alternate form
-             *     is present.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNote(guid: string, withContent: boolean, withResourcesData: boolean, withResourcesRecognition: boolean, withResourcesAlternateData: boolean, cb: Callback<Note>): void;
-
-            /**
-             * Get all of the application data for the note identified by GUID,
-             * with values returned within the LazyMap fullMap field.
-             * If there are no applicationData entries, then a LazyMap
-             * with an empty fullMap will be returned. If your application
-             * only needs to fetch its own applicationData entry, use
-             * getNoteApplicationDataEntry instead.
-             */
-            getNoteApplicationData(guid: string, cb: Callback<LazyMap>): void;
-
-            /**
-             * Get the value of a single entry in the applicationData map
-             * for the note identified by GUID.
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - note not found, by GUID</li>
-             *     <li> "NoteAttributes.applicationData.key" - note not found, by key</li>
-             * </ul>
-             */
-            getNoteApplicationDataEntry(guid: string, key: string, cb: Callback<string>): void;
-
-            /**
-             * Update, or create, an entry in the applicationData map for
-             * the note identified by guid.
-             */
-            setNoteApplicationDataEntry(guid: string, key: string, value: string, cb: Callback<number>): void;
-
-            /**
-             * Remove an entry identified by 'key' from the applicationData map for
-             * the note identified by 'guid'. Silently ignores an unset of a
-             * non-existing key.
-             */
-            unsetNoteApplicationDataEntry(guid: string, key: string, cb: Callback<number>): void;
-
-            /**
-             * Returns XHTML contents of the note with the provided GUID.
-             * If the Note is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the note to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNoteContent(guid: string, cb: Callback<string>): void;
-
-            /**
-             * Returns a block of the extracted plain text contents of the note with the
-             * provided GUID.    This text can be indexed for search purposes by a light
-             * client that doesn't have capabilities to extract all of the searchable
-             * text content from the note and its resources.
-             *
-             * If the Note is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the note to be retrieved.
-             *
-             * @param noteOnly
-             *     If true, this will only return the text extracted from the ENML contents
-             *     of the note itself.    If false, this will also include the extracted text
-             *     from any text-bearing resources (PDF, recognized images)
-             *
-             * @param tokenizeForIndexing
-             *     If true, this will break the text into cleanly separated and sanitized
-             *     tokens.    If false, this will return the more raw text extraction, with
-             *     its original punctuation, capitalization, spacing, etc.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNoteSearchText(guid: string, noteOnly: boolean, tokenizeForIndexing: boolean, cb: Callback<string>): void;
-
-            /**
-             * Returns a block of the extracted plain text contents of the resource with
-             * the provided GUID.    This text can be indexed for search purposes by a light
-             * client that doesn't have capability to extract all of the searchable
-             * text content from a resource.
-             *
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the resource to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getResourceSearchText(guid: string, cb: Callback<string>): void;
-
-            /**
-             * Returns a list of the names of the tags for the note with the provided
-             * guid.    This can be used with authentication to get the tags for a
-             * user's own note, or can be used without valid authentication to retrieve
-             * the names of the tags for a note in a public notebook.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getNoteTagNames(guid: string, cb: Callback<string[]>): void;
-
-            /**
-             * Asks the service to make a note with the provided set of information.
-             *
-             * @param note
-             *     A Note object containing the desired fields to be populated on
-             *     the service.
-             *
-             * @return
-             *     The newly created Note from the service.    The server-side
-             *     GUIDs for the Note and any Resources will be saved in this object.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.title" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Note.content" - invalid length for ENML content
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteAttributes.*" - bad resource string
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
-             *     </li>
-             *     <li> DATA_CONFLICT "Note.deleted" - deleted time set on active note
-             *     </li>
-             *     <li> DATA_REQUIRED "Resource.data" - resource data body missing
-             *     </li>
-             *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
-             *     </li>
-             *     <li> LIMIT_REACHED "Note" - at max number per account
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.size" - total note size too large
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.resources" - too many resources on Note
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.tagGuids" - too many Tags on Note
-             *     </li>
-             *     <li> LIMIT_REACHED "Resource.data.size" - resource too large
-             *     </li>
-             *     <li> LIMIT_REACHED "NoteAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note.notebookGuid" - NB not owned by user
-             *     </li>
-             *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Tag.name" - Note.tagNames was provided, and one
-             *         of the specified tags had an invalid length or pattern
-             *     </li>
-             *     <li> LIMIT_REACHED "Tag" - Note.tagNames was provided, and the required
-             *         new tags would exceed the maximum number per account
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.notebookGuid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            createNote(note: Note, cb: Callback<Note>): void;
-
-            /**
-             * Submit a set of changes to a note to the service.    The provided data
-             * must include the note's guid field for identification. The note's
-             * title must also be set.
-             *
-             * @param note
-             *     A Note object containing the desired fields to be populated on
-             *     the service. With the exception of the note's title and guid, fields
-             *     that are not being changed do not need to be set. If the content is not
-             *     being modified, note.content should be left unset. If the list of
-             *     resources is not being modified, note.resources should be left unset.
-             *
-             * @return
-             *     The metadata (no contents) for the Note on the server after the update
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.title" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Note.content" - invalid length for ENML body
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteAttributes.*" - bad resource string
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
-             *     </li>
-             *     <li> DATA_CONFLICT "Note.deleted" - deleted time set on active note
-             *     </li>
-             *     <li> DATA_REQUIRED "Resource.data" - resource data body missing
-             *     </li>
-             *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.tagGuids" - too many Tags on Note
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.resources" - too many resources on Note
-             *     </li>
-             *     <li> LIMIT_REACHED "Note.size" - total note size too large
-             *     </li>
-             *     <li> LIMIT_REACHED "Resource.data.size" - resource too large
-             *     </li>
-             *     <li> LIMIT_REACHED "NoteAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't own
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note.notebookGuid" - user doesn't own destination
-             *     </li>
-             *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Tag.name" - Note.tagNames was provided, and one
-             *         of the specified tags had an invalid length or pattern
-             *     </li>
-             *     <li> LIMIT_REACHED "Tag" - Note.tagNames was provided, and the required
-             *         new tags would exceed the maximum number per account
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - note not found, by GUID
-             *     </li>
-             *     <li> "Note.notebookGuid" - if notebookGuid provided, but not found
-             *     </li>
-             * </ul>
-             */
-            updateNote(note: Note, cb: Callback<Note>): void;
-
-            /**
-             * Moves the note into the trash. The note may still be undeleted, unless it
-             * is expunged.    This is equivalent to calling updateNote() after setting
-             * Note.active = false
-             *
-             * @param guid
-             *     The GUID of the note to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't have permission to
-             *                    update the note.
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_CONFLICT "Note.guid" - the note is already deleted
-             *     </li>
-             * </ul>
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            deleteNote(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Permanently removes a Note, and all of its Resources,
-             * from the service.
-             * <p/>
-             * NOTE: This function is not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The GUID of the note to delete.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            expungeNote(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Permanently removes a list of Notes, and all of their Resources, from
-             * the service.    This should be invoked with a small number of Note GUIDs
-             * (e.g. 100 or less) on each call.    To expunge a larger number of notes,
-             * call this method multiple times.    This should also be used to reduce the
-             * number of Notes in a notebook before calling expungeNotebook() or
-             * in the trash before calling expungeInactiveNotes(), since these calls may
-             * be prohibitively slow if there are more than a few hundred notes.
-             * If an exception is thrown for any of the GUIDs, then none of the notes
-             * will be deleted.    I.e. this call can be treated as an atomic transaction.
-             * <p/>
-             * NOTE: This function is not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param noteGuids
-             *     The list of GUIDs for the Notes to remove.
-             *
-             * @return
-             *     The account's updateCount at the end of this operation
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            expungeNotes(noteGuids: string[], cb: Callback<number>): void;
-
-            /**
-             * Permanently removes all of the Notes that are currently marked as
-             * inactive.    This is equivalent to "emptying the trash", and these Notes
-             * will be gone permanently.
-             * <p/>
-             * This operation may be relatively slow if the account contains a large
-             * number of inactive Notes.
-             * <p/>
-             * NOTE: This function is not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @return
-             *        The number of notes that were expunged.
-             */
-            expungeInactiveNotes(cb: Callback<number>): void;
-
-            /**
-             * Performs a deep copy of the Note with the provided GUID 'noteGuid' into
-             * the Notebook with the provided GUID 'toNotebookGuid'.
-             * The caller must be the owner of both the Note and the Notebook.
-             * This creates a new Note in the destination Notebook with new content and
-             * Resources that match all of the content and Resources from the original
-             * Note, but with new GUID identifiers.
-             * The original Note is not modified by this operation.
-             * The copied note is considered as an "upload" for the purpose of upload
-             * transfer limit calculation, so its size is added to the upload count for
-             * the owner.
-             *
-             * @param noteGuid
-             *     The GUID of the Note to copy.
-             *
-             * @param toNotebookGuid
-             *     The GUID of the Notebook that should receive the new Note.
-             *
-             * @return
-             *     The metadata for the new Note that was created.    This will include the
-             *     new GUID for this Note (and any copied Resources), but will not include
-             *     the content body or the binary bodies of any Resources.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> LIMIT_REACHED "Note" - at max number per account
-             *     </li>
-             *     <li> PERMISSION_DENIED "Notebook.guid" - destination not owned by user
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - user doesn't own
-             *     </li>
-             *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            copyNote(noteGuid: string, toNotebookGuid: string, cb: Callback<Note>): void;
-
-            /**
-             * Returns a list of the prior versions of a particular note that are
-             * saved within the service.    These prior versions are stored to provide a
-             * recovery from unintentional removal of content from a note. The identifiers
-             * that are returned by this call can be used with getNoteVersion to retrieve
-             * the previous note.
-             * The identifiers will be listed from the most recent versions to the oldest.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            listNoteVersions(noteGuid: string, cb: Callback<NoteVersionId[]>): void;
-
-            /**
-             * This can be used to retrieve a previous version of a Note after it has been
-             * updated within the service.    The caller must identify the note (via its
-             * guid) and the version (via the updateSequenceNumber of that version).
-             * to find a listing of the stored version USNs for a note, call
-             * listNoteVersions.
-             * This call is only available for notes in Premium accounts.    (I.e. access
-             * to past versions of Notes is a Premium-only feature.)
-             *
-             * @param noteGuid
-             *     The GUID of the note to be retrieved.
-             *
-             * @param updateSequenceNum
-             *     The USN of the version of the note that is being retrieved
-             *
-             * @param withResourcesData
-             *     If true, any Resource elements in this Note will include the binary
-             *     contents of their 'data' field's body.
-             *
-             * @param withResourcesRecognition
-             *     If true, any Resource elements will include the binary contents of the
-             *     'recognition' field's body if recognition data is present.
-             *
-             * @param withResourcesAlternateData
-             *     If true, any Resource elements in this Note will include the binary
-             *     contents of their 'alternateData' fields' body, if an alternate form
-             *     is present.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             *     <li> PERMISSION_DENIED "updateSequenceNum" -
-             *         The account isn't permitted to access previous versions of notes.
-             *         (i.e. this is a Free account.)
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             *     <li> "Note.updateSequenceNumber" - the Note doesn't have a version with
-             *            the corresponding USN.
-             *     </li>
-             * </ul>
-             */
-            getNoteVersion(noteGuid: string, updateSequenceNum: number, withResourcesData: boolean, withResourcesRecognition: boolean, withResourcesAlternateData: boolean, cb: Callback<Note>): void;
-
-            /**
-             * Returns the current state of the resource in the service with the
-             * provided GUID.
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).    Only the
-             * keys for the applicationData will be returned.
-             *
-             * @param guid
-             *     The GUID of the resource to be retrieved.
-             *
-             * @param withData
-             *     If true, the Resource will include the binary contents of the
-             *     'data' field's body.
-             *
-             * @param withRecognition
-             *     If true, the Resource will include the binary contents of the
-             *     'recognition' field's body if recognition data is present.
-             *
-             * @param withAttributes
-             *     If true, the Resource will include the attributes
-             *
-             * @param withAlternateData
-             *     If true, the Resource will include the binary contents of the
-             *     'alternateData' field's body, if an alternate form is present.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getResource(guid: string, withData: boolean, withRecognition: boolean, withAttributes: boolean, withAlternateData: boolean, cb: Callback<Resource>): void;
-
-            /**
-             * Get all of the application data for the Resource identified by GUID,
-             * with values returned within the LazyMap fullMap field.
-             * If there are no applicationData entries, then a LazyMap
-             * with an empty fullMap will be returned. If your application
-             * only needs to fetch its own applicationData entry, use
-             * getResourceApplicationDataEntry instead.
-             */
-            getResourceApplicationData(guid: string, cb: Callback<LazyMap>): void;
-
-            /**
-             * Get the value of a single entry in the applicationData map
-             * for the Resource identified by GUID.
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - Resource not found, by GUID</li>
-             *     <li> "ResourceAttributes.applicationData.key" - Resource not found, by key</li>
-             * </ul>
-             */
-            getResourceApplicationDataEntry(guid: string, key: string, cb: Callback<string>): void;
-
-            /**
-             * Update, or create, an entry in the applicationData map for
-             * the Resource identified by guid.
-             */
-            setResourceApplicationDataEntry(guid: string, key: string, value: string, cb: Callback<number>): void;
-
-            /**
-             * Remove an entry identified by 'key' from the applicationData map for
-             * the Resource identified by 'guid'.
-             */
-            unsetResourceApplicationDataEntry(guid: string, key: string, cb: Callback<number>): void;
-
-            /**
-             * Submit a set of changes to a resource to the service.    This can be used
-             * to update the meta-data about the resource, but cannot be used to change
-             * the binary contents of the resource (including the length and hash).    These
-             * cannot be changed directly without creating a new resource and removing the
-             * old one via updateNote.
-             *
-             * @param resource
-             *     A Resource object containing the desired fields to be populated on
-             *     the service.    The service will attempt to update the resource with the
-             *     following fields from the client:
-             *     <ul>
-             *            <li>guid:    must be provided to identify the resource
-             *            </li>
-             *            <li>mime
-             *            </li>
-             *            <li>width
-             *            </li>
-             *            <li>height
-             *            </li>
-             *            <li>duration
-             *            </li>
-             *            <li>attributes:    optional.    if present, the set of attributes will
-             *                     be replaced.
-             *            </li>
-             *     </ul>
-             *
-             * @return
-             *     The Update Sequence Number of the resource after the changes have been
-             *     applied.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
-             *     </li>
-             *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            updateResource(resource: Resource, cb: Callback<number>): void;
-
-            /**
-             * Returns binary data of the resource with the provided GUID.    For
-             * example, if this were an image resource, this would contain the
-             * raw bits of the image.
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the resource to be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getResourceData(guid: string, cb: Callback<string>): void;
-
-            /**
-             * Returns the current state of a resource, referenced by containing
-             * note GUID and resource content hash.
-             *
-             * @param noteGuid
-             *     The GUID of the note that holds the resource to be retrieved.
-             *
-             * @param contentHash
-             *     The MD5 checksum of the resource within that note. Note that
-             *     this is the binary checksum, for example from Resource.data.bodyHash,
-             *     and not the hex-encoded checksum that is used within an en-media
-             *     tag in a note body.
-             *
-             * @param withData
-             *     If true, the Resource will include the binary contents of the
-             *     'data' field's body.
-             *
-             * @param withRecognition
-             *     If true, the Resource will include the binary contents of the
-             *     'recognition' field's body.
-             *
-             * @param withAlternateData
-             *     If true, the Resource will include the binary contents of the
-             *     'alternateData' field's body, if an alternate form is present.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_REQUIRED "Note.guid" - noteGuid param missing
-             *     </li>
-             *     <li> DATA_REQUIRED "Note.contentHash" - contentHash param missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note" - not found, by guid
-             *     </li>
-             *     <li> "Resource" - not found, by hash
-             *     </li>
-             * </ul>
-             */
-            getResourceByHash(noteGuid: string, contentHash: string, withData: boolean, withRecognition: boolean, withAlternateData: boolean, cb: Callback<Resource>): void;
-
-            /**
-             * Returns the binary contents of the recognition index for the resource
-             * with the provided GUID.    If the caller asks about a resource that has
-             * no recognition data, this will throw EDAMNotFoundException.
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the resource whose recognition data should be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             *     <li> "Resource.recognition" - resource has no recognition
-             *     </li>
-             * </ul>
-             */
-            getResourceRecognition(guid: string, cb: Callback<string>): void;
-
-            /**
-             * If the Resource with the provided GUID has an alternate data representation
-             * (indicated via the Resource.alternateData field), then this request can
-             * be used to retrieve the binary contents of that alternate data file.
-             * If the caller asks about a resource that has no alternate data form, this
-             * will throw EDAMNotFoundException.
-             *
-             * @param guid
-             *        The GUID of the resource whose recognition data should be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             *     <li> "Resource.alternateData" - resource has no recognition
-             *     </li>
-             * </ul>
-             */
-            getResourceAlternateData(guid: string, cb: Callback<string>): void;
-
-            /**
-             * Returns the set of attributes for the Resource with the provided GUID.
-             * If the Resource is found in a public notebook, the authenticationToken
-             * will be ignored (so it could be an empty string).
-             *
-             * @param guid
-             *     The GUID of the resource whose attributes should be retrieved.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Resource.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            getResourceAttributes(guid: string, cb: Callback<ResourceAttributes>): void;
-
-            /**
-             * <p>
-             * Looks for a user account with the provided userId on this NoteStore
-             * shard and determines whether that account contains a public notebook
-             * with the given URI.    If the account is not found, or no public notebook
-             * exists with this URI, this will throw an EDAMNotFoundException,
-             * otherwise this will return the information for that Notebook.
-             * </p>
-             * <p>
-             * If a notebook is visible on the web with a full URL like
-             * http://www.evernote.com/pub/sethdemo/api
-             * Then 'sethdemo' is the username that can be used to look up the userId,
-             * and 'api' is the publicUri.
-             * </p>
-             *
-             * @param userId
-             *        The numeric identifier for the user who owns the public notebook.
-             *        To find this value based on a username string, you can invoke
-             *        UserStore.getPublicUserInfo
-             *
-             * @param publicUri
-             *        The uri string for the public notebook, from Notebook.publishing.uri.
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li>"Publishing.uri" - not found, by URI</li>
-             * </ul>
-             *
-             * @throws EDAMSystemException <ul>
-             *     <li> TAKEN_DOWN "PublicNotebook" - The specified public notebook is
-             *         taken down (for all requesters).</li>
-             *     <li> TAKEN_DOWN "Country" - The specified public notebook is taken
-             *         down for the requester because of an IP-based country lookup.</li>
-             * </ul>
-             */
-            getPublicNotebook(userId: number, publicUri: string, cb: Callback<Notebook>): void;
-
-            /**
-             * Used to construct a shared notebook object. The constructed notebook will
-             * contain a "share key" which serve as a unique identifer and access token
-             * for a user to access the notebook of the shared notebook owner.
-             *
-             * @param sharedNotebook
-             *     A shared notebook object populated with the email address of the share
-             *     recipient, the notebook guid and the access permissions. All other
-             *     attributes of the shared object are ignored. The SharedNotebook.allowPreview
-             *     field must be explicitly set with either a true or false value.
-             *
-             * @return
-             *     The fully populated SharedNotebook object including the server assigned
-             *     share id and shareKey which can both be used to uniquely identify the
-             *     SharedNotebook.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li>BAD_DATA_FORMAT "SharedNotebook.email" - if the email was not valid</li>
-             *     <li>BAD_DATA_FORMAT "requireLogin" - if the SharedNotebook.allowPreview field was
-             *             not set, and the SharedNotebook.requireLogin was also not set or was set to
-             *             false.</li>
-             *     <li>PERMISSION_DENIED "SharedNotebook.recipientSettings" - if
-             *             recipientSettings is set in the sharedNotebook.    Only the recipient
-             *             can set these values via the setSharedNotebookRecipientSettings
-             *             method.
-             *     </li>
-             *     </ul>
-             * @throws EDAMNotFoundException <ul>
-             *     <li>Notebook.guid - if the notebookGuid is not a valid GUID for the user.
-             *     </li>
-             *     </ul>
-             */
-            createSharedNotebook(sharedNotebook: SharedNotebook, cb: Callback<SharedNotebook>): void;
-
-            /**
-             * Update a SharedNotebook object.
-             *
-             * @param authenticationToken
-             *     Must be an authentication token from the owner or a shared notebook
-             *     authentication token or business authentication token with sufficient
-             *     permissions to change invitations for a notebook.
-             *
-             * @param sharedNotebook
-             *    The SharedNotebook object containing the requested changes.
-             *    The "id" of the shared notebook must be set to allow the service
-             *    to identify the SharedNotebook to be updated. In addition, you MUST set
-             *    the email, permission, and allowPreview fields to the desired values.
-             *    All other fields will be ignored if set.
-             *
-             * @return
-             *    The Update Serial Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li>UNSUPPORTED_OPERATION "updateSharedNotebook" - if this service instance does not support shared notebooks.</li>
-             *     <li>BAD_DATA_FORMAT "SharedNotebook.email" - if the email was not valid.</li>
-             *     <li>DATA_REQUIRED "SharedNotebook.id" - if the id field was not set.</li>
-             *     <li>DATA_REQUIRED "SharedNotebook.privilege" - if the privilege field was not set.</li>
-             *     <li>DATA_REQUIRED "SharedNotebook.allowPreview" - if the allowPreview field was not set.</li>
-             *     </ul>
-             * @throws EDAMNotFoundException <ul>
-             *     <li>SharedNotebook.id - if no shared notebook with the specified ID was found.
-             *     </ul>
-             */
-            updateSharedNotebook(sharedNotebook: SharedNotebook, cb: Callback<number>): void;
-
-            /**
-             * Set values for the recipient settings associated with a shared notebook.    Having
-             * update rights to the shared notebook record itself has no effect on this call;
-             * only the recipient of the shared notebook can can the recipient settings.
-             *
-             * If you do <i>not</i> wish to, or cannot, change one of the reminderNotifyEmail or
-             * reminderNotifyInApp fields, you must leave that field unset in recipientSettings.
-             * This method will skip that field for updates and leave the existing state as
-             * it is.
-             *
-             * @return The update sequence number of the account to which the shared notebook
-             *     belongs, which is the account from which we are sharing a notebook.
-             *
-             * @throws EDAMNotFoundException "sharedNotebookId" - Thrown if the service does not
-             *     have a shared notebook record for the sharedNotebookId on the given shard.    If you
-             *     receive this exception, it is probable that the shared notebook record has
-             *     been revoked or expired, or that you accessed the wrong shard.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li>PEMISSION_DENIED "authenticationToken" - If you do not have permission to set
-             *             the recipient settings for the shared notebook.    Only the recipient has
-             *             permission to do this.
-             *     <li>DATA_CONFLICT "recipientSettings.reminderNotifyEmail" - Setting whether
-             *             or not you want to receive reminder e-mail notifications is possible on
-             *             a business notebook in the business to which the user belongs.    All
-             *             others can safely unset the reminderNotifyEmail field from the
-             *             recipientSettings parameter.
-             * </ul>
-             */
-            setSharedNotebookRecipientSettings(sharedNotebookId: number, recipientSettings: SharedNotebookRecipientSettings, cb: Callback<number>): void;
-
-            /**
-             * Send a reminder message to some or all of the email addresses that a notebook has been
-             * shared with. The message includes the current link to view the notebook.
-             * @param authenticationToken
-             *     The auth token of the user with permissions to share the notebook
-             * @param notebookGuid
-             *     The guid of the shared notebook
-             * @param messageText
-             *    User provided text to include in the email
-             * @param recipients
-             *    The email addresses of the recipients. If this list is empty then all of the
-             *    users that the notebook has been shared with are emailed.
-             *    If an email address doesn't correspond to share invite members then that address
-             *    is ignored.
-             * @return
-             *    The number of messages sent
-             * @throws EDAMUserException <ul>
-             *     <li> LIMIT_REACHED "(recipients)" -
-             *         The email can't be sent because this would exceed the user's daily
-             *         email limit.
-             *     </li>
-             *     <li> PERMISSION_DENIED "Notebook.guid" - The user doesn't have permission to
-             *         send a message for the specified notebook.
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Notebook.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            sendMessageToSharedNotebookMembers(notebookGuid: string, messageText: string, recipients: string[], cb: Callback<number>): void;
-
-            /**
-             * Lists the collection of shared notebooks for all notebooks in the
-             * users account.
-             *
-             * @return
-             *    The list of all SharedNotebooks for the user
-             */
-            listSharedNotebooks(cb: Callback<SharedNotebook[]>): void;
-
-            /**
-             * Expunges the SharedNotebooks in the user's account using the
-             * SharedNotebook.id as the identifier.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param
-             *     sharedNotebookIds - a list of ShardNotebook.id longs identifying the
-             *             objects to delete permanently.
-             *
-             * @return
-             *     The account's update sequence number.
-             */
-            expungeSharedNotebooks(sharedNotebookIds: number[], cb: Callback<number>): void;
-
-            /**
-             * Asks the service to make a linked notebook with the provided name, username
-             * of the owner and identifiers provided. A linked notebook can be either a
-             * link to a public notebook or to a private shared notebook.
-             *
-             * @param linkedNotebook
-             *     The desired fields for the linked notebook must be provided on this
-             *     object.    The name of the linked notebook must be set. Either a username
-             *     uri or a shard id and share key must be provided otherwise a
-             *     EDAMUserException is thrown.
-             *
-             * @return
-             *     The newly created LinkedNotebook.    The server-side id will be
-             *     saved in this object's 'id' field.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.name" - invalid length or pattern
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.username" - bad username format
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.uri" -
-             *         if public notebook set but bad uri
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.shareKey" -
-             *         if private notebook set but bad shareKey
-             *     </li>
-             *     <li> DATA_REQUIRED "LinkedNotebook.shardId" -
-             *         if private notebook but shard id not provided
-             *     </li>
-             * </ul>
-             */
-            createLinkedNotebook(linkedNotebook: LinkedNotebook, cb: Callback<LinkedNotebook>): void;
-
-            /**
-             * @param linkedNotebook
-             *     Updates the name of a linked notebook.
-             *
-             * @return
-             *     The Update Sequence Number for this change within the account.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "LinkedNotebook.name" - invalid length or pattern
-             *     </li>
-             * </ul>
-             */
-            updateLinkedNotebook(linkedNotebook: LinkedNotebook, cb: Callback<number>): void;
-
-            /**
-             * Returns a list of linked notebooks
-             */
-            listLinkedNotebooks(cb: Callback<LinkedNotebook[]>): void;
-
-            /**
-             * Permanently expunges the linked notebook from the account.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param guid
-             *     The LinkedNotebook.guid field of the LinkedNotebook to permanently remove
-             *     from the account.
-             */
-            expungeLinkedNotebook(guid: string, cb: Callback<number>): void;
-
-            /**
-             * Asks the service to produce an authentication token that can be used to
-             * access the contents of a shared notebook from someone else's account.
-             * This authenticationToken can be used with the various other NoteStore
-             * calls to find and retrieve notes, and if the permissions in the shared
-             * notebook are sufficient, to make changes to the contents of the notebook.
-             *
-             * @param shareKey
-             *     The 'shareKey' identifier from the SharedNotebook that was granted to
-             *     some recipient.    This string internally encodes the notebook identifier
-             *     and a security signature.
-             *
-             * @param authenticationToken
-             *     If a non-empty string is provided, this is the full user-based
-             *     authentication token that identifies the user who is currently logged in
-             *     and trying to access the shared notebook.    This may be required if the
-             *     notebook was created with 'requireLogin'.
-             *     If this string is empty, the service will attempt to authenticate to the
-             *     shared notebook without any logged in user.
-             *
-             * @throws EDAMSystemException <ul>
-             *     <li> BAD_DATA_FORMAT "shareKey" - invalid shareKey string
-             *     </li>
-             *     <li> INVALID_AUTH "shareKey" - bad signature on shareKey string
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SharedNotebook.id" - the shared notebook no longer exists
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_REQUIRED "authenticationToken" - the share requires login, and
-             *                    no valid authentication token was provided.
-             *     </li>
-             *     <li> PERMISSION_DENIED "SharedNotebook.username" - share requires login,
-             *                    and another username has already been bound to this notebook.
-             *     </li>
-             * </ul>
-             */
-            authenticateToSharedNotebook(shareKey: string, cb: Callback<AuthenticationResult>): void;
-
-            /**
-             * This function is used to retrieve extended information about a shared
-             * notebook by a guest who has already authenticated to access that notebook.
-             * This requires an 'authenticationToken' parameter which should be the
-             * resut of a call to authenticateToSharedNotebook(...).
-             * I.e. this is the token that gives access to the particular shared notebook
-             * in someone else's account -- it's not the authenticationToken for the
-             * owner of the notebook itself.
-             *
-             * @param authenticationToken
-             *     Should be the authentication token retrieved from the reply of
-             *     authenticateToSharedNotebook(), proving access to a particular shared
-             *     notebook.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "authenticationToken" -
-             *                    authentication token doesn't correspond to a valid shared notebook
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "SharedNotebook.id" - the shared notebook no longer exists
-             *     </li>
-             * </ul>
-             */
-            getSharedNotebookByAuth(cb: Callback<SharedNotebook>): void;
-
-            /**
-             * Attempts to send a single note to one or more email recipients.
-             * <p/>
-             * NOTE: This function is generally not available to third party applications.
-             * Calls will result in an EDAMUserException with the error code
-             * PERMISSION_DENIED.
-             *
-             * @param authenticationToken
-             *        The note will be sent as the user logged in via this token, using that
-             *        user's registered email address.    If the authenticated user doesn't
-             *        have permission to read that note, the emailing will fail.
-             *
-             * @param parameters
-             *        The note must be specified either by GUID (in which case it will be
-             *        sent using the existing data in the service), or else the full Note
-             *        must be passed to this call.    This also specifies the additional
-             *        email fields that will be used in the email.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> LIMIT_REACHED "NoteEmailParameters.toAddresses" -
-             *         The email can't be sent because this would exceed the user's daily
-             *         email limit.
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "(email address)" -
-             *         email address malformed
-             *     </li>
-             *     <li> DATA_REQUIRED "NoteEmailParameters.toAddresses" -
-             *         if there are no To: or Cc: addresses provided.
-             *     </li>
-             *     <li> DATA_REQUIRED "Note.title" -
-             *         if the caller provides a Note parameter with no title
-             *     </li>
-             *     <li> DATA_REQUIRED "Note.content" -
-             *         if the caller provides a Note parameter with no content
-             *     </li>
-             *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
-             *     </li>
-             *     <li> DATA_REQUIRED "NoteEmailParameters.note" -
-             *         if no guid or note provided
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            emailNote(parameters: NoteEmailParameters, cb: Callback<void>): void;
-
-            /**
-             * If this note is not already shared (via its own direct URL), then this
-             * will start sharing that note.
-             * This will return the secret "Note Key" for this note that
-             * can currently be used in conjunction with the Note's GUID to gain direct
-             * read-only access to the Note.
-             * If the note is already shared, then this won't make any changes to the
-             * note, and the existing "Note Key" will be returned.    The only way to change
-             * the Note Key for an existing note is to stopSharingNote first, and then
-             * call this function.
-             *
-             * @param guid
-             *     The GUID of the note to be shared.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            shareNote(guid: string, cb: Callback<string>): void;
-
-            /**
-             * If this note is not already shared then this will stop sharing that note
-             * and invalidate its "Note Key", so any existing URLs to access that Note
-             * will stop working.
-             * If the Note is not shared, then this function will do nothing.
-             *
-             * @param guid
-             *     The GUID of the note to be un-shared.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
-             *     </li>
-             *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "Note.guid" - not found, by GUID
-             *     </li>
-             * </ul>
-             */
-            stopSharingNote(guid: string, cb: Callback<void>): void;
-
-            /**
-             * Asks the service to produce an authentication token that can be used to
-             * access the contents of a single Note which was individually shared
-             * from someone's account.
-             * This authenticationToken can be used with the various other NoteStore
-             * calls to find and retrieve the Note and its directly-referenced children.
-             *
-             * @param guid
-             *     The GUID identifying this Note on this shard.
-             *
-             * @param noteKey
-             *     The 'noteKey' identifier from the Note that was originally created via
-             *     a call to shareNote() and then given to a recipient to access.
-             *
-             * @param authenticationToken
-             *     An optional authenticationToken that identifies the user accessing the
-             *     shared note. This parameter may be required to access some shared notes.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "Note" - the Note with that GUID is either not
-             *         shared, or the noteKey doesn't match the current key for this note
-             *     </li>
-             *     <li> PERMISSION_DENIED "authenticationToken" - an authentication token is
-             *         required to access this Note, but either no authentication token or a
-             *         "non-owner" authentication token was provided.
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li> "guid" - the note with that GUID is not found
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMSystemException <ul>
-             *     <li> TAKEN_DOWN "Note" - The specified shared note is taken down (for
-             *         all requesters).
-             *     </li>
-             *     <li> TAKEN_DOWN "Country" - The specified shared note is taken down
-             *         for the requester because of an IP-based country lookup.
-             *     </ul>
-             * </ul>
-             */
-            authenticateToSharedNote(guid: string, noteKey: string, cb: Callback<AuthenticationResult>): void;
-
-            /**
-             * Identify related entities on the service, such as notes,
-             * notebooks, and tags related to notes or content.
-             *
-             * @param query
-             *     The information about which we are finding related entities.
-             *
-             * @param resultSpec
-             *     Allows the client to indicate the type and quantity of
-             *     information to be returned, allowing a saving of time and
-             *     bandwidth.
-             *
-             * @return
-             *     The result of the query, with information considered
-             *     to likely be relevantly related to the information
-             *     described by the query.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li>BAD_DATA_FORMAT "RelatedQuery.plainText" - If you provided a
-             *         a zero-length plain text value.
-             *     </li>
-             *     <li>BAD_DATA_FORMAT "RelatedQuery.noteGuid" - If you provided an
-             *         invalid Note GUID, that is, one that does not match the constraints
-             *         defined by EDAM_GUID_LEN_MIN, EDAM_GUID_LEN_MAX, EDAM_GUID_REGEX.
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
-             *     </li>
-             *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
-             *     </li>
-             *     <li>PERMISSION_DENIED "Note" - If the caller does not have access to
-             *         the note identified by RelatedQuery.noteGuid.
-             *     </li>
-             *     <li>DATA_REQUIRED "RelatedResultSpec" - If you did not not set any values
-             *         in the result spec.
-             *     </li>
-             * </ul>
-             *
-             * @throws EDAMNotFoundException <ul>
-             *     <li>"RelatedQuery.noteGuid" - the note with that GUID is not
-             *         found, if that field has been set in the query.
-             *     </li>
-             * </ul>
-             */
-            findRelated(query: RelatedQuery, resultSpec: RelatedResultSpec, cb: Callback<RelatedResult>): void;
-        }
-        /**
-         *    This structure encapsulates the information about the state of the
-         *    user's account for the purpose of "state based" synchronization.
-         * <dl>
-         *    <dt>currentTime</dt>
-         *        <dd>
-         *        The server's current date and time.
-         *        </dd>
-         *
-         *    <dt>fullSyncBefore</dt>
-         *        <dd>
-         *        The cutoff date and time for client caches to be
-         *        updated via incremental synchronization.    Any clients that were last
-         *        synched with the server before this date/time must do a full resync of all
-         *        objects.    This cutoff point will change over time as archival data is
-         *        deleted or special circumstances on the service require resynchronization.
-         *        </dd>
-         *
-         *    <dt>updateCount</dt>
-         *        <dd>
-         *        Indicates the total number of transactions that have
-         *        been committed within the account.    This reflects (for example) the
-         *        number of discrete additions or modifications that have been made to
-         *        the data in this account (tags, notes, resources, etc.).
-         *        This number is the "high water mark" for Update Sequence Numbers (USN)
-         *        within the account.
-         *        </dd>
-         *
-         *    <dt>uploaded</dt>
-         *        <dd>
-         *        The total number of bytes that have been uploaded to
-         *        this account in the current monthly period.    This can be compared against
-         *        Accounting.uploadLimit (from the UserStore) to determine how close the user
-         *        is to their monthly upload limit.
-         *        This value may not be present if the SyncState has been retrieved by
-         *        a caller that only has read access to the account.
-         *        </dd>
-         *    </dl>
-         */
-        class SyncState {
-            currentTime: number;
-            fullSyncBefore: number;
-            updateCount: number;
-            uploaded: number;
-
-            constructor(args?: { currentTime: number; fullSyncBefore: number; updateCount: number; uploaded?: number; });
-        }
-
-        /**
-         *    This structure is given out by the NoteStore when a client asks to
-         *    receive the current state of an account.    The client asks for the server's
-         *    state one chunk at a time in order to allow clients to retrieve the state
-         *    of a large account without needing to transfer the entire account in
-         *    a single message.
-         *
-         *    The server always gives SyncChunks using an ascending series of Update
-         *    Sequence Numbers (USNs).
-         *
-         * <dl>
-         *    <dt>currentTime</dt>
-         *        <dd>
-         *        The server's current date and time.
-         *        </dd>
-         *
-         *    <dt>chunkHighUSN</dt>
-         *        <dd>
-         *        The highest USN for any of the data objects represented
-         *        in this sync chunk.    If there are no objects in the chunk, this will not be
-         *        set.
-         *        </dd>
-         *
-         *    <dt>updateCount</dt>
-         *        <dd>
-         *        The total number of updates that have been performed in
-         *        the service for this account.    This is equal to the highest USN within the
-         *        account at the point that this SyncChunk was generated.    If updateCount
-         *        and chunkHighUSN are identical, that means that this is the last chunk
-         *        in the account ... there is no more recent information.
-         *        </dd>
-         *
-         *    <dt>notes</dt>
-         *        <dd>
-         *        If present, this is a list of non-expunged notes that
-         *        have a USN in this chunk.    This will include notes that are "deleted"
-         *        but not expunged (i.e. in the trash).    The notes will include their list
-         *        of tags and resources, but the note content, resource content, resource
-         *        recognition data and resource alternate data will not be supplied.
-         *        </dd>
-         *
-         *    <dt>notebooks</dt>
-         *        <dd>
-         *        If present, this is a list of non-expunged notebooks that
-         *        have a USN in this chunk.    This will include notebooks that are "deleted"
-         *        but not expunged (i.e. in the trash).
-         *        </dd>
-         *
-         *    <dt>tags</dt>
-         *        <dd>
-         *        If present, this is a list of the non-expunged tags that have a
-         *        USN in this chunk.
-         *        </dd>
-         *
-         *    <dt>searches</dt>
-         *        <dd>
-         *        If present, this is a list of non-expunged searches that
-         *        have a USN in this chunk.
-         *        </dd>
-         *
-         *    <dt>resources</dt>
-         *        <dd>
-         *        If present, this is a list of the non-expunged resources
-         *        that have a USN in this chunk.    This will include the metadata for each
-         *        resource, but not its binary contents or recognition data, which must be
-         *        retrieved separately.
-         *        </dd>
-         *
-         *    <dt>expungedNotes</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the notes that were
-         *        permanently expunged in this chunk.
-         *        </dd>
-         *
-         *    <dt>expungedNotebooks</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the notebooks that
-         *        were permanently expunged in this chunk.    When a notebook is expunged,
-         *        this implies that all of its child notes (and their resources) were
-         *        also expunged.
-         *        </dd>
-         *
-         *    <dt>expungedTags</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the tags that were
-         *        permanently expunged in this chunk.
-         *        </dd>
-         *
-         *    <dt>expungedSearches</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the saved searches
-         *        that were permanently expunged in this chunk.
-         *        </dd>
-         *
-         *    <dt>linkedNotebooks</dt>
-         *        <dd>
-         *        If present, this is a list of non-expunged LinkedNotebooks that
-         *        have a USN in this chunk.
-         *        </dd>
-         *
-         *    <dt>expungedLinkedNotebooks</dt>
-         *        <dd>
-         *        If present, the GUIDs of all of the LinkedNotebooks
-         *        that were permanently expunged in this chunk.
-         *        </dd>
-         *    </dl>
-         */
-        class SyncChunk {
-            currentTime: number;
-            chunkHighUSN: number;
-            updateCount: number;
-            notes: Note[];
-            notebooks: Notebook[];
-            tags: Tag[];
-            searches: SavedSearch[];
-            resources: Resource[];
-            expungedNotes: string[];
-            expungedNotebooks: string[];
-            expungedTags: string[];
-            expungedSearches: string[];
-            linkedNotebooks: LinkedNotebook[];
-            expungedLinkedNotebooks: string[];
-
-            constructor(args?: { currentTime: number; chunkHighUSN?: number; updateCount: number; notes?: Note[]; notebooks?: Notebook[]; tags?: Tag[]; searches?: SavedSearch[]; resources?: Resource[]; expungedNotes?: string[]; expungedNotebooks?: string[]; expungedTags?: string[]; expungedSearches?: string[]; linkedNotebooks?: LinkedNotebook[]; expungedLinkedNotebooks?: string[]; });
-        }
-
-        /**
-         *    This structure is used with the 'getFilteredSyncChunk' call to provide
-         *    fine-grained control over the data that's returned when a client needs
-         *    to synchronize with the service. Each flag in this structure specifies
-         *    whether to include one class of data in the results of that call.
-         *
-         * <dl>
-         *    <dt>includeNotes</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.notes field
-         *        </dd>
-         *
-         *    <dt>includeNoteResources</dt>
-         *        <dd>
-         *        If true, then the server will include the 'resources' field on all of
-         *        the Notes that are in SyncChunk.notes.
-         *        If 'includeNotes' is false, then this will have no effect.
-         *        </dd>
-         *
-         *    <dt>includeNoteAttributes</dt>
-         *        <dd>
-         *        If true, then the server will include the 'attributes' field on all of
-         *        the Notes that are in SyncChunks.notes.
-         *        If 'includeNotes' is false, then this will have no effect.
-         *        </dd>
-         *
-         *    <dt>includeNotebooks</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.notebooks field
-         *        </dd>
-         *
-         *    <dt>includeTags</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.tags field
-         *        </dd>
-         *
-         *    <dt>includeSearches</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.searches field
-         *        </dd>
-         *
-         *    <dt>includeResources</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.resources field.
-         *        Since the Resources are also provided with their Note
-         *        (in the Notes.resources list), this is primarily useful for clients that
-         *        want to watch for changes to individual Resources due to recognition data
-         *        being added.
-         *        </dd>
-         *
-         *    <dt>includeLinkedNotebooks</dt>
-         *        <dd>
-         *        If true, then the server will include the SyncChunks.linkedNotebooks field.
-         *        </dd>
-         *
-         *    <dt>includeExpunged</dt>
-         *        <dd>
-         *        If true, then the server will include the 'expunged' data for any type
-         *        of included data.    For example, if 'includeTags' and 'includeExpunged'
-         *        are both true, then the SyncChunks.expungedTags field will be set with
-         *        the GUIDs of tags that have been expunged from the server.
-         *        </dd>
-         *
-         *    <dt>includeNoteApplicationDataFullMap</dt>
-         *        <dd>
-         *        If true, then the values for the applicationData map will be filled
-         *        in, assuming notes and note attributes are being returned.    Otherwise,
-         *        only the keysOnly field will be filled in.
-         *        </dd>
-         *
-         *    <dt>includeResourceApplicationDataFullMap</dt>
-         *        <dd>
-         *        If true, then the fullMap values for the applicationData map will be
-         *        filled in, assuming resources and resource attributes are being returned
-         *        (includeResources is true).    Otherwise, only the keysOnly field will be
-         *        filled in.
-         *        </dd>
-         *
-         *    <dt>includeNoteResourceApplicationDataFullMap</dt>
-         *        <dd>
-         *        If true, then the fullMap values for the applicationData map will be
-         *        filled in for resources found inside of notes, assuming resources are
-         *        being returned in notes (includeNoteResources is true).    Otherwise,
-         *        only the keysOnly field will be filled in.
-         *        </dd>
-         *
-         *    <dt>requireNoteContentClass</dt>
-         *        <dd>
-         *        If set, then only send notes whose content class matches this value.
-         *        The value can be a literal match or, if the last character is an
-         *        asterisk, a prefix match.
-         *        </dd>
-         *    </dl>
-         */
-        class SyncChunkFilter {
-            includeNotes: boolean;
-            includeNoteResources: boolean;
-            includeNoteAttributes: boolean;
-            includeNotebooks: boolean;
-            includeTags: boolean;
-            includeSearches: boolean;
-            includeResources: boolean;
-            includeLinkedNotebooks: boolean;
-            includeExpunged: boolean;
-            includeNoteApplicationDataFullMap: boolean;
-            includeResourceApplicationDataFullMap: boolean;
-            includeNoteResourceApplicationDataFullMap: boolean;
-            requireNoteContentClass: string;
-
-            constructor(args?: { includeNotes?: boolean; includeNoteResources?: boolean; includeNoteAttributes?: boolean; includeNotebooks?: boolean; includeTags?: boolean; includeSearches?: boolean; includeResources?: boolean; includeLinkedNotebooks?: boolean; includeExpunged?: boolean; includeNoteApplicationDataFullMap?: boolean; includeResourceApplicationDataFullMap?: boolean; includeNoteResourceApplicationDataFullMap?: boolean; requireNoteContentClass?: string; });
-        }
-
-        /**
-         *    A list of criteria that are used to indicate which notes are desired from
-         *    the account.    This is used in queries to the NoteStore to determine
-         *    which notes should be retrieved.
-         *
-         * <dl>
-         *    <dt>order</dt>
-         *        <dd>
-         *        The NoteSortOrder value indicating what criterion should be
-         *        used to sort the results of the filter.
-         *        </dd>
-         *
-         *    <dt>ascending</dt>
-         *        <dd>
-         *        If true, the results will be ascending in the requested
-         *        sort order.    If false, the results will be descending.
-         *        </dd>
-         *
-         *    <dt>words</dt>
-         *        <dd>
-         *        If present, a search query string that will filter the set of notes to be returned.
-         *        Accepts the full search grammar documented in the Evernote API Overview.
-         *        </dd>
-         *
-         *    <dt>notebookGuid</dt>
-         *        <dd>
-         *        If present, the Guid of the notebook that must contain
-         *        the notes.
-         *        </dd>
-         *
-         *    <dt>tagGuids</dt>
-         *        <dd>
-         *        If present, the list of tags (by GUID) that must be present
-         *        on the notes.
-         *        </dd>
-         *
-         *    <dt>timeZone</dt>
-         *        <dd>
-         *        The zone ID for the user, which will be used to interpret
-         *        any dates or times in the queries that do not include their desired zone
-         *        information.
-         *        For example, if a query requests notes created "yesterday", this
-         *        will be evaluated from the provided time zone, if provided.
-         *        The format must be encoded as a standard zone ID such as
-         *        "America/Los_Angeles".
-         *        </dd>
-         *
-         *    <dt>inactive</dt>
-         *        <dd>
-         *        If true, then only notes that are not active (i.e. notes in
-         *        the Trash) will be returned. Otherwise, only active notes will be returned.
-         *        There is no way to find both active and inactive notes in a single query.
-         *        </dd>
-         *
-         *    <dt>emphasized</dt>
-         *        <dd>
-         *        If present, a search query string that may or may not influence the notes
-         *        to be returned, both in terms of coverage as well as of order. Think of it
-         *        as a wish list, not a requirement.
-         *        Accepts the full search grammar documented in the Evernote API Overview.
-         *        </dd>
-         *    </dl>
-         */
-        class NoteFilter {
-            order: number;
-            ascending: boolean;
-            words: string;
-            notebookGuid: string;
-            tagGuids: string[];
-            timeZone: string;
-            inactive: boolean;
-            emphasized: string;
-
-            constructor(args?: { order?: number; ascending?: boolean; words?: string; notebookGuid?: string; tagGuids?: string[]; timeZone?: string; inactive?: boolean; emphasized?: string; });
-        }
-
-        /**
-         *    A small structure for returning a list of notes out of a larger set.
-         *
-         * <dl>
-         *    <dt>startIndex</dt>
-         *        <dd>
-         *        The starting index within the overall set of notes.    This
-         *        is also the number of notes that are "before" this list in the set.
-         *        </dd>
-         *
-         *    <dt>totalNotes</dt>
-         *        <dd>
-         *        The number of notes in the larger set.    This can be used
-         *        to calculate how many notes are "after" this note in the set.
-         *        (I.e.    remaining = totalNotes - (startIndex + notes.length)    )
-         *        </dd>
-         *
-         *    <dt>notes</dt>
-         *        <dd>
-         *        The list of notes from this range.    The Notes will include all
-         *        metadata (attributes, resources, etc.), but will not include the ENML
-         *        content of the note or the binary contents of any resources.
-         *        </dd>
-         *
-         *    <dt>stoppedWords</dt>
-         *        <dd>
-         *        If the NoteList was produced using a text based search
-         *        query that included words that are not indexed or searched by the service,
-         *        this will include a list of those ignored words.
-         *        </dd>
-         *
-         *    <dt>searchedWords</dt>
-         *        <dd>
-         *        If the NoteList was produced using a text based search
-         *        query that included viable search words or quoted expressions, this will
-         *        include a list of those words.    Any stopped words will not be included
-         *        in this list.
-         *        </dd>
-         *
-         *    <dt>updateCount</dt>
-         *        <dd>
-         *        Indicates the total number of transactions that have
-         *        been committed within the account.    This reflects (for example) the
-         *        number of discrete additions or modifications that have been made to
-         *        the data in this account (tags, notes, resources, etc.).
-         *        This number is the "high water mark" for Update Sequence Numbers (USN)
-         *        within the account.
-         *        </dd>
-         *    </dl>
-         */
-        class NoteList {
-            startIndex: number;
-            totalNotes: number;
-            notes: Note[];
-            stoppedWords: string[];
-            searchedWords: string[];
-            updateCount: number;
-
-            constructor(args?: { startIndex: number; totalNotes: number; notes: Note[]; stoppedWords?: string[]; searchedWords?: string[]; updateCount?: number; });
-        }
-
-        /**
-         * This structure is used in the set of results returned by the
-         * findNotesMetadata function.    It represents the high-level information about
-         * a single Note, without some of the larger deep structure.    This allows
-         * for the information about a list of Notes to be returned relatively quickly
-         * with less marshalling and data transfer to remote clients.
-         * Most fields in this structure are identical to the corresponding field in
-         * the Note structure, with the exception of:
-         *
-         * <dl>
-         * <dt>largestResourceMime</dt>
-         *     <dd>If set, then this will contain the MIME type of the largest Resource
-         *     (in bytes) within the Note.    This may be useful, for example, to choose
-         *     an appropriate icon or thumbnail to represent the Note.
-         *     </dd>
-         *
-         * <dt>largestResourceSize</dt>
-         *    <dd>If set, this will contain the size of the largest Resource file, in
-         *    bytes, within the Note.    This may be useful, for example, to decide whether
-         *    to ask the server for a thumbnail to represent the Note.
-         *    </dd>
-         * </dl>
-         */
-        class NoteMetadata {
-            guid: string;
-            title: string;
-            contentLength: number;
-            created: number;
-            updated: number;
-            deleted: number;
-            updateSequenceNum: number;
-            notebookGuid: string;
-            tagGuids: string[];
-            attributes: NoteAttributes;
-            largestResourceMime: string;
-            largestResourceSize: number;
-
-            constructor(args?: { guid: string; title?: string; contentLength?: number; created?: number; updated?: number; deleted?: number; updateSequenceNum?: number; notebookGuid?: string; tagGuids?: string[]; attributes?: NoteAttributes; largestResourceMime?: string; largestResourceSize?: number; });
-        }
-
-        /**
-         *    This structure is returned from calls to the findNotesMetadata function to
-         *    give the high-level metadata about a subset of Notes that are found to
-         *    match a specified NoteFilter in a search.
-         *
-         * <dl>
-         *    <dt>startIndex</dt>
-         *        <dd>
-         *        The starting index within the overall set of notes.    This
-         *        is also the number of notes that are "before" this list in the set.
-         *        </dd>
-         *
-         *    <dt>totalNotes</dt>
-         *        <dd>
-         *        The number of notes in the larger set.    This can be used
-         *        to calculate how many notes are "after" this note in the set.
-         *        (I.e.    remaining = totalNotes - (startIndex + notes.length)    )
-         *        </dd>
-         *
-         *    <dt>notes</dt>
-         *        <dd>
-         *        The list of metadata for Notes in this range.    The set of optional fields
-         *        that are set in each metadata structure will depend on the
-         *        NotesMetadataResultSpec provided by the caller when the search was
-         *        performed.    Only the 'guid' field will be guaranteed to be set in each
-         *        Note.
-         *        </dd>
-         *
-         *    <dt>stoppedWords</dt>
-         *        <dd>
-         *        If the NoteList was produced using a text based search
-         *        query that included words that are not indexed or searched by the service,
-         *        this will include a list of those ignored words.
-         *        </dd>
-         *
-         *    <dt>searchedWords</dt>
-         *        <dd>
-         *        If the NoteList was produced using a text based search
-         *        query that included viable search words or quoted expressions, this will
-         *        include a list of those words.    Any stopped words will not be included
-         *        in this list.
-         *        </dd>
-         *
-         *    <dt>updateCount</dt>
-         *        <dd>
-         *        Indicates the total number of transactions that have
-         *        been committed within the account.    This reflects (for example) the
-         *        number of discrete additions or modifications that have been made to
-         *        the data in this account (tags, notes, resources, etc.).
-         *        This number is the "high water mark" for Update Sequence Numbers (USN)
-         *        within the account.
-         *        </dd>
-         *    </dl>
-         */
-        class NotesMetadataList {
-            startIndex: number;
-            totalNotes: number;
-            notes: NoteMetadata[];
-            stoppedWords: string[];
-            searchedWords: string[];
-            updateCount: number;
-
-            constructor(args?: { startIndex: number; totalNotes: number; notes: NoteMetadata[]; stoppedWords?: string[]; searchedWords?: string[]; updateCount?: number; });
-        }
-
-        /**
-         * This structure is provided to the findNotesMetadata function to specify
-         * the subset of fields that should be included in each NoteMetadata element
-         * that is returned in the NotesMetadataList.
-         * Each field on this structure is a boolean flag that indicates whether the
-         * corresponding field should be included in the NoteMetadata structure when
-         * it is returned.    For example, if the 'includeTitle' field is set on this
-         * structure when calling findNotesMetadata, then each NoteMetadata in the
-         * list should have its 'title' field set.
-         * If one of the fields in this spec is not set, then it will be treated as
-         * 'false' by the server, so the default behavior is to include nothing in
-         * replies (but the mandatory GUID)
-         */
-        class NotesMetadataResultSpec {
-            includeTitle: boolean;
-            includeContentLength: boolean;
-            includeCreated: boolean;
-            includeUpdated: boolean;
-            includeDeleted: boolean;
-            includeUpdateSequenceNum: boolean;
-            includeNotebookGuid: boolean;
-            includeTagGuids: boolean;
-            includeAttributes: boolean;
-            includeLargestResourceMime: boolean;
-            includeLargestResourceSize: boolean;
-
-            constructor(args?: { includeTitle?: boolean; includeContentLength?: boolean; includeCreated?: boolean; includeUpdated?: boolean; includeDeleted?: boolean; includeUpdateSequenceNum?: boolean; includeNotebookGuid?: boolean; includeTagGuids?: boolean; includeAttributes?: boolean; includeLargestResourceMime?: boolean; includeLargestResourceSize?: boolean; });
-        }
-
-        /**
-         *    A data structure representing the number of notes for each notebook
-         *    and tag with a non-zero set of applicable notes.
-         *
-         * <dl>
-         *    <dt>notebookCounts</dt>
-         *        <dd>
-         *        A mapping from the Notebook GUID to the number of
-         *        notes (from some selection) that are in the corresponding notebook.
-         *        </dd>
-         *
-         *    <dt>tagCounts</dt>
-         *        <dd>
-         *        A mapping from the Tag GUID to the number of notes (from some
-         *        selection) that have the corresponding tag.
-         *        </dd>
-         *
-         *    <dt>trashCount</dt>
-         *        <dd>
-         *        If this is set, then this is the number of notes that are in the trash.
-         *        If this is not set, then the number of notes in the trash hasn't been
-         *        reported.    (I.e. if there are no notes in the trash, this will be set
-         *        to 0.)
-         *        </dd>
-         *    </dl>
-         */
-        class NoteCollectionCounts {
-            notebookCounts: { [k: string]: number; };
-            tagCounts: { [k: string]: number; };
-            trashCount: number;
-
-            constructor(args?: { notebookCounts?: { [k: string]: number; }; tagCounts?: { [k: string]: number; }; trashCount?: number; });
-        }
-
-        /**
-         * Parameters that must be given to the NoteStore emailNote call. These allow
-         * the caller to specify the note to send, the recipient addresses, etc.
-         *
-         * <dl>
-         *    <dt>guid</dt>
-         *        <dd>
-         *            If set, this must be the GUID of a note within the user's account that
-         *            should be retrieved from the service and sent as email.    If not set,
-         *            the 'note' field must be provided instead.
-         *        </dd>
-         *
-         *    <dt>note</dt>
-         *        <dd>
-         *            If the 'guid' field is not set, this field must be provided, including
-         *            the full contents of the note note (and all of its Resources) to send.
-         *            This can be used for a Note that as not been created in the service,
-         *            for example by a local client with local notes.
-         *        </dd>
-         *
-         *    <dt>toAddresses</dt>
-         *        <dd>
-         *            If provided, this should contain a list of the SMTP email addresses
-         *            that should be included in the "To:" line of the email.
-         *            Callers must specify at least one "to" or "cc" email address.
-         *        </dd>
-         *
-         *    <dt>ccAddresses</dt>
-         *        <dd>
-         *            If provided, this should contain a list of the SMTP email addresses
-         *            that should be included in the "Cc:" line of the email.
-         *            Callers must specify at least one "to" or "cc" email address.
-         *        </dd>
-         *
-         *    <dt>subject</dt>
-         *        <dd>
-         *            If provided, this should contain the subject line of the email that
-         *            will be sent.    If not provided, the title of the note will be used
-         *            as the subject of the email.
-         *        </dd>
-         *
-         *    <dt>message</dt>
-         *        <dd>
-         *            If provided, this is additional personal text that should be included
-         *            into the email as a message from the owner to the recipient(s).
-         *        </dd>
-         * </dl>
-         */
-        class NoteEmailParameters {
-            guid: string;
-            note: Note;
-            toAddresses: string[];
-            ccAddresses: string[];
-            subject: string;
-            message: string;
-
-            constructor(args?: { guid?: string; note?: Note; toAddresses?: string[]; ccAddresses?: string[]; subject?: string; message?: string; });
-        }
-
-        /**
-         * Identifying information about previous versions of a note that are backed up
-         * within Evernote's servers.    Used in the return value of the listNoteVersions
-         * call.
-         *
-         * <dl>
-         *    <dt>updateSequenceNum</dt>
-         *    <dd>
-         *        The update sequence number for the Note when it last had this content.
-         *        This serves to uniquely identify each version of the note, since USN
-         *        values are unique within an account for each update.
-         *    </dd>
-         *    <dt>updated</dt>
-         *    <dd>
-         *        The 'updated' time that was set on the Note when it had this version
-         *        of the content.    This is the user-modifiable modification time on the
-         *        note, so it's not reliable for guaranteeing the order of various
-         *        versions.    (E.g. if someone modifies the note, then changes this time
-         *        manually into the past and then updates the note again.)
-         *    </dd>
-         *    <dt>saved</dt>
-         *    <dd>
-         *        A timestamp that holds the date and time when this version of the note
-         *        was backed up by Evernote's servers.    This
-         *    </dd>
-         *    <dt>title</dt>
-         *    <dd>
-         *        The title of the note when this particular version was saved.    (The
-         *        current title of the note may differ from this value.)
-         *    </dd>
-         * </dl>
-         */
-        class NoteVersionId {
-            updateSequenceNum: number;
-            updated: number;
-            saved: number;
-            title: string;
-
-            constructor(args?: { updateSequenceNum: number; updated: number; saved: number; title: string; });
-        }
-
-        /**
-         * This structure is passed from clients to the Evernote service when they wish
-         * to relay coarse-grained usage metrics to the service to help improve
-         * products.
-         *
-         * <dl>
-         *    <dt>sessions</dt>
-         *    <dd>
-         *        This field contains a count of the number of usage "sessions" that have
-         *        occurred with this client which have not previously been reported to
-         *        the service.
-         *        A "session" is defined as one of the 96 fifteen-minute intervals of the
-         *        day when someone used Evernote's interface at least once.
-         *        So if a user interacts with an Evernote client at 12:18, 12:24, and 12:36,
-         *        and then the client synchronizes at 12:39, it would report that there were
-         *        two previously-unreported sessions (one session for the 12:15-12:30 time
-         *        period, and one for the 12:30-12:45 period).
-         *        If the user used Evernote again at 12:41 and synchronized at 12:43, it
-         *        would not report any new sessions, because the 12:30-12:45 session had
-         *        already been reported.
-         *    </dd>
-         * </dl>
-         */
-        class ClientUsageMetrics {
-            sessions: number;
-
-            constructor(args?: { sessions?: number; });
-        }
-
-        /**
-         * A description of the thing for which we are searching for related
-         * entities.
-         *
-         * You must specify either <em>noteGuid</em> or <em>plainText</em>, but
-         * not both. <em>filter</em> and <em>referenceUri</em> are optional.
-         *
-         * <dl>
-         * <dt>noteGuid</dt>
-         * <dd>The GUID of an existing note in your account for which related
-         *         entities will be found.</dd>
-         *
-         * <dt>plainText</dt>
-         * <dd>A string of plain text for which to find related entities.
-         *         You should provide a text block with a number of characters between
-         *         EDAM_RELATED_PLAINTEXT_LEN_MIN and EDAM_RELATED_PLAINTEXT_LEN_MAX.
-         *         </dd>
-         *
-         * <dt>filter</dt>
-         * <dd>The list of criteria that will constrain the notes being considered
-         *         related.
-         *         Please note that some of the parameters may be ignored, such as
-         *         <em>order</em> and <em>ascending</em>.
-         * </dd>
-         *
-         * <dt>referenceUri</dt>
-         * <dd>A URI string specifying a reference entity, around which "relatedness"
-         *         should be based. This can be an URL pointing to a web page, for example.
-         * </dd>
-         * </dl>
-         */
-        class RelatedQuery {
-            noteGuid: string;
-            plainText: string;
-            filter: NoteFilter;
-            referenceUri: string;
-
-            constructor(args?: { noteGuid?: string; plainText?: string; filter?: NoteFilter; referenceUri?: string; });
-        }
-
-        /**
-         * The result of calling findRelated().    The contents of the notes,
-         * notebooks, and tags fields will be in decreasing order of expected
-         * relevance.    It is possible that fewer results than requested will be
-         * returned even if there are enough distinct entities in the account
-         * in cases where the relevance is estimated to be low.
-         *
-         * <dl>
-         * <dt>notes</dt>
-         * <dd>If notes have been requested to be included, this will be the
-         *         list of notes.</dd>
-         *
-         * <dt>notebooks</dt>
-         * <dd>If notebooks have been requested to be included, this will be the
-         *         list of notebooks.</dd>
-         *
-         * <dt>tags</dt>
-         * <dd>If tags have been requested to be included, this will be the list
-         *         of tags.</dd>
-         * </dl>
-         *
-         * <dt>containingNotebooks</dt>
-         * <dd>If <code>includeContainingNotebooks</code> is set to <code>true</code>
-         *         in the RelatedResultSpec, return the list of notebooks to
-         *         to which the returned related notes belong. The notebooks in this
-         *         list will occur once per notebook GUID and are represented as
-         *         NotebookDescriptor objects.</dd>
-         * </dl>
-         * </dl>
-         */
-        class RelatedResult {
-            notes: Note[];
-            notebooks: Notebook[];
-            tags: Tag[];
-            containingNotebooks: NotebookDescriptor[];
-
-            constructor(args?: { notes?: Note[]; notebooks?: Notebook[]; tags?: Tag[]; containingNotebooks?: NotebookDescriptor[]; });
-        }
-
-        /**
-         * A description of the thing for which the service will find related
-         * entities, via findRelated(), together with a description of what
-         * type of entities and how many you are seeking in the
-         * RelatedResult.
-         *
-         * <dl>
-         * <dt>maxNotes</dt>
-         * <dd>Return notes that are related to the query, but no more than
-         *         this many.    Any value greater than EDAM_RELATED_MAX_NOTES
-         *         will be silently capped.    If you do not set this field, then
-         *         no notes will be returned.</dd>
-         *
-         * <dt>maxNotebooks</dt>
-         * <dd>Return notebooks that are related to the query, but no more than
-         *         this many.    Any value greater than EDAM_RELATED_MAX_NOTEBOOKS
-         *         will be silently capped.    If you do not set this field, then
-         *         no notebooks will be returned.</dd>
-         *
-         * <dt>maxTags</dt>
-         * <dd>Return tags that are related to the query, but no more than
-         *         this many.    Any value greater than EDAM_RELATED_MAX_TAGS
-         *         will be silently capped.    If you do not set this field, then
-         *         no tags will be returned.</dd>
-         * </dl>
-         *
-         * <dt>writableNotebooksOnly</dt>
-         * <dd>Require that all returned related notebooks are writable.
-         *         The user will be able to create notes in all returned notebooks.
-         *         However, individual notes returned may still belong to notebooks
-         *         in which the user lacks the ability to create notes.</dd>
-         * </dl>
-         *
-         * <dt>includeContainingNotebooks</dt>
-         * <dd>If set to <code>true</code>, return the containingNotebooks field
-         *         in the RelatedResult, which will contain the list of notebooks to
-         *         to which the returned related notes belong.</dd>
-         * </dl>
-         * </dl>
-         */
-        class RelatedResultSpec {
-            maxNotes: number;
-            maxNotebooks: number;
-            maxTags: number;
-            writableNotebooksOnly: boolean;
-            includeContainingNotebooks: boolean;
-
-            constructor(args?: { maxNotes?: number; maxNotebooks?: number; maxTags?: number; writableNotebooksOnly?: boolean; includeContainingNotebooks?: boolean; });
-        }
-        /**
-         * This enumeration defines the possible permission levels for a user.
-         * Free accounts will have a level of NORMAL and paid Premium accounts
-         * will have a level of PREMIUM.
-         */
-        enum PrivilegeLevel {
-            'NORMAL' = 1,
-            'PREMIUM' = 3,
-            'VIP' = 5,
-            'MANAGER' = 7,
-            'SUPPORT' = 8,
-            'ADMIN' = 9,
-        }
-
-        /**
-         * Every search query is specified as a sequence of characters.
-         * Currently, only the USER query format is supported.
-         */
-        enum QueryFormat {
-            'USER' = 1,
-            'SEXP' = 2,
-        }
-
-        /**
-         * This enumeration defines the possible sort ordering for notes when
-         * they are returned from a search result.
-         */
-        enum NoteSortOrder {
-            'CREATED' = 1,
-            'UPDATED' = 2,
-            'RELEVANCE' = 3,
-            'UPDATE_SEQUENCE_NUMBER' = 4,
-            'TITLE' = 5,
-        }
-
-        /**
-         * This enumeration defines the possible states of a premium account
-         *
-         * NONE:        the user has never attempted to become a premium subscriber
-         *
-         * PENDING: the user has requested a premium account but their charge has not
-         *     been confirmed
-         *
-         * ACTIVE:    the user has been charged and their premium account is in good
-         *    standing
-         *
-         * FAILED:    the system attempted to charge the was denied. Their premium
-         *     privileges have been revoked. We will periodically attempt to re-validate
-         *     their order.
-         *
-         * CANCELLATION_PENDING: the user has requested that no further charges be made
-         *     but the current account is still active.
-         *
-         * CANCELED: the premium account was canceled either because of failure to pay
-         *     or user cancelation. No more attempts will be made to activate the account.
-         */
-        enum PremiumOrderStatus {
-            'NONE' = 0,
-            'PENDING' = 1,
-            'ACTIVE' = 2,
-            'FAILED' = 3,
-            'CANCELLATION_PENDING' = 4,
-            'CANCELED' = 5,
-        }
-
-        /**
-         * Privilege levels for accessing shared notebooks.
-         *
-         * READ_NOTEBOOK: Recipient is able to read the contents of the shared notebook
-         *     but does to have access to information about other recipients of the
-         *     notebook or the activity stream information.
-         *
-         * MODIFY_NOTEBOOK_PLUS_ACTIVITY: Recipient has rights to read and modify the contents
-         *     of the shared notebook, including the right to move notes to the trash and to create
-         *     notes in the notebook.    The recipient can also access information about other
-         *     recipients and the activity stream.
-         *
-         * READ_NOTEBOOK_PLUS_ACTIVITY: Recipient has READ_NOTEBOOK rights and can also
-         *     access information about other recipients and the activity stream.
-         *
-         * GROUP: If the user belongs to a group, such as a Business, that has a defined
-         *     privilege level, use the privilege level of the group as the privilege for
-         *     the individual.
-         *
-         * FULL_ACCESS: Recipient has full rights to the shared notebook and recipient lists,
-         *     including privilege to revoke and create invitations and to change privilege
-         *     levels on invitations for individuals.    This privilege level is primarily intended
-         *     for use by individual shares.
-         *
-         * BUSINESS_FULL_ACCESS: Intended for use with Business Notebooks, a
-         * BUSINESS_FULL_ACCESS level is FULL_ACCESS with the additional rights to
-         * change how the notebook will appear in the business library, including the
-         * rights to publish and unpublish the notebook from the library.
-         */
-        enum SharedNotebookPrivilegeLevel {
-            'READ_NOTEBOOK' = 0,
-            'MODIFY_NOTEBOOK_PLUS_ACTIVITY' = 1,
-            'READ_NOTEBOOK_PLUS_ACTIVITY' = 2,
-            'GROUP' = 3,
-            'FULL_ACCESS' = 4,
-            'BUSINESS_FULL_ACCESS' = 5,
-        }
-
-        /**
-         * Enumeration of the roles that a User can have within a sponsored group.
-         *
-         * GROUP_MEMBER: The user is a member of the group with no special privileges.
-         *
-         * GROUP_ADMIN: The user is an administrator within the group.
-         *
-         * GROUP_OWNER: The user is the owner of the group.
-         */
-        enum SponsoredGroupRole {
-            'GROUP_MEMBER' = 1,
-            'GROUP_ADMIN' = 2,
-            'GROUP_OWNER' = 3,
-        }
-
-        /**
-         * Enumeration of the roles that a User can have within an Evernote Business account.
-         *
-         * ADMIN: The user is an administrator of the Evernote Business account.
-         *
-         * NORMAL: The user is a regular user within the Evernote Business account.
-         */
-        enum BusinessUserRole {
-            'ADMIN' = 1,
-            'NORMAL' = 2,
-        }
-
-        /**
-         * An enumeration describing restrictions on the domain of shared notebook
-         * instances that are valid for a given operation, as used, for example, in
-         * NotebookRestrictions.
-         *
-         * ONLY_JOINED_OR_PREVIEW: The domain consists of shared notebooks that
-         *     "belong" to the recipient or still available for preview by any recipient.
-         *     Shared notebooks that the recipient has joined (the username has already been
-         *     assigned to our user) are in the domain.    Additionally, shared notebooks
-         *     that allow preview and have not yet been joined are in the domain.
-         *
-         * NO_SHARED_NOTEBOOKS: No shared notebooks are applicable to the operation.
-         */
-        enum SharedNotebookInstanceRestrictions {
-            'ONLY_JOINED_OR_PREVIEW' = 1,
-            'NO_SHARED_NOTEBOOKS' = 2,
-        }
-
-        /**
-         * An enumeration describing the configuration state related to receiving
-         * reminder e-mails from the service.    Reminder e-mails summarize notes
-         * based on their Note.attributes.reminderTime values.
-         *
-         * DO_NOT_SEND: The user has selected to not receive reminder e-mail.
-         *
-         * SEND_DAILY_EMAIL: The user has selected to receive reminder e-mail for those
-         *     days when there is a reminder.
-         */
-        enum ReminderEmailConfig {
-            'DO_NOT_SEND' = 1,
-            'SEND_DAILY_EMAIL' = 2,
-        }
-
-        /**
-         *    In several places, EDAM exchanges blocks of bytes of data for a component
-         *    which may be relatively large.    For example:    the contents of a clipped
-         *    HTML note, the bytes of an embedded image, or the recognition XML for
-         *    a large image.    This structure is used in the protocol to represent
-         *    any of those large blocks of data when they are transmitted or when
-         *    they are only referenced their metadata.
-         *
-         * <dl>
-         *    <dt>bodyHash</dt>
-         *        <dd>This field carries a one-way hash of the contents of the
-         *        data body, in binary form.    The hash function is MD5<br/>
-         *        Length:    EDAM_HASH_LEN (exactly)
-         *        </dd>
-         *
-         *    <dt>size</dt>
-         *        <dd>The length, in bytes, of the data body.
-         *        </dd>
-         *
-         *    <dt>body</dt>
-         *        <dd>This field is set to contain the binary contents of the data
-         *        whenever the resource is being transferred.    If only metadata is
-         *        being exchanged, this field will be empty.    For example, a client could
-         *        notify the service about the change to an attribute for a resource
-         *        without transmitting the binary resource contents.
-         *        </dd>
-         *    </dl>
-         */
-        class Data {
-            bodyHash: string;
-            size: number;
-            body: string;
-
-            constructor(args?: { bodyHash?: string; size?: number; body?: string; });
-        }
-
-        /**
-         *    A structure holding the optional attributes that can be stored
-         *    on a User.    These are generally less critical than the core User fields.
-         *
-         * <dl>
-         *    <dt>defaultLocationName</dt>
-         *        <dd>the location string that should be associated
-         *        with the user in order to determine where notes are taken if not otherwise
-         *        specified.<br/>
-         *        Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *        </dd>
-         *
-         *    <dt>defaultLatitude</dt>
-         *        <dd>if set, this is the latitude that should be
-         *        assigned to any notes that have no other latitude information.
-         *        </dd>
-         *
-         *    <dt>defaultLongitude</dt>
-         *        <dd>if set, this is the longitude that should be
-         *        assigned to any notes that have no other longitude information.
-         *        </dd>
-         *
-         *    <dt>preactivation</dt>
-         *        <dd>if set, the user account is not yet confirmed for
-         *        login.    I.e. the account has been created, but we are still waiting for
-         *        the user to complete the activation step.
-         *        </dd>
-         *
-         *    <dt>viewedPromotions</dt>
-         *        <dd>a list of promotions the user has seen.
-         *         This list may occasionally be modified by the system when promotions are
-         *         no longer available.<br/>
-         *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *        </dd>
-         *
-         *    <dt>incomingEmailAddress</dt>
-         *        <dd>if set, this is the email address that the
-         *         user may send email to in order to add an email note directly into the
-         *         account via the SMTP email gateway.    This is the part of the email
-         *         address before the '@' symbol ... our domain is not included.
-         *         If this is not set, the user may not add notes via the gateway.<br/>
-         *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *        </dd>
-         *
-         *    <dt>recentMailedAddresses</dt>
-         *        <dd>if set, this will contain a list of email
-         *         addresses that have recently been used as recipients
-         *         of outbound emails by the user.    This can be used to pre-populate a
-         *         list of possible destinations when a user wishes to send a note via
-         *         email.<br/>
-         *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX each<br/>
-         *         Max:    EDAM_USER_RECENT_MAILED_ADDRESSES_MAX entries
-         *        </dd>
-         *
-         *    <dt>comments</dt>
-         *        <dd>Free-form text field that may hold general support
-         *         information, etc.<br/>
-         *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *        </dd>
-         *
-         *    <dt>dateAgreedToTermsOfService</dt>
-         *        <dd>The date/time when the user agreed to
-         *         the terms of service.    This can be used as the effective "start date"
-         *         for the account.
-         *        </dd>
-         *
-         *    <dt>maxReferrals</dt>
-         *        <dd>The number of referrals that the user is permitted
-         *         to make.
-         *        </dd>
-         *
-         *    <dt>referralCount</dt>
-         *        <dd>The number of referrals sent from this account.
-         *        </dd>
-         *
-         *    <dt>refererCode</dt>
-         *        <dd>A code indicating where the user was sent from. AKA
-         *         promotion code
-         *        </dd>
-         *
-         *    <dt>sentEmailDate</dt>
-         *        <dd>The most recent date when the user sent outbound
-         *         emails from the service.    Used with sentEmailCount to limit the number
-         *         of emails that can be sent per day.
-         *        </dd>
-         *
-         *    <dt>sentEmailCount</dt>
-         *        <dd>The number of emails that were sent from the user
-         *         via the service on sentEmailDate.    Used to enforce a limit on the number
-         *         of emails per user per day to prevent spamming.
-         *        </dd>
-         *
-         *    <dt>dailyEmailLimit</dt>
-         *        <dd>If set, this is the maximum number of emails that
-         *         may be sent in a given day from this account.    If unset, the server will
-         *         use the configured default limit.
-         *        </dd>
-         *
-         *    <dt>emailOptOutDate</dt>
-         *        <dd>If set, this is the date when the user asked
-         *         to be excluded from offers and promotions sent by Evernote.    If not set,
-         *         then the user currently agrees to receive these messages.
-         *        </dd>
-         *
-         *    <dt>partnerEmailOptInDate</dt>
-         *        <dd>If set, this is the date when the user asked
-         *         to be included in offers and promotions sent by Evernote's partners.
-         *         If not sent, then the user currently does not agree to receive these
-         *         emails.
-         *        </dd>
-         *
-         *    <dt>preferredLanguage</dt>
-         *        <dd>a 2 character language codes based on:
-         *                http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt used for
-         *             localization purposes to determine what language to use for the web
-         *             interface and for other direct communication (e.g. emails).
-         *        </dd>
-         *
-         *    <dt>preferredCountry</dt>
-         *        <dd>Preferred country code based on ISO 3166-1-alpha-2 indicating the
-         *        users preferred country</dd>
-         *
-         *    <dt>clipFullPage</dt>
-         *        <dd>Boolean flag set to true if the user wants to clip full pages by
-         *        default when they use the web clipper without a selection.</dd>
-         *
-         *    <dt>twitterUserName</dt>
-         *        <dd>The username of the account of someone who has chosen to enable
-         *        Twittering into Evernote.    This value is subject to change, since users
-         *        may change their Twitter user name.</dd>
-         *
-         *    <dt>twitterId</dt>
-         *        <dd>The unique identifier of the user's Twitter account if that user
-         *        has chosen to enable Twittering into Evernote.</dd>
-         *
-         *    <dt>groupName</dt>
-         *        <dd>A name identifier used to identify a particular set of branding and
-         *         light customization.</dd>
-         *
-         *    <dt>recognitionLanguage</dt>
-         *        <dd>a 2 character language codes based on:
-         *                http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt
-         *                If set, this is used to determine the language that should be used
-         *                when processing images and PDF files to find text.
-         *                If not set, then the 'preferredLanguage' will be used.
-         *        </dd>
-         *
-         *    <dt>educationalInstitution</dt>
-         *        <dd>a flag indicating that the user is part of an educational institution which
-         *        makes them eligible for discounts on bulk purchases
-         *        </dd>
-         *
-         *    <dt>businessAddress</dt>
-         *        <dd>A string recording the business address of a Sponsored Account user who has requested invoicing.
-         *        </dd>
-         *
-         *    <dt>hideSponsorBilling</dt>
-         *        <dd>A flag indicating whether to hide the billing information on a sponsored
-         *                account owner's settings page
-         *        </dd>
-         *
-         *    <dt>taxExempt</dt>
-         *        <dd>A flag indicating the user's sponsored group is exempt from sale tax
-         *        </dd>
-         *
-         *    <dt>useEmailAutoFiling</dt>
-         *        <dd>A flag indicating whether the user chooses to allow Evernote to automatically
-         *                file and tag emailed notes
-         *        </dd>
-         *
-         *    <dt>reminderEmailConfig</dt>
-         *        <dd>Configuration state for whether or not the user wishes to receive
-         *                reminder e-mail.    This setting applies to both the reminder e-mail sent
-         *                for personal reminder notes and for the reminder e-mail sent for reminder
-         *                notes in the user's business notebooks that the user has configured for
-         *                e-mail notifications.
-         *        </dd>
-         *    </dl>
-         */
-        class UserAttributes {
-            defaultLocationName: string;
-            defaultLatitude: number;
-            defaultLongitude: number;
-            preactivation: boolean;
-            viewedPromotions: string[];
-            incomingEmailAddress: string;
-            recentMailedAddresses: string[];
-            comments: string;
-            dateAgreedToTermsOfService: number;
-            maxReferrals: number;
-            referralCount: number;
-            refererCode: string;
-            sentEmailDate: number;
-            sentEmailCount: number;
-            dailyEmailLimit: number;
-            emailOptOutDate: number;
-            partnerEmailOptInDate: number;
-            preferredLanguage: string;
-            preferredCountry: string;
-            clipFullPage: boolean;
-            twitterUserName: string;
-            twitterId: string;
-            groupName: string;
-            recognitionLanguage: string;
-            referralProof: string;
-            educationalDiscount: boolean;
-            businessAddress: string;
-            hideSponsorBilling: boolean;
-            taxExempt: boolean;
-            useEmailAutoFiling: boolean;
-            reminderEmailConfig: ReminderEmailConfig;
-
-            constructor(args?: { defaultLocationName?: string; defaultLatitude?: number; defaultLongitude?: number; preactivation?: boolean; viewedPromotions?: string[]; incomingEmailAddress?: string; recentMailedAddresses?: string[]; comments?: string; dateAgreedToTermsOfService?: number; maxReferrals?: number; referralCount?: number; refererCode?: string; sentEmailDate?: number; sentEmailCount?: number; dailyEmailLimit?: number; emailOptOutDate?: number; partnerEmailOptInDate?: number; preferredLanguage?: string; preferredCountry?: string; clipFullPage?: boolean; twitterUserName?: string; twitterId?: string; groupName?: string; recognitionLanguage?: string; referralProof?: string; educationalDiscount?: boolean; businessAddress?: string; hideSponsorBilling?: boolean; taxExempt?: boolean; useEmailAutoFiling?: boolean; reminderEmailConfig?: ReminderEmailConfig; });
-        }
-
-        /**
-         *    This represents the bookkeeping information for the user's subscription.
-         *
-         * <dl>
-         *    <dt>uploadLimit</dt>
-         *        <dd>The number of bytes that can be uploaded to the account
-         *        in the current month.    For new notes that are created, this is the length
-         *        of the note content (in Unicode characters) plus the size of each resource
-         *        (in bytes).    For edited notes, this is the the difference between the old
-         *        length and the new length (if this is greater than 0) plus the size of
-         *        each new resource.
-         *        </dd>
-         *    <dt>uploadLimitEnd</dt>
-         *        <dd>The date and time when the current upload limit
-         *        expires.    At this time, the monthly upload count reverts to 0 and a new
-         *        limit is imposed.    This date and time is exclusive, so this is effectively
-         *        the start of the new month.
-         *        </dd>
-         *    <dt>uploadLimitNextMonth</dt>
-         *        <dd> When uploadLimitEnd is reached, the service
-         *        will change uploadLimit to uploadLimitNextMonth. If a premium account is
-         *        canceled, this mechanism will reset the quota appropriately.
-         *        </dd>
-         *    <dt>premiumServiceStatus</dt>
-         *        <dd>Indicates the phases of a premium account
-         *        during the billing process.
-         *        </dd>
-         *    <dt>premiumOrderNumber</dt>
-         *        <dd>The order number used by the commerce system to
-         *        process recurring payments
-         *        </dd>
-         *    <dt>premiumServiceStart</dt>
-         *        <dd>The start date when this premium promotion
-         *        began (this number will get overwritten if a premium service is canceled
-         *        and then re-activated).
-         *        </dd>
-         *    <dt>premiumCommerceService</dt>
-         *        <dd>The commerce system used (paypal, Google
-         *        checkout, etc)
-         *        </dd>
-         *    <dt>premiumServiceSKU</dt>
-         *        <dd>The code associated with the purchase eg. monthly
-         *        or annual purchase. Clients should interpret this value and localize it.
-         *        </dd>
-         *    <dt>lastSuccessfulCharge</dt>
-         *        <dd>Date the last time the user was charged.
-         *        Null if never charged.
-         *        </dd>
-         *    <dt>lastFailedCharge</dt>
-         *        <dd>Date the last time a charge was attempted and
-         *        failed.
-         *        </dd>
-         *    <dt>lastFailedChargeReason</dt>
-         *        <dd>Reason provided for the charge failure
-         *        </dd>
-         *    <dt>nextPaymentDue</dt>
-         *        <dd>The end of the billing cycle. This could be in the
-         *        past if there are failed charges.
-         *        </dd>
-         *    <dt>premiumLockUntil</dt>
-         *        <dd>An internal variable to manage locking operations
-         *        on the commerce variables.
-         *        </dd>
-         *    <dt>updated</dt>
-         *        <dd>The date any modification where made to this record.
-         *        </dd>
-         *    <dt>premiumSubscriptionNumber</dt>
-         *        <dd>The number number identifying the
-         *        recurring subscription used to make the recurring charges.
-         *        </dd>
-         *    <dt>lastRequestedCharge</dt>
-         *        <dd>Date charge last attempted</dd>
-         *    <dt>currency</dt>
-         *        <dd>ISO 4217 currency code</dd>
-         *    <dt>unitPrice</dt>
-         *        <dd>charge in the smallest unit of the currency (e.g. cents for USD)</dd>
-         *    <dt>businessId</dt>
-         *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
-         *    <dt>businessName</dt>
-         *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
-         *    <dt>businessRole</dt>
-         *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
-         *    <dt>unitDiscount</dt>
-         *        <dd>discount per seat in negative amount and smallest unit of the currency (e.g. cents for USD)</dd>
-         *    <dt>nextChargeDate</dt>
-         *        <dd>The next time the user will be charged, may or may not be the same as nextPaymentDue</dd>
-         *    </dl>
-         */
-        class Accounting {
-            uploadLimit: number;
-            uploadLimitEnd: number;
-            uploadLimitNextMonth: number;
-            premiumServiceStatus: PremiumOrderStatus;
-            premiumOrderNumber: string;
-            premiumCommerceService: string;
-            premiumServiceStart: number;
-            premiumServiceSKU: string;
-            lastSuccessfulCharge: number;
-            lastFailedCharge: number;
-            lastFailedChargeReason: string;
-            nextPaymentDue: number;
-            premiumLockUntil: number;
-            updated: number;
-            premiumSubscriptionNumber: string;
-            lastRequestedCharge: number;
-            currency: string;
-            unitPrice: number;
-            businessId: number;
-            businessName: string;
-            businessRole: BusinessUserRole;
-            unitDiscount: number;
-            nextChargeDate: number;
-
-            constructor(args?: { uploadLimit?: number; uploadLimitEnd?: number; uploadLimitNextMonth?: number; premiumServiceStatus?: PremiumOrderStatus; premiumOrderNumber?: string; premiumCommerceService?: string; premiumServiceStart?: number; premiumServiceSKU?: string; lastSuccessfulCharge?: number; lastFailedCharge?: number; lastFailedChargeReason?: string; nextPaymentDue?: number; premiumLockUntil?: number; updated?: number; premiumSubscriptionNumber?: string; lastRequestedCharge?: number; currency?: string; unitPrice?: number; businessId?: number; businessName?: string; businessRole?: BusinessUserRole; unitDiscount?: number; nextChargeDate?: number; });
-        }
-
-        /**
-         * This structure is used to provide information about an Evernote Business
-         * membership, for members who are part of a business.
-         *
-         * <dl>
-         * <dt>businessId</dt>
-         *     <dd>The ID of the Evernote Business account that the user is a member of.
-         * <dt>businessName</dt>
-         *     <dd>The human-readable name of the Evernote Business account that the user
-         *             is a member of.</dd>
-         * <dt>role</dt>
-         *     <dd>The role of the user within the Evernote Business account that
-         *             they are a member of.</dd>
-         * <dt>email</dt>
-         *     <dd>An e-mail address that will be used by the service in the context of your
-         *             Evernote Business activities.    For example, this e-mail address will be used
-         *             when you e-mail a business note, when you update notes in the account of
-         *             your business, etc.    The business e-mail cannot be used for identification
-         *             purposes such as for logging into the service.
-         *     </dd>
-         * </dl>
-         */
-        class BusinessUserInfo {
-            businessId: number;
-            businessName: string;
-            role: BusinessUserRole;
-            email: string;
-
-            constructor(args?: { businessId?: number; businessName?: string; role?: BusinessUserRole; email?: string; });
-        }
-
-        /**
-         *    This structure is used to provide information about a user's Premium account.
-         * <dl>
-         *    <dt>currentTime</dt>
-         *        <dd>
-         *        The server-side date and time when this data was generated.
-         *        </dd>
-         *    <dt>premium</dt>
-         *        <dd>
-         *        True if the user's account is Premium.
-         *        </dd>
-         *    <dt>premiumRecurring</dt>
-         *        <dd>
-         *        True if the user's account is Premium and has a recurring payment method.
-         *        </dd>
-         *    <dt>premiumExpirationDate</dt>
-         *        <dd>
-         *        The date when the user's Premium account expires, or the date when the
-         *        user's account is due for payment if it has a recurring payment method.
-         *        </dd>
-         *    <dt>premiumExtendable</dt>
-         *        <dd>
-         *        True if the user is eligible for purchasing Premium account extensions.
-         *        </dd>
-         *    <dt>premiumPending</dt>
-         *        <dd>
-         *        True if the user's Premium account is pending payment confirmation
-         *        </dd>
-         *    <dt>premiumCancellationPending</dt>
-         *        <dd>
-         *        True if the user has requested that no further charges to be made; the
-         *        Premium account will remain active until it expires.
-         *        </dd>
-         *    <dt>canPurchaseUploadAllowance</dt>
-         *        <dd>
-         *        True if the user is eligible for purchasing additional upload allowance.
-         *        </dd>
-         *    <dt>sponsoredGroupName</dt>
-         *        <dd>
-         *        The name of the sponsored group that the user is part of.
-         *        </dd>
-         *    <dt>sponsoredGroupRole</dt>
-         *        <dd>
-         *        DEPRECATED - will be removed in a future update.
-         *        </dd>
-         *    <dt>premiumUpgradable</dt>
-         *        <dd>
-         *        True if the user is eligible for purchasing Premium account upgrade.
-         *        </dd>
-         *    </dl>
-         */
-        class PremiumInfo {
-            currentTime: number;
-            premium: boolean;
-            premiumRecurring: boolean;
-            premiumExpirationDate: number;
-            premiumExtendable: boolean;
-            premiumPending: boolean;
-            premiumCancellationPending: boolean;
-            canPurchaseUploadAllowance: boolean;
-            sponsoredGroupName: string;
-            sponsoredGroupRole: SponsoredGroupRole;
-            premiumUpgradable: boolean;
-
-            constructor(args?: { currentTime: number; premium: boolean; premiumRecurring: boolean; premiumExpirationDate?: number; premiumExtendable: boolean; premiumPending: boolean; premiumCancellationPending: boolean; canPurchaseUploadAllowance: boolean; sponsoredGroupName?: string; sponsoredGroupRole?: SponsoredGroupRole; premiumUpgradable?: boolean; });
-        }
-
-        /**
-         *    This represents the information about a single user account.
-         * <dl>
-         *    <dt>id</dt>
-         *        <dd>The unique numeric identifier for the account, which will not
-         *        change for the lifetime of the account.
-         *        </dd>
-         *
-         *    <dt>username</dt>
-         *        <dd>The name that uniquely identifies a single user account. This name
-         *        may be presented by the user, along with their password, to log into
-         *        their account.
-         *        May only contain a-z, 0-9, or '-', and may not start or end with the '-'
-         *        <br/>
-         *        Length:    EDAM_USER_USERNAME_LEN_MIN - EDAM_USER_USERNAME_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_USER_USERNAME_REGEX
-         *        </dd>
-         *
-         *    <dt>email</dt>
-         *        <dd>The email address registered for the user.    Must comply with
-         *        RFC 2821 and RFC 2822.<br/>
-         *        Third party applications that authenticate using OAuth do not have
-         *        access to this field.
-         *        Length:    EDAM_EMAIL_LEN_MIN - EDAM_EMAIL_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_EMAIL_REGEX
-         *        </dd>
-         *
-         *    <dt>name</dt>
-         *        <dd>The printable name of the user, which may be a combination
-         *        of given and family names.    This is used instead of separate "first"
-         *        and "last" names due to variations in international name format/order.
-         *        May not start or end with a whitespace character.    May contain any
-         *        character but carriage return or newline (Unicode classes Zl and Zp).
-         *        <br/>
-         *        Length:    EDAM_USER_NAME_LEN_MIN - EDAM_USER_NAME_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_USER_NAME_REGEX
-         *        </dd>
-         *
-         *    <dt>timezone</dt>
-         *        <dd>The zone ID for the user's default location.    If present,
-         *        this may be used to localize the display of any timestamp for which no
-         *        other timezone is available.
-         *        The format must be encoded as a standard zone ID such as
-         *        "America/Los_Angeles" or "GMT+08:00"
-         *        <br/>
-         *        Length:    EDAM_TIMEZONE_LEN_MIN - EDAM_TIMEZONE_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_TIMEZONE_REGEX
-         *        </dd>
-         *
-         *    <dt>privilege</dt>
-         *        <dd>The level of access permitted for the user.
-         *        </dd>
-         *
-         *    <dt>created</dt>
-         *        <dd>The date and time when this user account was created in the
-         *        service.
-         *        </dd>
-         *
-         *    <dt>updated</dt>
-         *        <dd>The date and time when this user account was last modified
-         *        in the service.
-         *        </dd>
-         *
-         *    <dt>deleted</dt>
-         *        <dd>If the account has been deleted from the system (e.g. as
-         *        the result of a legal request by the user), the date and time of the
-         *        deletion will be represented here.    If not, this value will not be set.
-         *        </dd>
-         *
-         *    <dt>active</dt>
-         *        <dd>If the user account is available for login and
-         *        synchronization, this flag will be set to true.
-         *        </dd>
-         *
-         *    <dt>shardId</dt>
-         *        <dd>DEPRECATED - Client applications should have no need to use this field.
-         *        </dd>
-         *
-         *    <dt>attributes</dt>
-         *        <dd>If present, this will contain a list of the attributes
-         *        for this user account.
-         *        </dd>
-         *
-         *    <dt>accounting</dt>
-         *        <dd>Bookkeeping information for the user's subscription.
-         *        </dd>
-         *
-         *    <dt>premiumInfo</dt>
-         *        <dd>If present, this will contain a set of commerce information
-         *        relating to the user's premium service level.
-         *        </dd>
-         *
-         *    <dt>businessUserInfo</dt>
-         *        <dd>If present, this will contain a set of business information
-         *        relating to the user's business membership.    If not present, the
-         *        user is not currently part of a business.
-         *        </dd>
-         *    </dl>
-         */
-        class User {
-            id: number;
-            username: string;
-            email: string;
-            name: string;
-            timezone: string;
-            privilege: PrivilegeLevel;
-            created: number;
-            updated: number;
-            deleted: number;
-            active: boolean;
-            shardId: string;
-            attributes: UserAttributes;
-            accounting: Accounting;
-            premiumInfo: PremiumInfo;
-            businessUserInfo: BusinessUserInfo;
-
-            constructor(args?: { id?: number; username?: string; email?: string; name?: string; timezone?: string; privilege?: PrivilegeLevel; created?: number; updated?: number; deleted?: number; active?: boolean; shardId?: string; attributes?: UserAttributes; accounting?: Accounting; premiumInfo?: PremiumInfo; businessUserInfo?: BusinessUserInfo; });
-        }
-
-        /**
-         *    A tag within a user's account is a unique name which may be organized
-         *    a simple hierarchy.
-         * <dl>
-         *    <dt>guid</dt>
-         *        <dd>The unique identifier of this tag. Will be set by the service,
-         *        so may be omitted by the client when creating the Tag.
-         *        <br/>
-         *        Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_GUID_REGEX
-         *        </dd>
-         *
-         *    <dt>name</dt>
-         *        <dd>A sequence of characters representing the tag's identifier.
-         *        Case is preserved, but is ignored for comparisons.
-         *        This means that an account may only have one tag with a given name, via
-         *        case-insensitive comparison, so an account may not have both "food" and
-         *        "Food" tags.
-         *        May not contain a comma (','), and may not begin or end with a space.
-         *        <br/>
-         *        Length:    EDAM_TAG_NAME_LEN_MIN - EDAM_TAG_NAME_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_TAG_NAME_REGEX
-         *        </dd>
-         *
-         *    <dt>parentGuid</dt>
-         *        <dd>If this is set, then this is the GUID of the tag that
-         *        holds this tag within the tag organizational hierarchy.    If this is
-         *        not set, then the tag has no parent and it is a "top level" tag.
-         *        Cycles are not allowed (e.g. a->parent->parent == a) and will be
-         *        rejected by the service.
-         *        <br/>
-         *        Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *        <br/>
-         *        Regex:    EDAM_GUID_REGEX
-         *        </dd>
-         *
-         *    <dt>updateSequenceNum</dt>
-         *        <dd>A number identifying the last transaction to
-         *        modify the state of this object.    The USN values are sequential within an
-         *        account, and can be used to compare the order of modifications within the
-         *        service.
-         *        </dd>
-         *    </dl>
-         */
-        class Tag {
-            guid: string;
-            name: string;
-            parentGuid: string;
-            updateSequenceNum: number;
-
-            constructor(args?: { guid?: string; name?: string; parentGuid?: string; updateSequenceNum?: number; });
-        }
-
-        /**
-         * A structure that wraps a map of name/value pairs whose values are not
-         * always present in the structure in order to reduce space when obtaining
-         * batches of entities that contain the map.
-         *
-         * When the server provides the client with a LazyMap, it will fill in either
-         * the keysOnly field or the fullMap field, but never both, based on the API
-         * and parameters.
-         *
-         * When a client provides a LazyMap to the server as part of an update to
-         * an object, the server will only update the LazyMap if the fullMap field is
-         * set. If the fullMap field is not set, the server will not make any changes
-         * to the map.
-         *
-         * Check the API documentation of the individual calls involving the LazyMap
-         * for full details including the constraints of the names and values of the
-         * map.
-         *
-         * <dl>
-         * <dt>keysOnly</dt>
-         *     <dd>The set of keys for the map.    This field is ignored by the
-         *             server when set.
-         *     </dd>
-         *
-         * <dt>fullMap</dt>
-         *     <dd>The complete map, including all keys and values.
-         *     </dd>
-         * </dl>
-         */
-        class LazyMap {
-            keysOnly: string[];
-            fullMap: { [k: string]: string; };
-
-            constructor(args?: { keysOnly?: string[]; fullMap?: { [k: string]: string; }; });
-        }
-
-        /**
-         * Structure holding the optional attributes of a Resource
-         * <dl>
-         * <dt>sourceURL</dt>
-         *     <dd>the original location where the resource was hosted
-         *     <br/>
-         *        Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>timestamp</dt>
-         *     <dd>the date and time that is associated with this resource
-         *     (e.g. the time embedded in an image from a digital camera with a clock)
-         *     </dd>
-         *
-         * <dt>latitude</dt>
-         *     <dd>the latitude where the resource was captured
-         *     </dd>
-         *
-         * <dt>longitude</dt>
-         *     <dd>the longitude where the resource was captured
-         *     </dd>
-         *
-         * <dt>altitude</dt>
-         *     <dd>the altitude where the resource was captured
-         *     </dd>
-         *
-         * <dt>cameraMake</dt>
-         *     <dd>information about an image's camera, e.g. as embedded in
-         *     the image's EXIF data
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>cameraModel</dt>
-         *     <dd>information about an image's camera, e.g. as embedded
-         *     in the image's EXIF data
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>clientWillIndex</dt>
-         *     <dd>if true, then the original client that submitted
-         *     the resource plans to submit the recognition index for this resource at a
-         *     later time.
-         *     </dd>
-         *
-         * <dt>recoType</dt>
-         *     <dd>DEPRECATED - this field is no longer set by the service, so should
-         *         be ignored.
-         *     </dd>
-         *
-         * <dt>fileName</dt>
-         *     <dd>if the resource came from a source that provided an
-         *     explicit file name, the original name will be stored here.    Many resources
-         *     come from unnamed sources, so this will not always be set.
-         *     </dd>
-         *
-         * <dt>attachment</dt>
-         *     <dd>this will be true if the resource should be displayed as an attachment,
-         *     or false if the resource should be displayed inline (if possible).
-         *     </dd>
-         *
-         * <dt>applicationData</dt>
-         * <dd>Provides a location for applications to store a relatively small
-         * (4kb) blob of data associated with a Resource that is not visible to the user
-         * and that is opaque to the Evernote service. A single application may use at most
-         * one entry in this map, using its API consumer key as the map key. See the
-         * documentation for LazyMap for a description of when the actual map values
-         * are returned by the service.
-         * <p>To safely add or modify your application's entry in the map, use
-         * NoteStore.setResourceApplicationDataEntry. To safely remove your application's
-         * entry from the map, use NoteStore.unsetResourceApplicationDataEntry.</p>
-         * Minimum length of a name (key): EDAM_APPLICATIONDATA_NAME_LEN_MIN
-         * <br/>
-         * Sum max size of key and value: EDAM_APPLICATIONDATA_ENTRY_LEN_MAX
-         * <br/>
-         * Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
-         * </dd>
-         *
-         * </dl>
-         */
-        class ResourceAttributes {
-            sourceURL: string;
-            timestamp: number;
-            latitude: number;
-            longitude: number;
-            altitude: number;
-            cameraMake: string;
-            cameraModel: string;
-            clientWillIndex: boolean;
-            recoType: string;
-            fileName: string;
-            attachment: boolean;
-            applicationData: LazyMap;
-
-            constructor(args?: { sourceURL?: string; timestamp?: number; latitude?: number; longitude?: number; altitude?: number; cameraMake?: string; cameraModel?: string; clientWillIndex?: boolean; recoType?: string; fileName?: string; attachment?: boolean; applicationData?: LazyMap; });
-        }
-
-        /**
-         * Every media file that is embedded or attached to a note is represented
-         * through a Resource entry.
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this resource.    Will be set whenever
-         *     a resource is retrieved from the service, but may be null when a client
-         *     is creating a resource.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>noteGuid</dt>
-         *     <dd>The unique identifier of the Note that holds this
-         *     Resource. Will be set whenever the resource is retrieved from the service,
-         *     but may be null when a client is creating a resource.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>data</dt>
-         *     <dd>The contents of the resource.
-         *     Maximum length:    The data.body is limited to EDAM_RESOURCE_SIZE_MAX_FREE
-         *     for free accounts and EDAM_RESOURCE_SIZE_MAX_PREMIUM for premium accounts.
-         *     </dd>
-         *
-         * <dt>mime</dt>
-         *     <dd>The MIME type for the embedded resource.    E.g. "image/gif"
-         *     <br/>
-         *     Length:    EDAM_MIME_LEN_MIN - EDAM_MIME_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_MIME_REGEX
-         *     </dd>
-         *
-         * <dt>width</dt>
-         *     <dd>If set, this contains the display width of this resource, in
-         *     pixels.
-         *     </dd>
-         *
-         * <dt>height</dt>
-         *     <dd>If set, this contains the display height of this resource,
-         *     in pixels.
-         *     </dd>
-         *
-         * <dt>duration</dt>
-         *     <dd>DEPRECATED: ignored.
-         *     </dd>
-         *
-         * <dt>active</dt>
-         *     <dd>DEPRECATED: ignored.
-         *     </dd>
-         *
-         * <dt>recognition</dt>
-         *     <dd>If set, this will hold the encoded data that provides
-         *     information on search and recognition within this resource.
-         *     </dd>
-         *
-         * <dt>attributes</dt>
-         *     <dd>A list of the attributes for this resource.
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this object. The USN values are sequential within an
-         *     account, and can be used to compare the order of modifications within the
-         *     service.
-         *     </dd>
-         *
-         * <dt>alternateData</dt>
-         *     <dd>Some Resources may be assigned an alternate data format by the service
-         *     which may be more appropriate for indexing or rendering than the original
-         *     data provided by the user.    In these cases, the alternate data form will
-         *     be available via this Data element.    If a Resource has no alternate form,
-         *     this field will be unset.</dd>
-         * </dl>
-         */
-        class Resource {
-            guid: string;
-            noteGuid: string;
-            data: Data;
-            mime: string;
-            width: number;
-            height: number;
-            duration: number;
-            active: boolean;
-            recognition: Data;
-            attributes: ResourceAttributes;
-            updateSequenceNum: number;
-            alternateData: Data;
-
-            constructor(args?: { guid?: string; noteGuid?: string; data?: Data; mime?: string; width?: number; height?: number; duration?: number; active?: boolean; recognition?: Data; attributes?: ResourceAttributes; updateSequenceNum?: number; alternateData?: Data; });
-        }
-
-        /**
-         * The list of optional attributes that can be stored on a note.
-         * <dl>
-         * <dt>subjectDate</dt>
-         *     <dd>time that the note refers to
-         *     </dd>
-         *
-         * <dt>latitude</dt>
-         *     <dd>the latitude where the note was taken
-         *     </dd>
-         *
-         * <dt>longitude</dt>
-         *     <dd>the longitude where the note was taken
-         *     </dd>
-         *
-         * <dt>altitude</dt>
-         *     <dd>the altitude where the note was taken
-         *     </dd>
-         *
-         * <dt>author</dt>
-         *     <dd>the author of the content of the note
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>source</dt>
-         *     <dd>the method that the note was added to the account, if the
-         *     note wasn't directly authored in an Evernote desktop client.
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>sourceURL</dt>
-         *     <dd>the original location where the resource was hosted. For web clips,
-         *     this will be the URL of the page that was clipped.
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>sourceApplication</dt>
-         *     <dd>an identifying string for the application that
-         *     created this note.    This string does not have a guaranteed syntax or
-         *     structure -- it is intended for human inspection and tracking.
-         *     <br/>
-         *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
-         *     </dd>
-         *
-         * <dt>shareDate</dt>
-         *    <dd>The date and time when this note was directly shared via its own URL.
-         *    This is only set on notes that were individually shared - it is independent
-         *    of any notebook-level sharing of the containing notebook. This field
-         *    is treated as "read-only" for clients; the server will ignore changes
-         *    to this field from an external client.
-         *    </dd>
-         *
-         * <dt>reminderOrder</dt>
-         * <dd>The set of notes with this parameter set are considered
-         * "reminders" and are to be treated specially by clients to give them
-         * higher UI prominence within a notebook.    The value is used to sort
-         * the reminder notes within the notebook with higher values
-         * representing greater prominence.    Outside of the context of a
-         * notebook, the value of this parameter is undefined.    The value is
-         * not intended to be compared to the values of reminder notes in
-         * other notebooks.    In order to allow clients to place a note at a
-         * higher precedence than other notes, you should never set a value
-         * greater than the current time (as defined for a Timetstamp). To
-         * place a note at higher precedence than existing notes, set the
-         * value to the current time as defined for a timestamp (milliseconds
-         * since the epoch).    Synchronizing clients must remember the time when
-         * the update was performed, using the local clock on the client,
-         * and use that value when they later upload the note to the service.
-         * Clients must not set the reminderOrder to the reminderTime as the
-         * reminderTime could be in the future.    Those two fields are never
-         * intended to be related.    The correct value for reminderOrder field
-         * for new notes is the "current" time when the user indicated that
-         * the note is a reminder.    Clients may implement a separate
-         * "sort by date" feature to show notes ordered by reminderTime.
-         * Whenever a reminderDoneTime or reminderTime is set but a
-         * reminderOrder is not set, the server will fill in the current
-         * server time for the reminderOrder field.</dd>
-         *
-         * <dt>reminderDoneTime</dt>
-         * <dd>The date and time when a user dismissed/"marked done" the reminder
-         * on the note.    Users typically do not manually set this value directly
-         * as it is set to the time when the user dismissed/"marked done" the
-         * reminder.</dd>
-         *
-         * <dt>reminderTime</dt>
-         * <dd>The date and time a user has selected to be reminded of the note.
-         * A note with this value set is known as a "reminder" and the user can
-         * be reminded, via e-mail or client-specific notifications, of the note
-         * when the time is reached or about to be reached.    When a user sets
-         * a reminder time on a note that has a reminder done time, and that
-         * reminder time is in the future, then the reminder done time should be
-         * cleared.    This should happen regardless of any existing reminder time
-         * that may have previously existed on the note.</dd>
-         *
-         * <dt>placeName</dt>
-         * <dd>Allows the user to assign a human-readable location name associated
-         * with a note. Users may assign values like 'Home' and 'Work'. Place
-         * names may also be populated with values from geonames database
-         * (e.g., a restaurant name). Applications are encouraged to normalize values
-         * so that grouping values by place name provides a useful result. Applications
-         * MUST NOT automatically add place name values based on geolocation without
-         * confirmation from the user; that is, the value in this field should be
-         * more useful than a simple automated lookup based on the note's latitude
-         * and longitude.</dd>
-         *
-         * <dt>contentClass</dt>
-         * <dd>The class (or type) of note. This field is used to indicate to
-         * clients that special structured information is represented within
-         * the note such that special rules apply when making
-         * modifications. If contentClass is set and the client
-         * application does not specifically support the specified class,
-         * the client MUST treat the note as read-only. In this case, the
-         * client MAY modify the note's notebook and tags via the
-         * Note.notebookGuid and Note.tagGuids fields.    The client MAY also
-         * modify the reminderOrder field as well as the reminderTime and
-         * reminderDoneTime fields.
-         * <p>Applications should set contentClass only when they are creating notes
-         * that contain structured information that needs to be maintained in order
-         * for the user to be able to use the note within that application.
-         * Setting contentClass makes a note read-only in other applications, so
-         * there is a trade-off when an application chooses to use contentClass.
-         * Applications that set contentClass when creating notes must use a contentClass
-         * string of the form <i>CompanyName.ApplicationName</i> to ensure uniqueness.</p>
-         * Length restrictions: EDAM_NOTE_CONTENT_CLASS_LEN_MIN, EDAM_NOTE_CONTENT_CLASS_LEN_MAX
-         * <br/>
-         * Regex: EDAM_NOTE_CONTENT_CLASS_REGEX
-         * </dd>
-         *
-         * <dt>applicationData</dt>
-         * <dd>Provides a location for applications to store a relatively small
-         * (4kb) blob of data that is not meant to be visible to the user and
-         * that is opaque to the Evernote service. A single application may use at most
-         * one entry in this map, using its API consumer key as the map key. See the
-         * documentation for LazyMap for a description of when the actual map values
-         * are returned by the service.
-         * <p>To safely add or modify your application's entry in the map, use
-         * NoteStore.setNoteApplicationDataEntry. To safely remove your application's
-         * entry from the map, use NoteStore.unsetNoteApplicationDataEntry.</p>
-         * Minimum length of a name (key): EDAM_APPLICATIONDATA_NAME_LEN_MIN
-         * <br/>
-         * Sum max size of key and value: EDAM_APPLICATIONDATA_ENTRY_LEN_MAX
-         * <br/>
-         * Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
-         * </dd>
-         *
-         * <dt>creatorId</dt>
-         * <dd>The numeric user ID of the user who originally created the note.</dd>
-         *
-         * <dt>lastEditedBy</dt>
-         * <dd>An indication of who made the last change to the note.    If you are
-         * accessing the note via a shared notebook to which you have modification
-         * rights, or if you are the owner of the notebook to which the note belongs,
-         * then you have access to the value.    In this case, the value will be
-         * unset if the owner of the notebook containing the note was the last to
-         * make the modification, else it will be a string describing the
-         * guest who made the last edit.    If you do not have access to this value,
-         * it will be left unset.    This field is read-only by clients.    The server
-         * will ignore all values set by clients into this field.</dd>
-         *
-         * <dt>lastEditorId</dt>
-         * <dd>The numeric user ID of the user described in lastEditedBy.</dd>
-         *
-         * <dt>classifications</dt>
-         * <dd>A map of classifications applied to the note by clients or by the
-         * Evernote service. The key is the string name of the classification type,
-         * and the value is a constant that begins with CLASSIFICATION_.</dd>
-         *
-         * </dl>
-         */
-        class NoteAttributes {
-            subjectDate: number;
-            latitude: number;
-            longitude: number;
-            altitude: number;
-            author: string;
-            source: string;
-            sourceURL: string;
-            sourceApplication: string;
-            shareDate: number;
-            reminderOrder: number;
-            reminderDoneTime: number;
-            reminderTime: number;
-            placeName: string;
-            contentClass: string;
-            applicationData: LazyMap;
-            lastEditedBy: string;
-            classifications: { [k: string]: string; };
-            creatorId: number;
-            lastEditorId: number;
-
-            constructor(args?: { subjectDate?: number; latitude?: number; longitude?: number; altitude?: number; author?: string; source?: string; sourceURL?: string; sourceApplication?: string; shareDate?: number; reminderOrder?: number; reminderDoneTime?: number; reminderTime?: number; placeName?: string; contentClass?: string; applicationData?: LazyMap; lastEditedBy?: string; classifications?: { [k: string]: string; }; creatorId?: number; lastEditorId?: number; });
-        }
-
-        /**
-         * Represents a single note in the user's account.
-         *
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this note.    Will be set by the
-         *     server, but will be omitted by clients calling NoteStore.createNote()
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>title</dt>
-         *     <dd>The subject of the note.    Can't begin or end with a space.
-         *     <br/>
-         *     Length:    EDAM_NOTE_TITLE_LEN_MIN - EDAM_NOTE_TITLE_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_NOTE_TITLE_REGEX
-         *     </dd>
-         *
-         * <dt>content</dt>
-         *     <dd>The XHTML block that makes up the note.    This is
-         *     the canonical form of the note's contents, so will include abstract
-         *     Evernote tags for internal resource references.    A client may create
-         *     a separate transformed version of this content for internal presentation,
-         *     but the same canonical bytes should be used for transmission and
-         *     comparison unless the user chooses to modify their content.
-         *     <br/>
-         *     Length:    EDAM_NOTE_CONTENT_LEN_MIN - EDAM_NOTE_CONTENT_LEN_MAX
-         *     </dd>
-         *
-         * <dt>contentHash</dt>
-         *     <dd>The binary MD5 checksum of the UTF-8 encoded content
-         *     body. This will always be set by the server, but clients may choose to omit
-         *     this when they submit a note with content.
-         *     <br/>
-         *     Length:    EDAM_HASH_LEN (exactly)
-         *     </dd>
-         *
-         * <dt>contentLength</dt>
-         *     <dd>The number of Unicode characters in the content of
-         *     the note.    This will always be set by the service, but clients may choose
-         *     to omit this value when they submit a Note.
-         *     </dd>
-         *
-         * <dt>created</dt>
-         *     <dd>The date and time when the note was created in one of the
-         *     clients.    In most cases, this will match the user's sense of when
-         *     the note was created, and ordering between notes will be based on
-         *     ordering of this field.    However, this is not a "reliable" timestamp
-         *     if a client has an incorrect clock, so it cannot provide a true absolute
-         *     ordering between notes.    Notes created directly through the service
-         *     (e.g. via the web GUI) will have an absolutely ordered "created" value.
-         *     </dd>
-         *
-         * <dt>updated</dt>
-         *     <dd>The date and time when the note was last modified in one of
-         *     the clients.    In most cases, this will match the user's sense of when
-         *     the note was modified, but this field may not be absolutely reliable
-         *     due to the possibility of client clock errors.
-         *     </dd>
-         *
-         * <dt>deleted</dt>
-         *     <dd>If present, the note is considered "deleted", and this
-         *     stores the date and time when the note was deleted by one of the clients.
-         *     In most cases, this will match the user's sense of when the note was
-         *     deleted, but this field may be unreliable due to the possibility of
-         *     client clock errors.
-         *     </dd>
-         *
-         * <dt>active</dt>
-         *     <dd>If the note is available for normal actions and viewing,
-         *     this flag will be set to true.
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this note (including changes to the note's attributes
-         *     or resources).    The USN values are sequential within an account,
-         *     and can be used to compare the order of modifications within the service.
-         *     </dd>
-         *
-         * <dt>notebookGuid</dt>
-         *     <dd>The unique identifier of the notebook that contains
-         *     this note.    If no notebookGuid is provided on a call to createNote(), the
-         *     default notebook will be used instead.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>tagGuids</dt>
-         *     <dd>A list of the GUID identifiers for tags that are applied to this note.
-         *     This may be provided in a call to createNote() to unambiguously
-         *     the tags that should be assigned to the new note.    Alternately, clients
-         *     may pass the names of desired tags via the 'tagNames' field during
-         *     note creation.
-         *     If the list of tags are omitted on a call to createNote(), then
-         *     the server will assume that no changes have been made to the resources.
-         *     Maximum:    EDAM_NOTE_TAGS_MAX tags per note
-         *     </dd>
-         *
-         * <dt>resources</dt>
-         *     <dd>The list of resources that are embedded within this note.
-         *     If the list of resources are omitted on a call to updateNote(), then
-         *     the server will assume that no changes have been made to the resources.
-         *     The binary contents of the resources must be provided when the resource
-         *     is first sent to the service, but it will be omitted by the service when
-         *     the Note is returned in the future.
-         *     Maximum:    EDAM_NOTE_RESOURCES_MAX resources per note
-         *     </dd>
-         *
-         * <dt>attributes</dt>
-         *     <dd>A list of the attributes for this note.
-         *     If the list of attributes are omitted on a call to updateNote(), then
-         *     the server will assume that no changes have been made to the resources.
-         *     </dd>
-         *
-         * <dt>tagNames</dt>
-         *     <dd>May be provided by clients during calls to createNote() as an
-         *     alternative to providing the tagGuids of existing tags.    If any tagNames
-         *     are provided during createNote(), these will be found, or created if they
-         *     don't already exist.    Created tags will have no parent (they will be at
-         *     the top level of the tag panel).
-         *     </dd>
-         * </dl>
-         */
-        class Note {
-            guid: string;
-            title: string;
-            content: string;
-            contentHash: string;
-            contentLength: number;
-            created: number;
-            updated: number;
-            deleted: number;
-            active: boolean;
-            updateSequenceNum: number;
-            notebookGuid: string;
-            tagGuids: string[];
-            resources: Resource[];
-            attributes: NoteAttributes;
-            tagNames: string[];
-
-            constructor(args?: { guid?: string; title?: string; content?: string; contentHash?: string; contentLength?: number; created?: number; updated?: number; deleted?: number; active?: boolean; updateSequenceNum?: number; notebookGuid?: string; tagGuids?: string[]; resources?: Resource[]; attributes?: NoteAttributes; tagNames?: string[]; });
-        }
-
-        /**
-         * If a Notebook has been opened to the public, the Notebook will have a
-         * reference to one of these structures, which gives the location and optional
-         * description of the externally-visible public Notebook.
-         * <dl>
-         * <dt>uri</dt>
-         *     <dd>If this field is present, then the notebook is published for
-         *     mass consumption on the Internet under the provided URI, which is
-         *     relative to a defined base publishing URI defined by the service.
-         *     This field can only be modified via the web service GUI ... publishing
-         *     cannot be modified via an offline client.
-         *     <br/>
-         *     Length:    EDAM_PUBLISHING_URI_LEN_MIN - EDAM_PUBLISHING_URI_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_PUBLISHING_URI_REGEX
-         *     </dd>
-         *
-         * <dt>order</dt>
-         *     <dd>When the notes are publicly displayed, they will be sorted
-         *     based on the requested criteria.
-         *     </dd>
-         *
-         * <dt>ascending</dt>
-         *     <dd>If this is set to true, then the public notes will be
-         *     displayed in ascending order (e.g. from oldest to newest).    Otherwise,
-         *     the notes will be displayed in descending order (e.g. newest to oldest).
-         *     </dd>
-         *
-         * <dt>publicDescription</dt>
-         *     <dd>This field may be used to provide a short
-         *     description of the notebook, which may be displayed when (e.g.) the
-         *     notebook is shown in a public view.    Can't begin or end with a space.
-         *     <br/>
-         *     Length:    EDAM_PUBLISHING_DESCRIPTION_LEN_MIN -
-         *                        EDAM_PUBLISHING_DESCRIPTION_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_PUBLISHING_DESCRIPTION_REGEX
-         *     </dd>
-         *
-         * </dl>
-         */
-        class Publishing {
-            uri: string;
-            order: NoteSortOrder;
-            ascending: boolean;
-            publicDescription: string;
-
-            constructor(args?: { uri?: string; order?: NoteSortOrder; ascending?: boolean; publicDescription?: string; });
-        }
-
-        /**
-         * If a Notebook contained in an Evernote Business account has been published
-         * the to business library, the Notebook will have a reference to one of these
-         * structures, which specifies how the Notebook will be represented in the
-         * library.
-         *
-         * <dl>
-         * <dt>notebookDescription</dt>
-         *     <dd>A short description of the notebook's content that will be displayed
-         *             in the business library user interface. The description may not begin
-         *             or end with whitespace.
-         *     <br/>
-         *     Length: EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MIN -
-         *                     EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_REGEX
-         *     </dd>
-         *
-         * <dt>privilege</dt>
-         *     <dd>The privileges that will be granted to users who join the notebook through
-         *             the business library.
-         *     </dd>
-         *
-         * <dt>recommended</dt>
-         *     <dd>Whether the notebook should be "recommended" when displayed in the business
-         *             library user interface.
-         *     </dd>
-         * </dl>
-         */
-        class BusinessNotebook {
-            notebookDescription: string;
-            privilege: SharedNotebookPrivilegeLevel;
-            recommended: boolean;
-
-            constructor(args?: { notebookDescription?: string; privilege?: SharedNotebookPrivilegeLevel; recommended?: boolean; });
-        }
-
-        /**
-         * A structure defining the scope of a SavedSearch.
-         *
-         * <dl>
-         *     <dt>includeAccount</dt>
-         *     <dd>The search should include notes from the account that contains the SavedSearch.</dd>
-         *
-         *     <dt>includePersonalLinkedNotebooks</dt>
-         *     <dd>The search should include notes within those shared notebooks
-         *     that the user has joined that are NOT business notebooks.</dd>
-         *
-         *     <dt>includeBusinessLinkedNotebooks</dt>
-         *     <dd>The search should include notes within those shared notebooks
-         *     that the user has joined that are business notebooks in the business that
-         *     the user is currently a member of.</dd>
-         * </dl>
-         */
-        class SavedSearchScope {
-            includeAccount: boolean;
-            includePersonalLinkedNotebooks: boolean;
-            includeBusinessLinkedNotebooks: boolean;
-
-            constructor(args?: { includeAccount?: boolean; includePersonalLinkedNotebooks?: boolean; includeBusinessLinkedNotebooks?: boolean; });
-        }
-
-        /**
-         * A named search associated with the account that can be quickly re-used.
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this search.    Will be set by the
-         *     service, so may be omitted by the client when creating.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>name</dt>
-         *     <dd>The name of the saved search to display in the GUI.    The
-         *     account may only contain one search with a given name (case-insensitive
-         *     compare). Can't begin or end with a space.
-         *     <br/>
-         *     Length:    EDAM_SAVED_SEARCH_NAME_LEN_MIN - EDAM_SAVED_SEARCH_NAME_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_SAVED_SEARCH_NAME_REGEX
-         *     </dd>
-         *
-         * <dt>query</dt>
-         *     <dd>A string expressing the search to be performed.
-         *     <br/>
-         *     Length:    EDAM_SAVED_SEARCH_QUERY_LEN_MIN - EDAM_SAVED_SEARCH_QUERY_LEN_MAX
-         *     </dd>
-         *
-         * <dt>format</dt>
-         *     <dd>The format of the query string, to determine how to parse
-         *     and process it.
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this object.    The USN values are sequential within an
-         *     account, and can be used to compare the order of modifications within the
-         *     service.
-         *     </dd>
-         *
-         * <dt>scope</dt>
-         *     <dd><p>Specifies the set of notes that should be included in the search, if
-         *        possible.</p>
-         *        <p>Clients are expected to search as much of the desired scope as possible,
-         *        with the understanding that a given client may not be able to cover the full
-         *        specified scope. For example, when executing a search that includes notes in both
-         *        the owner's account and business notebooks, a mobile client may choose to only
-         *        search within the user's account because it is not capable of searching both
-         *        scopes simultaneously. When a search across multiple scopes is not possible,
-         *        a client may choose which scope to search based on the current application
-         *        context. If a client cannot search any of the desired scopes, it should refuse
-         *        to execute the search.</p>
-         *        </dd>
-         * </dl>
-         */
-        class SavedSearch {
-            guid: string;
-            name: string;
-            query: string;
-            format: QueryFormat;
-            updateSequenceNum: number;
-            scope: SavedSearchScope;
-
-            constructor(args?: { guid?: string; name?: string; query?: string; format?: QueryFormat; updateSequenceNum?: number; scope?: SavedSearchScope; });
-        }
-
-        /**
-         * Settings meant for the recipient of a shared notebook, such as
-         * for indicating which types of notifications the recipient wishes
-         * for reminders, etc.
-         *
-         * The reminderNotifyEmail and reminderNotifyInApp fields have a
-         * 3-state read value but a 2-state write value.    On read, it is
-         * possible to observe "unset", true, or false.    The initial state is
-         * "unset".    When you choose to set a value, you may set it to either
-         * true or false, but you cannot unset the value.    Once one of these
-         * members has a true/false value, it will always have a true/false
-         * value.
-         *
-         * <dl>
-         * <dt>reminderNotifyEmail</dt>
-         * <dd>Indicates that the user wishes to receive daily e-mail notifications
-         *         for reminders associated with the shared notebook.    This may be
-         *         true only for business notebooks that belong to the business of
-         *         which the user is a member.    You may only set this value on a
-         *         notebook in your business.</dd>
-         * <dt>reminderNotifyInApp</dt>
-         * <dd>Indicates that the user wishes to receive notifications for
-         *         reminders by applications that support providing such
-         *         notifications.    The exact nature of the notification is defined
-         *         by the individual applications.</dd>
-         * </dl>
-         *
-         */
-        class SharedNotebookRecipientSettings {
-            reminderNotifyEmail: boolean;
-            reminderNotifyInApp: boolean;
-
-            constructor(args?: { reminderNotifyEmail?: boolean; reminderNotifyInApp?: boolean; });
-        }
-
-        /**
-         * Shared notebooks represent a relationship between a notebook and a single
-         * share invitation recipient.
-         * <dl>
-         * <dt>id</dt>
-         * <dd>the primary identifier of the share</dd>
-         *
-         * <dt>userId</dt>
-         * <dd>the user id of the owner of the notebook</dd>
-         *
-         * <dt>notebookGuid</dt>
-         * <dd>the GUID of the associated notebook shared.</dd>
-         *
-         * <dt>email</dt>
-         * <dd>the email address of the recipient - used by the notebook
-         * owner to identify who they shared with.</dd>
-         *
-         * <dt>notebookModifiable</dt>
-         * <dd>(DEPRECATED) a flag indicating the share is read/write -otherwise it's read
-         *         only.    This field is deprecated in favor of the new "privilege" field.</dd>
-         *
-         * <dt>requireLogin</dt>
-         * <dd>(DEPRECATED) indicates that a user must login to access the share.    This
-         *         field is deprecated and will be "true" for all new shared notebooks.    It
-         *         is read-only and ignored when creating or modifying a shared notebook,
-         *         except that a shared notebook can be modified to require login.
-         *         See "allowPreview" for information on privileges and shared notebooks.</dd>
-         *
-         * <dt>serviceCreated</dt>
-         * <dd>the date the owner first created the share with the specific email
-         *     address</dd>
-         *
-         * <dt>serviceUpdated</dt>
-         * <dd>the date the shared notebook was last updated on the service.    This
-         *         will be updated when authenticateToSharedNotebook is called the first
-         *         time with a shared notebook requiring login (i.e. when the username is
-         *         bound to that shared notebook).</dd>
-         *
-         * <dt>username</dt>
-         * <dd>the username of the user who can access this share.
-         *     Once it's assigned it cannot be changed.</dd>
-         *
-         * <dt>privilege</dt>
-         * <dd>The privilege level granted to the notebook, activity stream, and
-         *         invitations.    See the corresponding enumeration for details.</dd>
-         *
-         * <dt>allowPreview</dt>
-         * <dd>Whether or not to grant "READ_NOTEBOOK" privilege without an
-         *         authentication token, for authenticateToSharedNotebook(...).    With
-         *         the change to "requireLogin" always being true for new shared
-         *         notebooks, this is the only way to access a shared notebook without
-         *         an authorization token.    This setting expires after the first use
-         *         of authenticateToSharedNotebook(...) with a valid authentication
-         *         token.</dd>
-         *
-         * <dt>recipientSettings</dt>
-         * <dd>Settings intended for use only by the recipient of this shared
-         *         notebook.    You should skip setting this value unless you want
-         *         to change the value contained inside the structure, and only if
-         *         you are the recipient.</dd>
-         * </dl>
-         */
-        class SharedNotebook {
-            id: number;
-            userId: number;
-            notebookGuid: string;
-            email: string;
-            notebookModifiable: boolean;
-            requireLogin: boolean;
-            serviceCreated: number;
-            serviceUpdated: number;
-            shareKey: string;
-            username: string;
-            privilege: SharedNotebookPrivilegeLevel;
-            allowPreview: boolean;
-            recipientSettings: SharedNotebookRecipientSettings;
-
-            constructor(args?: { id?: number; userId?: number; notebookGuid?: string; email?: string; notebookModifiable?: boolean; requireLogin?: boolean; serviceCreated?: number; serviceUpdated?: number; shareKey?: string; username?: string; privilege?: SharedNotebookPrivilegeLevel; allowPreview?: boolean; recipientSettings?: SharedNotebookRecipientSettings; });
-        }
-
-        /**
-         * This structure captures information about the types of operations
-         * that cannot be performed on a given notebook with a type of
-         * authenticated access and credentials.    The values filled into this
-         * structure are based on then-current values in the server database
-         * for shared notebooks and notebook publishing records, as well as
-         * information related to the authentication token.    Information from
-         * the authentication token includes the application that is accessing
-         * the server, as defined by the permissions granted by consumer (api)
-         * key, and the method used to obtain the token, for example via
-         * authenticateToSharedNotebook, authenticateToBusiness, etc.    Note
-         * that changes to values in this structure that are the result of
-         * shared notebook or publishing record changes are communicated to
-         * the client via a change in the notebook USN during sync.    It is
-         * important to use the same access method, parameters, and consumer
-         * key in order obtain correct results from the sync engine.
-         *
-         * The server has the final say on what is allowed as values may
-         * change between calls to obtain NotebookRestrictions instances
-         * and to operate on data on the service.
-         *
-         * If the following are set and true, then the given restriction is
-         * in effect, as accessed by the same authentication token from which
-         * the values were obtained.
-         *
-         * <dt>noReadNotes</dt>
-         *     <dd>The client is not able to read notes from the service and
-         *     the notebook is write-only.
-         *     </dd>
-         * <dt>noCreateNotes</dt>
-         *     <dd>The client may not create new notes in the notebook.
-         *     </dd>
-         * <dt>noUpdateNotes</dt>
-         *     <dd>The client may not update notes currently in the notebook.
-         *     </dd>
-         * <dt>noExpungeNotes</dt>
-         *     <dd>The client may not expunge notes currently in the notebook.
-         *     </dd>
-         * <dt>noShareNotes</dt>
-         *     <dd>The client may not share notes in the notebook via the
-         *     shareNote method.
-         *     </dd>
-         * <dt>noEmailNotes</dt>
-         *     <dd>The client may not e-mail notes via the Evernote service by
-         *     using the emailNote method.
-         *     </dd>
-         * <dt>noSendMessageToRecipients</dt>
-         *     <dd>The client may not send messages to the share recipients of
-         *     the notebook.
-         *     </dd>
-         * <dt>noUpdateNotebook</dt>
-         *     <dd>The client may not update the Notebook object itself, for
-         *     example, via the updateNotebook method.
-         *     </dd>
-         * <dt>noExpungeNotebook</dt>
-         *     <dd>The client may not expunge the Notebook object itself, for
-         *     example, via the expungeNotebook method.
-         *     </dd>
-         * <dt>noSetDefaultNotebook</dt>
-         *     <dd>The client may not set this notebook to be the default notebook.
-         *     The caller should leave Notebook.defaultNotebook unset.
-         *     </dd>
-         * <dt>noSetNotebookStack</dt>
-         *     <dd>If the client is able to update the Notebook, the Notebook.stack
-         *     value may not be set.
-         *     </dd>
-         * <dt>noPublishToPublic</dt>
-         *     <dd>The client may not change the publish the notebook to the public.
-         *     For example, business notebooks may not be shared publicly.
-         *     </dd>
-         * <dt>noPublishToBusinessLibrary</dt>
-         *     <dd>The client may not publish the notebook to the business library.
-         *     </dd>
-         * <dt>noCreateTags</dt>
-         *     <dd>The client may not complete an operation that results in a new tag
-         *     being created in the owner's account.
-         *     </dd>
-         * <dt>noUpdateTags</dt>
-         *     <dd>The client may not update tags in the owner's account.
-         *     </dd>
-         * <dt>noExpungeTags</dt>
-         *     <dd>The client may not expunge tags in the owner's account.
-         *     </dd>
-         * <dt>noSetParentTag</dt>
-         *     <dd>If the client is able to create or update tags in the owner's account,
-         *     then they will not be able to set the parent tag.    Leave the value unset.
-         *     </dd>
-         * <dt>noCreateSharedNotebooks</dt>
-         *     <dd>The client is unable to create shared notebooks for the notebook.
-         *     </dd>
-         * <dt>updateWhichSharedNotebookRestrictions</dt>
-         *     <dd>Restrictions on which shared notebook instances can be updated.    If the
-         *     value is not set or null, then the client can update any of the shared notebooks
-         *     associated with the notebook on which the NotebookRestrictions are defined.
-         *     See the enumeration for further details.
-         *     </dd>
-         * <dt>expungeWhichSharedNotebookRestrictions</dt>
-         *     <dd>Restrictions on which shared notebook instances can be expunged.    If the
-         *     value is not set or null, then the client can expunge any of the shared notebooks
-         *     associated with the notebook on which the NotebookRestrictions are defined.
-         *     See the enumeration for further details.
-         *     </dd>
-         */
-        class NotebookRestrictions {
-            noReadNotes: boolean;
-            noCreateNotes: boolean;
-            noUpdateNotes: boolean;
-            noExpungeNotes: boolean;
-            noShareNotes: boolean;
-            noEmailNotes: boolean;
-            noSendMessageToRecipients: boolean;
-            noUpdateNotebook: boolean;
-            noExpungeNotebook: boolean;
-            noSetDefaultNotebook: boolean;
-            noSetNotebookStack: boolean;
-            noPublishToPublic: boolean;
-            noPublishToBusinessLibrary: boolean;
-            noCreateTags: boolean;
-            noUpdateTags: boolean;
-            noExpungeTags: boolean;
-            noSetParentTag: boolean;
-            noCreateSharedNotebooks: boolean;
-            updateWhichSharedNotebookRestrictions: SharedNotebookInstanceRestrictions;
-            expungeWhichSharedNotebookRestrictions: SharedNotebookInstanceRestrictions;
-
-            constructor(args?: { noReadNotes?: boolean; noCreateNotes?: boolean; noUpdateNotes?: boolean; noExpungeNotes?: boolean; noShareNotes?: boolean; noEmailNotes?: boolean; noSendMessageToRecipients?: boolean; noUpdateNotebook?: boolean; noExpungeNotebook?: boolean; noSetDefaultNotebook?: boolean; noSetNotebookStack?: boolean; noPublishToPublic?: boolean; noPublishToBusinessLibrary?: boolean; noCreateTags?: boolean; noUpdateTags?: boolean; noExpungeTags?: boolean; noSetParentTag?: boolean; noCreateSharedNotebooks?: boolean; updateWhichSharedNotebookRestrictions?: SharedNotebookInstanceRestrictions; expungeWhichSharedNotebookRestrictions?: SharedNotebookInstanceRestrictions; });
-        }
-
-        /**
-         * A unique container for a set of notes.
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this notebook.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>name</dt>
-         *     <dd>A sequence of characters representing the name of the
-         *     notebook.    May be changed by clients, but the account may not contain two
-         *     notebooks with names that are equal via a case-insensitive comparison.
-         *     Can't begin or end with a space.
-         *     <br/>
-         *     Length:    EDAM_NOTEBOOK_NAME_LEN_MIN - EDAM_NOTEBOOK_NAME_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_NOTEBOOK_NAME_REGEX
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this object.    The USN values are sequential within an
-         *     account, and can be used to compare the order of modifications within the
-         *     service.
-         *     </dd>
-         *
-         * <dt>defaultNotebook</dt>
-         *     <dd>If true, this notebook should be used for new notes
-         *     whenever the user has not (or cannot) specify a desired target notebook.
-         *     For example, if a note is submitted via SMTP email.
-         *     The service will maintain at most one defaultNotebook per account.
-         *     If a second notebook is created or updated with defaultNotebook set to
-         *     true, the service will automatically update the prior notebook's
-         *     defaultNotebook field to false.    If the default notebook is deleted
-         *     (i.e. "active" set to false), the "defaultNotebook" field will be
-         *     set to false by the service.    If the account has no default notebook
-         *     set, the service will use the most recent notebook as the default.
-         *     </dd>
-         *
-         * <dt>serviceCreated</dt>
-         *     <dd>The time when this notebook was created on the
-         *     service. This will be set on the service during creation, and the service
-         *     will provide this value when it returns a Notebook to a client.
-         *     The service will ignore this value if it is sent by clients.
-         *     </dd>
-         *
-         * <dt>serviceUpdated</dt>
-         *     <dd>The time when this notebook was last modified on the
-         *     service.    This will be set on the service during creation, and the service
-         *     will provide this value when it returns a Notebook to a client.
-         *     The service will ignore this value if it is sent by clients.
-         *     </dd>
-         *
-         * <dt>publishing</dt>
-         *     <dd>If the Notebook has been opened for public access, or
-         *     business users shared with their business (i.e. if 'published' is
-         *     set to true), then this will point to the set of publishing
-         *     information for the Notebook (URI, description, etc.).    A
-         *     Notebook cannot be published without providing this information,
-         *     but it will persist for later use if publishing is ever disabled
-         *     on the Notebook.    Clients that do not wish to change the
-         *     publishing behavior of a Notebook should not set this value when
-         *     calling NoteStore.updateNotebook().
-         *     </dd>
-         *
-         * <dt>published</dt>
-         *     <dd>If this is set to true, then the Notebook will be
-         *     accessible either to the public, or for business users to their business,
-         *     via the 'publishing' specification, which must also be set.    If this is set
-         *     to false, the Notebook will not be available to the public (or business).
-         *     Clients that do not wish to change the publishing behavior of a Notebook
-         *     should not set this value when calling NoteStore.updateNotebook().
-         *     </dd>
-         *
-         * <dt>stack</dt>
-         *     <dd>If this is set, then the notebook is visually contained within a stack
-         *     of notebooks with this name.    All notebooks in the same account with the
-         *     same 'stack' field are considered to be in the same stack.
-         *     Notebooks with no stack set are "top level" and not contained within a
-         *     stack.
-         *     </dd>
-         *
-         * <dt>sharedNotebookIds</dt>
-         *     <dd><i>DEPRECATED</i> - replaced by sharedNotebooks.</dd>
-         *
-         * <dt>sharedNotebooks</dt>
-         *     <dd>The list of recipients to whom this notebook has been shared
-         *     (one SharedNotebook object per recipient email address). This field will
-         *     be unset if you do not have permission to access this data. If you are
-         *     accessing the notebook as the owner or via a shared notebook that is
-         *     modifiable, then you have access to this data and the value will be set.
-         *     This field is read-only. Clients may not make changes to shared notebooks
-         *     via this field.
-         *     </dd>
-         *
-         * <dt>businessNotebook</dt>
-         *     <dd>If the notebook is part of a business account and has been published to the
-         *     business library, this will contain information for the library listing.
-         *     The presence or absence of this field is not a reliable test of whether a given
-         *     notebook is in fact a business notebook - the field is only used when a notebook is or
-         *     has been published to the business library.
-         *     </dd>
-         *
-         * <dt>contact</dt>
-         *     <dd>Intended for use with Business accounts, this field identifies the user who
-         *     has been designated as the "contact".    For notebooks created in business
-         *     accounts, the server will automatically set this value to the user who created
-         *     the notebook unless Notebook.contact.username has been set, in which that value
-         *     will be used.    When updating a notebook, it is common to leave Notebook.contact
-         *     field unset, indicating that no change to the value is being requested and that
-         *     the existing value, if any, should be preserved.
-         *     </dd>
-         *
-         * </dl>
-         */
-        class Notebook {
-            guid: string;
-            name: string;
-            updateSequenceNum: number;
-            defaultNotebook: boolean;
-            serviceCreated: number;
-            serviceUpdated: number;
-            publishing: Publishing;
-            published: boolean;
-            stack: string;
-            sharedNotebookIds: number[];
-            sharedNotebooks: SharedNotebook[];
-            businessNotebook: BusinessNotebook;
-            contact: User;
-            restrictions: NotebookRestrictions;
-
-            constructor(args?: { guid?: string; name?: string; updateSequenceNum?: number; defaultNotebook?: boolean; serviceCreated?: number; serviceUpdated?: number; publishing?: Publishing; published?: boolean; stack?: string; sharedNotebookIds?: number[]; sharedNotebooks?: SharedNotebook[]; businessNotebook?: BusinessNotebook; contact?: User; restrictions?: NotebookRestrictions; });
-        }
-
-        /**
-         * A link in an users account that refers them to a public or individual share in
-         * another user's account.
-         *
-         * <dl>
-         * <dt>shareName</dt>
-         * <dd>the display name of the shared notebook.
-         *     The link owner can change this.</dd>
-         *
-         * <dt>username</dt>
-         * <dd>the username of the user who owns the shared or public notebook</dd>
-         *
-         * <dt>shardId</dt>
-         * <dd>the shard ID of the notebook if the notebook is not public</dt>
-         *
-         * <dt>shareKey</dt>
-         * <dd>the secret key that provides access to the shared notebook</dd>
-         *
-         * <dt>uri</dt>
-         * <dd>the identifier of the public notebook</dd>
-         *
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of this linked notebook.    Will be set whenever
-         *     a linked notebook is retrieved from the service, but may be null when a client
-         *     is creating a linked notebook.
-         *     <br/>
-         *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
-         *     <br/>
-         *     Regex:    EDAM_GUID_REGEX
-         *     </dd>
-         *
-         * <dt>updateSequenceNum</dt>
-         *     <dd>A number identifying the last transaction to
-         *     modify the state of this object.    The USN values are sequential within an
-         *     account, and can be used to compare the order of modifications within the
-         *     service.
-         *     </dd>
-         *
-         * <dt>noteStoreUrl</dt>
-         *     <dd>
-         *     This field will contain the full URL that clients should use to make
-         *     NoteStore requests to the server shard that contains that notebook's data.
-         *     I.e. this is the URL that should be used to create the Thrift HTTP client
-         *     transport to send messages to the NoteStore service for the account.
-         *     </dd>
-         *
-         * <dt>webApiUrlPrefix:</dt>
-         *     <dd>
-         *     This field will contain the initial part of the URLs that should be used
-         *     to make requests to Evernote's thin client "web API", which provide
-         *     optimized operations for clients that aren't capable of manipulating
-         *     the full contents of accounts via the full Thrift data model. Clients
-         *     should concatenate the relative path for the various servlets onto the
-         *     end of this string to construct the full URL, as documented on our
-         *     developer web site.
-         *     </dd>
-         *
-         * <dt>stack</dt>
-         *     <dd>If this is set, then the notebook is visually contained within a stack
-         *     of notebooks with this name.    All notebooks in the same account with the
-         *     same 'stack' field are considered to be in the same stack.
-         *     Notebooks with no stack set are "top level" and not contained within a
-         *     stack.    The link owner can change this and this field is for the benefit
-         *     of the link owner.
-         *     </dd>
-         *
-         * <dt>businessId</dt>
-         *     <dd>If set, this will be the unique identifier for the business that owns
-         *     the notebook to which the linked notebook refers.
-         *
-         * </dl>
-         */
-        class LinkedNotebook {
-            shareName: string;
-            username: string;
-            shardId: string;
-            shareKey: string;
-            uri: string;
-            guid: string;
-            updateSequenceNum: number;
-            noteStoreUrl: string;
-            webApiUrlPrefix: string;
-            stack: string;
-            businessId: number;
-
-            constructor(args?: { shareName?: string; username?: string; shardId?: string; shareKey?: string; uri?: string; guid?: string; updateSequenceNum?: number; noteStoreUrl?: string; webApiUrlPrefix?: string; stack?: string; businessId?: number; });
-        }
-
-        /**
-         * A structure that describes a notebook or a user's relationship with
-         * a notebook. NotebookDescriptor is expected to remain a lighter-weight
-         * structure when compared to Notebook.
-         * <dl>
-         * <dt>guid</dt>
-         *     <dd>The unique identifier of the notebook.
-         *     </dd>
-         *
-         * <dt>notebookDisplayName</dt>
-         *     <dd>A sequence of characters representing the name of the
-         *     notebook.
-         *     </dd>
-         *
-         * <dt>contactName</dt>
-         *     <dd>The User.name value of the notebook's "contact".
-         *     </dd>
-         *
-         * <dt>hasSharedNotebook</dt>
-         *     <dd>Whether a SharedNotebook record exists between the calling user and this
-         *     notebook.
-         *     </dd>
-         *
-         * <dt>joinedUserCount</dt>
-         *     <dd>The number of users who have joined this notebook.
-         *     </dd>
-         *
-         * </dl>
-         */
-        class NotebookDescriptor {
-            guid: string;
-            notebookDisplayName: string;
-            contactName: string;
-            hasSharedNotebook: boolean;
-            joinedUserCount: number;
-
-            constructor(args?: { guid?: string; notebookDisplayName?: string; contactName?: string; hasSharedNotebook?: boolean; joinedUserCount?: number; });
-        }
-
-        /**
-         * A value for the "recipe" key in the "classifications" map in NoteAttributes
-         * that indicates the user has classified a note as being a non-recipe.
-         */
-        var CLASSIFICATION_RECIPE_USER_NON_RECIPE: string;
-
-        /**
-         * A value for the "recipe" key in the "classifications" map in NoteAttributes
-         * that indicates the user has classified a note as being a recipe.
-         */
-        var CLASSIFICATION_RECIPE_USER_RECIPE: string;
-
-        /**
-         * A value for the "recipe" key in the "classifications" map in NoteAttributes
-         * that indicates the Evernote service has classified a note as being a recipe.
-         */
-        var CLASSIFICATION_RECIPE_SERVICE_RECIPE: string;
-
-        /**
-         * Standardized value for the 'source' NoteAttribute for notes that
-         * were clipped from the web in some manner.
-         */
-        var EDAM_NOTE_SOURCE_WEB_CLIP: string;
-
-        /**
-         * Standardized value for the 'source' NoteAttribute for notes that
-         * were clipped from an email message.
-         */
-        var EDAM_NOTE_SOURCE_MAIL_CLIP: string;
-
-        /**
-         * Standardized value for the 'source' NoteAttribute for notes that
-         * were created via email sent to Evernote's email interface.
-         */
-        var EDAM_NOTE_SOURCE_MAIL_SMTP_GATEWAY: string;
-        /**
-         * Service:    UserStore
-         * <p>
-         * The UserStore service is primarily used by EDAM clients to establish
-         * authentication via username and password over a trusted connection (e.g.
-         * SSL).    A client's first call to this interface should be checkVersion() to
-         * ensure that the client's software is up to date.
-         * </p>
-         * All calls which require an authenticationToken may throw an
-         * EDAMUserException for the following reasons:
-         *    <ul>
-         *     <li> AUTH_EXPIRED "authenticationToken" - token has expired
-         *     <li> BAD_DATA_FORMAT "authenticationToken" - token is malformed
-         *     <li> DATA_REQUIRED "authenticationToken" - token is empty
-         *     <li> INVALID_AUTH "authenticationToken" - token signature is invalid
-         * </ul>
-         */
-        class UserStoreClient {
-            seqid: number;
-
-            /**
-             * This should be the first call made by a client to the EDAM service.    It
-             * tells the service what protocol version is used by the client.    The
-             * service will then return true if the client is capable of talking to
-             * the service, and false if the client's protocol version is incompatible
-             * with the service, so the client must upgrade.    If a client receives a
-             * false value, it should report the incompatibility to the user and not
-             * continue with any more EDAM requests (UserStore or NoteStore).
-             *
-             * @param clientName
-             *     This string provides some information about the client for
-             *     tracking/logging on the service.    It should provide information about
-             *     the client's software and platform. The structure should be:
-             *     application/version; platform/version; [ device/version ]
-             *     E.g. "Evernote Windows/3.0.1; Windows/XP SP3".
-             *
-             * @param edamVersionMajor
-             *     This should be the major protocol version that was compiled by the
-             *     client.    This should be the current value of the EDAM_VERSION_MAJOR
-             *     constant for the client.
-             *
-             * @param edamVersionMinor
-             *     This should be the major protocol version that was compiled by the
-             *     client.    This should be the current value of the EDAM_VERSION_MINOR
-             *     constant for the client.
-             */
-            checkVersion(clientName: string, edamVersionMajor: number, edamVersionMinor: number, cb: Callback<boolean>): void;
-
-            /**
-             * This provides bootstrap information to the client. Various bootstrap
-             * profiles and settings may be used by the client to configure itself.
-             *
-             * @param locale
-             *     The client's current locale, expressed in language[_country]
-             *     format. E.g., "en_US". See ISO-639 and ISO-3166 for valid
-             *     language and country codes.
-             *
-             * @return
-             *     The bootstrap information suitable for this client.
-             */
-            getBootstrapInfo(locale: string, cb: Callback<BootstrapInfo>): void;
-
-            /**
-             * Revoke an existing long lived authentication token. This can be used to
-             * revoke OAuth tokens or tokens created by calling authenticateLongSession,
-             * and allows a user to effectively log out of Evernote from the perspective
-             * of the application that holds the token. The authentication token that is
-             * passed is immediately revoked and may not be used to call any authenticated
-             * EDAM function.
-             *
-             * @param authenticationToken the authentication token to revoke.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_REQUIRED "authenticationToken" - no authentication token provided
-             *     <li> BAD_DATA_FORMAT "authenticationToken" - the authentication token is not well formed
-             *     <li> INVALID_AUTH "authenticationToken" - the authentication token is invalid
-             *     <li> AUTH_EXPIRED "authenticationToken" - the authentication token is expired or
-             *         is already revoked.
-             * </ul>
-             */
-            revokeLongSession(cb: Callback<void>): void;
-
-            /**
-             * This is used to take an existing authentication token that grants access
-             * to an individual user account (returned from 'authenticate',
-             * 'authenticateLongSession' or an OAuth authorization) and obtain an additional
-             * authentication token that may be used to access business notebooks if the user
-             * is a member of an Evernote Business account.
-             *
-             * The resulting authentication token may be used to make NoteStore API calls
-             * against the business using the NoteStore URL returned in the result.
-             *
-             * @param authenticationToken
-             *     The authentication token for the user. This may not be a shared authentication
-             *     token (returned by NoteStore.authenticateToSharedNotebook or
-             *     NoteStore.authenticateToSharedNote) or a business authentication token.
-             *
-             * @return
-             *     The result of the authentication, with the token granting access to the
-             *     business in the result's 'authenticationToken' field. The URL that must
-             *     be used to access the business account NoteStore will be returned in the
-             *     result's 'noteStoreUrl' field.    The 'User' field will
-             *     not be set in the result.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> PERMISSION_DENIED "authenticationToken" - the provided authentication token
-             *                is a shared or business authentication token. </li>
-             *     <li> PERMISSION_DENIED "Business" - the user identified by the provided
-             *                authentication token is not currently a member of a business. </li>
-             *     <li> PERMISSION_DENIED "Business.status" - the business that the user is a
-             *                member of is not currently in an active status. </li>
-             * </ul>
-             */
-            authenticateToBusiness(cb: Callback<AuthenticationResult>): void;
-
-            /**
-             * Returns the User corresponding to the provided authentication token,
-             * or throws an exception if this token is not valid.
-             * The level of detail provided in the returned User structure depends on
-             * the access level granted by the token, so a web service client may receive
-             * fewer fields than an integrated desktop client.
-             */
-            getUser(cb: Callback<User>): void;
-
-            /**
-             * Asks the UserStore about the publicly available location information for
-             * a particular username.
-             *
-             * @throws EDAMUserException <ul>
-             *     <li> DATA_REQUIRED "username" - username is empty
-             * </ul>
-             */
-            getPublicUserInfo(username: string, cb: Callback<PublicUserInfo>): void;
-
-
-            /**
-             * Returns the URL that should be used to talk to the NoteStore for the
-             * account represented by the provided authenticationToken.
-             * This method isn't needed by most clients, who can retrieve the correct
-             * NoteStore URL from the AuthenticationResult returned from the authenticate
-             * or refreshAuthentication calls. This method is typically only needed
-             * to look up the correct URL for a long-lived session token (e.g. for an
-             * OAuth web service).
-             */
-            getNoteStoreUrl(cb: Callback<string>): void;
-        }
-        /**
-         *    This structure is used to provide publicly-available user information
-         *    about a particular account.
-         * <dl>
-         *    <dt>userId:</dt>
-         *        <dd>
-         *        The unique numeric user identifier for the user account.
-         *        </dd>
-         *    <dt>shardId:</dt>
-         *        <dd>
-         *        DEPRECATED - Client applications should have no need to use this field.
-         *        </dd>
-         *    <dt>privilege:</dt>
-         *        <dd>
-         *        The privilege level of the account, to determine whether
-         *        this is a Premium or Free account.
-         *        </dd>
-         *    <dt>noteStoreUrl:</dt>
-         *        <dd>
-         *        This field will contain the full URL that clients should use to make
-         *        NoteStore requests to the server shard that contains that user's data.
-         *        I.e. this is the URL that should be used to create the Thrift HTTP client
-         *        transport to send messages to the NoteStore service for the account.
-         *        </dd>
-         *    <dt>webApiUrlPrefix:</dt>
-         *        <dd>
-         *        This field will contain the initial part of the URLs that should be used
-         *        to make requests to Evernote's thin client "web API", which provide
-         *        optimized operations for clients that aren't capable of manipulating
-         *        the full contents of accounts via the full Thrift data model. Clients
-         *        should concatenate the relative path for the various servlets onto the
-         *        end of this string to construct the full URL, as documented on our
-         *        developer web site.
-         *        </dd>
-         *    </dl>
-         */
-        class PublicUserInfo {
-            userId: number;
-            shardId: string;
-            privilege: PrivilegeLevel;
-            username: string;
-            noteStoreUrl: string;
-            webApiUrlPrefix: string;
-
-            constructor(args?: { userId: number; shardId: string; privilege?: PrivilegeLevel; username?: string; noteStoreUrl?: string; webApiUrlPrefix?: string; });
-        }
-
-        /**
-         *    When an authentication (or re-authentication) is performed, this structure
-         *    provides the result to the client.
-         * <dl>
-         *    <dt>currentTime:</dt>
-         *        <dd>
-         *        The server-side date and time when this result was
-         *        generated.
-         *        </dd>
-         *    <dt>authenticationToken:</dt>
-         *        <dd>
-         *        Holds an opaque, ASCII-encoded token that can be
-         *        used by the client to perform actions on a NoteStore.
-         *        </dd>
-         *    <dt>expiration:</dt>
-         *        <dd>
-         *        Holds the server-side date and time when the
-         *        authentication token will expire.
-         *        This time can be compared to "currentTime" to produce an expiration
-         *        time that can be reconciled with the client's local clock.
-         *        </dd>
-         *    <dt>user:</dt>
-         *        <dd>
-         *        Holds the information about the account which was
-         *        authenticated if this was a full authentication.    May be absent if this
-         *        particular authentication did not require user information.
-         *        </dd>
-         *    <dt>publicUserInfo:</dt>
-         *        <dd>
-         *        If this authentication result was achieved without full permissions to
-         *        access the full User structure, this field may be set to give back
-         *        a more limited public set of data.
-         *        </dd>
-         *    <dt>noteStoreUrl:</dt>
-         *        <dd>
-         *        This field will contain the full URL that clients should use to make
-         *        NoteStore requests to the server shard that contains that user's data.
-         *        I.e. this is the URL that should be used to create the Thrift HTTP client
-         *        transport to send messages to the NoteStore service for the account.
-         *        </dd>
-         *    <dt>webApiUrlPrefix:</dt>
-         *        <dd>
-         *        This field will contain the initial part of the URLs that should be used
-         *        to make requests to Evernote's thin client "web API", which provide
-         *        optimized operations for clients that aren't capable of manipulating
-         *        the full contents of accounts via the full Thrift data model. Clients
-         *        should concatenate the relative path for the various servlets onto the
-         *        end of this string to construct the full URL, as documented on our
-         *        developer web site.
-         *        </dd>
-         *    <dt>secondFactorRequired:</dt>
-         *        <dd>
-         *        If set to true, this field indicates that the user has enabled two-factor
-         *        authentication and must enter their second factor in order to complete
-         *        authentication. In this case the value of authenticationResult will be
-         *        a short-lived authentication token that may only be used to make a
-         *        subsequent call to completeTwoFactorAuthentication.
-         *        </dd>
-         *    <dt>secondFactorDeliveryHint:</dt>
-         *        <dd>
-         *        When secondFactorRequired is set to true, this field may contain a string
-         *        describing the second factor delivery method that the user has configured.
-         *        This will typically be an obfuscated mobile device number, such as
-         *        "(xxx) xxx-x095". This string can be displayed to the user to remind them
-         *        how to obtain the required second factor.
-         *        TODO do we need to differentiate between SMS and voice delivery?
-         *        </dd>
-         *    </dl>
-         */
-        class AuthenticationResult {
-            currentTime: number;
-            authenticationToken: string;
-            expiration: number;
-            user: User;
-            publicUserInfo: PublicUserInfo;
-            noteStoreUrl: string;
-            webApiUrlPrefix: string;
-            secondFactorRequired: boolean;
-            secondFactorDeliveryHint: string;
-
-            constructor(args?: { currentTime: number; authenticationToken: string; expiration: number; user?: User; publicUserInfo?: PublicUserInfo; noteStoreUrl?: string; webApiUrlPrefix?: string; secondFactorRequired?: boolean; secondFactorDeliveryHint?: string; });
-        }
-
-        /**
-         *    This structure describes a collection of bootstrap settings.
-         * <dl>
-         *    <dt>serviceHost:</dt>
-         *        <dd>
-         *        The hostname and optional port for composing Evernote web service URLs.
-         *        This URL can be used to access the UserStore and related services,
-         *        but must not be used to compose the NoteStore URL. Client applications
-         *        must handle serviceHost values that include only the hostname
-         *        (e.g. www.evernote.com) or both the hostname and port (e.g. www.evernote.com:8080).
-         *        If no port is specified, or if port 443 is specified, client applications must
-         *        use the scheme "https" when composing URLs. Otherwise, a client must use the
-         *        scheme "http".
-         *    </dd>
-         *    <dt>marketingUrl:</dt>
-         *        <dd>
-         *        The URL stem for the Evernote corporate marketing website, e.g. http://www.evernote.com.
-         *        This stem can be used to compose website URLs. For example, the URL of the Evernote
-         *        Trunk is composed by appending "/about/trunk/" to the value of marketingUrl.
-         *        </dd>
-         *    <dt>supportUrl:</dt>
-         *        <dd>
-         *        The full URL for the Evernote customer support website, e.g. https://support.evernote.com.
-         *        </dd>
-         *    <dt>accountEmailDomain:</dt>
-         *        <dd>
-         *        The domain used for an Evernote user's incoming email address, which allows notes to
-         *        be emailed into an account. E.g. m.evernote.com.
-         *        </dd>
-         *    <dt>enableFacebookSharing:</dt>
-         *        <dd>
-         *        Whether the client application should enable sharing of notes on Facebook.
-         *        </dd>
-         *    <dt>enableGiftSubscriptions:</dt>
-         *        <dd>
-         *        Whether the client application should enable gift subscriptions.
-         *        </dd>
-         *    <dt>enableSupportTickets:</dt>
-         *        <dd>
-         *        Whether the client application should enable in-client creation of support tickets.
-         *        </dd>
-         *    <dt>enableSharedNotebooks:</dt>
-         *        <dd>
-         *        Whether the client application should enable shared notebooks.
-         *        </dd>
-         *    <dt>enableSingleNoteSharing:</dt>
-         *        <dd>
-         *        Whether the client application should enable single note sharing.
-         *        </dd>
-         *    <dt>enableSponsoredAccounts:</dt>
-         *        <dd>
-         *        Whether the client application should enable sponsored accounts.
-         *        </dd>
-         *    <dt>enableTwitterSharing:</dt>
-         *        <dd>
-         *        Whether the client application should enable sharing of notes on Twitter.
-         *        </dd>
-         *    </dl>
-         */
-        class BootstrapSettings {
-            serviceHost: string;
-            marketingUrl: string;
-            supportUrl: string;
-            accountEmailDomain: string;
-            enableFacebookSharing: boolean;
-            enableGiftSubscriptions: boolean;
-            enableSupportTickets: boolean;
-            enableSharedNotebooks: boolean;
-            enableSingleNoteSharing: boolean;
-            enableSponsoredAccounts: boolean;
-            enableTwitterSharing: boolean;
-            enableLinkedInSharing: boolean;
-            enablePublicNotebooks: boolean;
-
-            constructor(args?: { serviceHost: string; marketingUrl: string; supportUrl: string; accountEmailDomain: string; enableFacebookSharing?: boolean; enableGiftSubscriptions?: boolean; enableSupportTickets?: boolean; enableSharedNotebooks?: boolean; enableSingleNoteSharing?: boolean; enableSponsoredAccounts?: boolean; enableTwitterSharing?: boolean; enableLinkedInSharing?: boolean; enablePublicNotebooks?: boolean; });
-        }
-
-        /**
-         *    This structure describes a collection of bootstrap settings.
-         * <dl>
-         *    <dt>name:</dt>
-         *        <dd>
-         *        The unique name of the profile, which is guaranteed to remain consistent across
-         *        calls to getBootstrapInfo.
-         *        </dd>
-         *    <dt>settings:</dt>
-         *        <dd>
-         *        The settings for this profile.
-         *        </dd>
-         *    </dl>
-         */
-        class BootstrapProfile {
-            name: string;
-            settings: BootstrapSettings;
-
-            constructor(args?: { name: string; settings: BootstrapSettings; });
-        }
-
-        /**
-         *    This structure describes a collection of bootstrap profiles.
-         * <dl>
-         *    <dt>profiles:</dt>
-         *        <dd>
-         *        List of one or more bootstrap profiles, in descending
-         *        preference order.
-         *        </dd>
-         *    </dl>
-         */
-        class BootstrapInfo {
-            profiles: BootstrapProfile[];
-
-            constructor(args?: { profiles: BootstrapProfile[]; });
-        }
-
-        /**
-         * The major version number for the current revision of the EDAM protocol.
-         * Clients pass this to the service using UserStore.checkVersion at the
-         * beginning of a session to confirm that they are not out of date.
-         */
-        var EDAM_VERSION_MAJOR: number;
-
-        /**
-         * The minor version number for the current revision of the EDAM protocol.
-         * Clients pass this to the service using UserStore.checkVersion at the
-         * beginning of a session to confirm that they are not out of date.
-         */
-        var EDAM_VERSION_MINOR: number;
+import { Thrift } from "thrift";
 
+declare namespace Evernote {
+    interface Callback<T> {
+        (err: EDAMUserException | EDAMSystemException | EDAMNotFoundException, v: T): void
     }
+
+    interface ClientConfig {
+        consumerKey?: string
+        consumerSecret?: string
+        sandbox?: boolean
+        token?: string
+        serviceHost?: string
+        additionalHeaders?: { [k: string]: string }
+        secret?: string
+    }
+
+    class Client {
+        static "new": (config: ClientConfig) => Client
+        constructor(config: ClientConfig);
+        getNoteStore(): NoteStoreClient;
+        getUserStore(): UserStoreClient;
+    }
+
+
+    /**
+     * Numeric codes indicating the type of error that occurred on the
+     * service.
+     * <dl>
+     *     <dt>UNKNOWN</dt>
+     *         <dd>No information available about the error</dd>
+     *     <dt>BAD_DATA_FORMAT</dt>
+     *         <dd>The format of the request data was incorrect</dd>
+     *     <dt>PERMISSION_DENIED</dt>
+     *         <dd>Not permitted to perform action</dd>
+     *     <dt>INTERNAL_ERROR</dt>
+     *         <dd>Unexpected problem with the service</dd>
+     *     <dt>DATA_REQUIRED</dt>
+     *         <dd>A required parameter/field was absent</dd>
+     *     <dt>LIMIT_REACHED</dt>
+     *         <dd>Operation denied due to data model limit</dd>
+     *     <dt>QUOTA_REACHED</dt>
+     *         <dd>Operation denied due to user storage limit</dd>
+     *     <dt>INVALID_AUTH</dt>
+     *         <dd>Username and/or password incorrect</dd>
+     *     <dt>AUTH_EXPIRED</dt>
+     *         <dd>Authentication token expired</dd>
+     *     <dt>DATA_CONFLICT</dt>
+     *         <dd>Change denied due to data model conflict</dd>
+     *     <dt>ENML_VALIDATION</dt>
+     *         <dd>Content of submitted note was malformed</dd>
+     *     <dt>SHARD_UNAVAILABLE</dt>
+     *         <dd>Service shard with account data is temporarily down</dd>
+     *     <dt>LEN_TOO_SHORT</dt>
+     *         <dd>Operation denied due to data model limit, where something such
+     *                 as a string length was too short</dd>
+     *     <dt>LEN_TOO_LONG</dt>
+     *         <dd>Operation denied due to data model limit, where something such
+     *                 as a string length was too long</dd>
+     *     <dt>TOO_FEW</dt>
+     *         <dd>Operation denied due to data model limit, where there were
+     *                 too few of something.</dd>
+     *     <dt>TOO_MANY</dt>
+     *         <dd>Operation denied due to data model limit, where there were
+     *                 too many of something.</dd>
+     *     <dt>UNSUPPORTED_OPERATION</dt>
+     *         <dd>Operation denied because it is currently unsupported.</dd>
+     *     <dt>TAKEN_DOWN</dt>
+     *         <dd>Operation denied because access to the corresponding object is
+     *                 prohibited in response to a take-down notice.</dd>
+     *     <dt>RATE_LIMIT_REACHED</dt>
+     *         <dd>Operation denied because the calling application has reached
+     *                 its hourly API call limit for this user.</dd>
+     * </dl>
+     */
+    enum EDAMErrorCode {
+        'UNKNOWN' = 1,
+        'BAD_DATA_FORMAT' = 2,
+        'PERMISSION_DENIED' = 3,
+        'INTERNAL_ERROR' = 4,
+        'DATA_REQUIRED' = 5,
+        'LIMIT_REACHED' = 6,
+        'QUOTA_REACHED' = 7,
+        'INVALID_AUTH' = 8,
+        'AUTH_EXPIRED' = 9,
+        'DATA_CONFLICT' = 10,
+        'ENML_VALIDATION' = 11,
+        'SHARD_UNAVAILABLE' = 12,
+        'LEN_TOO_SHORT' = 13,
+        'LEN_TOO_LONG' = 14,
+        'TOO_FEW' = 15,
+        'TOO_MANY' = 16,
+        'UNSUPPORTED_OPERATION' = 17,
+        'TAKEN_DOWN' = 18,
+        'RATE_LIMIT_REACHED' = 19,
+    }
+
+    /**
+     * This exception is thrown by EDAM procedures when a call fails as a result of
+     * a problem that a caller may be able to resolve.    For example, if the user
+     * attempts to add a note to their account which would exceed their storage
+     * quota, this type of exception may be thrown to indicate the source of the
+     * error so that they can choose an alternate action.
+     *
+     * This exception would not be used for internal system errors that do not
+     * reflect user actions, but rather reflect a problem within the service that
+     * the user cannot resolve.
+     *
+     * errorCode:    The numeric code indicating the type of error that occurred.
+     *     must be one of the values of EDAMErrorCode.
+     *
+     * parameter:    If the error applied to a particular input parameter, this will
+     *     indicate which parameter.
+     */
+    class EDAMUserException extends Thrift.TException {
+        errorCode: EDAMErrorCode;
+        parameter: string;
+
+        constructor(args?: { errorCode: EDAMErrorCode; parameter?: string; });
+    }
+
+    /**
+     * This exception is thrown by EDAM procedures when a call fails as a result of
+     * a problem in the service that could not be changed through caller action.
+     *
+     * errorCode:    The numeric code indicating the type of error that occurred.
+     *     must be one of the values of EDAMErrorCode.
+     *
+     * message:    This may contain additional information about the error
+     *
+     * rateLimitDuration:    Indicates the minimum number of seconds that an application should
+     *     expect subsequent API calls for this user to fail. The application should not retry
+     *     API requests for the user until at least this many seconds have passed. Present only
+     *     when errorCode is RATE_LIMIT_REACHED,
+     */
+    class EDAMSystemException extends Thrift.TException {
+        errorCode: EDAMErrorCode;
+        message: string;
+        rateLimitDuration: number;
+
+        constructor(args?: { errorCode: EDAMErrorCode; message?: string; rateLimitDuration?: number; });
+    }
+
+    /**
+     * This exception is thrown by EDAM procedures when a caller asks to perform
+     * an operation on an object that does not exist.    This may be thrown based on an invalid
+     * primary identifier (e.g. a bad GUID), or when the caller refers to an object
+     * by another unique identifier (e.g. a User's email address).
+     *
+     * identifier:    A description of the object that was not found on the server.
+     *     For example, "Note.notebookGuid" when a caller attempts to create a note in a
+     *     notebook that does not exist in the user's account.
+     *
+     * key:    The value passed from the client in the identifier, which was not
+     *     found. For example, the GUID that was not found.
+     */
+    class EDAMNotFoundException extends Thrift.TException {
+        identifier: string;
+        key: string;
+
+        constructor(args?: { identifier?: string; key?: string; });
+    }
+    /**
+     * Minimum length of any string-based attribute, in Unicode chars
+     */
+    var EDAM_ATTRIBUTE_LEN_MIN: number;
+
+    /**
+     * Maximum length of any string-based attribute, in Unicode chars
+     */
+    var EDAM_ATTRIBUTE_LEN_MAX: number;
+
+    /**
+     * Any string-based attribute must match the provided regular expression.
+     * This excludes all Unicode line endings and control characters.
+     */
+    var EDAM_ATTRIBUTE_REGEX: string;
+
+    /**
+     * The maximum number of values that can be stored in a list-based attribute
+     * (e.g. see UserAttributes.recentMailedAddresses)
+     */
+    var EDAM_ATTRIBUTE_LIST_MAX: number;
+
+    /**
+     * The maximum number of entries that can be stored in a map-based attribute
+     * such as applicationData fields in Resources and Notes.
+     */
+    var EDAM_ATTRIBUTE_MAP_MAX: number;
+
+    /**
+     * The minimum length of a GUID generated by the Evernote service
+     */
+    var EDAM_GUID_LEN_MIN: number;
+
+    /**
+     * The maximum length of a GUID generated by the Evernote service
+     */
+    var EDAM_GUID_LEN_MAX: number;
+
+    /**
+     * GUIDs generated by the Evernote service will match the provided pattern
+     */
+    var EDAM_GUID_REGEX: string;
+
+    /**
+     * The minimum length of any email address
+     */
+    var EDAM_EMAIL_LEN_MIN: number;
+
+    /**
+     * The maximum length of any email address
+     */
+    var EDAM_EMAIL_LEN_MAX: number;
+
+    /**
+     * A regular expression that matches the part of an email address before
+     * the '@' symbol.
+     */
+    var EDAM_EMAIL_LOCAL_REGEX: string;
+
+    /**
+     * A regular expression that matches the part of an email address after
+     * the '@' symbol.
+     */
+    var EDAM_EMAIL_DOMAIN_REGEX: string;
+
+    /**
+     * A regular expression that must match any email address given to Evernote.
+     * Email addresses must comply with RFC 2821 and 2822.
+     */
+    var EDAM_EMAIL_REGEX: string;
+
+    /**
+     * A regular expression that must match any VAT ID given to Evernote.
+     * ref http://en.wikipedia.org/wiki/VAT_identification_number
+     * ref http://my.safaribooksonline.com/book/programming/regular-expressions/9780596802837/4dot-validation-and-formatting/id2995136
+     */
+    var EDAM_VAT_REGEX: string;
+
+    /**
+     * The minimum length of a timezone specification string
+     */
+    var EDAM_TIMEZONE_LEN_MIN: number;
+
+    /**
+     * The maximum length of a timezone specification string
+     */
+    var EDAM_TIMEZONE_LEN_MAX: number;
+
+    /**
+     * Any timezone string given to Evernote must match the provided pattern.
+     * This permits either a locale-based standard timezone or a GMT offset.
+     * E.g.:<ul>
+     *        <li>America/Los_Angeles</li>
+     *        <li>GMT+08:00</li>
+     * </ul>
+     */
+    var EDAM_TIMEZONE_REGEX: string;
+
+    /**
+     * The minimum length of any MIME type string given to Evernote
+     */
+    var EDAM_MIME_LEN_MIN: number;
+
+    /**
+     * The maximum length of any MIME type string given to Evernote
+     */
+    var EDAM_MIME_LEN_MAX: number;
+
+    /**
+     * Any MIME type string given to Evernote must match the provided pattern.
+     * E.g.:    image/gif
+     */
+    var EDAM_MIME_REGEX: string;
+
+    /**
+     * Canonical MIME type string for GIF image resources
+     */
+    var EDAM_MIME_TYPE_GIF: string;
+
+    /**
+     * Canonical MIME type string for JPEG image resources
+     */
+    var EDAM_MIME_TYPE_JPEG: string;
+
+    /**
+     * Canonical MIME type string for PNG image resources
+     */
+    var EDAM_MIME_TYPE_PNG: string;
+
+    /**
+     * Canonical MIME type string for WAV audio resources
+     */
+    var EDAM_MIME_TYPE_WAV: string;
+
+    /**
+     * Canonical MIME type string for MP3 audio resources
+     */
+    var EDAM_MIME_TYPE_MP3: string;
+
+    /**
+     * Canonical MIME type string for AMR audio resources
+     */
+    var EDAM_MIME_TYPE_AMR: string;
+
+    /**
+     * Canonical MIME type string for AAC audio resources
+     */
+    var EDAM_MIME_TYPE_AAC: string;
+
+    /**
+     * Canonical MIME type string for MP4 audio resources
+     */
+    var EDAM_MIME_TYPE_M4A: string;
+
+    /**
+     * Canonical MIME type string for MP4 video resources
+     */
+    var EDAM_MIME_TYPE_MP4_VIDEO: string;
+
+    /**
+     * Canonical MIME type string for Evernote Ink resources
+     */
+    var EDAM_MIME_TYPE_INK: string;
+
+    /**
+     * Canonical MIME type string for PDF resources
+     */
+    var EDAM_MIME_TYPE_PDF: string;
+
+    /**
+     * MIME type used for attachments of an unspecified type
+     */
+    var EDAM_MIME_TYPE_DEFAULT: string;
+
+    /**
+     * The set of resource MIME types that are expected to be handled
+     * correctly by all of the major Evernote client applications.
+     */
+    var EDAM_MIME_TYPES: string[];
+
+    /**
+     * The set of MIME types that Evernote will parse and index for
+     * searching. With exception of images, and PDFs, which are
+     * handled in a different way.
+     */
+    var EDAM_INDEXABLE_RESOURCE_MIME_TYPES: string[];
+
+    /**
+     * The minimum length of a user search query string in Unicode chars
+     */
+    var EDAM_SEARCH_QUERY_LEN_MIN: number;
+
+    /**
+     * The maximum length of a user search query string in Unicode chars
+     */
+    var EDAM_SEARCH_QUERY_LEN_MAX: number;
+
+    /**
+     * Search queries must match the provided pattern.    This is used for
+     * both ad-hoc queries and SavedSearch.query fields.
+     * This excludes all control characters and line/paragraph separators.
+     */
+    var EDAM_SEARCH_QUERY_REGEX: string;
+
+    /**
+     * The exact length of a MD5 hash checksum, in binary bytes.
+     * This is the exact length that must be matched for any binary hash
+     * value.
+     */
+    var EDAM_HASH_LEN: number;
+
+    /**
+     * The minimum length of an Evernote username
+     */
+    var EDAM_USER_USERNAME_LEN_MIN: number;
+
+    /**
+     * The maximum length of an Evernote username
+     */
+    var EDAM_USER_USERNAME_LEN_MAX: number;
+
+    /**
+     * Any Evernote User.username field must match this pattern.    This
+     * restricts usernames to a format that could permit use as a domain
+     * name component.    E.g. "username.whatever.evernote.com"
+     */
+    var EDAM_USER_USERNAME_REGEX: string;
+
+    /**
+     * Minimum length of the User.name field
+     */
+    var EDAM_USER_NAME_LEN_MIN: number;
+
+    /**
+     * Maximum length of the User.name field
+     */
+    var EDAM_USER_NAME_LEN_MAX: number;
+
+    /**
+     * The User.name field must match this pattern, which excludes line
+     * endings and control characters.
+     */
+    var EDAM_USER_NAME_REGEX: string;
+
+    /**
+     * The minimum length of a Tag.name, in Unicode characters
+     */
+    var EDAM_TAG_NAME_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Tag.name, in Unicode characters
+     */
+    var EDAM_TAG_NAME_LEN_MAX: number;
+
+    /**
+     * All Tag.name fields must match this pattern.
+     * This excludes control chars, commas or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_TAG_NAME_REGEX: string;
+
+    /**
+     * The minimum length of a Note.title, in Unicode characters
+     */
+    var EDAM_NOTE_TITLE_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Note.title, in Unicode characters
+     */
+    var EDAM_NOTE_TITLE_LEN_MAX: number;
+
+    /**
+     * All Note.title fields must match this pattern.
+     * This excludes control chars or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_NOTE_TITLE_REGEX: string;
+
+    /**
+     * Minimum length of a Note.content field.
+     * Note.content fields must comply with the ENML DTD.
+     */
+    var EDAM_NOTE_CONTENT_LEN_MIN: number;
+
+    /**
+     * Maximum length of a Note.content field
+     * Note.content fields must comply with the ENML DTD.
+     */
+    var EDAM_NOTE_CONTENT_LEN_MAX: number;
+
+    /**
+     * Minimum length of an application name, which is the key in an
+     * applicationData LazyMap found in entities such as Resources and
+     * Notes.
+     */
+    var EDAM_APPLICATIONDATA_NAME_LEN_MIN: number;
+
+    /**
+     * Maximum length of an application name, which is the key in an
+     * applicationData LazyMap found in entities such as Resources and
+     * Notes.
+     */
+    var EDAM_APPLICATIONDATA_NAME_LEN_MAX: number;
+
+    /**
+     * Minimum length of an applicationData value in a LazyMap, found
+     * in entities such as Resources and Notes.
+     */
+    var EDAM_APPLICATIONDATA_VALUE_LEN_MIN: number;
+
+    /**
+     * Maximum length of an applicationData value in a LazyMap, found
+     * in entities such as Resources and Notes.    Note, however, that
+     * the sum of the size of hte key and value is constrained by
+     * EDAM_APPLICATIONDATA_ENTRY_LEN_MAX, so the maximum length, in
+     * practice, depends upon the key value being used.
+     */
+    var EDAM_APPLICATIONDATA_VALUE_LEN_MAX: number;
+
+    /**
+     * The total length of an entry in an applicationData LazyMap, which
+     * is the sum of the length of the key and the value for the entry.
+     */
+    var EDAM_APPLICATIONDATA_ENTRY_LEN_MAX: number;
+
+    /**
+     * An application name must match this regex.    An application
+     * name is the key portion of an entry in an applicationData
+     * map as found in entities such as Resources and Notes.
+     * Note that even if both the name and value regexes match,
+     * it is still necessary to check the sum of the lengths
+     * against EDAM_APPLICATIONDATA_ENTRY_LEN_MAX.
+     */
+    var EDAM_APPLICATIONDATA_NAME_REGEX: string;
+
+    /**
+     * An applicationData map value must match this regex.
+     * Note that even if both the name and value regexes match,
+     * it is still necessary to check the sum of the lengths
+     * against EDAM_APPLICATIONDATA_ENTRY_LEN_MAX.
+     */
+    var EDAM_APPLICATIONDATA_VALUE_REGEX: string;
+
+    /**
+     * The minimum length of a Notebook.name, in Unicode characters
+     */
+    var EDAM_NOTEBOOK_NAME_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Notebook.name, in Unicode characters
+     */
+    var EDAM_NOTEBOOK_NAME_LEN_MAX: number;
+
+    /**
+     * All Notebook.name fields must match this pattern.
+     * This excludes control chars or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_NOTEBOOK_NAME_REGEX: string;
+
+    /**
+     * The minimum length of a Notebook.stack, in Unicode characters
+     */
+    var EDAM_NOTEBOOK_STACK_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Notebook.stack, in Unicode characters
+     */
+    var EDAM_NOTEBOOK_STACK_LEN_MAX: number;
+
+    /**
+     * All Notebook.stack fields must match this pattern.
+     * This excludes control chars or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_NOTEBOOK_STACK_REGEX: string;
+
+    /**
+     * The minimum length of a public notebook URI component
+     */
+    var EDAM_PUBLISHING_URI_LEN_MIN: number;
+
+    /**
+     * The maximum length of a public notebook URI component
+     */
+    var EDAM_PUBLISHING_URI_LEN_MAX: number;
+
+    /**
+     * A public notebook URI component must match the provided pattern
+     */
+    var EDAM_PUBLISHING_URI_REGEX: string;
+
+    /**
+     * The set of strings that may not be used as a publishing URI
+     */
+    var EDAM_PUBLISHING_URI_PROHIBITED: string[];
+
+    /**
+     * The minimum length of a Publishing.publicDescription field.
+     */
+    var EDAM_PUBLISHING_DESCRIPTION_LEN_MIN: number;
+
+    /**
+     * The maximum length of a Publishing.publicDescription field.
+     */
+    var EDAM_PUBLISHING_DESCRIPTION_LEN_MAX: number;
+
+    /**
+     * Any public notebook's Publishing.publicDescription field must match
+     * this pattern.
+     * No control chars or line/paragraph separators, and can't start or
+     * end with whitespace.
+     */
+    var EDAM_PUBLISHING_DESCRIPTION_REGEX: string;
+
+    /**
+     * The minimum length of a SavedSearch.name field
+     */
+    var EDAM_SAVED_SEARCH_NAME_LEN_MIN: number;
+
+    /**
+     * The maximum length of a SavedSearch.name field
+     */
+    var EDAM_SAVED_SEARCH_NAME_LEN_MAX: number;
+
+    /**
+     * SavedSearch.name fields must match this pattern.
+     * No control chars or line/paragraph separators, and can't start or
+     * end with whitespace.
+     */
+    var EDAM_SAVED_SEARCH_NAME_REGEX: string;
+
+    /**
+     * The minimum length of an Evernote user password
+     */
+    var EDAM_USER_PASSWORD_LEN_MIN: number;
+
+    /**
+     * The maximum length of an Evernote user password
+     */
+    var EDAM_USER_PASSWORD_LEN_MAX: number;
+
+    /**
+     * Evernote user passwords must match this regular expression
+     */
+    var EDAM_USER_PASSWORD_REGEX: string;
+
+    /**
+     * The maximum length of an Evernote Business URI
+     */
+    var EDAM_BUSINESS_URI_LEN_MAX: number;
+
+    /**
+     * The maximum number of Tags per Note
+     */
+    var EDAM_NOTE_TAGS_MAX: number;
+
+    /**
+     * The maximum number of Resources per Note
+     */
+    var EDAM_NOTE_RESOURCES_MAX: number;
+
+    /**
+     * Maximum number of Tags per account
+     */
+    var EDAM_USER_TAGS_MAX: number;
+
+    /**
+     * Maximum number of Tags per business account.
+     */
+    var EDAM_BUSINESS_TAGS_MAX: number;
+
+    /**
+     * Maximum number of SavedSearches per account
+     */
+    var EDAM_USER_SAVED_SEARCHES_MAX: number;
+
+    /**
+     * Maximum number of Notes per user
+     */
+    var EDAM_USER_NOTES_MAX: number;
+
+    /**
+     * Maximum number of Notes per business account
+     */
+    var EDAM_BUSINESS_NOTES_MAX: number;
+
+    /**
+     * Maximum number of Notebooks per user
+     */
+    var EDAM_USER_NOTEBOOKS_MAX: number;
+
+    /**
+     * Maximum number of Notebooks in a business account
+     */
+    var EDAM_BUSINESS_NOTEBOOKS_MAX: number;
+
+    /**
+     * Maximum number of recent email addresses that are maintained
+     * (see UserAttributes.recentMailedAddresses)
+     */
+    var EDAM_USER_RECENT_MAILED_ADDRESSES_MAX: number;
+
+    /**
+     * The number of emails of any type that can be sent by a user with a Free
+     * account from the service per day.    If an email is sent to two different
+     * recipients, this counts as two emails.
+     */
+    var EDAM_USER_MAIL_LIMIT_DAILY_FREE: number;
+
+    /**
+     * The number of emails of any type that can be sent by a user with a Premium
+     * account from the service per day.    If an email is sent to two different
+     * recipients, this counts as two emails.
+     */
+    var EDAM_USER_MAIL_LIMIT_DAILY_PREMIUM: number;
+
+    /**
+     * The number of bytes of new data that may be uploaded to a Free user's
+     * account each month.
+     */
+    var EDAM_USER_UPLOAD_LIMIT_FREE: number;
+
+    /**
+     * The number of bytes of new data that may be uploaded to a Premium user's
+     * account each month.
+     */
+    var EDAM_USER_UPLOAD_LIMIT_PREMIUM: number;
+
+    /**
+     * The number of bytes of new data that may be uploaded to a Business user's
+     * personal account each month. Note that content uploaded into the Business
+     * notebooks by the user does not count against this limit.
+     */
+    var EDAM_USER_UPLOAD_LIMIT_BUSINESS: number;
+
+    /**
+     * Maximum total size of a Note that can be added to a Free account.
+     * The size of a note is calculated as:
+     * ENML content length (in Unicode characters) plus the sum of all resource
+     * sizes (in bytes).
+     */
+    var EDAM_NOTE_SIZE_MAX_FREE: number;
+
+    /**
+     * Maximum total size of a Note that can be added to a Premium account.
+     * The size of a note is calculated as:
+     * ENML content length (in Unicode characters) plus the sum of all resource
+     * sizes (in bytes).
+     */
+    var EDAM_NOTE_SIZE_MAX_PREMIUM: number;
+
+    /**
+     * Maximum size of a resource, in bytes, for Free accounts
+     */
+    var EDAM_RESOURCE_SIZE_MAX_FREE: number;
+
+    /**
+     * Maximum size of a resource, in bytes, for Premium accounts
+     */
+    var EDAM_RESOURCE_SIZE_MAX_PREMIUM: number;
+
+    /**
+     * Maximum number of linked notebooks per account, for a free
+     * account.
+     */
+    var EDAM_USER_LINKED_NOTEBOOK_MAX: number;
+
+    /**
+     * Maximum number of linked notebooks per account, for a premium
+     * account.    Users who are part of an active business are also
+     * covered under "premium".
+     */
+    var EDAM_USER_LINKED_NOTEBOOK_MAX_PREMIUM: number;
+
+    /**
+     * Maximum number of shared notebooks per notebook
+     */
+    var EDAM_NOTEBOOK_SHARED_NOTEBOOK_MAX: number;
+
+    /**
+     * The minimum length of the content class attribute of a note.
+     */
+    var EDAM_NOTE_CONTENT_CLASS_LEN_MIN: number;
+
+    /**
+     * The maximum length of the content class attribute of a note.
+     */
+    var EDAM_NOTE_CONTENT_CLASS_LEN_MAX: number;
+
+    /**
+     * The regular expression that the content class of a note must match
+     * to be valid.
+     */
+    var EDAM_NOTE_CONTENT_CLASS_REGEX: string;
+
+    /**
+     * The content class prefix used for all notes created by Evernote Hello.
+     * This prefix can be used to assemble individual content class strings,
+     * or can be used to create a wildcard search to get all notes created by
+     * Hello. When performing a wildcard search via filtered sync chunks or
+     * search strings, the * character must be appended to this constant.
+     */
+    var EDAM_HELLO_APP_CONTENT_CLASS_PREFIX: string;
+
+    /**
+     * The content class prefix used for all notes created by Evernote Food.
+     * This prefix can be used to assemble individual content class strings,
+     * or can be used to create a wildcard search to get all notes created by
+     * Food. When performing a wildcard search via filtered sync chunks or
+     * search strings, the * character must be appended to this constant.
+     */
+    var EDAM_FOOD_APP_CONTENT_CLASS_PREFIX: string;
+
+    /**
+     * The content class prefix used for structured notes created by Evernote
+     * Hello that represents an encounter with a person. When performing a
+     * wildcard search via filtered sync chunks or search strings, the *
+     * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_HELLO_ENCOUNTER: string;
+
+    /**
+     * The content class prefix used for structured notes created by Evernote
+     * Hello that represents the user's profile. When performing a
+     * wildcard search via filtered sync chunks or search strings, the *
+     * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_HELLO_PROFILE: string;
+
+    /**
+     * The content class prefix used for structured notes created by
+     * Evernote Food that captures the experience of a particular meal.
+     * When performing a wildcard search via filtered sync chunks or search
+     * strings, the * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_FOOD_MEAL: string;
+
+    /**
+     * The content class prefix used for structured notes created by Evernote
+     * Skitch. When performing a wildcard search via filtered sync chunks
+     * or search strings, the * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_SKITCH_PREFIX: string;
+
+    /**
+     * The content class value used for structured image notes created by Evernote
+     * Skitch.
+     */
+    var EDAM_CONTENT_CLASS_SKITCH: string;
+
+    /**
+     * The content class value used for structured PDF notes created by Evernote
+     * Skitch.
+     */
+    var EDAM_CONTENT_CLASS_SKITCH_PDF: string;
+
+    /**
+     * The content class prefix used for structured notes created by Evernote
+     * Penultimate. When performing a wildcard search via filtered sync chunks
+     * or search strings, the * character must be appended to this constant.
+     */
+    var EDAM_CONTENT_CLASS_PENULTIMATE_PREFIX: string;
+
+    /**
+     * The content class value used for structured notes created by Evernote
+     * Penultimate that represents a Penultimate notebook.
+     */
+    var EDAM_CONTENT_CLASS_PENULTIMATE_NOTEBOOK: string;
+
+    /**
+     * The minimum length of the plain text in a findRelated query, assuming that
+     * plaintext is being provided.
+     */
+    var EDAM_RELATED_PLAINTEXT_LEN_MIN: number;
+
+    /**
+     * The maximum length of the plain text in a findRelated query, assuming that
+     * plaintext is being provided.
+     */
+    var EDAM_RELATED_PLAINTEXT_LEN_MAX: number;
+
+    /**
+     * The maximum number of notes that will be returned from a findRelated()
+     * query.
+     */
+    var EDAM_RELATED_MAX_NOTES: number;
+
+    /**
+     * The maximum number of notebooks that will be returned from a findRelated()
+     * query.
+     */
+    var EDAM_RELATED_MAX_NOTEBOOKS: number;
+
+    /**
+     * The maximum number of tags that will be returned from a findRelated() query.
+     */
+    var EDAM_RELATED_MAX_TAGS: number;
+
+    /**
+     * The minimum length, in Unicode characters, of a description for a business
+     * notebook.
+     */
+    var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MIN: number;
+
+    /**
+     * The maximum length, in Unicode characters, of a description for a business
+     * notebook.
+     */
+    var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MAX: number;
+
+    /**
+     * All business notebook descriptions must match this pattern.
+     * This excludes control chars or line/paragraph separators.
+     * The string may not begin or end with whitespace.
+     */
+    var EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_REGEX: string;
+
+    /**
+     * The maximum length of a business phone number.
+     */
+    var EDAM_BUSINESS_PHONE_NUMBER_LEN_MAX: number;
+
+    /**
+     * Minimum length of a preference name
+     */
+    var EDAM_PREFERENCE_NAME_LEN_MIN: number;
+
+    /**
+     * Maximum length of a preference name
+     */
+    var EDAM_PREFERENCE_NAME_LEN_MAX: number;
+
+    /**
+     * Minimum length of a preference value
+     */
+    var EDAM_PREFERENCE_VALUE_LEN_MIN: number;
+
+    /**
+     * Maximum length of a preference value
+     */
+    var EDAM_PREFERENCE_VALUE_LEN_MAX: number;
+
+    /**
+     * Maximum number of name/value pairs allowed
+     */
+    var EDAM_MAX_PREFERENCES: number;
+
+    /**
+     * Maximum number of values per preference name
+     */
+    var EDAM_MAX_VALUES_PER_PREFERENCE: number;
+
+    /**
+     * A preference name must match this regex.
+     */
+    var EDAM_PREFERENCE_NAME_REGEX: string;
+
+    /**
+     * A preference value must match this regex.
+     */
+    var EDAM_PREFERENCE_VALUE_REGEX: string;
+
+    /**
+     * The name of the preferences entry that contains shortcuts.
+     */
+    var EDAM_PREFERENCE_SHORTCUTS: string;
+
+    /**
+     * The maximum number of shortcuts that a user may have.
+     */
+    var EDAM_PREFERENCE_SHORTCUTS_MAX_VALUES: number;
+
+    /**
+     * Maximum length of the device identifier string associated with long sessions.
+     */
+    var EDAM_DEVICE_ID_LEN_MAX: number;
+
+    /**
+     * Regular expression for device identifier strings associated with long sessions.
+     */
+    var EDAM_DEVICE_ID_REGEX: string;
+
+    /**
+     * Maximum length of the device description string associated with long sessions.
+     */
+    var EDAM_DEVICE_DESCRIPTION_LEN_MAX: number;
+
+    /**
+     * Regular expression for device description strings associated with long sessions.
+     */
+    var EDAM_DEVICE_DESCRIPTION_REGEX: string;
+
+    /**
+     * Maximum number of search suggestions that can be returned
+     */
+    var EDAM_SEARCH_SUGGESTIONS_MAX: number;
+
+    /**
+     * Maximum length of the search suggestion prefix
+     */
+    var EDAM_SEARCH_SUGGESTIONS_PREFIX_LEN_MAX: number;
+
+    /**
+     * Minimum length of the search suggestion prefix
+     */
+    var EDAM_SEARCH_SUGGESTIONS_PREFIX_LEN_MIN: number;
+    class NoteStoreClient {
+        seqid: number;
+
+        /**
+         * Asks the NoteStore to provide information about the status of the user
+         * account corresponding to the provided authentication token.
+         */
+        getSyncState(cb: Callback<SyncState>): void;
+
+        /**
+         * Asks the NoteStore to provide information about the status of the user
+         * account corresponding to the provided authentication token.
+         * This version of 'getSyncState' allows the client to upload coarse-
+         * grained usage metrics to the service.
+         *
+         * @param clientMetrics    see the documentation of the ClientUsageMetrics
+         *     structure for an explanation of the fields that clients can pass to
+         *     the service.
+         */
+        getSyncStateWithMetrics(clientMetrics: ClientUsageMetrics, cb: Callback<SyncState>): void;
+
+        /**
+         * Asks the NoteStore to provide the state of the account in order of
+         * last modification.    This request retrieves one block of the server's
+         * state so that a client can make several small requests against a large
+         * account rather than getting the entire state in one big message.
+         * This call gives fine-grained control of the data that will
+         * be received by a client by omitting data elements that a client doesn't
+         * need. This may reduce network traffic and sync times.
+         *
+         * @param afterUSN
+         *     The client can pass this value to ask only for objects that
+         *     have been updated after a certain point.    This allows the client to
+         *     receive updates after its last checkpoint rather than doing a full
+         *     synchronization on every pass.    The default value of "0" indicates
+         *     that the client wants to get objects from the start of the account.
+         *
+         * @param maxEntries
+         *     The maximum number of modified objects that should be
+         *     returned in the result SyncChunk.    This can be used to limit the size
+         *     of each individual message to be friendly for network transfer.
+         *
+         * @param filter
+         *     The caller must set some of the flags in this structure to specify which
+         *     data types should be returned during the synchronization.    See
+         *     the SyncChunkFilter structure for information on each flag.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "afterUSN" - if negative
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "maxEntries" - if less than 1
+         *     </li>
+         * </ul>
+         */
+        getFilteredSyncChunk(afterUSN: number, maxEntries: number, filter: SyncChunkFilter, cb: Callback<SyncState>): void;
+
+        /**
+         * Asks the NoteStore to provide information about the status of a linked
+         * notebook that has been shared with the caller, or that is public to the
+         * world.
+         * This will return a result that is similar to getSyncState, but may omit
+         * SyncState.uploaded if the caller doesn't have permission to write to
+         * the linked notebook.
+         *
+         * This function must be called on the shard that owns the referenced
+         * notebook.    (I.e. the shardId in /shard/shardId/edam/note must be the
+         * same as LinkedNotebook.shardId.)
+         *
+         * @param authenticationToken
+         *     This should be an authenticationToken for the guest who has received
+         *     the invitation to the share.    (I.e. this should not be the result of
+         *     NoteStore.authenticateToSharedNotebook)
+         *
+         * @param linkedNotebook
+         *     This structure should contain identifying information and permissions
+         *     to access the notebook in question.
+         */
+        getLinkedNotebookSyncState(linkedNotebook: LinkedNotebook, cb: Callback<SyncState>): void;
+
+        /**
+         * Asks the NoteStore to provide information about the contents of a linked
+         * notebook that has been shared with the caller, or that is public to the
+         * world.
+         * This will return a result that is similar to getSyncChunk, but will only
+         * contain entries that are visible to the caller.    I.e. only that particular
+         * Notebook will be visible, along with its Notes, and Tags on those Notes.
+         *
+         * This function must be called on the shard that owns the referenced
+         * notebook.    (I.e. the shardId in /shard/shardId/edam/note must be the
+         * same as LinkedNotebook.shardId.)
+         *
+         * @param authenticationToken
+         *     This should be an authenticationToken for the guest who has received
+         *     the invitation to the share.    (I.e. this should not be the result of
+         *     NoteStore.authenticateToSharedNotebook)
+         *
+         * @param linkedNotebook
+         *     This structure should contain identifying information and permissions
+         *     to access the notebook in question.    This must contain the valid fields
+         *     for either a shared notebook (e.g. shareKey)
+         *     or a public notebook (e.g. username, uri)
+         *
+         * @param afterUSN
+         *     The client can pass this value to ask only for objects that
+         *     have been updated after a certain point.    This allows the client to
+         *     receive updates after its last checkpoint rather than doing a full
+         *     synchronization on every pass.    The default value of "0" indicates
+         *     that the client wants to get objects from the start of the account.
+         *
+         * @param maxEntries
+         *     The maximum number of modified objects that should be
+         *     returned in the result SyncChunk.    This can be used to limit the size
+         *     of each individual message to be friendly for network transfer.
+         *     Applications should not request more than 256 objects at a time,
+         *     and must handle the case where the service returns less than the
+         *     requested number of objects in a given request even though more
+         *     objects are available on the service.
+         *
+         * @param fullSyncOnly
+         *     If true, then the client only wants initial data for a full sync.
+         *     In this case, the service will not return any expunged objects,
+         *     and will not return any Resources, since these are also provided
+         *     in their corresponding Notes.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "afterUSN" - if negative
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "maxEntries" - if less than 1
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "LinkedNotebook" - if the provided information doesn't match any
+         *         valid notebook
+         *     </li>
+         *     <li> "LinkedNotebook.uri" - if the provided public URI doesn't match any
+         *         valid notebook
+         *     </li>
+         *     <li> "SharedNotebook.id" - if the provided information indicates a
+         *            shared notebook that no longer exists
+         *     </li>
+         * </ul>
+         */
+        getLinkedNotebookSyncChunk(linkedNotebook: LinkedNotebook, afterUSN: number, maxEntries: number, fullSyncOnly: boolean, cb: Callback<SyncChunk>): void;
+
+        /**
+         * Returns a list of all of the notebooks in the account.
+         */
+        listNotebooks(cb: Callback<Notebook[]>): void;
+
+        /**
+         * Returns the current state of the notebook with the provided GUID.
+         * The notebook may be active or deleted (but not expunged).
+         *
+         * @param guid
+         *     The GUID of the notebook to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Notebook.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Notebook" - private notebook, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - tag not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNotebook(guid: string, cb: Callback<Notebook>): void;
+
+        /**
+         * Returns the notebook that should be used to store new notes in the
+         * user's account when no other notebooks are specified.
+         */
+        getDefaultNotebook(cb: Callback<Notebook>): void;
+
+        /**
+         * Asks the service to make a notebook with the provided name.
+         *
+         * @param notebook
+         *     The desired fields for the notebook must be provided on this
+         *     object.    The name of the notebook must be set, and either the 'active'
+         *     or 'defaultNotebook' fields may be set by the client at creation.
+         *     If a notebook exists in the account with the same name (via
+         *     case-insensitive compare), this will throw an EDAMUserException.
+         *
+         * @return
+         *     The newly created Notebook.    The server-side GUID will be
+         *     saved in this object's 'guid' field.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Notebook.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Notebook.stack" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Publishing.uri" - if publishing set but bad uri
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Publishing.publicDescription" - if too long
+         *     </li>
+         *     <li> DATA_CONFLICT "Notebook.name" - name already in use
+         *     </li>
+         *     <li> DATA_CONFLICT "Publishing.uri" - if URI already in use
+         *     </li>
+         *     <li> DATA_REQUIRED "Publishing.uri" - if publishing set but uri missing
+         *     </li>
+         *     <li> LIMIT_REACHED "Notebook" - at max number of notebooks
+         *     </li>
+         * </ul>
+         */
+        createNotebook(notebook: Notebook, cb: Callback<Notebook>): void;
+
+        /**
+         * Submits notebook changes to the service.    The provided data must include
+         * the notebook's guid field for identification.
+         *
+         * @param notebook
+         *     The notebook object containing the requested changes.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Notebook.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Notebook.stack" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Publishing.uri" - if publishing set but bad uri
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Publishing.publicDescription" - if too long
+         *     </li>
+         *     <li> DATA_CONFLICT "Notebook.name" - name already in use
+         *     </li>
+         *     <li> DATA_CONFLICT "Publishing.uri" - if URI already in use
+         *     </li>
+         *     <li> DATA_REQUIRED "Publishing.uri" - if publishing set but uri missing
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        updateNotebook(notebook: Notebook, cb: Callback<number>): void;
+
+        /**
+         * Permanently removes the notebook from the user's account.
+         * After this action, the notebook is no longer available for undeletion, etc.
+         * If the notebook contains any Notes, they will be moved to the current
+         * default notebook and moved into the trash (i.e. Note.active=false).
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The GUID of the notebook to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Notebook.guid" - if the parameter is missing
+         *     </li>
+         *     <li> LIMIT_REACHED "Notebook" - trying to expunge the last Notebook
+         *     </li>
+         *     <li> PERMISSION_DENIED "Notebook" - private notebook, user doesn't own
+         *     </li>
+         * </ul>
+         */
+        expungeNotebook(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Returns a list of the tags in the account.    Evernote does not support
+         * the undeletion of tags, so this will only include active tags.
+         */
+        listTags(cb: Callback<Tag[]>): void;
+
+        /**
+         * Returns a list of the tags that are applied to at least one note within
+         * the provided notebook.    If the notebook is public, the authenticationToken
+         * may be ignored.
+         *
+         * @param notebookGuid
+         *        the GUID of the notebook to use to find tags
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - notebook not found by GUID
+         *     </li>
+         * </ul>
+         */
+        listTagsByNotebook(notebookGuid: string, cb: Callback<Tag[]>): void;
+
+        /**
+         * Returns the current state of the Tag with the provided GUID.
+         *
+         * @param guid
+         *     The GUID of the tag to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Tag" - private Tag, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.guid" - tag not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getTag(guid: string, cb: Callback<Tag>): void;
+
+        /**
+         * Asks the service to make a tag with a set of information.
+         *
+         * @param tag
+         *     The desired list of fields for the tag are specified in this
+         *     object.    The caller must specify the tag name, and may provide
+         *     the parentGUID.
+         *
+         * @return
+         *     The newly created Tag.    The server-side GUID will be
+         *     saved in this object.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Tag.parentGuid" - malformed GUID
+         *     </li>
+         *     <li> DATA_CONFLICT "Tag.name" - name already in use
+         *     </li>
+         *     <li> LIMIT_REACHED "Tag" - at max number of tags
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.parentGuid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        createTag(tag: Tag, cb: Callback<Tag>): void;
+
+        /**
+         * Submits tag changes to the service.    The provided data must include
+         * the tag's guid field for identification.    The service will apply
+         * updates to the following tag fields:    name, parentGuid
+         *
+         * @param tag
+         *     The tag object containing the requested changes.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Tag.parentGuid" - malformed GUID
+         *     </li>
+         *     <li> DATA_CONFLICT "Tag.name" - name already in use
+         *     </li>
+         *     <li> DATA_CONFLICT "Tag.parentGuid" - can't set parent: circular
+         *     </li>
+         *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.guid" - tag not found, by GUID
+         *     </li>
+         *     <li> "Tag.parentGuid" - parent not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        updateTag(tag: Tag, cb: Callback<number>): void;
+
+        /**
+         * Removes the provided tag from every note that is currently tagged with
+         * this tag.    If this operation is successful, the tag will still be in
+         * the account, but it will not be tagged on any notes.
+         *
+         * This function is not indended for use by full synchronizing clients, since
+         * it does not provide enough result information to the client to reconcile
+         * the local state without performing a follow-up sync from the service.    This
+         * is intended for "thin clients" that need to efficiently support this as
+         * a UI operation.
+         *
+         * @param guid
+         *     The GUID of the tag to remove from all notes.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.guid" - if the guid parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.guid" - tag not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        untagAll(guid: string, cb: Callback<void>): void;
+
+        /**
+         * Permanently deletes the tag with the provided GUID, if present.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The GUID of the tag to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Tag.guid" - if the guid parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Tag" - user doesn't own tag
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Tag.guid" - tag not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        expungeTag(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Returns a list of the searches in the account.    Evernote does not support
+         * the undeletion of searches, so this will only include active searches.
+         */
+        listSearches(cb: Callback<SavedSearch[]>): void;
+
+        /**
+         * Returns the current state of the search with the provided GUID.
+         *
+         * @param guid
+         *     The GUID of the search to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "SavedSearch" - private Tag, user doesn't own
+         *     </li>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SavedSearch.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getSearch(guid: string, cb: Callback<SavedSearch>): void;
+
+        /**
+         * Asks the service to make a saved search with a set of information.
+         *
+         * @param search
+         *     The desired list of fields for the search are specified in this
+         *     object. The caller must specify the name and query for the
+         *     search, and may optionally specify a search scope.
+         *     The SavedSearch.format field is ignored by the service.
+         *
+         * @return
+         *     The newly created SavedSearch.    The server-side GUID will be
+         *     saved in this object.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.query" - invalid length
+         *     </li>
+         *     <li> DATA_CONFLICT "SavedSearch.name" - name already in use
+         *     </li>
+         *     <li> LIMIT_REACHED "SavedSearch" - at max number of searches
+         *     </li>
+         * </ul>
+         */
+        createSearch(search: SavedSearch, cb: Callback<SavedSearch>): void;
+
+        /**
+         * Submits search changes to the service. The provided data must include
+         * the search's guid field for identification. The service will apply
+         * updates to the following search fields: name, query, and scope.
+         *
+         * @param search
+         *     The search object containing the requested changes.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.query" - invalid length
+         *     </li>
+         *     <li> DATA_CONFLICT "SavedSearch.name" - name already in use
+         *     </li>
+         *     <li> PERMISSION_DENIED "SavedSearch" - user doesn't own tag
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SavedSearch.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        updateSearch(search: SavedSearch, cb: Callback<number>): number;
+
+        /**
+         * Permanently deletes the saved search with the provided GUID, if present.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The GUID of the search to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "SavedSearch.guid" - if the guid parameter is empty
+         *     </li>
+         *     <li> PERMISSION_DENIED "SavedSearch" - user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SavedSearch.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        expungeSearch(guid: string, cb: Callback<number>): void;
+
+        /**
+         * DEPRECATED. Use findNotesMetadata.
+         */
+        findNotes(filter: NoteFilter, offset: number, maxNotes: number, cb: Callback<NoteList>): void;
+
+        /**
+         * Finds the position of a note within a sorted subset of all of the user's
+         * notes. This may be useful for thin clients that are displaying a paginated
+         * listing of a large account, which need to know where a particular note
+         * sits in the list without retrieving all notes first.
+         *
+         * @param authenticationToken
+         *     Must be a valid token for the user's account unless the NoteFilter
+         *     'notebookGuid' is the GUID of a public notebook.
+         *
+         * @param filter
+         *     The list of criteria that will constrain the notes to be returned.
+         *
+         * @param guid
+         *     The GUID of the note to be retrieved.
+         *
+         * @return
+         *     If the note with the provided GUID is found within the matching note
+         *     list, this will return the offset of that note within that list (where
+         *     the first offset is 0).    If the note is not found within the set of
+         *     notes, this will return -1.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "offset" - not between 0 and EDAM_USER_NOTES_MAX
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "maxNotes" - not between 0 and EDAM_USER_NOTES_MAX
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
+         *     </li>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        findNoteOffset(filter: NoteFilter, guid: string, cb: Callback<number>): void;
+
+        /**
+         * Used to find the high-level information about a set of the notes from a
+         * user's account based on various criteria specified via a NoteFilter object.
+         * <p/>
+         * Web applications that wish to periodically check for new content in a user's
+         * Evernote account should consider using webhooks instead of polling this API.
+         * See http://dev.evernote.com/documentation/cloud/chapters/polling_notification.php
+         * for more information.
+         *
+         * @param authenticationToken
+         *     Must be a valid token for the user's account unless the NoteFilter
+         *     'notebookGuid' is the GUID of a public notebook.
+         *
+         * @param filter
+         *     The list of criteria that will constrain the notes to be returned.
+         *
+         * @param offset
+         *     The numeric index of the first note to show within the sorted
+         *     results.    The numbering scheme starts with "0".    This can be used for
+         *     pagination.
+         *
+         * @param maxNotes
+         *     The mximum notes to return in this query.    The service will return a set
+         *     of notes that is no larger than this number, but may return fewer notes
+         *     if needed.    The NoteList.totalNotes field in the return value will
+         *     indicate whether there are more values available after the returned set.
+         *
+         * @param resultSpec
+         *     This specifies which information should be returned for each matching
+         *     Note. The fields on this structure can be used to eliminate data that
+         *     the client doesn't need, which will reduce the time and bandwidth
+         *     to receive and process the reply.
+         *
+         * @return
+         *     The list of notes that match the criteria.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "offset" - not between 0 and EDAM_USER_NOTES_MAX
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "maxNotes" - not between 0 and EDAM_USER_NOTES_MAX
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        findNotesMetadata(filter: NoteFilter, offset: number, maxNotes: number, resultSpec: NotesMetadataResultSpec, cb: Callback<NotesMetadataList>): void;
+
+        /**
+         * This function is used to determine how many notes are found for each
+         * notebook and tag in the user's account, given a current set of filter
+         * parameters that determine the current selection.    This function will
+         * return a structure that gives the note count for each notebook and tag
+         * that has at least one note under the requested filter.    Any notebook or
+         * tag that has zero notes in the filtered set will not be listed in the
+         * reply to this function (so they can be assumed to be 0).
+         *
+         * @param authenticationToken
+         *     Must be a valid token for the user's account unless the NoteFilter
+         *     'notebookGuid' is the GUID of a public notebook.
+         *
+         * @param filter
+         *     The note selection filter that is currently being applied.    The note
+         *     counts are to be calculated with this filter applied to the total set
+         *     of notes in the user's account.
+         *
+         * @param withTrash
+         *     If true, then the NoteCollectionCounts.trashCount will be calculated
+         *     and supplied in the reply. Otherwise, the trash value will be omitted.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuids" - if any are malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
+         *     </li>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        findNoteCounts(filter: NoteFilter, withTrash: boolean, cb: Callback<NoteCollectionCounts>): void;
+
+        /**
+         * Returns the current state of the note in the service with the provided
+         * GUID.    The ENML contents of the note will only be provided if the
+         * 'withContent' parameter is true.    The service will include the meta-data
+         * for each resource in the note, but the binary contents of the resources
+         * and their recognition data will be omitted.
+         * If the Note is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).    The applicationData
+         * fields are returned as keysOnly.
+         *
+         * @param guid
+         *     The GUID of the note to be retrieved.
+         *
+         * @param withContent
+         *     If true, the note will include the ENML contents of its
+         *     'content' field.
+         *
+         * @param withResourcesData
+         *     If true, any Resource elements in this Note will include the binary
+         *     contents of their 'data' field's body.
+         *
+         * @param withResourcesRecognition
+         *     If true, any Resource elements will include the binary contents of the
+         *     'recognition' field's body if recognition data is present.
+         *
+         * @param withResourcesAlternateData
+         *     If true, any Resource elements in this Note will include the binary
+         *     contents of their 'alternateData' fields' body, if an alternate form
+         *     is present.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNote(guid: string, withContent: boolean, withResourcesData: boolean, withResourcesRecognition: boolean, withResourcesAlternateData: boolean, cb: Callback<Note>): void;
+
+        /**
+         * Get all of the application data for the note identified by GUID,
+         * with values returned within the LazyMap fullMap field.
+         * If there are no applicationData entries, then a LazyMap
+         * with an empty fullMap will be returned. If your application
+         * only needs to fetch its own applicationData entry, use
+         * getNoteApplicationDataEntry instead.
+         */
+        getNoteApplicationData(guid: string, cb: Callback<LazyMap>): void;
+
+        /**
+         * Get the value of a single entry in the applicationData map
+         * for the note identified by GUID.
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - note not found, by GUID</li>
+         *     <li> "NoteAttributes.applicationData.key" - note not found, by key</li>
+         * </ul>
+         */
+        getNoteApplicationDataEntry(guid: string, key: string, cb: Callback<string>): void;
+
+        /**
+         * Update, or create, an entry in the applicationData map for
+         * the note identified by guid.
+         */
+        setNoteApplicationDataEntry(guid: string, key: string, value: string, cb: Callback<number>): void;
+
+        /**
+         * Remove an entry identified by 'key' from the applicationData map for
+         * the note identified by 'guid'. Silently ignores an unset of a
+         * non-existing key.
+         */
+        unsetNoteApplicationDataEntry(guid: string, key: string, cb: Callback<number>): void;
+
+        /**
+         * Returns XHTML contents of the note with the provided GUID.
+         * If the Note is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the note to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNoteContent(guid: string, cb: Callback<string>): void;
+
+        /**
+         * Returns a block of the extracted plain text contents of the note with the
+         * provided GUID.    This text can be indexed for search purposes by a light
+         * client that doesn't have capabilities to extract all of the searchable
+         * text content from the note and its resources.
+         *
+         * If the Note is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the note to be retrieved.
+         *
+         * @param noteOnly
+         *     If true, this will only return the text extracted from the ENML contents
+         *     of the note itself.    If false, this will also include the extracted text
+         *     from any text-bearing resources (PDF, recognized images)
+         *
+         * @param tokenizeForIndexing
+         *     If true, this will break the text into cleanly separated and sanitized
+         *     tokens.    If false, this will return the more raw text extraction, with
+         *     its original punctuation, capitalization, spacing, etc.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNoteSearchText(guid: string, noteOnly: boolean, tokenizeForIndexing: boolean, cb: Callback<string>): void;
+
+        /**
+         * Returns a block of the extracted plain text contents of the resource with
+         * the provided GUID.    This text can be indexed for search purposes by a light
+         * client that doesn't have capability to extract all of the searchable
+         * text content from a resource.
+         *
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the resource to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getResourceSearchText(guid: string, cb: Callback<string>): void;
+
+        /**
+         * Returns a list of the names of the tags for the note with the provided
+         * guid.    This can be used with authentication to get the tags for a
+         * user's own note, or can be used without valid authentication to retrieve
+         * the names of the tags for a note in a public notebook.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getNoteTagNames(guid: string, cb: Callback<string[]>): void;
+
+        /**
+         * Asks the service to make a note with the provided set of information.
+         *
+         * @param note
+         *     A Note object containing the desired fields to be populated on
+         *     the service.
+         *
+         * @return
+         *     The newly created Note from the service.    The server-side
+         *     GUIDs for the Note and any Resources will be saved in this object.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.title" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Note.content" - invalid length for ENML content
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteAttributes.*" - bad resource string
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
+         *     </li>
+         *     <li> DATA_CONFLICT "Note.deleted" - deleted time set on active note
+         *     </li>
+         *     <li> DATA_REQUIRED "Resource.data" - resource data body missing
+         *     </li>
+         *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
+         *     </li>
+         *     <li> LIMIT_REACHED "Note" - at max number per account
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.size" - total note size too large
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.resources" - too many resources on Note
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.tagGuids" - too many Tags on Note
+         *     </li>
+         *     <li> LIMIT_REACHED "Resource.data.size" - resource too large
+         *     </li>
+         *     <li> LIMIT_REACHED "NoteAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note.notebookGuid" - NB not owned by user
+         *     </li>
+         *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Tag.name" - Note.tagNames was provided, and one
+         *         of the specified tags had an invalid length or pattern
+         *     </li>
+         *     <li> LIMIT_REACHED "Tag" - Note.tagNames was provided, and the required
+         *         new tags would exceed the maximum number per account
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.notebookGuid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        createNote(note: Note, cb: Callback<Note>): void;
+
+        /**
+         * Submit a set of changes to a note to the service.    The provided data
+         * must include the note's guid field for identification. The note's
+         * title must also be set.
+         *
+         * @param note
+         *     A Note object containing the desired fields to be populated on
+         *     the service. With the exception of the note's title and guid, fields
+         *     that are not being changed do not need to be set. If the content is not
+         *     being modified, note.content should be left unset. If the list of
+         *     resources is not being modified, note.resources should be left unset.
+         *
+         * @return
+         *     The metadata (no contents) for the Note on the server after the update
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.title" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Note.content" - invalid length for ENML body
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteAttributes.*" - bad resource string
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
+         *     </li>
+         *     <li> DATA_CONFLICT "Note.deleted" - deleted time set on active note
+         *     </li>
+         *     <li> DATA_REQUIRED "Resource.data" - resource data body missing
+         *     </li>
+         *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.tagGuids" - too many Tags on Note
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.resources" - too many resources on Note
+         *     </li>
+         *     <li> LIMIT_REACHED "Note.size" - total note size too large
+         *     </li>
+         *     <li> LIMIT_REACHED "Resource.data.size" - resource too large
+         *     </li>
+         *     <li> LIMIT_REACHED "NoteAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't own
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note.notebookGuid" - user doesn't own destination
+         *     </li>
+         *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Tag.name" - Note.tagNames was provided, and one
+         *         of the specified tags had an invalid length or pattern
+         *     </li>
+         *     <li> LIMIT_REACHED "Tag" - Note.tagNames was provided, and the required
+         *         new tags would exceed the maximum number per account
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - note not found, by GUID
+         *     </li>
+         *     <li> "Note.notebookGuid" - if notebookGuid provided, but not found
+         *     </li>
+         * </ul>
+         */
+        updateNote(note: Note, cb: Callback<Note>): void;
+
+        /**
+         * Moves the note into the trash. The note may still be undeleted, unless it
+         * is expunged.    This is equivalent to calling updateNote() after setting
+         * Note.active = false
+         *
+         * @param guid
+         *     The GUID of the note to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't have permission to
+         *                    update the note.
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_CONFLICT "Note.guid" - the note is already deleted
+         *     </li>
+         * </ul>
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        deleteNote(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Permanently removes a Note, and all of its Resources,
+         * from the service.
+         * <p/>
+         * NOTE: This function is not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The GUID of the note to delete.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        expungeNote(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Permanently removes a list of Notes, and all of their Resources, from
+         * the service.    This should be invoked with a small number of Note GUIDs
+         * (e.g. 100 or less) on each call.    To expunge a larger number of notes,
+         * call this method multiple times.    This should also be used to reduce the
+         * number of Notes in a notebook before calling expungeNotebook() or
+         * in the trash before calling expungeInactiveNotes(), since these calls may
+         * be prohibitively slow if there are more than a few hundred notes.
+         * If an exception is thrown for any of the GUIDs, then none of the notes
+         * will be deleted.    I.e. this call can be treated as an atomic transaction.
+         * <p/>
+         * NOTE: This function is not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param noteGuids
+         *     The list of GUIDs for the Notes to remove.
+         *
+         * @return
+         *     The account's updateCount at the end of this operation
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        expungeNotes(noteGuids: string[], cb: Callback<number>): void;
+
+        /**
+         * Permanently removes all of the Notes that are currently marked as
+         * inactive.    This is equivalent to "emptying the trash", and these Notes
+         * will be gone permanently.
+         * <p/>
+         * This operation may be relatively slow if the account contains a large
+         * number of inactive Notes.
+         * <p/>
+         * NOTE: This function is not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @return
+         *        The number of notes that were expunged.
+         */
+        expungeInactiveNotes(cb: Callback<number>): void;
+
+        /**
+         * Performs a deep copy of the Note with the provided GUID 'noteGuid' into
+         * the Notebook with the provided GUID 'toNotebookGuid'.
+         * The caller must be the owner of both the Note and the Notebook.
+         * This creates a new Note in the destination Notebook with new content and
+         * Resources that match all of the content and Resources from the original
+         * Note, but with new GUID identifiers.
+         * The original Note is not modified by this operation.
+         * The copied note is considered as an "upload" for the purpose of upload
+         * transfer limit calculation, so its size is added to the upload count for
+         * the owner.
+         *
+         * @param noteGuid
+         *     The GUID of the Note to copy.
+         *
+         * @param toNotebookGuid
+         *     The GUID of the Notebook that should receive the new Note.
+         *
+         * @return
+         *     The metadata for the new Note that was created.    This will include the
+         *     new GUID for this Note (and any copied Resources), but will not include
+         *     the content body or the binary bodies of any Resources.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> LIMIT_REACHED "Note" - at max number per account
+         *     </li>
+         *     <li> PERMISSION_DENIED "Notebook.guid" - destination not owned by user
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - user doesn't own
+         *     </li>
+         *     <li> QUOTA_REACHED "Accounting.uploadLimit" - note exceeds upload quota
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        copyNote(noteGuid: string, toNotebookGuid: string, cb: Callback<Note>): void;
+
+        /**
+         * Returns a list of the prior versions of a particular note that are
+         * saved within the service.    These prior versions are stored to provide a
+         * recovery from unintentional removal of content from a note. The identifiers
+         * that are returned by this call can be used with getNoteVersion to retrieve
+         * the previous note.
+         * The identifiers will be listed from the most recent versions to the oldest.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        listNoteVersions(noteGuid: string, cb: Callback<NoteVersionId[]>): void;
+
+        /**
+         * This can be used to retrieve a previous version of a Note after it has been
+         * updated within the service.    The caller must identify the note (via its
+         * guid) and the version (via the updateSequenceNumber of that version).
+         * to find a listing of the stored version USNs for a note, call
+         * listNoteVersions.
+         * This call is only available for notes in Premium accounts.    (I.e. access
+         * to past versions of Notes is a Premium-only feature.)
+         *
+         * @param noteGuid
+         *     The GUID of the note to be retrieved.
+         *
+         * @param updateSequenceNum
+         *     The USN of the version of the note that is being retrieved
+         *
+         * @param withResourcesData
+         *     If true, any Resource elements in this Note will include the binary
+         *     contents of their 'data' field's body.
+         *
+         * @param withResourcesRecognition
+         *     If true, any Resource elements will include the binary contents of the
+         *     'recognition' field's body if recognition data is present.
+         *
+         * @param withResourcesAlternateData
+         *     If true, any Resource elements in this Note will include the binary
+         *     contents of their 'alternateData' fields' body, if an alternate form
+         *     is present.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         *     <li> PERMISSION_DENIED "updateSequenceNum" -
+         *         The account isn't permitted to access previous versions of notes.
+         *         (i.e. this is a Free account.)
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         *     <li> "Note.updateSequenceNumber" - the Note doesn't have a version with
+         *            the corresponding USN.
+         *     </li>
+         * </ul>
+         */
+        getNoteVersion(noteGuid: string, updateSequenceNum: number, withResourcesData: boolean, withResourcesRecognition: boolean, withResourcesAlternateData: boolean, cb: Callback<Note>): void;
+
+        /**
+         * Returns the current state of the resource in the service with the
+         * provided GUID.
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).    Only the
+         * keys for the applicationData will be returned.
+         *
+         * @param guid
+         *     The GUID of the resource to be retrieved.
+         *
+         * @param withData
+         *     If true, the Resource will include the binary contents of the
+         *     'data' field's body.
+         *
+         * @param withRecognition
+         *     If true, the Resource will include the binary contents of the
+         *     'recognition' field's body if recognition data is present.
+         *
+         * @param withAttributes
+         *     If true, the Resource will include the attributes
+         *
+         * @param withAlternateData
+         *     If true, the Resource will include the binary contents of the
+         *     'alternateData' field's body, if an alternate form is present.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getResource(guid: string, withData: boolean, withRecognition: boolean, withAttributes: boolean, withAlternateData: boolean, cb: Callback<Resource>): void;
+
+        /**
+         * Get all of the application data for the Resource identified by GUID,
+         * with values returned within the LazyMap fullMap field.
+         * If there are no applicationData entries, then a LazyMap
+         * with an empty fullMap will be returned. If your application
+         * only needs to fetch its own applicationData entry, use
+         * getResourceApplicationDataEntry instead.
+         */
+        getResourceApplicationData(guid: string, cb: Callback<LazyMap>): void;
+
+        /**
+         * Get the value of a single entry in the applicationData map
+         * for the Resource identified by GUID.
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - Resource not found, by GUID</li>
+         *     <li> "ResourceAttributes.applicationData.key" - Resource not found, by key</li>
+         * </ul>
+         */
+        getResourceApplicationDataEntry(guid: string, key: string, cb: Callback<string>): void;
+
+        /**
+         * Update, or create, an entry in the applicationData map for
+         * the Resource identified by guid.
+         */
+        setResourceApplicationDataEntry(guid: string, key: string, value: string, cb: Callback<number>): void;
+
+        /**
+         * Remove an entry identified by 'key' from the applicationData map for
+         * the Resource identified by 'guid'.
+         */
+        unsetResourceApplicationDataEntry(guid: string, key: string, cb: Callback<number>): void;
+
+        /**
+         * Submit a set of changes to a resource to the service.    This can be used
+         * to update the meta-data about the resource, but cannot be used to change
+         * the binary contents of the resource (including the length and hash).    These
+         * cannot be changed directly without creating a new resource and removing the
+         * old one via updateNote.
+         *
+         * @param resource
+         *     A Resource object containing the desired fields to be populated on
+         *     the service.    The service will attempt to update the resource with the
+         *     following fields from the client:
+         *     <ul>
+         *            <li>guid:    must be provided to identify the resource
+         *            </li>
+         *            <li>mime
+         *            </li>
+         *            <li>width
+         *            </li>
+         *            <li>height
+         *            </li>
+         *            <li>duration
+         *            </li>
+         *            <li>attributes:    optional.    if present, the set of attributes will
+         *                     be replaced.
+         *            </li>
+         *     </ul>
+         *
+         * @return
+         *     The Update Sequence Number of the resource after the changes have been
+         *     applied.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "Resource.mime" - invalid resource MIME type
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "ResourceAttributes.*" - bad resource string
+         *     </li>
+         *     <li> LIMIT_REACHED "ResourceAttribute.*" - attribute string too long
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        updateResource(resource: Resource, cb: Callback<number>): void;
+
+        /**
+         * Returns binary data of the resource with the provided GUID.    For
+         * example, if this were an image resource, this would contain the
+         * raw bits of the image.
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the resource to be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getResourceData(guid: string, cb: Callback<string>): void;
+
+        /**
+         * Returns the current state of a resource, referenced by containing
+         * note GUID and resource content hash.
+         *
+         * @param noteGuid
+         *     The GUID of the note that holds the resource to be retrieved.
+         *
+         * @param contentHash
+         *     The MD5 checksum of the resource within that note. Note that
+         *     this is the binary checksum, for example from Resource.data.bodyHash,
+         *     and not the hex-encoded checksum that is used within an en-media
+         *     tag in a note body.
+         *
+         * @param withData
+         *     If true, the Resource will include the binary contents of the
+         *     'data' field's body.
+         *
+         * @param withRecognition
+         *     If true, the Resource will include the binary contents of the
+         *     'recognition' field's body.
+         *
+         * @param withAlternateData
+         *     If true, the Resource will include the binary contents of the
+         *     'alternateData' field's body, if an alternate form is present.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_REQUIRED "Note.guid" - noteGuid param missing
+         *     </li>
+         *     <li> DATA_REQUIRED "Note.contentHash" - contentHash param missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note" - not found, by guid
+         *     </li>
+         *     <li> "Resource" - not found, by hash
+         *     </li>
+         * </ul>
+         */
+        getResourceByHash(noteGuid: string, contentHash: string, withData: boolean, withRecognition: boolean, withAlternateData: boolean, cb: Callback<Resource>): void;
+
+        /**
+         * Returns the binary contents of the recognition index for the resource
+         * with the provided GUID.    If the caller asks about a resource that has
+         * no recognition data, this will throw EDAMNotFoundException.
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the resource whose recognition data should be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         *     <li> "Resource.recognition" - resource has no recognition
+         *     </li>
+         * </ul>
+         */
+        getResourceRecognition(guid: string, cb: Callback<string>): void;
+
+        /**
+         * If the Resource with the provided GUID has an alternate data representation
+         * (indicated via the Resource.alternateData field), then this request can
+         * be used to retrieve the binary contents of that alternate data file.
+         * If the caller asks about a resource that has no alternate data form, this
+         * will throw EDAMNotFoundException.
+         *
+         * @param guid
+         *        The GUID of the resource whose recognition data should be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         *     <li> "Resource.alternateData" - resource has no recognition
+         *     </li>
+         * </ul>
+         */
+        getResourceAlternateData(guid: string, cb: Callback<string>): void;
+
+        /**
+         * Returns the set of attributes for the Resource with the provided GUID.
+         * If the Resource is found in a public notebook, the authenticationToken
+         * will be ignored (so it could be an empty string).
+         *
+         * @param guid
+         *     The GUID of the resource whose attributes should be retrieved.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Resource.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Resource" - private resource, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Resource.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        getResourceAttributes(guid: string, cb: Callback<ResourceAttributes>): void;
+
+        /**
+         * <p>
+         * Looks for a user account with the provided userId on this NoteStore
+         * shard and determines whether that account contains a public notebook
+         * with the given URI.    If the account is not found, or no public notebook
+         * exists with this URI, this will throw an EDAMNotFoundException,
+         * otherwise this will return the information for that Notebook.
+         * </p>
+         * <p>
+         * If a notebook is visible on the web with a full URL like
+         * http://www.evernote.com/pub/sethdemo/api
+         * Then 'sethdemo' is the username that can be used to look up the userId,
+         * and 'api' is the publicUri.
+         * </p>
+         *
+         * @param userId
+         *        The numeric identifier for the user who owns the public notebook.
+         *        To find this value based on a username string, you can invoke
+         *        UserStore.getPublicUserInfo
+         *
+         * @param publicUri
+         *        The uri string for the public notebook, from Notebook.publishing.uri.
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li>"Publishing.uri" - not found, by URI</li>
+         * </ul>
+         *
+         * @throws EDAMSystemException <ul>
+         *     <li> TAKEN_DOWN "PublicNotebook" - The specified public notebook is
+         *         taken down (for all requesters).</li>
+         *     <li> TAKEN_DOWN "Country" - The specified public notebook is taken
+         *         down for the requester because of an IP-based country lookup.</li>
+         * </ul>
+         */
+        getPublicNotebook(userId: number, publicUri: string, cb: Callback<Notebook>): void;
+
+        /**
+         * Used to construct a shared notebook object. The constructed notebook will
+         * contain a "share key" which serve as a unique identifer and access token
+         * for a user to access the notebook of the shared notebook owner.
+         *
+         * @param sharedNotebook
+         *     A shared notebook object populated with the email address of the share
+         *     recipient, the notebook guid and the access permissions. All other
+         *     attributes of the shared object are ignored. The SharedNotebook.allowPreview
+         *     field must be explicitly set with either a true or false value.
+         *
+         * @return
+         *     The fully populated SharedNotebook object including the server assigned
+         *     share id and shareKey which can both be used to uniquely identify the
+         *     SharedNotebook.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li>BAD_DATA_FORMAT "SharedNotebook.email" - if the email was not valid</li>
+         *     <li>BAD_DATA_FORMAT "requireLogin" - if the SharedNotebook.allowPreview field was
+         *             not set, and the SharedNotebook.requireLogin was also not set or was set to
+         *             false.</li>
+         *     <li>PERMISSION_DENIED "SharedNotebook.recipientSettings" - if
+         *             recipientSettings is set in the sharedNotebook.    Only the recipient
+         *             can set these values via the setSharedNotebookRecipientSettings
+         *             method.
+         *     </li>
+         *     </ul>
+         * @throws EDAMNotFoundException <ul>
+         *     <li>Notebook.guid - if the notebookGuid is not a valid GUID for the user.
+         *     </li>
+         *     </ul>
+         */
+        createSharedNotebook(sharedNotebook: SharedNotebook, cb: Callback<SharedNotebook>): void;
+
+        /**
+         * Update a SharedNotebook object.
+         *
+         * @param authenticationToken
+         *     Must be an authentication token from the owner or a shared notebook
+         *     authentication token or business authentication token with sufficient
+         *     permissions to change invitations for a notebook.
+         *
+         * @param sharedNotebook
+         *    The SharedNotebook object containing the requested changes.
+         *    The "id" of the shared notebook must be set to allow the service
+         *    to identify the SharedNotebook to be updated. In addition, you MUST set
+         *    the email, permission, and allowPreview fields to the desired values.
+         *    All other fields will be ignored if set.
+         *
+         * @return
+         *    The Update Serial Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li>UNSUPPORTED_OPERATION "updateSharedNotebook" - if this service instance does not support shared notebooks.</li>
+         *     <li>BAD_DATA_FORMAT "SharedNotebook.email" - if the email was not valid.</li>
+         *     <li>DATA_REQUIRED "SharedNotebook.id" - if the id field was not set.</li>
+         *     <li>DATA_REQUIRED "SharedNotebook.privilege" - if the privilege field was not set.</li>
+         *     <li>DATA_REQUIRED "SharedNotebook.allowPreview" - if the allowPreview field was not set.</li>
+         *     </ul>
+         * @throws EDAMNotFoundException <ul>
+         *     <li>SharedNotebook.id - if no shared notebook with the specified ID was found.
+         *     </ul>
+         */
+        updateSharedNotebook(sharedNotebook: SharedNotebook, cb: Callback<number>): void;
+
+        /**
+         * Set values for the recipient settings associated with a shared notebook.    Having
+         * update rights to the shared notebook record itself has no effect on this call;
+         * only the recipient of the shared notebook can can the recipient settings.
+         *
+         * If you do <i>not</i> wish to, or cannot, change one of the reminderNotifyEmail or
+         * reminderNotifyInApp fields, you must leave that field unset in recipientSettings.
+         * This method will skip that field for updates and leave the existing state as
+         * it is.
+         *
+         * @return The update sequence number of the account to which the shared notebook
+         *     belongs, which is the account from which we are sharing a notebook.
+         *
+         * @throws EDAMNotFoundException "sharedNotebookId" - Thrown if the service does not
+         *     have a shared notebook record for the sharedNotebookId on the given shard.    If you
+         *     receive this exception, it is probable that the shared notebook record has
+         *     been revoked or expired, or that you accessed the wrong shard.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li>PEMISSION_DENIED "authenticationToken" - If you do not have permission to set
+         *             the recipient settings for the shared notebook.    Only the recipient has
+         *             permission to do this.
+         *     <li>DATA_CONFLICT "recipientSettings.reminderNotifyEmail" - Setting whether
+         *             or not you want to receive reminder e-mail notifications is possible on
+         *             a business notebook in the business to which the user belongs.    All
+         *             others can safely unset the reminderNotifyEmail field from the
+         *             recipientSettings parameter.
+         * </ul>
+         */
+        setSharedNotebookRecipientSettings(sharedNotebookId: number, recipientSettings: SharedNotebookRecipientSettings, cb: Callback<number>): void;
+
+        /**
+         * Send a reminder message to some or all of the email addresses that a notebook has been
+         * shared with. The message includes the current link to view the notebook.
+         * @param authenticationToken
+         *     The auth token of the user with permissions to share the notebook
+         * @param notebookGuid
+         *     The guid of the shared notebook
+         * @param messageText
+         *    User provided text to include in the email
+         * @param recipients
+         *    The email addresses of the recipients. If this list is empty then all of the
+         *    users that the notebook has been shared with are emailed.
+         *    If an email address doesn't correspond to share invite members then that address
+         *    is ignored.
+         * @return
+         *    The number of messages sent
+         * @throws EDAMUserException <ul>
+         *     <li> LIMIT_REACHED "(recipients)" -
+         *         The email can't be sent because this would exceed the user's daily
+         *         email limit.
+         *     </li>
+         *     <li> PERMISSION_DENIED "Notebook.guid" - The user doesn't have permission to
+         *         send a message for the specified notebook.
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Notebook.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        sendMessageToSharedNotebookMembers(notebookGuid: string, messageText: string, recipients: string[], cb: Callback<number>): void;
+
+        /**
+         * Lists the collection of shared notebooks for all notebooks in the
+         * users account.
+         *
+         * @return
+         *    The list of all SharedNotebooks for the user
+         */
+        listSharedNotebooks(cb: Callback<SharedNotebook[]>): void;
+
+        /**
+         * Expunges the SharedNotebooks in the user's account using the
+         * SharedNotebook.id as the identifier.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param
+         *     sharedNotebookIds - a list of ShardNotebook.id longs identifying the
+         *             objects to delete permanently.
+         *
+         * @return
+         *     The account's update sequence number.
+         */
+        expungeSharedNotebooks(sharedNotebookIds: number[], cb: Callback<number>): void;
+
+        /**
+         * Asks the service to make a linked notebook with the provided name, username
+         * of the owner and identifiers provided. A linked notebook can be either a
+         * link to a public notebook or to a private shared notebook.
+         *
+         * @param linkedNotebook
+         *     The desired fields for the linked notebook must be provided on this
+         *     object.    The name of the linked notebook must be set. Either a username
+         *     uri or a shard id and share key must be provided otherwise a
+         *     EDAMUserException is thrown.
+         *
+         * @return
+         *     The newly created LinkedNotebook.    The server-side id will be
+         *     saved in this object's 'id' field.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.name" - invalid length or pattern
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.username" - bad username format
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.uri" -
+         *         if public notebook set but bad uri
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.shareKey" -
+         *         if private notebook set but bad shareKey
+         *     </li>
+         *     <li> DATA_REQUIRED "LinkedNotebook.shardId" -
+         *         if private notebook but shard id not provided
+         *     </li>
+         * </ul>
+         */
+        createLinkedNotebook(linkedNotebook: LinkedNotebook, cb: Callback<LinkedNotebook>): void;
+
+        /**
+         * @param linkedNotebook
+         *     Updates the name of a linked notebook.
+         *
+         * @return
+         *     The Update Sequence Number for this change within the account.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "LinkedNotebook.name" - invalid length or pattern
+         *     </li>
+         * </ul>
+         */
+        updateLinkedNotebook(linkedNotebook: LinkedNotebook, cb: Callback<number>): void;
+
+        /**
+         * Returns a list of linked notebooks
+         */
+        listLinkedNotebooks(cb: Callback<LinkedNotebook[]>): void;
+
+        /**
+         * Permanently expunges the linked notebook from the account.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param guid
+         *     The LinkedNotebook.guid field of the LinkedNotebook to permanently remove
+         *     from the account.
+         */
+        expungeLinkedNotebook(guid: string, cb: Callback<number>): void;
+
+        /**
+         * Asks the service to produce an authentication token that can be used to
+         * access the contents of a shared notebook from someone else's account.
+         * This authenticationToken can be used with the various other NoteStore
+         * calls to find and retrieve notes, and if the permissions in the shared
+         * notebook are sufficient, to make changes to the contents of the notebook.
+         *
+         * @param shareKey
+         *     The 'shareKey' identifier from the SharedNotebook that was granted to
+         *     some recipient.    This string internally encodes the notebook identifier
+         *     and a security signature.
+         *
+         * @param authenticationToken
+         *     If a non-empty string is provided, this is the full user-based
+         *     authentication token that identifies the user who is currently logged in
+         *     and trying to access the shared notebook.    This may be required if the
+         *     notebook was created with 'requireLogin'.
+         *     If this string is empty, the service will attempt to authenticate to the
+         *     shared notebook without any logged in user.
+         *
+         * @throws EDAMSystemException <ul>
+         *     <li> BAD_DATA_FORMAT "shareKey" - invalid shareKey string
+         *     </li>
+         *     <li> INVALID_AUTH "shareKey" - bad signature on shareKey string
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SharedNotebook.id" - the shared notebook no longer exists
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_REQUIRED "authenticationToken" - the share requires login, and
+         *                    no valid authentication token was provided.
+         *     </li>
+         *     <li> PERMISSION_DENIED "SharedNotebook.username" - share requires login,
+         *                    and another username has already been bound to this notebook.
+         *     </li>
+         * </ul>
+         */
+        authenticateToSharedNotebook(shareKey: string, cb: Callback<AuthenticationResult>): void;
+
+        /**
+         * This function is used to retrieve extended information about a shared
+         * notebook by a guest who has already authenticated to access that notebook.
+         * This requires an 'authenticationToken' parameter which should be the
+         * resut of a call to authenticateToSharedNotebook(...).
+         * I.e. this is the token that gives access to the particular shared notebook
+         * in someone else's account -- it's not the authenticationToken for the
+         * owner of the notebook itself.
+         *
+         * @param authenticationToken
+         *     Should be the authentication token retrieved from the reply of
+         *     authenticateToSharedNotebook(), proving access to a particular shared
+         *     notebook.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "authenticationToken" -
+         *                    authentication token doesn't correspond to a valid shared notebook
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "SharedNotebook.id" - the shared notebook no longer exists
+         *     </li>
+         * </ul>
+         */
+        getSharedNotebookByAuth(cb: Callback<SharedNotebook>): void;
+
+        /**
+         * Attempts to send a single note to one or more email recipients.
+         * <p/>
+         * NOTE: This function is generally not available to third party applications.
+         * Calls will result in an EDAMUserException with the error code
+         * PERMISSION_DENIED.
+         *
+         * @param authenticationToken
+         *        The note will be sent as the user logged in via this token, using that
+         *        user's registered email address.    If the authenticated user doesn't
+         *        have permission to read that note, the emailing will fail.
+         *
+         * @param parameters
+         *        The note must be specified either by GUID (in which case it will be
+         *        sent using the existing data in the service), or else the full Note
+         *        must be passed to this call.    This also specifies the additional
+         *        email fields that will be used in the email.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> LIMIT_REACHED "NoteEmailParameters.toAddresses" -
+         *         The email can't be sent because this would exceed the user's daily
+         *         email limit.
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "(email address)" -
+         *         email address malformed
+         *     </li>
+         *     <li> DATA_REQUIRED "NoteEmailParameters.toAddresses" -
+         *         if there are no To: or Cc: addresses provided.
+         *     </li>
+         *     <li> DATA_REQUIRED "Note.title" -
+         *         if the caller provides a Note parameter with no title
+         *     </li>
+         *     <li> DATA_REQUIRED "Note.content" -
+         *         if the caller provides a Note parameter with no content
+         *     </li>
+         *     <li> ENML_VALIDATION "*" - note content doesn't validate against DTD
+         *     </li>
+         *     <li> DATA_REQUIRED "NoteEmailParameters.note" -
+         *         if no guid or note provided
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        emailNote(parameters: NoteEmailParameters, cb: Callback<void>): void;
+
+        /**
+         * If this note is not already shared (via its own direct URL), then this
+         * will start sharing that note.
+         * This will return the secret "Note Key" for this note that
+         * can currently be used in conjunction with the Note's GUID to gain direct
+         * read-only access to the Note.
+         * If the note is already shared, then this won't make any changes to the
+         * note, and the existing "Note Key" will be returned.    The only way to change
+         * the Note Key for an existing note is to stopSharingNote first, and then
+         * call this function.
+         *
+         * @param guid
+         *     The GUID of the note to be shared.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        shareNote(guid: string, cb: Callback<string>): void;
+
+        /**
+         * If this note is not already shared then this will stop sharing that note
+         * and invalidate its "Note Key", so any existing URLs to access that Note
+         * will stop working.
+         * If the Note is not shared, then this function will do nothing.
+         *
+         * @param guid
+         *     The GUID of the note to be un-shared.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> BAD_DATA_FORMAT "Note.guid" - if the parameter is missing
+         *     </li>
+         *     <li> PERMISSION_DENIED "Note" - private note, user doesn't own
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "Note.guid" - not found, by GUID
+         *     </li>
+         * </ul>
+         */
+        stopSharingNote(guid: string, cb: Callback<void>): void;
+
+        /**
+         * Asks the service to produce an authentication token that can be used to
+         * access the contents of a single Note which was individually shared
+         * from someone's account.
+         * This authenticationToken can be used with the various other NoteStore
+         * calls to find and retrieve the Note and its directly-referenced children.
+         *
+         * @param guid
+         *     The GUID identifying this Note on this shard.
+         *
+         * @param noteKey
+         *     The 'noteKey' identifier from the Note that was originally created via
+         *     a call to shareNote() and then given to a recipient to access.
+         *
+         * @param authenticationToken
+         *     An optional authenticationToken that identifies the user accessing the
+         *     shared note. This parameter may be required to access some shared notes.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "Note" - the Note with that GUID is either not
+         *         shared, or the noteKey doesn't match the current key for this note
+         *     </li>
+         *     <li> PERMISSION_DENIED "authenticationToken" - an authentication token is
+         *         required to access this Note, but either no authentication token or a
+         *         "non-owner" authentication token was provided.
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li> "guid" - the note with that GUID is not found
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMSystemException <ul>
+         *     <li> TAKEN_DOWN "Note" - The specified shared note is taken down (for
+         *         all requesters).
+         *     </li>
+         *     <li> TAKEN_DOWN "Country" - The specified shared note is taken down
+         *         for the requester because of an IP-based country lookup.
+         *     </ul>
+         * </ul>
+         */
+        authenticateToSharedNote(guid: string, noteKey: string, cb: Callback<AuthenticationResult>): void;
+
+        /**
+         * Identify related entities on the service, such as notes,
+         * notebooks, and tags related to notes or content.
+         *
+         * @param query
+         *     The information about which we are finding related entities.
+         *
+         * @param resultSpec
+         *     Allows the client to indicate the type and quantity of
+         *     information to be returned, allowing a saving of time and
+         *     bandwidth.
+         *
+         * @return
+         *     The result of the query, with information considered
+         *     to likely be relevantly related to the information
+         *     described by the query.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li>BAD_DATA_FORMAT "RelatedQuery.plainText" - If you provided a
+         *         a zero-length plain text value.
+         *     </li>
+         *     <li>BAD_DATA_FORMAT "RelatedQuery.noteGuid" - If you provided an
+         *         invalid Note GUID, that is, one that does not match the constraints
+         *         defined by EDAM_GUID_LEN_MIN, EDAM_GUID_LEN_MAX, EDAM_GUID_REGEX.
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.notebookGuid" - if malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.tagGuids" - if any are malformed
+         *     </li>
+         *     <li> BAD_DATA_FORMAT "NoteFilter.words" - if search string too long
+         *     </li>
+         *     <li>PERMISSION_DENIED "Note" - If the caller does not have access to
+         *         the note identified by RelatedQuery.noteGuid.
+         *     </li>
+         *     <li>DATA_REQUIRED "RelatedResultSpec" - If you did not not set any values
+         *         in the result spec.
+         *     </li>
+         * </ul>
+         *
+         * @throws EDAMNotFoundException <ul>
+         *     <li>"RelatedQuery.noteGuid" - the note with that GUID is not
+         *         found, if that field has been set in the query.
+         *     </li>
+         * </ul>
+         */
+        findRelated(query: RelatedQuery, resultSpec: RelatedResultSpec, cb: Callback<RelatedResult>): void;
+    }
+    /**
+     *    This structure encapsulates the information about the state of the
+     *    user's account for the purpose of "state based" synchronization.
+     * <dl>
+     *    <dt>currentTime</dt>
+     *        <dd>
+     *        The server's current date and time.
+     *        </dd>
+     *
+     *    <dt>fullSyncBefore</dt>
+     *        <dd>
+     *        The cutoff date and time for client caches to be
+     *        updated via incremental synchronization.    Any clients that were last
+     *        synched with the server before this date/time must do a full resync of all
+     *        objects.    This cutoff point will change over time as archival data is
+     *        deleted or special circumstances on the service require resynchronization.
+     *        </dd>
+     *
+     *    <dt>updateCount</dt>
+     *        <dd>
+     *        Indicates the total number of transactions that have
+     *        been committed within the account.    This reflects (for example) the
+     *        number of discrete additions or modifications that have been made to
+     *        the data in this account (tags, notes, resources, etc.).
+     *        This number is the "high water mark" for Update Sequence Numbers (USN)
+     *        within the account.
+     *        </dd>
+     *
+     *    <dt>uploaded</dt>
+     *        <dd>
+     *        The total number of bytes that have been uploaded to
+     *        this account in the current monthly period.    This can be compared against
+     *        Accounting.uploadLimit (from the UserStore) to determine how close the user
+     *        is to their monthly upload limit.
+     *        This value may not be present if the SyncState has been retrieved by
+     *        a caller that only has read access to the account.
+     *        </dd>
+     *    </dl>
+     */
+    class SyncState {
+        currentTime: number;
+        fullSyncBefore: number;
+        updateCount: number;
+        uploaded: number;
+
+        constructor(args?: { currentTime: number; fullSyncBefore: number; updateCount: number; uploaded?: number; });
+    }
+
+    /**
+     *    This structure is given out by the NoteStore when a client asks to
+     *    receive the current state of an account.    The client asks for the server's
+     *    state one chunk at a time in order to allow clients to retrieve the state
+     *    of a large account without needing to transfer the entire account in
+     *    a single message.
+     *
+     *    The server always gives SyncChunks using an ascending series of Update
+     *    Sequence Numbers (USNs).
+     *
+     * <dl>
+     *    <dt>currentTime</dt>
+     *        <dd>
+     *        The server's current date and time.
+     *        </dd>
+     *
+     *    <dt>chunkHighUSN</dt>
+     *        <dd>
+     *        The highest USN for any of the data objects represented
+     *        in this sync chunk.    If there are no objects in the chunk, this will not be
+     *        set.
+     *        </dd>
+     *
+     *    <dt>updateCount</dt>
+     *        <dd>
+     *        The total number of updates that have been performed in
+     *        the service for this account.    This is equal to the highest USN within the
+     *        account at the point that this SyncChunk was generated.    If updateCount
+     *        and chunkHighUSN are identical, that means that this is the last chunk
+     *        in the account ... there is no more recent information.
+     *        </dd>
+     *
+     *    <dt>notes</dt>
+     *        <dd>
+     *        If present, this is a list of non-expunged notes that
+     *        have a USN in this chunk.    This will include notes that are "deleted"
+     *        but not expunged (i.e. in the trash).    The notes will include their list
+     *        of tags and resources, but the note content, resource content, resource
+     *        recognition data and resource alternate data will not be supplied.
+     *        </dd>
+     *
+     *    <dt>notebooks</dt>
+     *        <dd>
+     *        If present, this is a list of non-expunged notebooks that
+     *        have a USN in this chunk.    This will include notebooks that are "deleted"
+     *        but not expunged (i.e. in the trash).
+     *        </dd>
+     *
+     *    <dt>tags</dt>
+     *        <dd>
+     *        If present, this is a list of the non-expunged tags that have a
+     *        USN in this chunk.
+     *        </dd>
+     *
+     *    <dt>searches</dt>
+     *        <dd>
+     *        If present, this is a list of non-expunged searches that
+     *        have a USN in this chunk.
+     *        </dd>
+     *
+     *    <dt>resources</dt>
+     *        <dd>
+     *        If present, this is a list of the non-expunged resources
+     *        that have a USN in this chunk.    This will include the metadata for each
+     *        resource, but not its binary contents or recognition data, which must be
+     *        retrieved separately.
+     *        </dd>
+     *
+     *    <dt>expungedNotes</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the notes that were
+     *        permanently expunged in this chunk.
+     *        </dd>
+     *
+     *    <dt>expungedNotebooks</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the notebooks that
+     *        were permanently expunged in this chunk.    When a notebook is expunged,
+     *        this implies that all of its child notes (and their resources) were
+     *        also expunged.
+     *        </dd>
+     *
+     *    <dt>expungedTags</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the tags that were
+     *        permanently expunged in this chunk.
+     *        </dd>
+     *
+     *    <dt>expungedSearches</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the saved searches
+     *        that were permanently expunged in this chunk.
+     *        </dd>
+     *
+     *    <dt>linkedNotebooks</dt>
+     *        <dd>
+     *        If present, this is a list of non-expunged LinkedNotebooks that
+     *        have a USN in this chunk.
+     *        </dd>
+     *
+     *    <dt>expungedLinkedNotebooks</dt>
+     *        <dd>
+     *        If present, the GUIDs of all of the LinkedNotebooks
+     *        that were permanently expunged in this chunk.
+     *        </dd>
+     *    </dl>
+     */
+    class SyncChunk {
+        currentTime: number;
+        chunkHighUSN: number;
+        updateCount: number;
+        notes: Note[];
+        notebooks: Notebook[];
+        tags: Tag[];
+        searches: SavedSearch[];
+        resources: Resource[];
+        expungedNotes: string[];
+        expungedNotebooks: string[];
+        expungedTags: string[];
+        expungedSearches: string[];
+        linkedNotebooks: LinkedNotebook[];
+        expungedLinkedNotebooks: string[];
+
+        constructor(args?: { currentTime: number; chunkHighUSN?: number; updateCount: number; notes?: Note[]; notebooks?: Notebook[]; tags?: Tag[]; searches?: SavedSearch[]; resources?: Resource[]; expungedNotes?: string[]; expungedNotebooks?: string[]; expungedTags?: string[]; expungedSearches?: string[]; linkedNotebooks?: LinkedNotebook[]; expungedLinkedNotebooks?: string[]; });
+    }
+
+    /**
+     *    This structure is used with the 'getFilteredSyncChunk' call to provide
+     *    fine-grained control over the data that's returned when a client needs
+     *    to synchronize with the service. Each flag in this structure specifies
+     *    whether to include one class of data in the results of that call.
+     *
+     * <dl>
+     *    <dt>includeNotes</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.notes field
+     *        </dd>
+     *
+     *    <dt>includeNoteResources</dt>
+     *        <dd>
+     *        If true, then the server will include the 'resources' field on all of
+     *        the Notes that are in SyncChunk.notes.
+     *        If 'includeNotes' is false, then this will have no effect.
+     *        </dd>
+     *
+     *    <dt>includeNoteAttributes</dt>
+     *        <dd>
+     *        If true, then the server will include the 'attributes' field on all of
+     *        the Notes that are in SyncChunks.notes.
+     *        If 'includeNotes' is false, then this will have no effect.
+     *        </dd>
+     *
+     *    <dt>includeNotebooks</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.notebooks field
+     *        </dd>
+     *
+     *    <dt>includeTags</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.tags field
+     *        </dd>
+     *
+     *    <dt>includeSearches</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.searches field
+     *        </dd>
+     *
+     *    <dt>includeResources</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.resources field.
+     *        Since the Resources are also provided with their Note
+     *        (in the Notes.resources list), this is primarily useful for clients that
+     *        want to watch for changes to individual Resources due to recognition data
+     *        being added.
+     *        </dd>
+     *
+     *    <dt>includeLinkedNotebooks</dt>
+     *        <dd>
+     *        If true, then the server will include the SyncChunks.linkedNotebooks field.
+     *        </dd>
+     *
+     *    <dt>includeExpunged</dt>
+     *        <dd>
+     *        If true, then the server will include the 'expunged' data for any type
+     *        of included data.    For example, if 'includeTags' and 'includeExpunged'
+     *        are both true, then the SyncChunks.expungedTags field will be set with
+     *        the GUIDs of tags that have been expunged from the server.
+     *        </dd>
+     *
+     *    <dt>includeNoteApplicationDataFullMap</dt>
+     *        <dd>
+     *        If true, then the values for the applicationData map will be filled
+     *        in, assuming notes and note attributes are being returned.    Otherwise,
+     *        only the keysOnly field will be filled in.
+     *        </dd>
+     *
+     *    <dt>includeResourceApplicationDataFullMap</dt>
+     *        <dd>
+     *        If true, then the fullMap values for the applicationData map will be
+     *        filled in, assuming resources and resource attributes are being returned
+     *        (includeResources is true).    Otherwise, only the keysOnly field will be
+     *        filled in.
+     *        </dd>
+     *
+     *    <dt>includeNoteResourceApplicationDataFullMap</dt>
+     *        <dd>
+     *        If true, then the fullMap values for the applicationData map will be
+     *        filled in for resources found inside of notes, assuming resources are
+     *        being returned in notes (includeNoteResources is true).    Otherwise,
+     *        only the keysOnly field will be filled in.
+     *        </dd>
+     *
+     *    <dt>requireNoteContentClass</dt>
+     *        <dd>
+     *        If set, then only send notes whose content class matches this value.
+     *        The value can be a literal match or, if the last character is an
+     *        asterisk, a prefix match.
+     *        </dd>
+     *    </dl>
+     */
+    class SyncChunkFilter {
+        includeNotes: boolean;
+        includeNoteResources: boolean;
+        includeNoteAttributes: boolean;
+        includeNotebooks: boolean;
+        includeTags: boolean;
+        includeSearches: boolean;
+        includeResources: boolean;
+        includeLinkedNotebooks: boolean;
+        includeExpunged: boolean;
+        includeNoteApplicationDataFullMap: boolean;
+        includeResourceApplicationDataFullMap: boolean;
+        includeNoteResourceApplicationDataFullMap: boolean;
+        requireNoteContentClass: string;
+
+        constructor(args?: { includeNotes?: boolean; includeNoteResources?: boolean; includeNoteAttributes?: boolean; includeNotebooks?: boolean; includeTags?: boolean; includeSearches?: boolean; includeResources?: boolean; includeLinkedNotebooks?: boolean; includeExpunged?: boolean; includeNoteApplicationDataFullMap?: boolean; includeResourceApplicationDataFullMap?: boolean; includeNoteResourceApplicationDataFullMap?: boolean; requireNoteContentClass?: string; });
+    }
+
+    /**
+     *    A list of criteria that are used to indicate which notes are desired from
+     *    the account.    This is used in queries to the NoteStore to determine
+     *    which notes should be retrieved.
+     *
+     * <dl>
+     *    <dt>order</dt>
+     *        <dd>
+     *        The NoteSortOrder value indicating what criterion should be
+     *        used to sort the results of the filter.
+     *        </dd>
+     *
+     *    <dt>ascending</dt>
+     *        <dd>
+     *        If true, the results will be ascending in the requested
+     *        sort order.    If false, the results will be descending.
+     *        </dd>
+     *
+     *    <dt>words</dt>
+     *        <dd>
+     *        If present, a search query string that will filter the set of notes to be returned.
+     *        Accepts the full search grammar documented in the Evernote API Overview.
+     *        </dd>
+     *
+     *    <dt>notebookGuid</dt>
+     *        <dd>
+     *        If present, the Guid of the notebook that must contain
+     *        the notes.
+     *        </dd>
+     *
+     *    <dt>tagGuids</dt>
+     *        <dd>
+     *        If present, the list of tags (by GUID) that must be present
+     *        on the notes.
+     *        </dd>
+     *
+     *    <dt>timeZone</dt>
+     *        <dd>
+     *        The zone ID for the user, which will be used to interpret
+     *        any dates or times in the queries that do not include their desired zone
+     *        information.
+     *        For example, if a query requests notes created "yesterday", this
+     *        will be evaluated from the provided time zone, if provided.
+     *        The format must be encoded as a standard zone ID such as
+     *        "America/Los_Angeles".
+     *        </dd>
+     *
+     *    <dt>inactive</dt>
+     *        <dd>
+     *        If true, then only notes that are not active (i.e. notes in
+     *        the Trash) will be returned. Otherwise, only active notes will be returned.
+     *        There is no way to find both active and inactive notes in a single query.
+     *        </dd>
+     *
+     *    <dt>emphasized</dt>
+     *        <dd>
+     *        If present, a search query string that may or may not influence the notes
+     *        to be returned, both in terms of coverage as well as of order. Think of it
+     *        as a wish list, not a requirement.
+     *        Accepts the full search grammar documented in the Evernote API Overview.
+     *        </dd>
+     *    </dl>
+     */
+    class NoteFilter {
+        order: number;
+        ascending: boolean;
+        words: string;
+        notebookGuid: string;
+        tagGuids: string[];
+        timeZone: string;
+        inactive: boolean;
+        emphasized: string;
+
+        constructor(args?: { order?: number; ascending?: boolean; words?: string; notebookGuid?: string; tagGuids?: string[]; timeZone?: string; inactive?: boolean; emphasized?: string; });
+    }
+
+    /**
+     *    A small structure for returning a list of notes out of a larger set.
+     *
+     * <dl>
+     *    <dt>startIndex</dt>
+     *        <dd>
+     *        The starting index within the overall set of notes.    This
+     *        is also the number of notes that are "before" this list in the set.
+     *        </dd>
+     *
+     *    <dt>totalNotes</dt>
+     *        <dd>
+     *        The number of notes in the larger set.    This can be used
+     *        to calculate how many notes are "after" this note in the set.
+     *        (I.e.    remaining = totalNotes - (startIndex + notes.length)    )
+     *        </dd>
+     *
+     *    <dt>notes</dt>
+     *        <dd>
+     *        The list of notes from this range.    The Notes will include all
+     *        metadata (attributes, resources, etc.), but will not include the ENML
+     *        content of the note or the binary contents of any resources.
+     *        </dd>
+     *
+     *    <dt>stoppedWords</dt>
+     *        <dd>
+     *        If the NoteList was produced using a text based search
+     *        query that included words that are not indexed or searched by the service,
+     *        this will include a list of those ignored words.
+     *        </dd>
+     *
+     *    <dt>searchedWords</dt>
+     *        <dd>
+     *        If the NoteList was produced using a text based search
+     *        query that included viable search words or quoted expressions, this will
+     *        include a list of those words.    Any stopped words will not be included
+     *        in this list.
+     *        </dd>
+     *
+     *    <dt>updateCount</dt>
+     *        <dd>
+     *        Indicates the total number of transactions that have
+     *        been committed within the account.    This reflects (for example) the
+     *        number of discrete additions or modifications that have been made to
+     *        the data in this account (tags, notes, resources, etc.).
+     *        This number is the "high water mark" for Update Sequence Numbers (USN)
+     *        within the account.
+     *        </dd>
+     *    </dl>
+     */
+    class NoteList {
+        startIndex: number;
+        totalNotes: number;
+        notes: Note[];
+        stoppedWords: string[];
+        searchedWords: string[];
+        updateCount: number;
+
+        constructor(args?: { startIndex: number; totalNotes: number; notes: Note[]; stoppedWords?: string[]; searchedWords?: string[]; updateCount?: number; });
+    }
+
+    /**
+     * This structure is used in the set of results returned by the
+     * findNotesMetadata function.    It represents the high-level information about
+     * a single Note, without some of the larger deep structure.    This allows
+     * for the information about a list of Notes to be returned relatively quickly
+     * with less marshalling and data transfer to remote clients.
+     * Most fields in this structure are identical to the corresponding field in
+     * the Note structure, with the exception of:
+     *
+     * <dl>
+     * <dt>largestResourceMime</dt>
+     *     <dd>If set, then this will contain the MIME type of the largest Resource
+     *     (in bytes) within the Note.    This may be useful, for example, to choose
+     *     an appropriate icon or thumbnail to represent the Note.
+     *     </dd>
+     *
+     * <dt>largestResourceSize</dt>
+     *    <dd>If set, this will contain the size of the largest Resource file, in
+     *    bytes, within the Note.    This may be useful, for example, to decide whether
+     *    to ask the server for a thumbnail to represent the Note.
+     *    </dd>
+     * </dl>
+     */
+    class NoteMetadata {
+        guid: string;
+        title: string;
+        contentLength: number;
+        created: number;
+        updated: number;
+        deleted: number;
+        updateSequenceNum: number;
+        notebookGuid: string;
+        tagGuids: string[];
+        attributes: NoteAttributes;
+        largestResourceMime: string;
+        largestResourceSize: number;
+
+        constructor(args?: { guid: string; title?: string; contentLength?: number; created?: number; updated?: number; deleted?: number; updateSequenceNum?: number; notebookGuid?: string; tagGuids?: string[]; attributes?: NoteAttributes; largestResourceMime?: string; largestResourceSize?: number; });
+    }
+
+    /**
+     *    This structure is returned from calls to the findNotesMetadata function to
+     *    give the high-level metadata about a subset of Notes that are found to
+     *    match a specified NoteFilter in a search.
+     *
+     * <dl>
+     *    <dt>startIndex</dt>
+     *        <dd>
+     *        The starting index within the overall set of notes.    This
+     *        is also the number of notes that are "before" this list in the set.
+     *        </dd>
+     *
+     *    <dt>totalNotes</dt>
+     *        <dd>
+     *        The number of notes in the larger set.    This can be used
+     *        to calculate how many notes are "after" this note in the set.
+     *        (I.e.    remaining = totalNotes - (startIndex + notes.length)    )
+     *        </dd>
+     *
+     *    <dt>notes</dt>
+     *        <dd>
+     *        The list of metadata for Notes in this range.    The set of optional fields
+     *        that are set in each metadata structure will depend on the
+     *        NotesMetadataResultSpec provided by the caller when the search was
+     *        performed.    Only the 'guid' field will be guaranteed to be set in each
+     *        Note.
+     *        </dd>
+     *
+     *    <dt>stoppedWords</dt>
+     *        <dd>
+     *        If the NoteList was produced using a text based search
+     *        query that included words that are not indexed or searched by the service,
+     *        this will include a list of those ignored words.
+     *        </dd>
+     *
+     *    <dt>searchedWords</dt>
+     *        <dd>
+     *        If the NoteList was produced using a text based search
+     *        query that included viable search words or quoted expressions, this will
+     *        include a list of those words.    Any stopped words will not be included
+     *        in this list.
+     *        </dd>
+     *
+     *    <dt>updateCount</dt>
+     *        <dd>
+     *        Indicates the total number of transactions that have
+     *        been committed within the account.    This reflects (for example) the
+     *        number of discrete additions or modifications that have been made to
+     *        the data in this account (tags, notes, resources, etc.).
+     *        This number is the "high water mark" for Update Sequence Numbers (USN)
+     *        within the account.
+     *        </dd>
+     *    </dl>
+     */
+    class NotesMetadataList {
+        startIndex: number;
+        totalNotes: number;
+        notes: NoteMetadata[];
+        stoppedWords: string[];
+        searchedWords: string[];
+        updateCount: number;
+
+        constructor(args?: { startIndex: number; totalNotes: number; notes: NoteMetadata[]; stoppedWords?: string[]; searchedWords?: string[]; updateCount?: number; });
+    }
+
+    /**
+     * This structure is provided to the findNotesMetadata function to specify
+     * the subset of fields that should be included in each NoteMetadata element
+     * that is returned in the NotesMetadataList.
+     * Each field on this structure is a boolean flag that indicates whether the
+     * corresponding field should be included in the NoteMetadata structure when
+     * it is returned.    For example, if the 'includeTitle' field is set on this
+     * structure when calling findNotesMetadata, then each NoteMetadata in the
+     * list should have its 'title' field set.
+     * If one of the fields in this spec is not set, then it will be treated as
+     * 'false' by the server, so the default behavior is to include nothing in
+     * replies (but the mandatory GUID)
+     */
+    class NotesMetadataResultSpec {
+        includeTitle: boolean;
+        includeContentLength: boolean;
+        includeCreated: boolean;
+        includeUpdated: boolean;
+        includeDeleted: boolean;
+        includeUpdateSequenceNum: boolean;
+        includeNotebookGuid: boolean;
+        includeTagGuids: boolean;
+        includeAttributes: boolean;
+        includeLargestResourceMime: boolean;
+        includeLargestResourceSize: boolean;
+
+        constructor(args?: { includeTitle?: boolean; includeContentLength?: boolean; includeCreated?: boolean; includeUpdated?: boolean; includeDeleted?: boolean; includeUpdateSequenceNum?: boolean; includeNotebookGuid?: boolean; includeTagGuids?: boolean; includeAttributes?: boolean; includeLargestResourceMime?: boolean; includeLargestResourceSize?: boolean; });
+    }
+
+    /**
+     *    A data structure representing the number of notes for each notebook
+     *    and tag with a non-zero set of applicable notes.
+     *
+     * <dl>
+     *    <dt>notebookCounts</dt>
+     *        <dd>
+     *        A mapping from the Notebook GUID to the number of
+     *        notes (from some selection) that are in the corresponding notebook.
+     *        </dd>
+     *
+     *    <dt>tagCounts</dt>
+     *        <dd>
+     *        A mapping from the Tag GUID to the number of notes (from some
+     *        selection) that have the corresponding tag.
+     *        </dd>
+     *
+     *    <dt>trashCount</dt>
+     *        <dd>
+     *        If this is set, then this is the number of notes that are in the trash.
+     *        If this is not set, then the number of notes in the trash hasn't been
+     *        reported.    (I.e. if there are no notes in the trash, this will be set
+     *        to 0.)
+     *        </dd>
+     *    </dl>
+     */
+    class NoteCollectionCounts {
+        notebookCounts: { [k: string]: number; };
+        tagCounts: { [k: string]: number; };
+        trashCount: number;
+
+        constructor(args?: { notebookCounts?: { [k: string]: number; }; tagCounts?: { [k: string]: number; }; trashCount?: number; });
+    }
+
+    /**
+     * Parameters that must be given to the NoteStore emailNote call. These allow
+     * the caller to specify the note to send, the recipient addresses, etc.
+     *
+     * <dl>
+     *    <dt>guid</dt>
+     *        <dd>
+     *            If set, this must be the GUID of a note within the user's account that
+     *            should be retrieved from the service and sent as email.    If not set,
+     *            the 'note' field must be provided instead.
+     *        </dd>
+     *
+     *    <dt>note</dt>
+     *        <dd>
+     *            If the 'guid' field is not set, this field must be provided, including
+     *            the full contents of the note note (and all of its Resources) to send.
+     *            This can be used for a Note that as not been created in the service,
+     *            for example by a local client with local notes.
+     *        </dd>
+     *
+     *    <dt>toAddresses</dt>
+     *        <dd>
+     *            If provided, this should contain a list of the SMTP email addresses
+     *            that should be included in the "To:" line of the email.
+     *            Callers must specify at least one "to" or "cc" email address.
+     *        </dd>
+     *
+     *    <dt>ccAddresses</dt>
+     *        <dd>
+     *            If provided, this should contain a list of the SMTP email addresses
+     *            that should be included in the "Cc:" line of the email.
+     *            Callers must specify at least one "to" or "cc" email address.
+     *        </dd>
+     *
+     *    <dt>subject</dt>
+     *        <dd>
+     *            If provided, this should contain the subject line of the email that
+     *            will be sent.    If not provided, the title of the note will be used
+     *            as the subject of the email.
+     *        </dd>
+     *
+     *    <dt>message</dt>
+     *        <dd>
+     *            If provided, this is additional personal text that should be included
+     *            into the email as a message from the owner to the recipient(s).
+     *        </dd>
+     * </dl>
+     */
+    class NoteEmailParameters {
+        guid: string;
+        note: Note;
+        toAddresses: string[];
+        ccAddresses: string[];
+        subject: string;
+        message: string;
+
+        constructor(args?: { guid?: string; note?: Note; toAddresses?: string[]; ccAddresses?: string[]; subject?: string; message?: string; });
+    }
+
+    /**
+     * Identifying information about previous versions of a note that are backed up
+     * within Evernote's servers.    Used in the return value of the listNoteVersions
+     * call.
+     *
+     * <dl>
+     *    <dt>updateSequenceNum</dt>
+     *    <dd>
+     *        The update sequence number for the Note when it last had this content.
+     *        This serves to uniquely identify each version of the note, since USN
+     *        values are unique within an account for each update.
+     *    </dd>
+     *    <dt>updated</dt>
+     *    <dd>
+     *        The 'updated' time that was set on the Note when it had this version
+     *        of the content.    This is the user-modifiable modification time on the
+     *        note, so it's not reliable for guaranteeing the order of various
+     *        versions.    (E.g. if someone modifies the note, then changes this time
+     *        manually into the past and then updates the note again.)
+     *    </dd>
+     *    <dt>saved</dt>
+     *    <dd>
+     *        A timestamp that holds the date and time when this version of the note
+     *        was backed up by Evernote's servers.    This
+     *    </dd>
+     *    <dt>title</dt>
+     *    <dd>
+     *        The title of the note when this particular version was saved.    (The
+     *        current title of the note may differ from this value.)
+     *    </dd>
+     * </dl>
+     */
+    class NoteVersionId {
+        updateSequenceNum: number;
+        updated: number;
+        saved: number;
+        title: string;
+
+        constructor(args?: { updateSequenceNum: number; updated: number; saved: number; title: string; });
+    }
+
+    /**
+     * This structure is passed from clients to the Evernote service when they wish
+     * to relay coarse-grained usage metrics to the service to help improve
+     * products.
+     *
+     * <dl>
+     *    <dt>sessions</dt>
+     *    <dd>
+     *        This field contains a count of the number of usage "sessions" that have
+     *        occurred with this client which have not previously been reported to
+     *        the service.
+     *        A "session" is defined as one of the 96 fifteen-minute intervals of the
+     *        day when someone used Evernote's interface at least once.
+     *        So if a user interacts with an Evernote client at 12:18, 12:24, and 12:36,
+     *        and then the client synchronizes at 12:39, it would report that there were
+     *        two previously-unreported sessions (one session for the 12:15-12:30 time
+     *        period, and one for the 12:30-12:45 period).
+     *        If the user used Evernote again at 12:41 and synchronized at 12:43, it
+     *        would not report any new sessions, because the 12:30-12:45 session had
+     *        already been reported.
+     *    </dd>
+     * </dl>
+     */
+    class ClientUsageMetrics {
+        sessions: number;
+
+        constructor(args?: { sessions?: number; });
+    }
+
+    /**
+     * A description of the thing for which we are searching for related
+     * entities.
+     *
+     * You must specify either <em>noteGuid</em> or <em>plainText</em>, but
+     * not both. <em>filter</em> and <em>referenceUri</em> are optional.
+     *
+     * <dl>
+     * <dt>noteGuid</dt>
+     * <dd>The GUID of an existing note in your account for which related
+     *         entities will be found.</dd>
+     *
+     * <dt>plainText</dt>
+     * <dd>A string of plain text for which to find related entities.
+     *         You should provide a text block with a number of characters between
+     *         EDAM_RELATED_PLAINTEXT_LEN_MIN and EDAM_RELATED_PLAINTEXT_LEN_MAX.
+     *         </dd>
+     *
+     * <dt>filter</dt>
+     * <dd>The list of criteria that will constrain the notes being considered
+     *         related.
+     *         Please note that some of the parameters may be ignored, such as
+     *         <em>order</em> and <em>ascending</em>.
+     * </dd>
+     *
+     * <dt>referenceUri</dt>
+     * <dd>A URI string specifying a reference entity, around which "relatedness"
+     *         should be based. This can be an URL pointing to a web page, for example.
+     * </dd>
+     * </dl>
+     */
+    class RelatedQuery {
+        noteGuid: string;
+        plainText: string;
+        filter: NoteFilter;
+        referenceUri: string;
+
+        constructor(args?: { noteGuid?: string; plainText?: string; filter?: NoteFilter; referenceUri?: string; });
+    }
+
+    /**
+     * The result of calling findRelated().    The contents of the notes,
+     * notebooks, and tags fields will be in decreasing order of expected
+     * relevance.    It is possible that fewer results than requested will be
+     * returned even if there are enough distinct entities in the account
+     * in cases where the relevance is estimated to be low.
+     *
+     * <dl>
+     * <dt>notes</dt>
+     * <dd>If notes have been requested to be included, this will be the
+     *         list of notes.</dd>
+     *
+     * <dt>notebooks</dt>
+     * <dd>If notebooks have been requested to be included, this will be the
+     *         list of notebooks.</dd>
+     *
+     * <dt>tags</dt>
+     * <dd>If tags have been requested to be included, this will be the list
+     *         of tags.</dd>
+     * </dl>
+     *
+     * <dt>containingNotebooks</dt>
+     * <dd>If <code>includeContainingNotebooks</code> is set to <code>true</code>
+     *         in the RelatedResultSpec, return the list of notebooks to
+     *         to which the returned related notes belong. The notebooks in this
+     *         list will occur once per notebook GUID and are represented as
+     *         NotebookDescriptor objects.</dd>
+     * </dl>
+     * </dl>
+     */
+    class RelatedResult {
+        notes: Note[];
+        notebooks: Notebook[];
+        tags: Tag[];
+        containingNotebooks: NotebookDescriptor[];
+
+        constructor(args?: { notes?: Note[]; notebooks?: Notebook[]; tags?: Tag[]; containingNotebooks?: NotebookDescriptor[]; });
+    }
+
+    /**
+     * A description of the thing for which the service will find related
+     * entities, via findRelated(), together with a description of what
+     * type of entities and how many you are seeking in the
+     * RelatedResult.
+     *
+     * <dl>
+     * <dt>maxNotes</dt>
+     * <dd>Return notes that are related to the query, but no more than
+     *         this many.    Any value greater than EDAM_RELATED_MAX_NOTES
+     *         will be silently capped.    If you do not set this field, then
+     *         no notes will be returned.</dd>
+     *
+     * <dt>maxNotebooks</dt>
+     * <dd>Return notebooks that are related to the query, but no more than
+     *         this many.    Any value greater than EDAM_RELATED_MAX_NOTEBOOKS
+     *         will be silently capped.    If you do not set this field, then
+     *         no notebooks will be returned.</dd>
+     *
+     * <dt>maxTags</dt>
+     * <dd>Return tags that are related to the query, but no more than
+     *         this many.    Any value greater than EDAM_RELATED_MAX_TAGS
+     *         will be silently capped.    If you do not set this field, then
+     *         no tags will be returned.</dd>
+     * </dl>
+     *
+     * <dt>writableNotebooksOnly</dt>
+     * <dd>Require that all returned related notebooks are writable.
+     *         The user will be able to create notes in all returned notebooks.
+     *         However, individual notes returned may still belong to notebooks
+     *         in which the user lacks the ability to create notes.</dd>
+     * </dl>
+     *
+     * <dt>includeContainingNotebooks</dt>
+     * <dd>If set to <code>true</code>, return the containingNotebooks field
+     *         in the RelatedResult, which will contain the list of notebooks to
+     *         to which the returned related notes belong.</dd>
+     * </dl>
+     * </dl>
+     */
+    class RelatedResultSpec {
+        maxNotes: number;
+        maxNotebooks: number;
+        maxTags: number;
+        writableNotebooksOnly: boolean;
+        includeContainingNotebooks: boolean;
+
+        constructor(args?: { maxNotes?: number; maxNotebooks?: number; maxTags?: number; writableNotebooksOnly?: boolean; includeContainingNotebooks?: boolean; });
+    }
+    /**
+     * This enumeration defines the possible permission levels for a user.
+     * Free accounts will have a level of NORMAL and paid Premium accounts
+     * will have a level of PREMIUM.
+     */
+    enum PrivilegeLevel {
+        'NORMAL' = 1,
+        'PREMIUM' = 3,
+        'VIP' = 5,
+        'MANAGER' = 7,
+        'SUPPORT' = 8,
+        'ADMIN' = 9,
+    }
+
+    /**
+     * Every search query is specified as a sequence of characters.
+     * Currently, only the USER query format is supported.
+     */
+    enum QueryFormat {
+        'USER' = 1,
+        'SEXP' = 2,
+    }
+
+    /**
+     * This enumeration defines the possible sort ordering for notes when
+     * they are returned from a search result.
+     */
+    enum NoteSortOrder {
+        'CREATED' = 1,
+        'UPDATED' = 2,
+        'RELEVANCE' = 3,
+        'UPDATE_SEQUENCE_NUMBER' = 4,
+        'TITLE' = 5,
+    }
+
+    /**
+     * This enumeration defines the possible states of a premium account
+     *
+     * NONE:        the user has never attempted to become a premium subscriber
+     *
+     * PENDING: the user has requested a premium account but their charge has not
+     *     been confirmed
+     *
+     * ACTIVE:    the user has been charged and their premium account is in good
+     *    standing
+     *
+     * FAILED:    the system attempted to charge the was denied. Their premium
+     *     privileges have been revoked. We will periodically attempt to re-validate
+     *     their order.
+     *
+     * CANCELLATION_PENDING: the user has requested that no further charges be made
+     *     but the current account is still active.
+     *
+     * CANCELED: the premium account was canceled either because of failure to pay
+     *     or user cancelation. No more attempts will be made to activate the account.
+     */
+    enum PremiumOrderStatus {
+        'NONE' = 0,
+        'PENDING' = 1,
+        'ACTIVE' = 2,
+        'FAILED' = 3,
+        'CANCELLATION_PENDING' = 4,
+        'CANCELED' = 5,
+    }
+
+    /**
+     * Privilege levels for accessing shared notebooks.
+     *
+     * READ_NOTEBOOK: Recipient is able to read the contents of the shared notebook
+     *     but does to have access to information about other recipients of the
+     *     notebook or the activity stream information.
+     *
+     * MODIFY_NOTEBOOK_PLUS_ACTIVITY: Recipient has rights to read and modify the contents
+     *     of the shared notebook, including the right to move notes to the trash and to create
+     *     notes in the notebook.    The recipient can also access information about other
+     *     recipients and the activity stream.
+     *
+     * READ_NOTEBOOK_PLUS_ACTIVITY: Recipient has READ_NOTEBOOK rights and can also
+     *     access information about other recipients and the activity stream.
+     *
+     * GROUP: If the user belongs to a group, such as a Business, that has a defined
+     *     privilege level, use the privilege level of the group as the privilege for
+     *     the individual.
+     *
+     * FULL_ACCESS: Recipient has full rights to the shared notebook and recipient lists,
+     *     including privilege to revoke and create invitations and to change privilege
+     *     levels on invitations for individuals.    This privilege level is primarily intended
+     *     for use by individual shares.
+     *
+     * BUSINESS_FULL_ACCESS: Intended for use with Business Notebooks, a
+     * BUSINESS_FULL_ACCESS level is FULL_ACCESS with the additional rights to
+     * change how the notebook will appear in the business library, including the
+     * rights to publish and unpublish the notebook from the library.
+     */
+    enum SharedNotebookPrivilegeLevel {
+        'READ_NOTEBOOK' = 0,
+        'MODIFY_NOTEBOOK_PLUS_ACTIVITY' = 1,
+        'READ_NOTEBOOK_PLUS_ACTIVITY' = 2,
+        'GROUP' = 3,
+        'FULL_ACCESS' = 4,
+        'BUSINESS_FULL_ACCESS' = 5,
+    }
+
+    /**
+     * Enumeration of the roles that a User can have within a sponsored group.
+     *
+     * GROUP_MEMBER: The user is a member of the group with no special privileges.
+     *
+     * GROUP_ADMIN: The user is an administrator within the group.
+     *
+     * GROUP_OWNER: The user is the owner of the group.
+     */
+    enum SponsoredGroupRole {
+        'GROUP_MEMBER' = 1,
+        'GROUP_ADMIN' = 2,
+        'GROUP_OWNER' = 3,
+    }
+
+    /**
+     * Enumeration of the roles that a User can have within an Evernote Business account.
+     *
+     * ADMIN: The user is an administrator of the Evernote Business account.
+     *
+     * NORMAL: The user is a regular user within the Evernote Business account.
+     */
+    enum BusinessUserRole {
+        'ADMIN' = 1,
+        'NORMAL' = 2,
+    }
+
+    /**
+     * An enumeration describing restrictions on the domain of shared notebook
+     * instances that are valid for a given operation, as used, for example, in
+     * NotebookRestrictions.
+     *
+     * ONLY_JOINED_OR_PREVIEW: The domain consists of shared notebooks that
+     *     "belong" to the recipient or still available for preview by any recipient.
+     *     Shared notebooks that the recipient has joined (the username has already been
+     *     assigned to our user) are in the domain.    Additionally, shared notebooks
+     *     that allow preview and have not yet been joined are in the domain.
+     *
+     * NO_SHARED_NOTEBOOKS: No shared notebooks are applicable to the operation.
+     */
+    enum SharedNotebookInstanceRestrictions {
+        'ONLY_JOINED_OR_PREVIEW' = 1,
+        'NO_SHARED_NOTEBOOKS' = 2,
+    }
+
+    /**
+     * An enumeration describing the configuration state related to receiving
+     * reminder e-mails from the service.    Reminder e-mails summarize notes
+     * based on their Note.attributes.reminderTime values.
+     *
+     * DO_NOT_SEND: The user has selected to not receive reminder e-mail.
+     *
+     * SEND_DAILY_EMAIL: The user has selected to receive reminder e-mail for those
+     *     days when there is a reminder.
+     */
+    enum ReminderEmailConfig {
+        'DO_NOT_SEND' = 1,
+        'SEND_DAILY_EMAIL' = 2,
+    }
+
+    /**
+     *    In several places, EDAM exchanges blocks of bytes of data for a component
+     *    which may be relatively large.    For example:    the contents of a clipped
+     *    HTML note, the bytes of an embedded image, or the recognition XML for
+     *    a large image.    This structure is used in the protocol to represent
+     *    any of those large blocks of data when they are transmitted or when
+     *    they are only referenced their metadata.
+     *
+     * <dl>
+     *    <dt>bodyHash</dt>
+     *        <dd>This field carries a one-way hash of the contents of the
+     *        data body, in binary form.    The hash function is MD5<br/>
+     *        Length:    EDAM_HASH_LEN (exactly)
+     *        </dd>
+     *
+     *    <dt>size</dt>
+     *        <dd>The length, in bytes, of the data body.
+     *        </dd>
+     *
+     *    <dt>body</dt>
+     *        <dd>This field is set to contain the binary contents of the data
+     *        whenever the resource is being transferred.    If only metadata is
+     *        being exchanged, this field will be empty.    For example, a client could
+     *        notify the service about the change to an attribute for a resource
+     *        without transmitting the binary resource contents.
+     *        </dd>
+     *    </dl>
+     */
+    class Data {
+        bodyHash: string;
+        size: number;
+        body: string;
+
+        constructor(args?: { bodyHash?: string; size?: number; body?: string; });
+    }
+
+    /**
+     *    A structure holding the optional attributes that can be stored
+     *    on a User.    These are generally less critical than the core User fields.
+     *
+     * <dl>
+     *    <dt>defaultLocationName</dt>
+     *        <dd>the location string that should be associated
+     *        with the user in order to determine where notes are taken if not otherwise
+     *        specified.<br/>
+     *        Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *        </dd>
+     *
+     *    <dt>defaultLatitude</dt>
+     *        <dd>if set, this is the latitude that should be
+     *        assigned to any notes that have no other latitude information.
+     *        </dd>
+     *
+     *    <dt>defaultLongitude</dt>
+     *        <dd>if set, this is the longitude that should be
+     *        assigned to any notes that have no other longitude information.
+     *        </dd>
+     *
+     *    <dt>preactivation</dt>
+     *        <dd>if set, the user account is not yet confirmed for
+     *        login.    I.e. the account has been created, but we are still waiting for
+     *        the user to complete the activation step.
+     *        </dd>
+     *
+     *    <dt>viewedPromotions</dt>
+     *        <dd>a list of promotions the user has seen.
+     *         This list may occasionally be modified by the system when promotions are
+     *         no longer available.<br/>
+     *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *        </dd>
+     *
+     *    <dt>incomingEmailAddress</dt>
+     *        <dd>if set, this is the email address that the
+     *         user may send email to in order to add an email note directly into the
+     *         account via the SMTP email gateway.    This is the part of the email
+     *         address before the '@' symbol ... our domain is not included.
+     *         If this is not set, the user may not add notes via the gateway.<br/>
+     *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *        </dd>
+     *
+     *    <dt>recentMailedAddresses</dt>
+     *        <dd>if set, this will contain a list of email
+     *         addresses that have recently been used as recipients
+     *         of outbound emails by the user.    This can be used to pre-populate a
+     *         list of possible destinations when a user wishes to send a note via
+     *         email.<br/>
+     *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX each<br/>
+     *         Max:    EDAM_USER_RECENT_MAILED_ADDRESSES_MAX entries
+     *        </dd>
+     *
+     *    <dt>comments</dt>
+     *        <dd>Free-form text field that may hold general support
+     *         information, etc.<br/>
+     *         Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *        </dd>
+     *
+     *    <dt>dateAgreedToTermsOfService</dt>
+     *        <dd>The date/time when the user agreed to
+     *         the terms of service.    This can be used as the effective "start date"
+     *         for the account.
+     *        </dd>
+     *
+     *    <dt>maxReferrals</dt>
+     *        <dd>The number of referrals that the user is permitted
+     *         to make.
+     *        </dd>
+     *
+     *    <dt>referralCount</dt>
+     *        <dd>The number of referrals sent from this account.
+     *        </dd>
+     *
+     *    <dt>refererCode</dt>
+     *        <dd>A code indicating where the user was sent from. AKA
+     *         promotion code
+     *        </dd>
+     *
+     *    <dt>sentEmailDate</dt>
+     *        <dd>The most recent date when the user sent outbound
+     *         emails from the service.    Used with sentEmailCount to limit the number
+     *         of emails that can be sent per day.
+     *        </dd>
+     *
+     *    <dt>sentEmailCount</dt>
+     *        <dd>The number of emails that were sent from the user
+     *         via the service on sentEmailDate.    Used to enforce a limit on the number
+     *         of emails per user per day to prevent spamming.
+     *        </dd>
+     *
+     *    <dt>dailyEmailLimit</dt>
+     *        <dd>If set, this is the maximum number of emails that
+     *         may be sent in a given day from this account.    If unset, the server will
+     *         use the configured default limit.
+     *        </dd>
+     *
+     *    <dt>emailOptOutDate</dt>
+     *        <dd>If set, this is the date when the user asked
+     *         to be excluded from offers and promotions sent by Evernote.    If not set,
+     *         then the user currently agrees to receive these messages.
+     *        </dd>
+     *
+     *    <dt>partnerEmailOptInDate</dt>
+     *        <dd>If set, this is the date when the user asked
+     *         to be included in offers and promotions sent by Evernote's partners.
+     *         If not sent, then the user currently does not agree to receive these
+     *         emails.
+     *        </dd>
+     *
+     *    <dt>preferredLanguage</dt>
+     *        <dd>a 2 character language codes based on:
+     *                http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt used for
+     *             localization purposes to determine what language to use for the web
+     *             interface and for other direct communication (e.g. emails).
+     *        </dd>
+     *
+     *    <dt>preferredCountry</dt>
+     *        <dd>Preferred country code based on ISO 3166-1-alpha-2 indicating the
+     *        users preferred country</dd>
+     *
+     *    <dt>clipFullPage</dt>
+     *        <dd>Boolean flag set to true if the user wants to clip full pages by
+     *        default when they use the web clipper without a selection.</dd>
+     *
+     *    <dt>twitterUserName</dt>
+     *        <dd>The username of the account of someone who has chosen to enable
+     *        Twittering into Evernote.    This value is subject to change, since users
+     *        may change their Twitter user name.</dd>
+     *
+     *    <dt>twitterId</dt>
+     *        <dd>The unique identifier of the user's Twitter account if that user
+     *        has chosen to enable Twittering into Evernote.</dd>
+     *
+     *    <dt>groupName</dt>
+     *        <dd>A name identifier used to identify a particular set of branding and
+     *         light customization.</dd>
+     *
+     *    <dt>recognitionLanguage</dt>
+     *        <dd>a 2 character language codes based on:
+     *                http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt
+     *                If set, this is used to determine the language that should be used
+     *                when processing images and PDF files to find text.
+     *                If not set, then the 'preferredLanguage' will be used.
+     *        </dd>
+     *
+     *    <dt>educationalInstitution</dt>
+     *        <dd>a flag indicating that the user is part of an educational institution which
+     *        makes them eligible for discounts on bulk purchases
+     *        </dd>
+     *
+     *    <dt>businessAddress</dt>
+     *        <dd>A string recording the business address of a Sponsored Account user who has requested invoicing.
+     *        </dd>
+     *
+     *    <dt>hideSponsorBilling</dt>
+     *        <dd>A flag indicating whether to hide the billing information on a sponsored
+     *                account owner's settings page
+     *        </dd>
+     *
+     *    <dt>taxExempt</dt>
+     *        <dd>A flag indicating the user's sponsored group is exempt from sale tax
+     *        </dd>
+     *
+     *    <dt>useEmailAutoFiling</dt>
+     *        <dd>A flag indicating whether the user chooses to allow Evernote to automatically
+     *                file and tag emailed notes
+     *        </dd>
+     *
+     *    <dt>reminderEmailConfig</dt>
+     *        <dd>Configuration state for whether or not the user wishes to receive
+     *                reminder e-mail.    This setting applies to both the reminder e-mail sent
+     *                for personal reminder notes and for the reminder e-mail sent for reminder
+     *                notes in the user's business notebooks that the user has configured for
+     *                e-mail notifications.
+     *        </dd>
+     *    </dl>
+     */
+    class UserAttributes {
+        defaultLocationName: string;
+        defaultLatitude: number;
+        defaultLongitude: number;
+        preactivation: boolean;
+        viewedPromotions: string[];
+        incomingEmailAddress: string;
+        recentMailedAddresses: string[];
+        comments: string;
+        dateAgreedToTermsOfService: number;
+        maxReferrals: number;
+        referralCount: number;
+        refererCode: string;
+        sentEmailDate: number;
+        sentEmailCount: number;
+        dailyEmailLimit: number;
+        emailOptOutDate: number;
+        partnerEmailOptInDate: number;
+        preferredLanguage: string;
+        preferredCountry: string;
+        clipFullPage: boolean;
+        twitterUserName: string;
+        twitterId: string;
+        groupName: string;
+        recognitionLanguage: string;
+        referralProof: string;
+        educationalDiscount: boolean;
+        businessAddress: string;
+        hideSponsorBilling: boolean;
+        taxExempt: boolean;
+        useEmailAutoFiling: boolean;
+        reminderEmailConfig: ReminderEmailConfig;
+
+        constructor(args?: { defaultLocationName?: string; defaultLatitude?: number; defaultLongitude?: number; preactivation?: boolean; viewedPromotions?: string[]; incomingEmailAddress?: string; recentMailedAddresses?: string[]; comments?: string; dateAgreedToTermsOfService?: number; maxReferrals?: number; referralCount?: number; refererCode?: string; sentEmailDate?: number; sentEmailCount?: number; dailyEmailLimit?: number; emailOptOutDate?: number; partnerEmailOptInDate?: number; preferredLanguage?: string; preferredCountry?: string; clipFullPage?: boolean; twitterUserName?: string; twitterId?: string; groupName?: string; recognitionLanguage?: string; referralProof?: string; educationalDiscount?: boolean; businessAddress?: string; hideSponsorBilling?: boolean; taxExempt?: boolean; useEmailAutoFiling?: boolean; reminderEmailConfig?: ReminderEmailConfig; });
+    }
+
+    /**
+     *    This represents the bookkeeping information for the user's subscription.
+     *
+     * <dl>
+     *    <dt>uploadLimit</dt>
+     *        <dd>The number of bytes that can be uploaded to the account
+     *        in the current month.    For new notes that are created, this is the length
+     *        of the note content (in Unicode characters) plus the size of each resource
+     *        (in bytes).    For edited notes, this is the the difference between the old
+     *        length and the new length (if this is greater than 0) plus the size of
+     *        each new resource.
+     *        </dd>
+     *    <dt>uploadLimitEnd</dt>
+     *        <dd>The date and time when the current upload limit
+     *        expires.    At this time, the monthly upload count reverts to 0 and a new
+     *        limit is imposed.    This date and time is exclusive, so this is effectively
+     *        the start of the new month.
+     *        </dd>
+     *    <dt>uploadLimitNextMonth</dt>
+     *        <dd> When uploadLimitEnd is reached, the service
+     *        will change uploadLimit to uploadLimitNextMonth. If a premium account is
+     *        canceled, this mechanism will reset the quota appropriately.
+     *        </dd>
+     *    <dt>premiumServiceStatus</dt>
+     *        <dd>Indicates the phases of a premium account
+     *        during the billing process.
+     *        </dd>
+     *    <dt>premiumOrderNumber</dt>
+     *        <dd>The order number used by the commerce system to
+     *        process recurring payments
+     *        </dd>
+     *    <dt>premiumServiceStart</dt>
+     *        <dd>The start date when this premium promotion
+     *        began (this number will get overwritten if a premium service is canceled
+     *        and then re-activated).
+     *        </dd>
+     *    <dt>premiumCommerceService</dt>
+     *        <dd>The commerce system used (paypal, Google
+     *        checkout, etc)
+     *        </dd>
+     *    <dt>premiumServiceSKU</dt>
+     *        <dd>The code associated with the purchase eg. monthly
+     *        or annual purchase. Clients should interpret this value and localize it.
+     *        </dd>
+     *    <dt>lastSuccessfulCharge</dt>
+     *        <dd>Date the last time the user was charged.
+     *        Null if never charged.
+     *        </dd>
+     *    <dt>lastFailedCharge</dt>
+     *        <dd>Date the last time a charge was attempted and
+     *        failed.
+     *        </dd>
+     *    <dt>lastFailedChargeReason</dt>
+     *        <dd>Reason provided for the charge failure
+     *        </dd>
+     *    <dt>nextPaymentDue</dt>
+     *        <dd>The end of the billing cycle. This could be in the
+     *        past if there are failed charges.
+     *        </dd>
+     *    <dt>premiumLockUntil</dt>
+     *        <dd>An internal variable to manage locking operations
+     *        on the commerce variables.
+     *        </dd>
+     *    <dt>updated</dt>
+     *        <dd>The date any modification where made to this record.
+     *        </dd>
+     *    <dt>premiumSubscriptionNumber</dt>
+     *        <dd>The number number identifying the
+     *        recurring subscription used to make the recurring charges.
+     *        </dd>
+     *    <dt>lastRequestedCharge</dt>
+     *        <dd>Date charge last attempted</dd>
+     *    <dt>currency</dt>
+     *        <dd>ISO 4217 currency code</dd>
+     *    <dt>unitPrice</dt>
+     *        <dd>charge in the smallest unit of the currency (e.g. cents for USD)</dd>
+     *    <dt>businessId</dt>
+     *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
+     *    <dt>businessName</dt>
+     *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
+     *    <dt>businessRole</dt>
+     *        <dd><i>DEPRECATED:</i>See BusinessUserInfo.</dd>
+     *    <dt>unitDiscount</dt>
+     *        <dd>discount per seat in negative amount and smallest unit of the currency (e.g. cents for USD)</dd>
+     *    <dt>nextChargeDate</dt>
+     *        <dd>The next time the user will be charged, may or may not be the same as nextPaymentDue</dd>
+     *    </dl>
+     */
+    class Accounting {
+        uploadLimit: number;
+        uploadLimitEnd: number;
+        uploadLimitNextMonth: number;
+        premiumServiceStatus: PremiumOrderStatus;
+        premiumOrderNumber: string;
+        premiumCommerceService: string;
+        premiumServiceStart: number;
+        premiumServiceSKU: string;
+        lastSuccessfulCharge: number;
+        lastFailedCharge: number;
+        lastFailedChargeReason: string;
+        nextPaymentDue: number;
+        premiumLockUntil: number;
+        updated: number;
+        premiumSubscriptionNumber: string;
+        lastRequestedCharge: number;
+        currency: string;
+        unitPrice: number;
+        businessId: number;
+        businessName: string;
+        businessRole: BusinessUserRole;
+        unitDiscount: number;
+        nextChargeDate: number;
+
+        constructor(args?: { uploadLimit?: number; uploadLimitEnd?: number; uploadLimitNextMonth?: number; premiumServiceStatus?: PremiumOrderStatus; premiumOrderNumber?: string; premiumCommerceService?: string; premiumServiceStart?: number; premiumServiceSKU?: string; lastSuccessfulCharge?: number; lastFailedCharge?: number; lastFailedChargeReason?: string; nextPaymentDue?: number; premiumLockUntil?: number; updated?: number; premiumSubscriptionNumber?: string; lastRequestedCharge?: number; currency?: string; unitPrice?: number; businessId?: number; businessName?: string; businessRole?: BusinessUserRole; unitDiscount?: number; nextChargeDate?: number; });
+    }
+
+    /**
+     * This structure is used to provide information about an Evernote Business
+     * membership, for members who are part of a business.
+     *
+     * <dl>
+     * <dt>businessId</dt>
+     *     <dd>The ID of the Evernote Business account that the user is a member of.
+     * <dt>businessName</dt>
+     *     <dd>The human-readable name of the Evernote Business account that the user
+     *             is a member of.</dd>
+     * <dt>role</dt>
+     *     <dd>The role of the user within the Evernote Business account that
+     *             they are a member of.</dd>
+     * <dt>email</dt>
+     *     <dd>An e-mail address that will be used by the service in the context of your
+     *             Evernote Business activities.    For example, this e-mail address will be used
+     *             when you e-mail a business note, when you update notes in the account of
+     *             your business, etc.    The business e-mail cannot be used for identification
+     *             purposes such as for logging into the service.
+     *     </dd>
+     * </dl>
+     */
+    class BusinessUserInfo {
+        businessId: number;
+        businessName: string;
+        role: BusinessUserRole;
+        email: string;
+
+        constructor(args?: { businessId?: number; businessName?: string; role?: BusinessUserRole; email?: string; });
+    }
+
+    /**
+     *    This structure is used to provide information about a user's Premium account.
+     * <dl>
+     *    <dt>currentTime</dt>
+     *        <dd>
+     *        The server-side date and time when this data was generated.
+     *        </dd>
+     *    <dt>premium</dt>
+     *        <dd>
+     *        True if the user's account is Premium.
+     *        </dd>
+     *    <dt>premiumRecurring</dt>
+     *        <dd>
+     *        True if the user's account is Premium and has a recurring payment method.
+     *        </dd>
+     *    <dt>premiumExpirationDate</dt>
+     *        <dd>
+     *        The date when the user's Premium account expires, or the date when the
+     *        user's account is due for payment if it has a recurring payment method.
+     *        </dd>
+     *    <dt>premiumExtendable</dt>
+     *        <dd>
+     *        True if the user is eligible for purchasing Premium account extensions.
+     *        </dd>
+     *    <dt>premiumPending</dt>
+     *        <dd>
+     *        True if the user's Premium account is pending payment confirmation
+     *        </dd>
+     *    <dt>premiumCancellationPending</dt>
+     *        <dd>
+     *        True if the user has requested that no further charges to be made; the
+     *        Premium account will remain active until it expires.
+     *        </dd>
+     *    <dt>canPurchaseUploadAllowance</dt>
+     *        <dd>
+     *        True if the user is eligible for purchasing additional upload allowance.
+     *        </dd>
+     *    <dt>sponsoredGroupName</dt>
+     *        <dd>
+     *        The name of the sponsored group that the user is part of.
+     *        </dd>
+     *    <dt>sponsoredGroupRole</dt>
+     *        <dd>
+     *        DEPRECATED - will be removed in a future update.
+     *        </dd>
+     *    <dt>premiumUpgradable</dt>
+     *        <dd>
+     *        True if the user is eligible for purchasing Premium account upgrade.
+     *        </dd>
+     *    </dl>
+     */
+    class PremiumInfo {
+        currentTime: number;
+        premium: boolean;
+        premiumRecurring: boolean;
+        premiumExpirationDate: number;
+        premiumExtendable: boolean;
+        premiumPending: boolean;
+        premiumCancellationPending: boolean;
+        canPurchaseUploadAllowance: boolean;
+        sponsoredGroupName: string;
+        sponsoredGroupRole: SponsoredGroupRole;
+        premiumUpgradable: boolean;
+
+        constructor(args?: { currentTime: number; premium: boolean; premiumRecurring: boolean; premiumExpirationDate?: number; premiumExtendable: boolean; premiumPending: boolean; premiumCancellationPending: boolean; canPurchaseUploadAllowance: boolean; sponsoredGroupName?: string; sponsoredGroupRole?: SponsoredGroupRole; premiumUpgradable?: boolean; });
+    }
+
+    /**
+     *    This represents the information about a single user account.
+     * <dl>
+     *    <dt>id</dt>
+     *        <dd>The unique numeric identifier for the account, which will not
+     *        change for the lifetime of the account.
+     *        </dd>
+     *
+     *    <dt>username</dt>
+     *        <dd>The name that uniquely identifies a single user account. This name
+     *        may be presented by the user, along with their password, to log into
+     *        their account.
+     *        May only contain a-z, 0-9, or '-', and may not start or end with the '-'
+     *        <br/>
+     *        Length:    EDAM_USER_USERNAME_LEN_MIN - EDAM_USER_USERNAME_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_USER_USERNAME_REGEX
+     *        </dd>
+     *
+     *    <dt>email</dt>
+     *        <dd>The email address registered for the user.    Must comply with
+     *        RFC 2821 and RFC 2822.<br/>
+     *        Third party applications that authenticate using OAuth do not have
+     *        access to this field.
+     *        Length:    EDAM_EMAIL_LEN_MIN - EDAM_EMAIL_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_EMAIL_REGEX
+     *        </dd>
+     *
+     *    <dt>name</dt>
+     *        <dd>The printable name of the user, which may be a combination
+     *        of given and family names.    This is used instead of separate "first"
+     *        and "last" names due to variations in international name format/order.
+     *        May not start or end with a whitespace character.    May contain any
+     *        character but carriage return or newline (Unicode classes Zl and Zp).
+     *        <br/>
+     *        Length:    EDAM_USER_NAME_LEN_MIN - EDAM_USER_NAME_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_USER_NAME_REGEX
+     *        </dd>
+     *
+     *    <dt>timezone</dt>
+     *        <dd>The zone ID for the user's default location.    If present,
+     *        this may be used to localize the display of any timestamp for which no
+     *        other timezone is available.
+     *        The format must be encoded as a standard zone ID such as
+     *        "America/Los_Angeles" or "GMT+08:00"
+     *        <br/>
+     *        Length:    EDAM_TIMEZONE_LEN_MIN - EDAM_TIMEZONE_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_TIMEZONE_REGEX
+     *        </dd>
+     *
+     *    <dt>privilege</dt>
+     *        <dd>The level of access permitted for the user.
+     *        </dd>
+     *
+     *    <dt>created</dt>
+     *        <dd>The date and time when this user account was created in the
+     *        service.
+     *        </dd>
+     *
+     *    <dt>updated</dt>
+     *        <dd>The date and time when this user account was last modified
+     *        in the service.
+     *        </dd>
+     *
+     *    <dt>deleted</dt>
+     *        <dd>If the account has been deleted from the system (e.g. as
+     *        the result of a legal request by the user), the date and time of the
+     *        deletion will be represented here.    If not, this value will not be set.
+     *        </dd>
+     *
+     *    <dt>active</dt>
+     *        <dd>If the user account is available for login and
+     *        synchronization, this flag will be set to true.
+     *        </dd>
+     *
+     *    <dt>shardId</dt>
+     *        <dd>DEPRECATED - Client applications should have no need to use this field.
+     *        </dd>
+     *
+     *    <dt>attributes</dt>
+     *        <dd>If present, this will contain a list of the attributes
+     *        for this user account.
+     *        </dd>
+     *
+     *    <dt>accounting</dt>
+     *        <dd>Bookkeeping information for the user's subscription.
+     *        </dd>
+     *
+     *    <dt>premiumInfo</dt>
+     *        <dd>If present, this will contain a set of commerce information
+     *        relating to the user's premium service level.
+     *        </dd>
+     *
+     *    <dt>businessUserInfo</dt>
+     *        <dd>If present, this will contain a set of business information
+     *        relating to the user's business membership.    If not present, the
+     *        user is not currently part of a business.
+     *        </dd>
+     *    </dl>
+     */
+    class User {
+        id: number;
+        username: string;
+        email: string;
+        name: string;
+        timezone: string;
+        privilege: PrivilegeLevel;
+        created: number;
+        updated: number;
+        deleted: number;
+        active: boolean;
+        shardId: string;
+        attributes: UserAttributes;
+        accounting: Accounting;
+        premiumInfo: PremiumInfo;
+        businessUserInfo: BusinessUserInfo;
+
+        constructor(args?: { id?: number; username?: string; email?: string; name?: string; timezone?: string; privilege?: PrivilegeLevel; created?: number; updated?: number; deleted?: number; active?: boolean; shardId?: string; attributes?: UserAttributes; accounting?: Accounting; premiumInfo?: PremiumInfo; businessUserInfo?: BusinessUserInfo; });
+    }
+
+    /**
+     *    A tag within a user's account is a unique name which may be organized
+     *    a simple hierarchy.
+     * <dl>
+     *    <dt>guid</dt>
+     *        <dd>The unique identifier of this tag. Will be set by the service,
+     *        so may be omitted by the client when creating the Tag.
+     *        <br/>
+     *        Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_GUID_REGEX
+     *        </dd>
+     *
+     *    <dt>name</dt>
+     *        <dd>A sequence of characters representing the tag's identifier.
+     *        Case is preserved, but is ignored for comparisons.
+     *        This means that an account may only have one tag with a given name, via
+     *        case-insensitive comparison, so an account may not have both "food" and
+     *        "Food" tags.
+     *        May not contain a comma (','), and may not begin or end with a space.
+     *        <br/>
+     *        Length:    EDAM_TAG_NAME_LEN_MIN - EDAM_TAG_NAME_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_TAG_NAME_REGEX
+     *        </dd>
+     *
+     *    <dt>parentGuid</dt>
+     *        <dd>If this is set, then this is the GUID of the tag that
+     *        holds this tag within the tag organizational hierarchy.    If this is
+     *        not set, then the tag has no parent and it is a "top level" tag.
+     *        Cycles are not allowed (e.g. a->parent->parent == a) and will be
+     *        rejected by the service.
+     *        <br/>
+     *        Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *        <br/>
+     *        Regex:    EDAM_GUID_REGEX
+     *        </dd>
+     *
+     *    <dt>updateSequenceNum</dt>
+     *        <dd>A number identifying the last transaction to
+     *        modify the state of this object.    The USN values are sequential within an
+     *        account, and can be used to compare the order of modifications within the
+     *        service.
+     *        </dd>
+     *    </dl>
+     */
+    class Tag {
+        guid: string;
+        name: string;
+        parentGuid: string;
+        updateSequenceNum: number;
+
+        constructor(args?: { guid?: string; name?: string; parentGuid?: string; updateSequenceNum?: number; });
+    }
+
+    /**
+     * A structure that wraps a map of name/value pairs whose values are not
+     * always present in the structure in order to reduce space when obtaining
+     * batches of entities that contain the map.
+     *
+     * When the server provides the client with a LazyMap, it will fill in either
+     * the keysOnly field or the fullMap field, but never both, based on the API
+     * and parameters.
+     *
+     * When a client provides a LazyMap to the server as part of an update to
+     * an object, the server will only update the LazyMap if the fullMap field is
+     * set. If the fullMap field is not set, the server will not make any changes
+     * to the map.
+     *
+     * Check the API documentation of the individual calls involving the LazyMap
+     * for full details including the constraints of the names and values of the
+     * map.
+     *
+     * <dl>
+     * <dt>keysOnly</dt>
+     *     <dd>The set of keys for the map.    This field is ignored by the
+     *             server when set.
+     *     </dd>
+     *
+     * <dt>fullMap</dt>
+     *     <dd>The complete map, including all keys and values.
+     *     </dd>
+     * </dl>
+     */
+    class LazyMap {
+        keysOnly: string[];
+        fullMap: { [k: string]: string; };
+
+        constructor(args?: { keysOnly?: string[]; fullMap?: { [k: string]: string; }; });
+    }
+
+    /**
+     * Structure holding the optional attributes of a Resource
+     * <dl>
+     * <dt>sourceURL</dt>
+     *     <dd>the original location where the resource was hosted
+     *     <br/>
+     *        Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>timestamp</dt>
+     *     <dd>the date and time that is associated with this resource
+     *     (e.g. the time embedded in an image from a digital camera with a clock)
+     *     </dd>
+     *
+     * <dt>latitude</dt>
+     *     <dd>the latitude where the resource was captured
+     *     </dd>
+     *
+     * <dt>longitude</dt>
+     *     <dd>the longitude where the resource was captured
+     *     </dd>
+     *
+     * <dt>altitude</dt>
+     *     <dd>the altitude where the resource was captured
+     *     </dd>
+     *
+     * <dt>cameraMake</dt>
+     *     <dd>information about an image's camera, e.g. as embedded in
+     *     the image's EXIF data
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>cameraModel</dt>
+     *     <dd>information about an image's camera, e.g. as embedded
+     *     in the image's EXIF data
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>clientWillIndex</dt>
+     *     <dd>if true, then the original client that submitted
+     *     the resource plans to submit the recognition index for this resource at a
+     *     later time.
+     *     </dd>
+     *
+     * <dt>recoType</dt>
+     *     <dd>DEPRECATED - this field is no longer set by the service, so should
+     *         be ignored.
+     *     </dd>
+     *
+     * <dt>fileName</dt>
+     *     <dd>if the resource came from a source that provided an
+     *     explicit file name, the original name will be stored here.    Many resources
+     *     come from unnamed sources, so this will not always be set.
+     *     </dd>
+     *
+     * <dt>attachment</dt>
+     *     <dd>this will be true if the resource should be displayed as an attachment,
+     *     or false if the resource should be displayed inline (if possible).
+     *     </dd>
+     *
+     * <dt>applicationData</dt>
+     * <dd>Provides a location for applications to store a relatively small
+     * (4kb) blob of data associated with a Resource that is not visible to the user
+     * and that is opaque to the Evernote service. A single application may use at most
+     * one entry in this map, using its API consumer key as the map key. See the
+     * documentation for LazyMap for a description of when the actual map values
+     * are returned by the service.
+     * <p>To safely add or modify your application's entry in the map, use
+     * NoteStore.setResourceApplicationDataEntry. To safely remove your application's
+     * entry from the map, use NoteStore.unsetResourceApplicationDataEntry.</p>
+     * Minimum length of a name (key): EDAM_APPLICATIONDATA_NAME_LEN_MIN
+     * <br/>
+     * Sum max size of key and value: EDAM_APPLICATIONDATA_ENTRY_LEN_MAX
+     * <br/>
+     * Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
+     * </dd>
+     *
+     * </dl>
+     */
+    class ResourceAttributes {
+        sourceURL: string;
+        timestamp: number;
+        latitude: number;
+        longitude: number;
+        altitude: number;
+        cameraMake: string;
+        cameraModel: string;
+        clientWillIndex: boolean;
+        recoType: string;
+        fileName: string;
+        attachment: boolean;
+        applicationData: LazyMap;
+
+        constructor(args?: { sourceURL?: string; timestamp?: number; latitude?: number; longitude?: number; altitude?: number; cameraMake?: string; cameraModel?: string; clientWillIndex?: boolean; recoType?: string; fileName?: string; attachment?: boolean; applicationData?: LazyMap; });
+    }
+
+    /**
+     * Every media file that is embedded or attached to a note is represented
+     * through a Resource entry.
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this resource.    Will be set whenever
+     *     a resource is retrieved from the service, but may be null when a client
+     *     is creating a resource.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>noteGuid</dt>
+     *     <dd>The unique identifier of the Note that holds this
+     *     Resource. Will be set whenever the resource is retrieved from the service,
+     *     but may be null when a client is creating a resource.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>data</dt>
+     *     <dd>The contents of the resource.
+     *     Maximum length:    The data.body is limited to EDAM_RESOURCE_SIZE_MAX_FREE
+     *     for free accounts and EDAM_RESOURCE_SIZE_MAX_PREMIUM for premium accounts.
+     *     </dd>
+     *
+     * <dt>mime</dt>
+     *     <dd>The MIME type for the embedded resource.    E.g. "image/gif"
+     *     <br/>
+     *     Length:    EDAM_MIME_LEN_MIN - EDAM_MIME_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_MIME_REGEX
+     *     </dd>
+     *
+     * <dt>width</dt>
+     *     <dd>If set, this contains the display width of this resource, in
+     *     pixels.
+     *     </dd>
+     *
+     * <dt>height</dt>
+     *     <dd>If set, this contains the display height of this resource,
+     *     in pixels.
+     *     </dd>
+     *
+     * <dt>duration</dt>
+     *     <dd>DEPRECATED: ignored.
+     *     </dd>
+     *
+     * <dt>active</dt>
+     *     <dd>DEPRECATED: ignored.
+     *     </dd>
+     *
+     * <dt>recognition</dt>
+     *     <dd>If set, this will hold the encoded data that provides
+     *     information on search and recognition within this resource.
+     *     </dd>
+     *
+     * <dt>attributes</dt>
+     *     <dd>A list of the attributes for this resource.
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this object. The USN values are sequential within an
+     *     account, and can be used to compare the order of modifications within the
+     *     service.
+     *     </dd>
+     *
+     * <dt>alternateData</dt>
+     *     <dd>Some Resources may be assigned an alternate data format by the service
+     *     which may be more appropriate for indexing or rendering than the original
+     *     data provided by the user.    In these cases, the alternate data form will
+     *     be available via this Data element.    If a Resource has no alternate form,
+     *     this field will be unset.</dd>
+     * </dl>
+     */
+    class Resource {
+        guid: string;
+        noteGuid: string;
+        data: Data;
+        mime: string;
+        width: number;
+        height: number;
+        duration: number;
+        active: boolean;
+        recognition: Data;
+        attributes: ResourceAttributes;
+        updateSequenceNum: number;
+        alternateData: Data;
+
+        constructor(args?: { guid?: string; noteGuid?: string; data?: Data; mime?: string; width?: number; height?: number; duration?: number; active?: boolean; recognition?: Data; attributes?: ResourceAttributes; updateSequenceNum?: number; alternateData?: Data; });
+    }
+
+    /**
+     * The list of optional attributes that can be stored on a note.
+     * <dl>
+     * <dt>subjectDate</dt>
+     *     <dd>time that the note refers to
+     *     </dd>
+     *
+     * <dt>latitude</dt>
+     *     <dd>the latitude where the note was taken
+     *     </dd>
+     *
+     * <dt>longitude</dt>
+     *     <dd>the longitude where the note was taken
+     *     </dd>
+     *
+     * <dt>altitude</dt>
+     *     <dd>the altitude where the note was taken
+     *     </dd>
+     *
+     * <dt>author</dt>
+     *     <dd>the author of the content of the note
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>source</dt>
+     *     <dd>the method that the note was added to the account, if the
+     *     note wasn't directly authored in an Evernote desktop client.
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>sourceURL</dt>
+     *     <dd>the original location where the resource was hosted. For web clips,
+     *     this will be the URL of the page that was clipped.
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>sourceApplication</dt>
+     *     <dd>an identifying string for the application that
+     *     created this note.    This string does not have a guaranteed syntax or
+     *     structure -- it is intended for human inspection and tracking.
+     *     <br/>
+     *     Length:    EDAM_ATTRIBUTE_LEN_MIN - EDAM_ATTRIBUTE_LEN_MAX
+     *     </dd>
+     *
+     * <dt>shareDate</dt>
+     *    <dd>The date and time when this note was directly shared via its own URL.
+     *    This is only set on notes that were individually shared - it is independent
+     *    of any notebook-level sharing of the containing notebook. This field
+     *    is treated as "read-only" for clients; the server will ignore changes
+     *    to this field from an external client.
+     *    </dd>
+     *
+     * <dt>reminderOrder</dt>
+     * <dd>The set of notes with this parameter set are considered
+     * "reminders" and are to be treated specially by clients to give them
+     * higher UI prominence within a notebook.    The value is used to sort
+     * the reminder notes within the notebook with higher values
+     * representing greater prominence.    Outside of the context of a
+     * notebook, the value of this parameter is undefined.    The value is
+     * not intended to be compared to the values of reminder notes in
+     * other notebooks.    In order to allow clients to place a note at a
+     * higher precedence than other notes, you should never set a value
+     * greater than the current time (as defined for a Timetstamp). To
+     * place a note at higher precedence than existing notes, set the
+     * value to the current time as defined for a timestamp (milliseconds
+     * since the epoch).    Synchronizing clients must remember the time when
+     * the update was performed, using the local clock on the client,
+     * and use that value when they later upload the note to the service.
+     * Clients must not set the reminderOrder to the reminderTime as the
+     * reminderTime could be in the future.    Those two fields are never
+     * intended to be related.    The correct value for reminderOrder field
+     * for new notes is the "current" time when the user indicated that
+     * the note is a reminder.    Clients may implement a separate
+     * "sort by date" feature to show notes ordered by reminderTime.
+     * Whenever a reminderDoneTime or reminderTime is set but a
+     * reminderOrder is not set, the server will fill in the current
+     * server time for the reminderOrder field.</dd>
+     *
+     * <dt>reminderDoneTime</dt>
+     * <dd>The date and time when a user dismissed/"marked done" the reminder
+     * on the note.    Users typically do not manually set this value directly
+     * as it is set to the time when the user dismissed/"marked done" the
+     * reminder.</dd>
+     *
+     * <dt>reminderTime</dt>
+     * <dd>The date and time a user has selected to be reminded of the note.
+     * A note with this value set is known as a "reminder" and the user can
+     * be reminded, via e-mail or client-specific notifications, of the note
+     * when the time is reached or about to be reached.    When a user sets
+     * a reminder time on a note that has a reminder done time, and that
+     * reminder time is in the future, then the reminder done time should be
+     * cleared.    This should happen regardless of any existing reminder time
+     * that may have previously existed on the note.</dd>
+     *
+     * <dt>placeName</dt>
+     * <dd>Allows the user to assign a human-readable location name associated
+     * with a note. Users may assign values like 'Home' and 'Work'. Place
+     * names may also be populated with values from geonames database
+     * (e.g., a restaurant name). Applications are encouraged to normalize values
+     * so that grouping values by place name provides a useful result. Applications
+     * MUST NOT automatically add place name values based on geolocation without
+     * confirmation from the user; that is, the value in this field should be
+     * more useful than a simple automated lookup based on the note's latitude
+     * and longitude.</dd>
+     *
+     * <dt>contentClass</dt>
+     * <dd>The class (or type) of note. This field is used to indicate to
+     * clients that special structured information is represented within
+     * the note such that special rules apply when making
+     * modifications. If contentClass is set and the client
+     * application does not specifically support the specified class,
+     * the client MUST treat the note as read-only. In this case, the
+     * client MAY modify the note's notebook and tags via the
+     * Note.notebookGuid and Note.tagGuids fields.    The client MAY also
+     * modify the reminderOrder field as well as the reminderTime and
+     * reminderDoneTime fields.
+     * <p>Applications should set contentClass only when they are creating notes
+     * that contain structured information that needs to be maintained in order
+     * for the user to be able to use the note within that application.
+     * Setting contentClass makes a note read-only in other applications, so
+     * there is a trade-off when an application chooses to use contentClass.
+     * Applications that set contentClass when creating notes must use a contentClass
+     * string of the form <i>CompanyName.ApplicationName</i> to ensure uniqueness.</p>
+     * Length restrictions: EDAM_NOTE_CONTENT_CLASS_LEN_MIN, EDAM_NOTE_CONTENT_CLASS_LEN_MAX
+     * <br/>
+     * Regex: EDAM_NOTE_CONTENT_CLASS_REGEX
+     * </dd>
+     *
+     * <dt>applicationData</dt>
+     * <dd>Provides a location for applications to store a relatively small
+     * (4kb) blob of data that is not meant to be visible to the user and
+     * that is opaque to the Evernote service. A single application may use at most
+     * one entry in this map, using its API consumer key as the map key. See the
+     * documentation for LazyMap for a description of when the actual map values
+     * are returned by the service.
+     * <p>To safely add or modify your application's entry in the map, use
+     * NoteStore.setNoteApplicationDataEntry. To safely remove your application's
+     * entry from the map, use NoteStore.unsetNoteApplicationDataEntry.</p>
+     * Minimum length of a name (key): EDAM_APPLICATIONDATA_NAME_LEN_MIN
+     * <br/>
+     * Sum max size of key and value: EDAM_APPLICATIONDATA_ENTRY_LEN_MAX
+     * <br/>
+     * Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
+     * </dd>
+     *
+     * <dt>creatorId</dt>
+     * <dd>The numeric user ID of the user who originally created the note.</dd>
+     *
+     * <dt>lastEditedBy</dt>
+     * <dd>An indication of who made the last change to the note.    If you are
+     * accessing the note via a shared notebook to which you have modification
+     * rights, or if you are the owner of the notebook to which the note belongs,
+     * then you have access to the value.    In this case, the value will be
+     * unset if the owner of the notebook containing the note was the last to
+     * make the modification, else it will be a string describing the
+     * guest who made the last edit.    If you do not have access to this value,
+     * it will be left unset.    This field is read-only by clients.    The server
+     * will ignore all values set by clients into this field.</dd>
+     *
+     * <dt>lastEditorId</dt>
+     * <dd>The numeric user ID of the user described in lastEditedBy.</dd>
+     *
+     * <dt>classifications</dt>
+     * <dd>A map of classifications applied to the note by clients or by the
+     * Evernote service. The key is the string name of the classification type,
+     * and the value is a constant that begins with CLASSIFICATION_.</dd>
+     *
+     * </dl>
+     */
+    class NoteAttributes {
+        subjectDate: number;
+        latitude: number;
+        longitude: number;
+        altitude: number;
+        author: string;
+        source: string;
+        sourceURL: string;
+        sourceApplication: string;
+        shareDate: number;
+        reminderOrder: number;
+        reminderDoneTime: number;
+        reminderTime: number;
+        placeName: string;
+        contentClass: string;
+        applicationData: LazyMap;
+        lastEditedBy: string;
+        classifications: { [k: string]: string; };
+        creatorId: number;
+        lastEditorId: number;
+
+        constructor(args?: { subjectDate?: number; latitude?: number; longitude?: number; altitude?: number; author?: string; source?: string; sourceURL?: string; sourceApplication?: string; shareDate?: number; reminderOrder?: number; reminderDoneTime?: number; reminderTime?: number; placeName?: string; contentClass?: string; applicationData?: LazyMap; lastEditedBy?: string; classifications?: { [k: string]: string; }; creatorId?: number; lastEditorId?: number; });
+    }
+
+    /**
+     * Represents a single note in the user's account.
+     *
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this note.    Will be set by the
+     *     server, but will be omitted by clients calling NoteStore.createNote()
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>title</dt>
+     *     <dd>The subject of the note.    Can't begin or end with a space.
+     *     <br/>
+     *     Length:    EDAM_NOTE_TITLE_LEN_MIN - EDAM_NOTE_TITLE_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_NOTE_TITLE_REGEX
+     *     </dd>
+     *
+     * <dt>content</dt>
+     *     <dd>The XHTML block that makes up the note.    This is
+     *     the canonical form of the note's contents, so will include abstract
+     *     Evernote tags for internal resource references.    A client may create
+     *     a separate transformed version of this content for internal presentation,
+     *     but the same canonical bytes should be used for transmission and
+     *     comparison unless the user chooses to modify their content.
+     *     <br/>
+     *     Length:    EDAM_NOTE_CONTENT_LEN_MIN - EDAM_NOTE_CONTENT_LEN_MAX
+     *     </dd>
+     *
+     * <dt>contentHash</dt>
+     *     <dd>The binary MD5 checksum of the UTF-8 encoded content
+     *     body. This will always be set by the server, but clients may choose to omit
+     *     this when they submit a note with content.
+     *     <br/>
+     *     Length:    EDAM_HASH_LEN (exactly)
+     *     </dd>
+     *
+     * <dt>contentLength</dt>
+     *     <dd>The number of Unicode characters in the content of
+     *     the note.    This will always be set by the service, but clients may choose
+     *     to omit this value when they submit a Note.
+     *     </dd>
+     *
+     * <dt>created</dt>
+     *     <dd>The date and time when the note was created in one of the
+     *     clients.    In most cases, this will match the user's sense of when
+     *     the note was created, and ordering between notes will be based on
+     *     ordering of this field.    However, this is not a "reliable" timestamp
+     *     if a client has an incorrect clock, so it cannot provide a true absolute
+     *     ordering between notes.    Notes created directly through the service
+     *     (e.g. via the web GUI) will have an absolutely ordered "created" value.
+     *     </dd>
+     *
+     * <dt>updated</dt>
+     *     <dd>The date and time when the note was last modified in one of
+     *     the clients.    In most cases, this will match the user's sense of when
+     *     the note was modified, but this field may not be absolutely reliable
+     *     due to the possibility of client clock errors.
+     *     </dd>
+     *
+     * <dt>deleted</dt>
+     *     <dd>If present, the note is considered "deleted", and this
+     *     stores the date and time when the note was deleted by one of the clients.
+     *     In most cases, this will match the user's sense of when the note was
+     *     deleted, but this field may be unreliable due to the possibility of
+     *     client clock errors.
+     *     </dd>
+     *
+     * <dt>active</dt>
+     *     <dd>If the note is available for normal actions and viewing,
+     *     this flag will be set to true.
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this note (including changes to the note's attributes
+     *     or resources).    The USN values are sequential within an account,
+     *     and can be used to compare the order of modifications within the service.
+     *     </dd>
+     *
+     * <dt>notebookGuid</dt>
+     *     <dd>The unique identifier of the notebook that contains
+     *     this note.    If no notebookGuid is provided on a call to createNote(), the
+     *     default notebook will be used instead.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>tagGuids</dt>
+     *     <dd>A list of the GUID identifiers for tags that are applied to this note.
+     *     This may be provided in a call to createNote() to unambiguously
+     *     the tags that should be assigned to the new note.    Alternately, clients
+     *     may pass the names of desired tags via the 'tagNames' field during
+     *     note creation.
+     *     If the list of tags are omitted on a call to createNote(), then
+     *     the server will assume that no changes have been made to the resources.
+     *     Maximum:    EDAM_NOTE_TAGS_MAX tags per note
+     *     </dd>
+     *
+     * <dt>resources</dt>
+     *     <dd>The list of resources that are embedded within this note.
+     *     If the list of resources are omitted on a call to updateNote(), then
+     *     the server will assume that no changes have been made to the resources.
+     *     The binary contents of the resources must be provided when the resource
+     *     is first sent to the service, but it will be omitted by the service when
+     *     the Note is returned in the future.
+     *     Maximum:    EDAM_NOTE_RESOURCES_MAX resources per note
+     *     </dd>
+     *
+     * <dt>attributes</dt>
+     *     <dd>A list of the attributes for this note.
+     *     If the list of attributes are omitted on a call to updateNote(), then
+     *     the server will assume that no changes have been made to the resources.
+     *     </dd>
+     *
+     * <dt>tagNames</dt>
+     *     <dd>May be provided by clients during calls to createNote() as an
+     *     alternative to providing the tagGuids of existing tags.    If any tagNames
+     *     are provided during createNote(), these will be found, or created if they
+     *     don't already exist.    Created tags will have no parent (they will be at
+     *     the top level of the tag panel).
+     *     </dd>
+     * </dl>
+     */
+    class Note {
+        guid: string;
+        title: string;
+        content: string;
+        contentHash: string;
+        contentLength: number;
+        created: number;
+        updated: number;
+        deleted: number;
+        active: boolean;
+        updateSequenceNum: number;
+        notebookGuid: string;
+        tagGuids: string[];
+        resources: Resource[];
+        attributes: NoteAttributes;
+        tagNames: string[];
+
+        constructor(args?: { guid?: string; title?: string; content?: string; contentHash?: string; contentLength?: number; created?: number; updated?: number; deleted?: number; active?: boolean; updateSequenceNum?: number; notebookGuid?: string; tagGuids?: string[]; resources?: Resource[]; attributes?: NoteAttributes; tagNames?: string[]; });
+    }
+
+    /**
+     * If a Notebook has been opened to the public, the Notebook will have a
+     * reference to one of these structures, which gives the location and optional
+     * description of the externally-visible public Notebook.
+     * <dl>
+     * <dt>uri</dt>
+     *     <dd>If this field is present, then the notebook is published for
+     *     mass consumption on the Internet under the provided URI, which is
+     *     relative to a defined base publishing URI defined by the service.
+     *     This field can only be modified via the web service GUI ... publishing
+     *     cannot be modified via an offline client.
+     *     <br/>
+     *     Length:    EDAM_PUBLISHING_URI_LEN_MIN - EDAM_PUBLISHING_URI_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_PUBLISHING_URI_REGEX
+     *     </dd>
+     *
+     * <dt>order</dt>
+     *     <dd>When the notes are publicly displayed, they will be sorted
+     *     based on the requested criteria.
+     *     </dd>
+     *
+     * <dt>ascending</dt>
+     *     <dd>If this is set to true, then the public notes will be
+     *     displayed in ascending order (e.g. from oldest to newest).    Otherwise,
+     *     the notes will be displayed in descending order (e.g. newest to oldest).
+     *     </dd>
+     *
+     * <dt>publicDescription</dt>
+     *     <dd>This field may be used to provide a short
+     *     description of the notebook, which may be displayed when (e.g.) the
+     *     notebook is shown in a public view.    Can't begin or end with a space.
+     *     <br/>
+     *     Length:    EDAM_PUBLISHING_DESCRIPTION_LEN_MIN -
+     *                        EDAM_PUBLISHING_DESCRIPTION_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_PUBLISHING_DESCRIPTION_REGEX
+     *     </dd>
+     *
+     * </dl>
+     */
+    class Publishing {
+        uri: string;
+        order: NoteSortOrder;
+        ascending: boolean;
+        publicDescription: string;
+
+        constructor(args?: { uri?: string; order?: NoteSortOrder; ascending?: boolean; publicDescription?: string; });
+    }
+
+    /**
+     * If a Notebook contained in an Evernote Business account has been published
+     * the to business library, the Notebook will have a reference to one of these
+     * structures, which specifies how the Notebook will be represented in the
+     * library.
+     *
+     * <dl>
+     * <dt>notebookDescription</dt>
+     *     <dd>A short description of the notebook's content that will be displayed
+     *             in the business library user interface. The description may not begin
+     *             or end with whitespace.
+     *     <br/>
+     *     Length: EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MIN -
+     *                     EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_BUSINESS_NOTEBOOK_DESCRIPTION_REGEX
+     *     </dd>
+     *
+     * <dt>privilege</dt>
+     *     <dd>The privileges that will be granted to users who join the notebook through
+     *             the business library.
+     *     </dd>
+     *
+     * <dt>recommended</dt>
+     *     <dd>Whether the notebook should be "recommended" when displayed in the business
+     *             library user interface.
+     *     </dd>
+     * </dl>
+     */
+    class BusinessNotebook {
+        notebookDescription: string;
+        privilege: SharedNotebookPrivilegeLevel;
+        recommended: boolean;
+
+        constructor(args?: { notebookDescription?: string; privilege?: SharedNotebookPrivilegeLevel; recommended?: boolean; });
+    }
+
+    /**
+     * A structure defining the scope of a SavedSearch.
+     *
+     * <dl>
+     *     <dt>includeAccount</dt>
+     *     <dd>The search should include notes from the account that contains the SavedSearch.</dd>
+     *
+     *     <dt>includePersonalLinkedNotebooks</dt>
+     *     <dd>The search should include notes within those shared notebooks
+     *     that the user has joined that are NOT business notebooks.</dd>
+     *
+     *     <dt>includeBusinessLinkedNotebooks</dt>
+     *     <dd>The search should include notes within those shared notebooks
+     *     that the user has joined that are business notebooks in the business that
+     *     the user is currently a member of.</dd>
+     * </dl>
+     */
+    class SavedSearchScope {
+        includeAccount: boolean;
+        includePersonalLinkedNotebooks: boolean;
+        includeBusinessLinkedNotebooks: boolean;
+
+        constructor(args?: { includeAccount?: boolean; includePersonalLinkedNotebooks?: boolean; includeBusinessLinkedNotebooks?: boolean; });
+    }
+
+    /**
+     * A named search associated with the account that can be quickly re-used.
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this search.    Will be set by the
+     *     service, so may be omitted by the client when creating.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>name</dt>
+     *     <dd>The name of the saved search to display in the GUI.    The
+     *     account may only contain one search with a given name (case-insensitive
+     *     compare). Can't begin or end with a space.
+     *     <br/>
+     *     Length:    EDAM_SAVED_SEARCH_NAME_LEN_MIN - EDAM_SAVED_SEARCH_NAME_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_SAVED_SEARCH_NAME_REGEX
+     *     </dd>
+     *
+     * <dt>query</dt>
+     *     <dd>A string expressing the search to be performed.
+     *     <br/>
+     *     Length:    EDAM_SAVED_SEARCH_QUERY_LEN_MIN - EDAM_SAVED_SEARCH_QUERY_LEN_MAX
+     *     </dd>
+     *
+     * <dt>format</dt>
+     *     <dd>The format of the query string, to determine how to parse
+     *     and process it.
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this object.    The USN values are sequential within an
+     *     account, and can be used to compare the order of modifications within the
+     *     service.
+     *     </dd>
+     *
+     * <dt>scope</dt>
+     *     <dd><p>Specifies the set of notes that should be included in the search, if
+     *        possible.</p>
+     *        <p>Clients are expected to search as much of the desired scope as possible,
+     *        with the understanding that a given client may not be able to cover the full
+     *        specified scope. For example, when executing a search that includes notes in both
+     *        the owner's account and business notebooks, a mobile client may choose to only
+     *        search within the user's account because it is not capable of searching both
+     *        scopes simultaneously. When a search across multiple scopes is not possible,
+     *        a client may choose which scope to search based on the current application
+     *        context. If a client cannot search any of the desired scopes, it should refuse
+     *        to execute the search.</p>
+     *        </dd>
+     * </dl>
+     */
+    class SavedSearch {
+        guid: string;
+        name: string;
+        query: string;
+        format: QueryFormat;
+        updateSequenceNum: number;
+        scope: SavedSearchScope;
+
+        constructor(args?: { guid?: string; name?: string; query?: string; format?: QueryFormat; updateSequenceNum?: number; scope?: SavedSearchScope; });
+    }
+
+    /**
+     * Settings meant for the recipient of a shared notebook, such as
+     * for indicating which types of notifications the recipient wishes
+     * for reminders, etc.
+     *
+     * The reminderNotifyEmail and reminderNotifyInApp fields have a
+     * 3-state read value but a 2-state write value.    On read, it is
+     * possible to observe "unset", true, or false.    The initial state is
+     * "unset".    When you choose to set a value, you may set it to either
+     * true or false, but you cannot unset the value.    Once one of these
+     * members has a true/false value, it will always have a true/false
+     * value.
+     *
+     * <dl>
+     * <dt>reminderNotifyEmail</dt>
+     * <dd>Indicates that the user wishes to receive daily e-mail notifications
+     *         for reminders associated with the shared notebook.    This may be
+     *         true only for business notebooks that belong to the business of
+     *         which the user is a member.    You may only set this value on a
+     *         notebook in your business.</dd>
+     * <dt>reminderNotifyInApp</dt>
+     * <dd>Indicates that the user wishes to receive notifications for
+     *         reminders by applications that support providing such
+     *         notifications.    The exact nature of the notification is defined
+     *         by the individual applications.</dd>
+     * </dl>
+     *
+     */
+    class SharedNotebookRecipientSettings {
+        reminderNotifyEmail: boolean;
+        reminderNotifyInApp: boolean;
+
+        constructor(args?: { reminderNotifyEmail?: boolean; reminderNotifyInApp?: boolean; });
+    }
+
+    /**
+     * Shared notebooks represent a relationship between a notebook and a single
+     * share invitation recipient.
+     * <dl>
+     * <dt>id</dt>
+     * <dd>the primary identifier of the share</dd>
+     *
+     * <dt>userId</dt>
+     * <dd>the user id of the owner of the notebook</dd>
+     *
+     * <dt>notebookGuid</dt>
+     * <dd>the GUID of the associated notebook shared.</dd>
+     *
+     * <dt>email</dt>
+     * <dd>the email address of the recipient - used by the notebook
+     * owner to identify who they shared with.</dd>
+     *
+     * <dt>notebookModifiable</dt>
+     * <dd>(DEPRECATED) a flag indicating the share is read/write -otherwise it's read
+     *         only.    This field is deprecated in favor of the new "privilege" field.</dd>
+     *
+     * <dt>requireLogin</dt>
+     * <dd>(DEPRECATED) indicates that a user must login to access the share.    This
+     *         field is deprecated and will be "true" for all new shared notebooks.    It
+     *         is read-only and ignored when creating or modifying a shared notebook,
+     *         except that a shared notebook can be modified to require login.
+     *         See "allowPreview" for information on privileges and shared notebooks.</dd>
+     *
+     * <dt>serviceCreated</dt>
+     * <dd>the date the owner first created the share with the specific email
+     *     address</dd>
+     *
+     * <dt>serviceUpdated</dt>
+     * <dd>the date the shared notebook was last updated on the service.    This
+     *         will be updated when authenticateToSharedNotebook is called the first
+     *         time with a shared notebook requiring login (i.e. when the username is
+     *         bound to that shared notebook).</dd>
+     *
+     * <dt>username</dt>
+     * <dd>the username of the user who can access this share.
+     *     Once it's assigned it cannot be changed.</dd>
+     *
+     * <dt>privilege</dt>
+     * <dd>The privilege level granted to the notebook, activity stream, and
+     *         invitations.    See the corresponding enumeration for details.</dd>
+     *
+     * <dt>allowPreview</dt>
+     * <dd>Whether or not to grant "READ_NOTEBOOK" privilege without an
+     *         authentication token, for authenticateToSharedNotebook(...).    With
+     *         the change to "requireLogin" always being true for new shared
+     *         notebooks, this is the only way to access a shared notebook without
+     *         an authorization token.    This setting expires after the first use
+     *         of authenticateToSharedNotebook(...) with a valid authentication
+     *         token.</dd>
+     *
+     * <dt>recipientSettings</dt>
+     * <dd>Settings intended for use only by the recipient of this shared
+     *         notebook.    You should skip setting this value unless you want
+     *         to change the value contained inside the structure, and only if
+     *         you are the recipient.</dd>
+     * </dl>
+     */
+    class SharedNotebook {
+        id: number;
+        userId: number;
+        notebookGuid: string;
+        email: string;
+        notebookModifiable: boolean;
+        requireLogin: boolean;
+        serviceCreated: number;
+        serviceUpdated: number;
+        shareKey: string;
+        username: string;
+        privilege: SharedNotebookPrivilegeLevel;
+        allowPreview: boolean;
+        recipientSettings: SharedNotebookRecipientSettings;
+
+        constructor(args?: { id?: number; userId?: number; notebookGuid?: string; email?: string; notebookModifiable?: boolean; requireLogin?: boolean; serviceCreated?: number; serviceUpdated?: number; shareKey?: string; username?: string; privilege?: SharedNotebookPrivilegeLevel; allowPreview?: boolean; recipientSettings?: SharedNotebookRecipientSettings; });
+    }
+
+    /**
+     * This structure captures information about the types of operations
+     * that cannot be performed on a given notebook with a type of
+     * authenticated access and credentials.    The values filled into this
+     * structure are based on then-current values in the server database
+     * for shared notebooks and notebook publishing records, as well as
+     * information related to the authentication token.    Information from
+     * the authentication token includes the application that is accessing
+     * the server, as defined by the permissions granted by consumer (api)
+     * key, and the method used to obtain the token, for example via
+     * authenticateToSharedNotebook, authenticateToBusiness, etc.    Note
+     * that changes to values in this structure that are the result of
+     * shared notebook or publishing record changes are communicated to
+     * the client via a change in the notebook USN during sync.    It is
+     * important to use the same access method, parameters, and consumer
+     * key in order obtain correct results from the sync engine.
+     *
+     * The server has the final say on what is allowed as values may
+     * change between calls to obtain NotebookRestrictions instances
+     * and to operate on data on the service.
+     *
+     * If the following are set and true, then the given restriction is
+     * in effect, as accessed by the same authentication token from which
+     * the values were obtained.
+     *
+     * <dt>noReadNotes</dt>
+     *     <dd>The client is not able to read notes from the service and
+     *     the notebook is write-only.
+     *     </dd>
+     * <dt>noCreateNotes</dt>
+     *     <dd>The client may not create new notes in the notebook.
+     *     </dd>
+     * <dt>noUpdateNotes</dt>
+     *     <dd>The client may not update notes currently in the notebook.
+     *     </dd>
+     * <dt>noExpungeNotes</dt>
+     *     <dd>The client may not expunge notes currently in the notebook.
+     *     </dd>
+     * <dt>noShareNotes</dt>
+     *     <dd>The client may not share notes in the notebook via the
+     *     shareNote method.
+     *     </dd>
+     * <dt>noEmailNotes</dt>
+     *     <dd>The client may not e-mail notes via the Evernote service by
+     *     using the emailNote method.
+     *     </dd>
+     * <dt>noSendMessageToRecipients</dt>
+     *     <dd>The client may not send messages to the share recipients of
+     *     the notebook.
+     *     </dd>
+     * <dt>noUpdateNotebook</dt>
+     *     <dd>The client may not update the Notebook object itself, for
+     *     example, via the updateNotebook method.
+     *     </dd>
+     * <dt>noExpungeNotebook</dt>
+     *     <dd>The client may not expunge the Notebook object itself, for
+     *     example, via the expungeNotebook method.
+     *     </dd>
+     * <dt>noSetDefaultNotebook</dt>
+     *     <dd>The client may not set this notebook to be the default notebook.
+     *     The caller should leave Notebook.defaultNotebook unset.
+     *     </dd>
+     * <dt>noSetNotebookStack</dt>
+     *     <dd>If the client is able to update the Notebook, the Notebook.stack
+     *     value may not be set.
+     *     </dd>
+     * <dt>noPublishToPublic</dt>
+     *     <dd>The client may not change the publish the notebook to the public.
+     *     For example, business notebooks may not be shared publicly.
+     *     </dd>
+     * <dt>noPublishToBusinessLibrary</dt>
+     *     <dd>The client may not publish the notebook to the business library.
+     *     </dd>
+     * <dt>noCreateTags</dt>
+     *     <dd>The client may not complete an operation that results in a new tag
+     *     being created in the owner's account.
+     *     </dd>
+     * <dt>noUpdateTags</dt>
+     *     <dd>The client may not update tags in the owner's account.
+     *     </dd>
+     * <dt>noExpungeTags</dt>
+     *     <dd>The client may not expunge tags in the owner's account.
+     *     </dd>
+     * <dt>noSetParentTag</dt>
+     *     <dd>If the client is able to create or update tags in the owner's account,
+     *     then they will not be able to set the parent tag.    Leave the value unset.
+     *     </dd>
+     * <dt>noCreateSharedNotebooks</dt>
+     *     <dd>The client is unable to create shared notebooks for the notebook.
+     *     </dd>
+     * <dt>updateWhichSharedNotebookRestrictions</dt>
+     *     <dd>Restrictions on which shared notebook instances can be updated.    If the
+     *     value is not set or null, then the client can update any of the shared notebooks
+     *     associated with the notebook on which the NotebookRestrictions are defined.
+     *     See the enumeration for further details.
+     *     </dd>
+     * <dt>expungeWhichSharedNotebookRestrictions</dt>
+     *     <dd>Restrictions on which shared notebook instances can be expunged.    If the
+     *     value is not set or null, then the client can expunge any of the shared notebooks
+     *     associated with the notebook on which the NotebookRestrictions are defined.
+     *     See the enumeration for further details.
+     *     </dd>
+     */
+    class NotebookRestrictions {
+        noReadNotes: boolean;
+        noCreateNotes: boolean;
+        noUpdateNotes: boolean;
+        noExpungeNotes: boolean;
+        noShareNotes: boolean;
+        noEmailNotes: boolean;
+        noSendMessageToRecipients: boolean;
+        noUpdateNotebook: boolean;
+        noExpungeNotebook: boolean;
+        noSetDefaultNotebook: boolean;
+        noSetNotebookStack: boolean;
+        noPublishToPublic: boolean;
+        noPublishToBusinessLibrary: boolean;
+        noCreateTags: boolean;
+        noUpdateTags: boolean;
+        noExpungeTags: boolean;
+        noSetParentTag: boolean;
+        noCreateSharedNotebooks: boolean;
+        updateWhichSharedNotebookRestrictions: SharedNotebookInstanceRestrictions;
+        expungeWhichSharedNotebookRestrictions: SharedNotebookInstanceRestrictions;
+
+        constructor(args?: { noReadNotes?: boolean; noCreateNotes?: boolean; noUpdateNotes?: boolean; noExpungeNotes?: boolean; noShareNotes?: boolean; noEmailNotes?: boolean; noSendMessageToRecipients?: boolean; noUpdateNotebook?: boolean; noExpungeNotebook?: boolean; noSetDefaultNotebook?: boolean; noSetNotebookStack?: boolean; noPublishToPublic?: boolean; noPublishToBusinessLibrary?: boolean; noCreateTags?: boolean; noUpdateTags?: boolean; noExpungeTags?: boolean; noSetParentTag?: boolean; noCreateSharedNotebooks?: boolean; updateWhichSharedNotebookRestrictions?: SharedNotebookInstanceRestrictions; expungeWhichSharedNotebookRestrictions?: SharedNotebookInstanceRestrictions; });
+    }
+
+    /**
+     * A unique container for a set of notes.
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this notebook.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>name</dt>
+     *     <dd>A sequence of characters representing the name of the
+     *     notebook.    May be changed by clients, but the account may not contain two
+     *     notebooks with names that are equal via a case-insensitive comparison.
+     *     Can't begin or end with a space.
+     *     <br/>
+     *     Length:    EDAM_NOTEBOOK_NAME_LEN_MIN - EDAM_NOTEBOOK_NAME_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_NOTEBOOK_NAME_REGEX
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this object.    The USN values are sequential within an
+     *     account, and can be used to compare the order of modifications within the
+     *     service.
+     *     </dd>
+     *
+     * <dt>defaultNotebook</dt>
+     *     <dd>If true, this notebook should be used for new notes
+     *     whenever the user has not (or cannot) specify a desired target notebook.
+     *     For example, if a note is submitted via SMTP email.
+     *     The service will maintain at most one defaultNotebook per account.
+     *     If a second notebook is created or updated with defaultNotebook set to
+     *     true, the service will automatically update the prior notebook's
+     *     defaultNotebook field to false.    If the default notebook is deleted
+     *     (i.e. "active" set to false), the "defaultNotebook" field will be
+     *     set to false by the service.    If the account has no default notebook
+     *     set, the service will use the most recent notebook as the default.
+     *     </dd>
+     *
+     * <dt>serviceCreated</dt>
+     *     <dd>The time when this notebook was created on the
+     *     service. This will be set on the service during creation, and the service
+     *     will provide this value when it returns a Notebook to a client.
+     *     The service will ignore this value if it is sent by clients.
+     *     </dd>
+     *
+     * <dt>serviceUpdated</dt>
+     *     <dd>The time when this notebook was last modified on the
+     *     service.    This will be set on the service during creation, and the service
+     *     will provide this value when it returns a Notebook to a client.
+     *     The service will ignore this value if it is sent by clients.
+     *     </dd>
+     *
+     * <dt>publishing</dt>
+     *     <dd>If the Notebook has been opened for public access, or
+     *     business users shared with their business (i.e. if 'published' is
+     *     set to true), then this will point to the set of publishing
+     *     information for the Notebook (URI, description, etc.).    A
+     *     Notebook cannot be published without providing this information,
+     *     but it will persist for later use if publishing is ever disabled
+     *     on the Notebook.    Clients that do not wish to change the
+     *     publishing behavior of a Notebook should not set this value when
+     *     calling NoteStore.updateNotebook().
+     *     </dd>
+     *
+     * <dt>published</dt>
+     *     <dd>If this is set to true, then the Notebook will be
+     *     accessible either to the public, or for business users to their business,
+     *     via the 'publishing' specification, which must also be set.    If this is set
+     *     to false, the Notebook will not be available to the public (or business).
+     *     Clients that do not wish to change the publishing behavior of a Notebook
+     *     should not set this value when calling NoteStore.updateNotebook().
+     *     </dd>
+     *
+     * <dt>stack</dt>
+     *     <dd>If this is set, then the notebook is visually contained within a stack
+     *     of notebooks with this name.    All notebooks in the same account with the
+     *     same 'stack' field are considered to be in the same stack.
+     *     Notebooks with no stack set are "top level" and not contained within a
+     *     stack.
+     *     </dd>
+     *
+     * <dt>sharedNotebookIds</dt>
+     *     <dd><i>DEPRECATED</i> - replaced by sharedNotebooks.</dd>
+     *
+     * <dt>sharedNotebooks</dt>
+     *     <dd>The list of recipients to whom this notebook has been shared
+     *     (one SharedNotebook object per recipient email address). This field will
+     *     be unset if you do not have permission to access this data. If you are
+     *     accessing the notebook as the owner or via a shared notebook that is
+     *     modifiable, then you have access to this data and the value will be set.
+     *     This field is read-only. Clients may not make changes to shared notebooks
+     *     via this field.
+     *     </dd>
+     *
+     * <dt>businessNotebook</dt>
+     *     <dd>If the notebook is part of a business account and has been published to the
+     *     business library, this will contain information for the library listing.
+     *     The presence or absence of this field is not a reliable test of whether a given
+     *     notebook is in fact a business notebook - the field is only used when a notebook is or
+     *     has been published to the business library.
+     *     </dd>
+     *
+     * <dt>contact</dt>
+     *     <dd>Intended for use with Business accounts, this field identifies the user who
+     *     has been designated as the "contact".    For notebooks created in business
+     *     accounts, the server will automatically set this value to the user who created
+     *     the notebook unless Notebook.contact.username has been set, in which that value
+     *     will be used.    When updating a notebook, it is common to leave Notebook.contact
+     *     field unset, indicating that no change to the value is being requested and that
+     *     the existing value, if any, should be preserved.
+     *     </dd>
+     *
+     * </dl>
+     */
+    class Notebook {
+        guid: string;
+        name: string;
+        updateSequenceNum: number;
+        defaultNotebook: boolean;
+        serviceCreated: number;
+        serviceUpdated: number;
+        publishing: Publishing;
+        published: boolean;
+        stack: string;
+        sharedNotebookIds: number[];
+        sharedNotebooks: SharedNotebook[];
+        businessNotebook: BusinessNotebook;
+        contact: User;
+        restrictions: NotebookRestrictions;
+
+        constructor(args?: { guid?: string; name?: string; updateSequenceNum?: number; defaultNotebook?: boolean; serviceCreated?: number; serviceUpdated?: number; publishing?: Publishing; published?: boolean; stack?: string; sharedNotebookIds?: number[]; sharedNotebooks?: SharedNotebook[]; businessNotebook?: BusinessNotebook; contact?: User; restrictions?: NotebookRestrictions; });
+    }
+
+    /**
+     * A link in an users account that refers them to a public or individual share in
+     * another user's account.
+     *
+     * <dl>
+     * <dt>shareName</dt>
+     * <dd>the display name of the shared notebook.
+     *     The link owner can change this.</dd>
+     *
+     * <dt>username</dt>
+     * <dd>the username of the user who owns the shared or public notebook</dd>
+     *
+     * <dt>shardId</dt>
+     * <dd>the shard ID of the notebook if the notebook is not public</dt>
+     *
+     * <dt>shareKey</dt>
+     * <dd>the secret key that provides access to the shared notebook</dd>
+     *
+     * <dt>uri</dt>
+     * <dd>the identifier of the public notebook</dd>
+     *
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of this linked notebook.    Will be set whenever
+     *     a linked notebook is retrieved from the service, but may be null when a client
+     *     is creating a linked notebook.
+     *     <br/>
+     *     Length:    EDAM_GUID_LEN_MIN - EDAM_GUID_LEN_MAX
+     *     <br/>
+     *     Regex:    EDAM_GUID_REGEX
+     *     </dd>
+     *
+     * <dt>updateSequenceNum</dt>
+     *     <dd>A number identifying the last transaction to
+     *     modify the state of this object.    The USN values are sequential within an
+     *     account, and can be used to compare the order of modifications within the
+     *     service.
+     *     </dd>
+     *
+     * <dt>noteStoreUrl</dt>
+     *     <dd>
+     *     This field will contain the full URL that clients should use to make
+     *     NoteStore requests to the server shard that contains that notebook's data.
+     *     I.e. this is the URL that should be used to create the Thrift HTTP client
+     *     transport to send messages to the NoteStore service for the account.
+     *     </dd>
+     *
+     * <dt>webApiUrlPrefix:</dt>
+     *     <dd>
+     *     This field will contain the initial part of the URLs that should be used
+     *     to make requests to Evernote's thin client "web API", which provide
+     *     optimized operations for clients that aren't capable of manipulating
+     *     the full contents of accounts via the full Thrift data model. Clients
+     *     should concatenate the relative path for the various servlets onto the
+     *     end of this string to construct the full URL, as documented on our
+     *     developer web site.
+     *     </dd>
+     *
+     * <dt>stack</dt>
+     *     <dd>If this is set, then the notebook is visually contained within a stack
+     *     of notebooks with this name.    All notebooks in the same account with the
+     *     same 'stack' field are considered to be in the same stack.
+     *     Notebooks with no stack set are "top level" and not contained within a
+     *     stack.    The link owner can change this and this field is for the benefit
+     *     of the link owner.
+     *     </dd>
+     *
+     * <dt>businessId</dt>
+     *     <dd>If set, this will be the unique identifier for the business that owns
+     *     the notebook to which the linked notebook refers.
+     *
+     * </dl>
+     */
+    class LinkedNotebook {
+        shareName: string;
+        username: string;
+        shardId: string;
+        shareKey: string;
+        uri: string;
+        guid: string;
+        updateSequenceNum: number;
+        noteStoreUrl: string;
+        webApiUrlPrefix: string;
+        stack: string;
+        businessId: number;
+
+        constructor(args?: { shareName?: string; username?: string; shardId?: string; shareKey?: string; uri?: string; guid?: string; updateSequenceNum?: number; noteStoreUrl?: string; webApiUrlPrefix?: string; stack?: string; businessId?: number; });
+    }
+
+    /**
+     * A structure that describes a notebook or a user's relationship with
+     * a notebook. NotebookDescriptor is expected to remain a lighter-weight
+     * structure when compared to Notebook.
+     * <dl>
+     * <dt>guid</dt>
+     *     <dd>The unique identifier of the notebook.
+     *     </dd>
+     *
+     * <dt>notebookDisplayName</dt>
+     *     <dd>A sequence of characters representing the name of the
+     *     notebook.
+     *     </dd>
+     *
+     * <dt>contactName</dt>
+     *     <dd>The User.name value of the notebook's "contact".
+     *     </dd>
+     *
+     * <dt>hasSharedNotebook</dt>
+     *     <dd>Whether a SharedNotebook record exists between the calling user and this
+     *     notebook.
+     *     </dd>
+     *
+     * <dt>joinedUserCount</dt>
+     *     <dd>The number of users who have joined this notebook.
+     *     </dd>
+     *
+     * </dl>
+     */
+    class NotebookDescriptor {
+        guid: string;
+        notebookDisplayName: string;
+        contactName: string;
+        hasSharedNotebook: boolean;
+        joinedUserCount: number;
+
+        constructor(args?: { guid?: string; notebookDisplayName?: string; contactName?: string; hasSharedNotebook?: boolean; joinedUserCount?: number; });
+    }
+
+    /**
+     * A value for the "recipe" key in the "classifications" map in NoteAttributes
+     * that indicates the user has classified a note as being a non-recipe.
+     */
+    var CLASSIFICATION_RECIPE_USER_NON_RECIPE: string;
+
+    /**
+     * A value for the "recipe" key in the "classifications" map in NoteAttributes
+     * that indicates the user has classified a note as being a recipe.
+     */
+    var CLASSIFICATION_RECIPE_USER_RECIPE: string;
+
+    /**
+     * A value for the "recipe" key in the "classifications" map in NoteAttributes
+     * that indicates the Evernote service has classified a note as being a recipe.
+     */
+    var CLASSIFICATION_RECIPE_SERVICE_RECIPE: string;
+
+    /**
+     * Standardized value for the 'source' NoteAttribute for notes that
+     * were clipped from the web in some manner.
+     */
+    var EDAM_NOTE_SOURCE_WEB_CLIP: string;
+
+    /**
+     * Standardized value for the 'source' NoteAttribute for notes that
+     * were clipped from an email message.
+     */
+    var EDAM_NOTE_SOURCE_MAIL_CLIP: string;
+
+    /**
+     * Standardized value for the 'source' NoteAttribute for notes that
+     * were created via email sent to Evernote's email interface.
+     */
+    var EDAM_NOTE_SOURCE_MAIL_SMTP_GATEWAY: string;
+    /**
+     * Service:    UserStore
+     * <p>
+     * The UserStore service is primarily used by EDAM clients to establish
+     * authentication via username and password over a trusted connection (e.g.
+     * SSL).    A client's first call to this interface should be checkVersion() to
+     * ensure that the client's software is up to date.
+     * </p>
+     * All calls which require an authenticationToken may throw an
+     * EDAMUserException for the following reasons:
+     *    <ul>
+     *     <li> AUTH_EXPIRED "authenticationToken" - token has expired
+     *     <li> BAD_DATA_FORMAT "authenticationToken" - token is malformed
+     *     <li> DATA_REQUIRED "authenticationToken" - token is empty
+     *     <li> INVALID_AUTH "authenticationToken" - token signature is invalid
+     * </ul>
+     */
+    class UserStoreClient {
+        seqid: number;
+
+        /**
+         * This should be the first call made by a client to the EDAM service.    It
+         * tells the service what protocol version is used by the client.    The
+         * service will then return true if the client is capable of talking to
+         * the service, and false if the client's protocol version is incompatible
+         * with the service, so the client must upgrade.    If a client receives a
+         * false value, it should report the incompatibility to the user and not
+         * continue with any more EDAM requests (UserStore or NoteStore).
+         *
+         * @param clientName
+         *     This string provides some information about the client for
+         *     tracking/logging on the service.    It should provide information about
+         *     the client's software and platform. The structure should be:
+         *     application/version; platform/version; [ device/version ]
+         *     E.g. "Evernote Windows/3.0.1; Windows/XP SP3".
+         *
+         * @param edamVersionMajor
+         *     This should be the major protocol version that was compiled by the
+         *     client.    This should be the current value of the EDAM_VERSION_MAJOR
+         *     constant for the client.
+         *
+         * @param edamVersionMinor
+         *     This should be the major protocol version that was compiled by the
+         *     client.    This should be the current value of the EDAM_VERSION_MINOR
+         *     constant for the client.
+         */
+        checkVersion(clientName: string, edamVersionMajor: number, edamVersionMinor: number, cb: Callback<boolean>): void;
+
+        /**
+         * This provides bootstrap information to the client. Various bootstrap
+         * profiles and settings may be used by the client to configure itself.
+         *
+         * @param locale
+         *     The client's current locale, expressed in language[_country]
+         *     format. E.g., "en_US". See ISO-639 and ISO-3166 for valid
+         *     language and country codes.
+         *
+         * @return
+         *     The bootstrap information suitable for this client.
+         */
+        getBootstrapInfo(locale: string, cb: Callback<BootstrapInfo>): void;
+
+        /**
+         * Revoke an existing long lived authentication token. This can be used to
+         * revoke OAuth tokens or tokens created by calling authenticateLongSession,
+         * and allows a user to effectively log out of Evernote from the perspective
+         * of the application that holds the token. The authentication token that is
+         * passed is immediately revoked and may not be used to call any authenticated
+         * EDAM function.
+         *
+         * @param authenticationToken the authentication token to revoke.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_REQUIRED "authenticationToken" - no authentication token provided
+         *     <li> BAD_DATA_FORMAT "authenticationToken" - the authentication token is not well formed
+         *     <li> INVALID_AUTH "authenticationToken" - the authentication token is invalid
+         *     <li> AUTH_EXPIRED "authenticationToken" - the authentication token is expired or
+         *         is already revoked.
+         * </ul>
+         */
+        revokeLongSession(cb: Callback<void>): void;
+
+        /**
+         * This is used to take an existing authentication token that grants access
+         * to an individual user account (returned from 'authenticate',
+         * 'authenticateLongSession' or an OAuth authorization) and obtain an additional
+         * authentication token that may be used to access business notebooks if the user
+         * is a member of an Evernote Business account.
+         *
+         * The resulting authentication token may be used to make NoteStore API calls
+         * against the business using the NoteStore URL returned in the result.
+         *
+         * @param authenticationToken
+         *     The authentication token for the user. This may not be a shared authentication
+         *     token (returned by NoteStore.authenticateToSharedNotebook or
+         *     NoteStore.authenticateToSharedNote) or a business authentication token.
+         *
+         * @return
+         *     The result of the authentication, with the token granting access to the
+         *     business in the result's 'authenticationToken' field. The URL that must
+         *     be used to access the business account NoteStore will be returned in the
+         *     result's 'noteStoreUrl' field.    The 'User' field will
+         *     not be set in the result.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> PERMISSION_DENIED "authenticationToken" - the provided authentication token
+         *                is a shared or business authentication token. </li>
+         *     <li> PERMISSION_DENIED "Business" - the user identified by the provided
+         *                authentication token is not currently a member of a business. </li>
+         *     <li> PERMISSION_DENIED "Business.status" - the business that the user is a
+         *                member of is not currently in an active status. </li>
+         * </ul>
+         */
+        authenticateToBusiness(cb: Callback<AuthenticationResult>): void;
+
+        /**
+         * Returns the User corresponding to the provided authentication token,
+         * or throws an exception if this token is not valid.
+         * The level of detail provided in the returned User structure depends on
+         * the access level granted by the token, so a web service client may receive
+         * fewer fields than an integrated desktop client.
+         */
+        getUser(cb: Callback<User>): void;
+
+        /**
+         * Asks the UserStore about the publicly available location information for
+         * a particular username.
+         *
+         * @throws EDAMUserException <ul>
+         *     <li> DATA_REQUIRED "username" - username is empty
+         * </ul>
+         */
+        getPublicUserInfo(username: string, cb: Callback<PublicUserInfo>): void;
+
+
+        /**
+         * Returns the URL that should be used to talk to the NoteStore for the
+         * account represented by the provided authenticationToken.
+         * This method isn't needed by most clients, who can retrieve the correct
+         * NoteStore URL from the AuthenticationResult returned from the authenticate
+         * or refreshAuthentication calls. This method is typically only needed
+         * to look up the correct URL for a long-lived session token (e.g. for an
+         * OAuth web service).
+         */
+        getNoteStoreUrl(cb: Callback<string>): void;
+    }
+    /**
+     *    This structure is used to provide publicly-available user information
+     *    about a particular account.
+     * <dl>
+     *    <dt>userId:</dt>
+     *        <dd>
+     *        The unique numeric user identifier for the user account.
+     *        </dd>
+     *    <dt>shardId:</dt>
+     *        <dd>
+     *        DEPRECATED - Client applications should have no need to use this field.
+     *        </dd>
+     *    <dt>privilege:</dt>
+     *        <dd>
+     *        The privilege level of the account, to determine whether
+     *        this is a Premium or Free account.
+     *        </dd>
+     *    <dt>noteStoreUrl:</dt>
+     *        <dd>
+     *        This field will contain the full URL that clients should use to make
+     *        NoteStore requests to the server shard that contains that user's data.
+     *        I.e. this is the URL that should be used to create the Thrift HTTP client
+     *        transport to send messages to the NoteStore service for the account.
+     *        </dd>
+     *    <dt>webApiUrlPrefix:</dt>
+     *        <dd>
+     *        This field will contain the initial part of the URLs that should be used
+     *        to make requests to Evernote's thin client "web API", which provide
+     *        optimized operations for clients that aren't capable of manipulating
+     *        the full contents of accounts via the full Thrift data model. Clients
+     *        should concatenate the relative path for the various servlets onto the
+     *        end of this string to construct the full URL, as documented on our
+     *        developer web site.
+     *        </dd>
+     *    </dl>
+     */
+    class PublicUserInfo {
+        userId: number;
+        shardId: string;
+        privilege: PrivilegeLevel;
+        username: string;
+        noteStoreUrl: string;
+        webApiUrlPrefix: string;
+
+        constructor(args?: { userId: number; shardId: string; privilege?: PrivilegeLevel; username?: string; noteStoreUrl?: string; webApiUrlPrefix?: string; });
+    }
+
+    /**
+     *    When an authentication (or re-authentication) is performed, this structure
+     *    provides the result to the client.
+     * <dl>
+     *    <dt>currentTime:</dt>
+     *        <dd>
+     *        The server-side date and time when this result was
+     *        generated.
+     *        </dd>
+     *    <dt>authenticationToken:</dt>
+     *        <dd>
+     *        Holds an opaque, ASCII-encoded token that can be
+     *        used by the client to perform actions on a NoteStore.
+     *        </dd>
+     *    <dt>expiration:</dt>
+     *        <dd>
+     *        Holds the server-side date and time when the
+     *        authentication token will expire.
+     *        This time can be compared to "currentTime" to produce an expiration
+     *        time that can be reconciled with the client's local clock.
+     *        </dd>
+     *    <dt>user:</dt>
+     *        <dd>
+     *        Holds the information about the account which was
+     *        authenticated if this was a full authentication.    May be absent if this
+     *        particular authentication did not require user information.
+     *        </dd>
+     *    <dt>publicUserInfo:</dt>
+     *        <dd>
+     *        If this authentication result was achieved without full permissions to
+     *        access the full User structure, this field may be set to give back
+     *        a more limited public set of data.
+     *        </dd>
+     *    <dt>noteStoreUrl:</dt>
+     *        <dd>
+     *        This field will contain the full URL that clients should use to make
+     *        NoteStore requests to the server shard that contains that user's data.
+     *        I.e. this is the URL that should be used to create the Thrift HTTP client
+     *        transport to send messages to the NoteStore service for the account.
+     *        </dd>
+     *    <dt>webApiUrlPrefix:</dt>
+     *        <dd>
+     *        This field will contain the initial part of the URLs that should be used
+     *        to make requests to Evernote's thin client "web API", which provide
+     *        optimized operations for clients that aren't capable of manipulating
+     *        the full contents of accounts via the full Thrift data model. Clients
+     *        should concatenate the relative path for the various servlets onto the
+     *        end of this string to construct the full URL, as documented on our
+     *        developer web site.
+     *        </dd>
+     *    <dt>secondFactorRequired:</dt>
+     *        <dd>
+     *        If set to true, this field indicates that the user has enabled two-factor
+     *        authentication and must enter their second factor in order to complete
+     *        authentication. In this case the value of authenticationResult will be
+     *        a short-lived authentication token that may only be used to make a
+     *        subsequent call to completeTwoFactorAuthentication.
+     *        </dd>
+     *    <dt>secondFactorDeliveryHint:</dt>
+     *        <dd>
+     *        When secondFactorRequired is set to true, this field may contain a string
+     *        describing the second factor delivery method that the user has configured.
+     *        This will typically be an obfuscated mobile device number, such as
+     *        "(xxx) xxx-x095". This string can be displayed to the user to remind them
+     *        how to obtain the required second factor.
+     *        TODO do we need to differentiate between SMS and voice delivery?
+     *        </dd>
+     *    </dl>
+     */
+    class AuthenticationResult {
+        currentTime: number;
+        authenticationToken: string;
+        expiration: number;
+        user: User;
+        publicUserInfo: PublicUserInfo;
+        noteStoreUrl: string;
+        webApiUrlPrefix: string;
+        secondFactorRequired: boolean;
+        secondFactorDeliveryHint: string;
+
+        constructor(args?: { currentTime: number; authenticationToken: string; expiration: number; user?: User; publicUserInfo?: PublicUserInfo; noteStoreUrl?: string; webApiUrlPrefix?: string; secondFactorRequired?: boolean; secondFactorDeliveryHint?: string; });
+    }
+
+    /**
+     *    This structure describes a collection of bootstrap settings.
+     * <dl>
+     *    <dt>serviceHost:</dt>
+     *        <dd>
+     *        The hostname and optional port for composing Evernote web service URLs.
+     *        This URL can be used to access the UserStore and related services,
+     *        but must not be used to compose the NoteStore URL. Client applications
+     *        must handle serviceHost values that include only the hostname
+     *        (e.g. www.evernote.com) or both the hostname and port (e.g. www.evernote.com:8080).
+     *        If no port is specified, or if port 443 is specified, client applications must
+     *        use the scheme "https" when composing URLs. Otherwise, a client must use the
+     *        scheme "http".
+     *    </dd>
+     *    <dt>marketingUrl:</dt>
+     *        <dd>
+     *        The URL stem for the Evernote corporate marketing website, e.g. http://www.evernote.com.
+     *        This stem can be used to compose website URLs. For example, the URL of the Evernote
+     *        Trunk is composed by appending "/about/trunk/" to the value of marketingUrl.
+     *        </dd>
+     *    <dt>supportUrl:</dt>
+     *        <dd>
+     *        The full URL for the Evernote customer support website, e.g. https://support.evernote.com.
+     *        </dd>
+     *    <dt>accountEmailDomain:</dt>
+     *        <dd>
+     *        The domain used for an Evernote user's incoming email address, which allows notes to
+     *        be emailed into an account. E.g. m.evernote.com.
+     *        </dd>
+     *    <dt>enableFacebookSharing:</dt>
+     *        <dd>
+     *        Whether the client application should enable sharing of notes on Facebook.
+     *        </dd>
+     *    <dt>enableGiftSubscriptions:</dt>
+     *        <dd>
+     *        Whether the client application should enable gift subscriptions.
+     *        </dd>
+     *    <dt>enableSupportTickets:</dt>
+     *        <dd>
+     *        Whether the client application should enable in-client creation of support tickets.
+     *        </dd>
+     *    <dt>enableSharedNotebooks:</dt>
+     *        <dd>
+     *        Whether the client application should enable shared notebooks.
+     *        </dd>
+     *    <dt>enableSingleNoteSharing:</dt>
+     *        <dd>
+     *        Whether the client application should enable single note sharing.
+     *        </dd>
+     *    <dt>enableSponsoredAccounts:</dt>
+     *        <dd>
+     *        Whether the client application should enable sponsored accounts.
+     *        </dd>
+     *    <dt>enableTwitterSharing:</dt>
+     *        <dd>
+     *        Whether the client application should enable sharing of notes on Twitter.
+     *        </dd>
+     *    </dl>
+     */
+    class BootstrapSettings {
+        serviceHost: string;
+        marketingUrl: string;
+        supportUrl: string;
+        accountEmailDomain: string;
+        enableFacebookSharing: boolean;
+        enableGiftSubscriptions: boolean;
+        enableSupportTickets: boolean;
+        enableSharedNotebooks: boolean;
+        enableSingleNoteSharing: boolean;
+        enableSponsoredAccounts: boolean;
+        enableTwitterSharing: boolean;
+        enableLinkedInSharing: boolean;
+        enablePublicNotebooks: boolean;
+
+        constructor(args?: { serviceHost: string; marketingUrl: string; supportUrl: string; accountEmailDomain: string; enableFacebookSharing?: boolean; enableGiftSubscriptions?: boolean; enableSupportTickets?: boolean; enableSharedNotebooks?: boolean; enableSingleNoteSharing?: boolean; enableSponsoredAccounts?: boolean; enableTwitterSharing?: boolean; enableLinkedInSharing?: boolean; enablePublicNotebooks?: boolean; });
+    }
+
+    /**
+     *    This structure describes a collection of bootstrap settings.
+     * <dl>
+     *    <dt>name:</dt>
+     *        <dd>
+     *        The unique name of the profile, which is guaranteed to remain consistent across
+     *        calls to getBootstrapInfo.
+     *        </dd>
+     *    <dt>settings:</dt>
+     *        <dd>
+     *        The settings for this profile.
+     *        </dd>
+     *    </dl>
+     */
+    class BootstrapProfile {
+        name: string;
+        settings: BootstrapSettings;
+
+        constructor(args?: { name: string; settings: BootstrapSettings; });
+    }
+
+    /**
+     *    This structure describes a collection of bootstrap profiles.
+     * <dl>
+     *    <dt>profiles:</dt>
+     *        <dd>
+     *        List of one or more bootstrap profiles, in descending
+     *        preference order.
+     *        </dd>
+     *    </dl>
+     */
+    class BootstrapInfo {
+        profiles: BootstrapProfile[];
+
+        constructor(args?: { profiles: BootstrapProfile[]; });
+    }
+
+    /**
+     * The major version number for the current revision of the EDAM protocol.
+     * Clients pass this to the service using UserStore.checkVersion at the
+     * beginning of a session to confirm that they are not out of date.
+     */
+    var EDAM_VERSION_MAJOR: number;
+
+    /**
+     * The minor version number for the current revision of the EDAM protocol.
+     * Clients pass this to the service using UserStore.checkVersion at the
+     * beginning of a session to confirm that they are not out of date.
+     */
+    var EDAM_VERSION_MINOR: number;
+
 }
diff --git a/exit/exit.d.ts b/exit/exit.d.ts
index 76443a382c..bab76c5513 100644
--- a/exit/exit.d.ts
+++ b/exit/exit.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'exit' {
-	function exit(code: number): void;
-	export = exit;
-}
+
+declare function exit(code: number): void;
+export = exit;
diff --git a/expect/expect.d.ts b/expect/expect.d.ts
index 038ae5111a..3bb623566a 100644
--- a/expect/expect.d.ts
+++ b/expect/expect.d.ts
@@ -3,69 +3,68 @@
 // Definitions by: Justin Reidy <https://github.com/jmreidy/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "expect" {
-    export class Expectation {
-      constructor(actual:any);
-      toExist(message?:string):Expectation;
-      toBeTruthy(message?:string):Expectation;
-      toNotExist(message?:string):Expectation;
-      toBeFalsy(message?:string):Expectation;
-      toBe(value:any, message?:string):Expectation;
-      toNotBe(value:any, message?:string):Expectation;
-      toEqual(value:any, message?:string):Expectation;
-      toNotEqual(value:any, message?:string):Expectation;
-      toThrow(value?:any, message?:string):Expectation;
-      toNotThrow(value?:any, message?:string):Expectation;
-      toBeA(value:any, message?:string):Expectation;
-      toBeAn(value:any, message?:string):Expectation;
-      toNotBeA(value:any, message?:string):Expectation;
-      toNotBeAn(value:any, message?:string):Expectation;
-      toMatch(value:any, message?:string):Expectation;
-      toNotMatch(value:any, message?:string):Expectation;
-      toBeLessThan(value:any, message?:string):Expectation;
-      toBeFewerThan(value:any, message?:string):Expectation;
-      toBeGreaterThan(value:any, message?:string):Expectation;
-      toBeMoreThan(value:any, message?:string):Expectation;
-      toInclude(value:any, compareValues?:any, message?:string):Expectation;
-      toContain(value:any, compareValues?:any, message?:string):Expectation;
-      toExclude(value:any, compareValues?:any, message?:string):Expectation;
-      toNotContain(value:any, compareValues?:any, message?:string):Expectation;
-      toHaveBeenCalled(message?:string):Expectation;
-      toHaveBeenCalledWith(...args:Array<any>):Expectation;
-      toNotHaveBeenCalled(message?:string):Expectation;
-      withContext(context:any):Expectation;
-      withArgs(...args:Array<any>):Expectation;
-    }
 
-    export interface Extension {
-      [name:string]:(args?:Array<any>) => void;
-    }
-
-    export interface Call {
-      context: Spy;
-      arguments: Array<any>;
-    }
-
-    export interface Spy {
-      __isSpy:Boolean;
-      calls:Array<Call>;
-      andCall(fn:Function):Spy;
-      andCallThrough():Spy;
-      andThrow(object:Object):Spy;
-      andReturn(value:any):Spy;
-      getLastCall():Call;
-      restore():void;
-      destroy():void;
-    }
-
-    function expect(actual:any):Expectation;
-
-    export function createSpy(fn?:Function, restore?:Function):Spy;
-    export function spyOn(object:Object, methodName:string):Spy;
-    export function isSpy(object:any):Boolean;
-    export function restoreSpies():void;
-    export function assert(condition:any, messageFormat:string, ...extraArgs:Array<any>):void;
-    export function extend(extension:Extension):void;
-
-    export default expect;
+declare export class Expectation {
+    constructor(actual: any);
+    toExist(message?: string): Expectation;
+    toBeTruthy(message?: string): Expectation;
+    toNotExist(message?: string): Expectation;
+    toBeFalsy(message?: string): Expectation;
+    toBe(value: any, message?: string): Expectation;
+    toNotBe(value: any, message?: string): Expectation;
+    toEqual(value: any, message?: string): Expectation;
+    toNotEqual(value: any, message?: string): Expectation;
+    toThrow(value?: any, message?: string): Expectation;
+    toNotThrow(value?: any, message?: string): Expectation;
+    toBeA(value: any, message?: string): Expectation;
+    toBeAn(value: any, message?: string): Expectation;
+    toNotBeA(value: any, message?: string): Expectation;
+    toNotBeAn(value: any, message?: string): Expectation;
+    toMatch(value: any, message?: string): Expectation;
+    toNotMatch(value: any, message?: string): Expectation;
+    toBeLessThan(value: any, message?: string): Expectation;
+    toBeFewerThan(value: any, message?: string): Expectation;
+    toBeGreaterThan(value: any, message?: string): Expectation;
+    toBeMoreThan(value: any, message?: string): Expectation;
+    toInclude(value: any, compareValues?: any, message?: string): Expectation;
+    toContain(value: any, compareValues?: any, message?: string): Expectation;
+    toExclude(value: any, compareValues?: any, message?: string): Expectation;
+    toNotContain(value: any, compareValues?: any, message?: string): Expectation;
+    toHaveBeenCalled(message?: string): Expectation;
+    toHaveBeenCalledWith(...args: Array<any>): Expectation;
+    toNotHaveBeenCalled(message?: string): Expectation;
+    withContext(context: any): Expectation;
+    withArgs(...args: Array<any>): Expectation;
 }
+
+export interface Extension {
+    [name: string]: (args?: Array<any>) => void;
+}
+
+export interface Call {
+    context: Spy;
+    arguments: Array<any>;
+}
+
+export interface Spy {
+    __isSpy: Boolean;
+    calls: Array<Call>;
+    andCall(fn: Function): Spy;
+    andCallThrough(): Spy;
+    andThrow(object: Object): Spy;
+    andReturn(value: any): Spy;
+    getLastCall(): Call;
+    restore(): void;
+    destroy(): void;
+}
+
+declare function expect(actual: any): Expectation;
+
+declare export function createSpy(fn?: Function, restore?: Function): Spy;
+declare export function spyOn(object: Object, methodName: string): Spy;
+declare export function isSpy(object: any): Boolean;
+declare export function restoreSpies(): void;
+declare export function assert(condition: any, messageFormat: string, ...extraArgs: Array<any>): void;
+declare export function extend(extension: Extension): void;
+
+export default expect;
diff --git a/express-brute-memcached/express-brute-memcached.d.ts b/express-brute-memcached/express-brute-memcached.d.ts
index 6fcee383fa..57a9fdb54e 100644
--- a/express-brute-memcached/express-brute-memcached.d.ts
+++ b/express-brute-memcached/express-brute-memcached.d.ts
@@ -5,110 +5,109 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-brute-memcached" {
-    /**
-     * @summary Memcached options.
-     * @interface
-     */
-    interface MemcachedStoreOptions {
-         prefix: string;
 
-         /**
-          * @summary Maximum key size allowed.
-          * @type {number}
-          */
-         maxKeySize: number;
-
-         /**
-          * @summary Maximum expiration time of keys (in seconds).
-          * @type {number}
-          */
-         maxExpiration: number;
-
-         /**
-          * @summary Maximum size of a value.
-          * @type {number}
-          */
-         maxValue: number;
-
-         /**
-          * @summary Maximum size of the connection pool.
-          * @type {number}
-          */
-         poolSize: number;
-
-         /**
-          * @summary Hashing algorithm used to generate the  hashRing  values
-          * @type {string}
-          */
-         algorithm: string;
-
-         /**
-          * @summary Time between reconnection attempts (in milliseconds).
-          * @type {number}
-          */
-         reconnect: number;
-
-         /**
-          * @summary Time after which Memcached sends a connection timeout (in milliseconds).
-          * @type {number}
-          */
-         timeout: number;
-
-         /**
-          * @summary Number of socket allocation retries per request.
-          * @type {number}
-          */
-         retries: number;
-
-         /**
-          * @summary Number of failed-attempts to a server before it is regarded as 'dead'.
-          * @type {number}
-          */
-         failures: number;
-
-         /**
-          * @summary Time between a server failure and an attempt to set it up back in service.
-          * @type {number}
-          */
-         retry: number;
-
-         /**
-          * @summary If true, authorizes the automatic removal of dead servers from the pool.
-          * @type {boolean}
-          */
-         remove: boolean;
-
-         /**
-          * @summary An array of  server_locations  to replace servers that fail and that are removed from the consistent hashing scheme.
-          * @type {Array}
-          */
-         failOverServers: Array<any>;
-
-         /**
-          * @summary True, whether to use  md5  as hashing scheme when keys exceed  maxKeySize .
-          * @type
-          */
-         keyCompression: boolean;
-
-         /**
-          * @summary Idle timeout for the connections.
-          * @type {number}
-          */
-         idle: number;
-    }
+/**
+ * @summary Memcached options.
+ * @interface
+ */
+interface MemcachedStoreOptions {
+    prefix: string;
 
     /**
-     * @summary A memcached store adapter.
-     * @class
+     * @summary Maximum key size allowed.
+     * @type {number}
      */
-    export default class MemcachedStore {
-        /**
-         * @summary Constructor.
-         * @constructor
-         * @param {string|Array}    hosts   The collection.
-         * @param {Object}          options The otpions.
-         */
-        constructor(hosts: string|Array<string>, options?: MemcachedStoreOptions);
-    }
+    maxKeySize: number;
+
+    /**
+     * @summary Maximum expiration time of keys (in seconds).
+     * @type {number}
+     */
+    maxExpiration: number;
+
+    /**
+     * @summary Maximum size of a value.
+     * @type {number}
+     */
+    maxValue: number;
+
+    /**
+     * @summary Maximum size of the connection pool.
+     * @type {number}
+     */
+    poolSize: number;
+
+    /**
+     * @summary Hashing algorithm used to generate the  hashRing  values
+     * @type {string}
+     */
+    algorithm: string;
+
+    /**
+     * @summary Time between reconnection attempts (in milliseconds).
+     * @type {number}
+     */
+    reconnect: number;
+
+    /**
+     * @summary Time after which Memcached sends a connection timeout (in milliseconds).
+     * @type {number}
+     */
+    timeout: number;
+
+    /**
+     * @summary Number of socket allocation retries per request.
+     * @type {number}
+     */
+    retries: number;
+
+    /**
+     * @summary Number of failed-attempts to a server before it is regarded as 'dead'.
+     * @type {number}
+     */
+    failures: number;
+
+    /**
+     * @summary Time between a server failure and an attempt to set it up back in service.
+     * @type {number}
+     */
+    retry: number;
+
+    /**
+     * @summary If true, authorizes the automatic removal of dead servers from the pool.
+     * @type {boolean}
+     */
+    remove: boolean;
+
+    /**
+     * @summary An array of  server_locations  to replace servers that fail and that are removed from the consistent hashing scheme.
+     * @type {Array}
+     */
+    failOverServers: Array<any>;
+
+    /**
+     * @summary True, whether to use  md5  as hashing scheme when keys exceed  maxKeySize .
+     * @type
+     */
+    keyCompression: boolean;
+
+    /**
+     * @summary Idle timeout for the connections.
+     * @type {number}
+     */
+    idle: number;
+}
+
+/**
+ * @summary A memcached store adapter.
+ * @class
+ */
+declare export default class MemcachedStore {
+    /**
+     * @summary Constructor.
+     * @constructor
+     * @param {string|Array}    hosts   The collection.
+     * @param {Object}          options The otpions.
+     */
+    constructor(hosts: string | Array<string>, options?: MemcachedStoreOptions);
 }
diff --git a/express-brute-mongo/express-brute-mongo.d.ts b/express-brute-mongo/express-brute-mongo.d.ts
index 602a944a31..d898d65537 100644
--- a/express-brute-mongo/express-brute-mongo.d.ts
+++ b/express-brute-mongo/express-brute-mongo.d.ts
@@ -5,18 +5,17 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-brute-mongo" {
+
+/**
+ * @summary MongoDB store adapter.
+ * @class
+ */
+export = class MongoStore {
     /**
-     * @summary MongoDB store adapter.
-     * @class
+     * @summary Constructor.
+     * @constructor
+     * @param {Function} getCollection The collection.
+     * @param {Object}   options       The otpions.
      */
-    export = class MongoStore {
-        /**
-         * @summary Constructor.
-         * @constructor
-         * @param {Function} getCollection The collection.
-         * @param {Object}   options       The otpions.
-         */
-        constructor(getCollection: (collection: any) => void, options?: Object);
-    }
+    constructor(getCollection: (collection: any) => void, options?: Object);
 }
diff --git a/express-brute/express-brute.d.ts b/express-brute/express-brute.d.ts
index 37df68af64..ad7068bee3 100644
--- a/express-brute/express-brute.d.ts
+++ b/express-brute/express-brute.d.ts
@@ -5,66 +5,66 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-brute" {
-    import express = require("express");
+
+import express = require("express");
+
+/**
+ * @summary Options for {@link MemoryStore} class.
+ * @interface
+ */
+interface MemoryStoreOptions {
+    /**
+     * @summary Key prefix.
+     * @type {string}
+     */
+    prefix: string;
+}
+
+/**
+ * @summary Options for {@link ExpressBrute#getMiddleware} class.
+ * @interface
+ */
+interface ExpressBruteMiddleware {
+    /**
+     * @summary Allows you to override the value of failCallback for this middleware.
+     * @type {Function}
+     */
+    failCallback: Function;
 
     /**
-     * @summary Options for {@link MemoryStore} class.
-     * @interface
+     * @summary Disregard IP address when matching requests if set to true. Defaults to false.
+     * @type {boolean}
      */
-    interface MemoryStoreOptions {
-        /**
-         * @summary Key prefix.
-         * @type {string}
-         */
-        prefix: string;
-    }
+    ignoreIP: boolean;
 
     /**
-     * @summary Options for {@link ExpressBrute#getMiddleware} class.
-     * @interface
+     * @summary Key.
+     * @type {any}
      */
-    interface ExpressBruteMiddleware {
-        /**
-         * @summary Allows you to override the value of failCallback for this middleware.
-         * @type {Function}
-         */
-        failCallback: Function;
+    key: any;
+}
 
-        /**
-         * @summary Disregard IP address when matching requests if set to true. Defaults to false.
-         * @type {boolean}
-         */
-        ignoreIP: boolean;
-
-        /**
-         * @summary Key.
-         * @type {any}
-         */
-        key: any;
-    }
-
-    /**
-     * @summary Options for {@link ExpressBrute} class.
-     * @interface
-     */
-    interface ExpressBruteOptions {
-        freeRetries: number;
-        proxyDepth: number;
-        attachResetToRequest: boolean;
-        refreshTimeoutOnRequest: boolean;
-        minWait: number;
-        maxWait: number;
-        lifetime: number;
-        failCallback: (req: express.Request, res: express.Response, next: Function, nextValidRequestDate: any) => void;
-        handleStoreError: any;
+/**
+ * @summary Options for {@link ExpressBrute} class.
+ * @interface
+ */
+interface ExpressBruteOptions {
+    freeRetries: number;
+    proxyDepth: number;
+    attachResetToRequest: boolean;
+    refreshTimeoutOnRequest: boolean;
+    minWait: number;
+    maxWait: number;
+    lifetime: number;
+    failCallback: (req: express.Request, res: express.Response, next: Function, nextValidRequestDate: any) => void;
+    handleStoreError: any;
 }
 
 /**
  * @summary Middleware.
  * @class
  */
-class ExpressBrute {
+declare class ExpressBrute {
     /**
      * @summary Constructor.
      * @constructor
@@ -104,7 +104,7 @@ class ExpressBrute {
     reset(ip: string, key: string, next: Function): express.RequestHandler;
 }
 
-namespace ExpressBrute {
+declare namespace ExpressBrute {
     /**
      * @summary In-memory store.
      * @class
@@ -142,4 +142,3 @@ namespace ExpressBrute {
 }
 
 export = ExpressBrute;
-}
diff --git a/express-debug/express-debug.d.ts b/express-debug/express-debug.d.ts
index f4faf5ee69..e17554ccd0 100644
--- a/express-debug/express-debug.d.ts
+++ b/express-debug/express-debug.d.ts
@@ -12,72 +12,71 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-debug" {
-    import express = require('express');
 
-    interface CustomPanel {
-        name: string;
+import express = require('express');
 
-        template: string;
+interface CustomPanel {
+    name: string;
 
-        process(locals: any): any;
+    template: string;
 
-        standalone?: boolean;
+    process(locals: any): any;
 
-        initialize?(req: express.Request): void;
+    standalone?: boolean;
 
-        finalize?(req: express.Request): void;
+    initialize?(req: express.Request): void;
 
-        pre_render?(req: express.Request): void;
+    finalize?(req: express.Request): void;
 
-        post_render?(req: express.Request): void;
+    pre_render?(req: express.Request): void;
 
-        options?: any;
-    }
+    post_render?(req: express.Request): void;
+
+    options?: any;
+}
+
+/**
+ * Node.js middleware for serving a favicon.
+ */
+declare function debug(app: express.Application, settings?: {
+    /**
+     * How deep to recurse through printed objects. This is the default unless the
+     * print_obj function is passed an options object with a 'depth' property.
+     */
+    depth?: number;
 
     /**
-     * Node.js middleware for serving a favicon.
+     * Absolute path to a css file to include and override EDT's default css.
      */
-    function debug(app: express.Application, settings?: {
-        /**
-         * How deep to recurse through printed objects. This is the default unless the
-         * print_obj function is passed an options object with a 'depth' property.
-         */
-        depth?: number;
+    theme?: string;
 
-        /**
-         * Absolute path to a css file to include and override EDT's default css.
-         */
-        theme?: string;
+    /**
+     * Additional panels to show.
+     */
+    extra_panels?: CustomPanel[];
 
-        /**
-         * Additional panels to show.
-         */
-        extra_panels?: CustomPanel[];
+    /**
+     * Allows changing the default panel.
+     */
+    panels?: string[];
 
-        /**
-         * Allows changing the default panel.
-         */
-        panels?: string[];
+    /**
+     * Path to render standalone express-debug.
+     */
+    path?: string;
 
-        /**
-         * Path to render standalone express-debug.
-         */
-        path?: string;
+    /**
+     * If you need to add arbitrary attributes to the containing element of EDT,
+     * this allows you to.
+     */
+    extra_attrs?: string;
 
-        /**
-         * If you need to add arbitrary attributes to the containing element of EDT,
-         * this allows you to.
-         */
-        extra_attrs?: string;
+    /**
+     * Global option to determine sort order of printed object values. false for
+     * default order, true for basic default sort, or a function to use for sort.
+     */
+    sort?: boolean | ((a: number, b: number) => number);
 
-        /**
-         * Global option to determine sort order of printed object values. false for
-         * default order, true for basic default sort, or a function to use for sort.
-         */
-        sort?: boolean | ((a: number, b: number) => number);
+}): void;
 
-    }): void;
-
-    export = debug;
-}
+export = debug;
diff --git a/express-graphql/express-graphql.d.ts b/express-graphql/express-graphql.d.ts
index 25f36967fe..87f1f4bb53 100644
--- a/express-graphql/express-graphql.d.ts
+++ b/express-graphql/express-graphql.d.ts
@@ -5,48 +5,47 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-graphql" {
-    import { Request, Response } from "express";
+
+import { Request, Response } from "express";
+
+/**
+ * Used to configure the graphQLHTTP middleware by providing a schema
+ * and other configuration options.
+ */
+export type Options = ((req: Request) => OptionsObj) | OptionsObj
+export type OptionsObj = {
+    /**
+     * A GraphQL schema from graphql-js.
+     */
+    schema: Object,
 
     /**
-     * Used to configure the graphQLHTTP middleware by providing a schema
-     * and other configuration options.
+     * An object to pass as the rootValue to the graphql() function.
      */
-    export type Options = ((req: Request) => OptionsObj) | OptionsObj
-    export type OptionsObj = {
-        /**
-         * A GraphQL schema from graphql-js.
-         */
-        schema: Object,
-
-        /**
-         * An object to pass as the rootValue to the graphql() function.
-         */
-        rootValue?: Object,
-
-        /**
-         * A boolean to configure whether the output should be pretty-printed.
-         */
-        pretty?: boolean,
-
-        /**
-         * An optional function which will be used to format any errors produced by
-         * fulfilling a GraphQL operation. If no function is provided, GraphQL's
-         * default spec-compliant `formatError` function will be used.
-         */
-        formatError?: Function,
-
-        /**
-         * A boolean to optionally enable GraphiQL mode.
-         */
-        graphiql?: boolean,
-    };
-
-    type Middleware = (request: Request, response: Response) => void;
+    rootValue?: Object,
 
     /**
-     * Middleware for express; takes an options object or function as input to
-     * configure behavior, and returns an express middleware.
+     * A boolean to configure whether the output should be pretty-printed.
      */
-    export default function graphqlHTTP(options: Options): Middleware;
-}
+    pretty?: boolean,
+
+    /**
+     * An optional function which will be used to format any errors produced by
+     * fulfilling a GraphQL operation. If no function is provided, GraphQL's
+     * default spec-compliant `formatError` function will be used.
+     */
+    formatError?: Function,
+
+    /**
+     * A boolean to optionally enable GraphiQL mode.
+     */
+    graphiql?: boolean,
+};
+
+type Middleware = (request: Request, response: Response) => void;
+
+/**
+ * Middleware for express; takes an options object or function as input to
+ * configure behavior, and returns an express middleware.
+ */
+declare export default function graphqlHTTP(options: Options): Middleware;
diff --git a/express-jwt/express-jwt.d.ts b/express-jwt/express-jwt.d.ts
index 1aec6606fe..de971ec689 100644
--- a/express-jwt/express-jwt.d.ts
+++ b/express-jwt/express-jwt.d.ts
@@ -6,32 +6,31 @@
 /// <reference path="../express/express.d.ts" />
 /// <reference path="../express-unless/express-unless.d.ts" />
 
-declare module "express-jwt" {
-    import express = require('express');
-    import unless = require('express-unless');
 
-    function jwt(options: jwt.Options): jwt.RequestHandler;
+import express = require('express');
+import unless = require('express-unless');
 
-    interface IDoneCallback<T> {
-        (err: Error, result: T): void;
-    }
+declare function jwt(options: jwt.Options): jwt.RequestHandler;
 
-    type ICallback = <T>(req: express.Request, payload: T, done: IDoneCallback<boolean>) => void;
-
-    namespace jwt {
-        export interface Options {
-            secret: string|Buffer|ICallback;
-            userProperty?: string;
-            skip?: string[];
-            credentialsRequired?: boolean;
-            isRevoked?: boolean;
-            requestProperty?: string;
-            getToken?: ICallback;
-            [property: string]: any;
-        }
-        export interface RequestHandler extends express.RequestHandler {
-            unless?: typeof unless;
-        }
-    }
-    export = jwt;
+interface IDoneCallback<T> {
+    (err: Error, result: T): void;
 }
+
+type ICallback = <T>(req: express.Request, payload: T, done: IDoneCallback<boolean>) => void;
+
+declare namespace jwt {
+    export interface Options {
+        secret: string | Buffer | ICallback;
+        userProperty?: string;
+        skip?: string[];
+        credentialsRequired?: boolean;
+        isRevoked?: boolean;
+        requestProperty?: string;
+        getToken?: ICallback;
+        [property: string]: any;
+    }
+    export interface RequestHandler extends express.RequestHandler {
+        unless?: typeof unless;
+    }
+}
+export = jwt;
diff --git a/express-less/express-less.d.ts b/express-less/express-less.d.ts
index be52234d20..45476fede5 100644
--- a/express-less/express-less.d.ts
+++ b/express-less/express-less.d.ts
@@ -5,17 +5,16 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-less" {
-    import express = require('express');
 
-    function less(root: string, options?: less.Options): express.RequestHandler;
+import express = require('express');
 
-    namespace less {
-        export interface Options {
-            debug?: boolean;
-            compress?: boolean;
-        }
+declare function less(root: string, options?: less.Options): express.RequestHandler;
+
+declare namespace less {
+    export interface Options {
+        debug?: boolean;
+        compress?: boolean;
     }
-
-    export = less;
 }
+
+export = less;
diff --git a/express-openapi/express-openapi.d.ts b/express-openapi/express-openapi.d.ts
index 6487f230d7..12055fd114 100644
--- a/express-openapi/express-openapi.d.ts
+++ b/express-openapi/express-openapi.d.ts
@@ -29,290 +29,156 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-openapi" {
-    import express = require('express');
 
-    export function initialize(args:Args):InitializedApi;
+import express = require('express');
 
-    export interface InitializedApi {
-        apiDoc: OpenApi.ApiDefinition;
+declare export function initialize(args: Args): InitializedApi;
+
+export interface InitializedApi {
+    apiDoc: OpenApi.ApiDefinition;
+}
+
+declare export module OpenApi {
+    export interface ApiDefinition {
+        swagger: string
+        info: InfoObject
+        host?: string
+        basePath?: string
+        schemes?: string[]
+        consumes?: MimeTypes
+        produces?: MimeTypes
+        paths: PathsObject
+        definitions?: DefinitionsObject
+        parameters?: ParametersDefinitionsObject
+        responses?: ResponsesDefinitionsObject
+        securityDefinitions?: SecurityDefinitionsObject
+        security?: SecurityRequirementObject[]
+        tags?: TagObject[]
+        externalDocs?: ExternalDocumentationObject
     }
 
-    export module OpenApi {
-        export interface ApiDefinition {
-            swagger: string
-            info: InfoObject
-            host?: string
-            basePath?: string
-            schemes?: string[]
-            consumes?: MimeTypes
-            produces?: MimeTypes
-            paths: PathsObject
-            definitions?: DefinitionsObject
-            parameters?: ParametersDefinitionsObject
-            responses?: ResponsesDefinitionsObject
-            securityDefinitions?: SecurityDefinitionsObject
-            security?: SecurityRequirementObject[]
-            tags?: TagObject[]
-            externalDocs?: ExternalDocumentationObject
-        }
+    type MimeTypes = string[]
 
-        type MimeTypes = string[]
-
-        export interface InfoObject {
-            title: string
-            description?: string
-            termsOfService?: string
-            contact?: ContactObject
-            license?: LicenseObject
-            version: string
-        }
-
-        export interface ContactObject {
-            name?: string
-            url?: string
-            email?: string
-        }
-
-        export interface LicenseObject {
-            name: string
-            url?: string
-        }
-
-        export interface PathsObject {
-            [index: string]: PathItemObject|any
-        }
-
-        export interface PathItemObject {
-            $ref?: string
-            get?: OperationObject
-            put?: OperationObject
-            post?: OperationObject
-            'delete'?: OperationObject
-            options?: OperationObject
-            head?: OperationObject
-            patch?: OperationObject
-            parameters?: Parameters
-        }
-
-        export interface OperationObject {
-            tags?: string[]
-            summary?: string
-            description?: string
-            externalDocs?: ExternalDocumentationObject
-            operationId?: string
-            consumes?: MimeTypes
-            produces?: MimeTypes
-            parameters?: Parameters
-            responses: ResponsesObject
-            schemes?: string[]
-            deprecated?: boolean
-            security?: SecurityRequirementObject[],
-            [index: string]: any
-        }
-
-        export interface DefinitionsObject {
-            [index: string]: SchemaObject
-        }
-
-        export interface ResponsesObject {
-            [index: string]: Response|any
-            'default': Response
-        }
-
-        type Response = ResponseObject|ReferenceObject
-
-        export interface ResponsesDefinitionsObject {
-            [index: string]: ResponseObject
-        }
-
-        export interface ResponseObject {
-            description: string
-            schema?: Schema
-            headers?: HeadersObject
-            examples?: ExampleObject
-        }
-
-        export interface HeadersObject {
-            [index: string]: HeaderObject
-        }
-
-        export interface HeaderObject extends ItemsObject {
-        }
-
-        export interface ExampleObject {
-            [index: string]: any
-        }
-
-        export interface SecurityDefinitionsObject {
-            [index: string]: SecuritySchemeObject
-        }
-
-        export interface SecuritySchemeObject {
-            type: string
-            description?: string
-            name: string
-            'in': string
-            flow: string
-            authorizationUrl: string
-            tokenUrl: string
-            scopes: ScopesObject
-        }
-
-        export interface ScopesObject {
-            [index: string]: any
-        }
-
-        export interface SecurityRequirementObject {
-            [index: string]: string[]
-        }
-
-        export interface TagObject {
-            name: string
-            description?: string
-            externalDocs?: ExternalDocumentationObject
-        }
-
-        export interface ItemsObject {
-            type: string
-            format?: string
-            items?: ItemsObject
-            collectionFormat?: string
-            'default'?: any
-            maximum?: number
-            exclusiveMaximum?: boolean
-            minimum?: number
-            exclusiveMinimum?: boolean
-            maxLength?: number
-            minLength?: number
-            pattern?: string
-            maxItems?: number
-            minItems?: number
-            uniqueItems?: boolean
-            'enum'?: any[]
-            multipleOf?: number
-        }
-
-        export interface ParametersDefinitionsObject {
-            [index: string]: ParameterObject
-        }
-
-        type Parameters = (ReferenceObject|Parameter)[]
-
-        type Parameter = (InBodyParameterObject|GeneralParameterObject);
-
-        interface ParameterObject {
-            name: string
-            'in': string
-            description?: string
-            required?: boolean
-        }
-
-        export interface InBodyParameterObject extends ParameterObject {
-            schema: Schema
-        }
-
-        export interface GeneralParameterObject extends ParameterObject, ItemsObject {
-            allowEmptyValue?: boolean
-        }
-
-        export interface ReferenceObject {
-            $ref: string
-        }
-
-        export interface ExternalDocumentationObject {
-            [index: string]: any
-            description?: string
-            url: string
-        }
-
-        type Schema = SchemaObject | ReferenceObject
-
-        export interface SchemaObject extends IJsonSchema {
-            [index: string]: any
-            discriminator?: string
-            readOnly?: boolean
-            xml?: XMLObject
-            externalDocs: ExternalDocumentationObject
-            example: any
-        }
-
-        export interface XMLObject {
-            [index: string]: any
-            name?: string
-            namespace?: string
-            prefix?: string
-            attribute?: boolean
-            wrapped?: boolean
-        }
-    }
-
-    export interface Args {
-        apiDoc: OpenApi.ApiDefinition
-        app: express.Application
-        routes: string
-        docPath: string
-        errorTransformer(openapiError: OpenapiError, jsonschemaError: JsonschemaError): any
-        exposeApiDocs: boolean
-        validateApiDoc: boolean
-        customFormats: CustomFormats
-    }
-
-    export interface OperationFunction extends express.RequestHandler {
-        apiDoc?: OpenApi.OperationObject;
-    }
-
-    export interface OperationHandlerArray {
-        apiDoc?: OpenApi.OperationObject;
-        [index: number]: express.RequestHandler;
-    }
-
-    export type Operation = OperationFunction | OperationHandlerArray;
-
-    export interface PathModule {
-        parameters?: OpenApi.Parameters;
-        get?: Operation;
-        put?: Operation;
-        post?: Operation;
-        delete?: Operation;
-        patch?: Operation;
-        options?: Operation;
-        head?: Operation;
-    }
-
-    export interface OpenapiError {
-        errorCode: string
-        location: string
-        message: string
-        path: string
-    }
-
-    export interface CustomFormats {
-        [index: string]: CustomFormatValidator
-    }
-
-    // Following 2 interfaces are part of jsonschema package.
-    interface JsonschemaError {
-        property: string
-        message: string
-        schema: string|IJsonSchema
-        instance: any
-        name: string
-        argument: any
-        stack: string
-        toString(): string
-    }
-
-    interface CustomFormatValidator {
-        (input: any): boolean
-    }
-
-    interface IJsonSchema {
-        id?: string
-        $schema?: string
-        title?: string
+    export interface InfoObject {
+        title: string
         description?: string
-        multipleOf?: number
+        termsOfService?: string
+        contact?: ContactObject
+        license?: LicenseObject
+        version: string
+    }
+
+    export interface ContactObject {
+        name?: string
+        url?: string
+        email?: string
+    }
+
+    export interface LicenseObject {
+        name: string
+        url?: string
+    }
+
+    export interface PathsObject {
+        [index: string]: PathItemObject | any
+    }
+
+    export interface PathItemObject {
+        $ref?: string
+        get?: OperationObject
+        put?: OperationObject
+        post?: OperationObject
+        'delete'?: OperationObject
+        options?: OperationObject
+        head?: OperationObject
+        patch?: OperationObject
+        parameters?: Parameters
+    }
+
+    export interface OperationObject {
+        tags?: string[]
+        summary?: string
+        description?: string
+        externalDocs?: ExternalDocumentationObject
+        operationId?: string
+        consumes?: MimeTypes
+        produces?: MimeTypes
+        parameters?: Parameters
+        responses: ResponsesObject
+        schemes?: string[]
+        deprecated?: boolean
+        security?: SecurityRequirementObject[],
+        [index: string]: any
+    }
+
+    export interface DefinitionsObject {
+        [index: string]: SchemaObject
+    }
+
+    export interface ResponsesObject {
+        [index: string]: Response | any
+        'default': Response
+    }
+
+    type Response = ResponseObject | ReferenceObject
+
+    export interface ResponsesDefinitionsObject {
+        [index: string]: ResponseObject
+    }
+
+    export interface ResponseObject {
+        description: string
+        schema?: Schema
+        headers?: HeadersObject
+        examples?: ExampleObject
+    }
+
+    export interface HeadersObject {
+        [index: string]: HeaderObject
+    }
+
+    export interface HeaderObject extends ItemsObject {
+    }
+
+    export interface ExampleObject {
+        [index: string]: any
+    }
+
+    export interface SecurityDefinitionsObject {
+        [index: string]: SecuritySchemeObject
+    }
+
+    export interface SecuritySchemeObject {
+        type: string
+        description?: string
+        name: string
+        'in': string
+        flow: string
+        authorizationUrl: string
+        tokenUrl: string
+        scopes: ScopesObject
+    }
+
+    export interface ScopesObject {
+        [index: string]: any
+    }
+
+    export interface SecurityRequirementObject {
+        [index: string]: string[]
+    }
+
+    export interface TagObject {
+        name: string
+        description?: string
+        externalDocs?: ExternalDocumentationObject
+    }
+
+    export interface ItemsObject {
+        type: string
+        format?: string
+        items?: ItemsObject
+        collectionFormat?: string
+        'default'?: any
         maximum?: number
         exclusiveMaximum?: boolean
         minimum?: number
@@ -320,32 +186,165 @@ declare module "express-openapi" {
         maxLength?: number
         minLength?: number
         pattern?: string
-        additionalItems?: boolean | IJsonSchema
-        items?: IJsonSchema | IJsonSchema[]
         maxItems?: number
         minItems?: number
         uniqueItems?: boolean
-        maxProperties?: number
-        minProperties?: number
-        required?: string[]
-        additionalProperties?: boolean | IJsonSchema
-        definitions?: {
-            [name: string]: IJsonSchema
-        }
-        properties?: {
-            [name: string]: IJsonSchema
-        }
-        patternProperties?: {
-            [name: string]: IJsonSchema
-        }
-        dependencies?: {
-            [name: string]: IJsonSchema | string[]
-        }
         'enum'?: any[]
-        type?: string | string[]
-        allOf?: IJsonSchema[]
-        anyOf?: IJsonSchema[]
-        oneOf?: IJsonSchema[]
-        not?: IJsonSchema
+        multipleOf?: number
+    }
+
+    export interface ParametersDefinitionsObject {
+        [index: string]: ParameterObject
+    }
+
+    type Parameters = (ReferenceObject | Parameter)[]
+
+    type Parameter = (InBodyParameterObject | GeneralParameterObject);
+
+    interface ParameterObject {
+        name: string
+        'in': string
+        description?: string
+        required?: boolean
+    }
+
+    export interface InBodyParameterObject extends ParameterObject {
+        schema: Schema
+    }
+
+    export interface GeneralParameterObject extends ParameterObject, ItemsObject {
+        allowEmptyValue?: boolean
+    }
+
+    export interface ReferenceObject {
+        $ref: string
+    }
+
+    export interface ExternalDocumentationObject {
+        [index: string]: any
+        description?: string
+        url: string
+    }
+
+    type Schema = SchemaObject | ReferenceObject
+
+    export interface SchemaObject extends IJsonSchema {
+        [index: string]: any
+        discriminator?: string
+        readOnly?: boolean
+        xml?: XMLObject
+        externalDocs: ExternalDocumentationObject
+        example: any
+    }
+
+    export interface XMLObject {
+        [index: string]: any
+        name?: string
+        namespace?: string
+        prefix?: string
+        attribute?: boolean
+        wrapped?: boolean
     }
 }
+
+export interface Args {
+    apiDoc: OpenApi.ApiDefinition
+    app: express.Application
+    routes: string
+    docPath: string
+    errorTransformer(openapiError: OpenapiError, jsonschemaError: JsonschemaError): any
+    exposeApiDocs: boolean
+    validateApiDoc: boolean
+    customFormats: CustomFormats
+}
+
+export interface OperationFunction extends express.RequestHandler {
+    apiDoc?: OpenApi.OperationObject;
+}
+
+export interface OperationHandlerArray {
+    apiDoc?: OpenApi.OperationObject;
+    [index: number]: express.RequestHandler;
+}
+
+export type Operation = OperationFunction | OperationHandlerArray;
+
+export interface PathModule {
+    parameters?: OpenApi.Parameters;
+    get?: Operation;
+    put?: Operation;
+    post?: Operation;
+    delete?: Operation;
+    patch?: Operation;
+    options?: Operation;
+    head?: Operation;
+}
+
+export interface OpenapiError {
+    errorCode: string
+    location: string
+    message: string
+    path: string
+}
+
+export interface CustomFormats {
+    [index: string]: CustomFormatValidator
+}
+
+// Following 2 interfaces are part of jsonschema package.
+interface JsonschemaError {
+    property: string
+    message: string
+    schema: string | IJsonSchema
+    instance: any
+    name: string
+    argument: any
+    stack: string
+    toString(): string
+}
+
+interface CustomFormatValidator {
+    (input: any): boolean
+}
+
+interface IJsonSchema {
+    id?: string
+    $schema?: string
+    title?: string
+    description?: string
+    multipleOf?: number
+    maximum?: number
+    exclusiveMaximum?: boolean
+    minimum?: number
+    exclusiveMinimum?: boolean
+    maxLength?: number
+    minLength?: number
+    pattern?: string
+    additionalItems?: boolean | IJsonSchema
+    items?: IJsonSchema | IJsonSchema[]
+    maxItems?: number
+    minItems?: number
+    uniqueItems?: boolean
+    maxProperties?: number
+    minProperties?: number
+    required?: string[]
+    additionalProperties?: boolean | IJsonSchema
+    definitions?: {
+        [name: string]: IJsonSchema
+    }
+    properties?: {
+        [name: string]: IJsonSchema
+    }
+    patternProperties?: {
+        [name: string]: IJsonSchema
+    }
+    dependencies?: {
+        [name: string]: IJsonSchema | string[]
+    }
+    'enum'?: any[]
+    type?: string | string[]
+    allOf?: IJsonSchema[]
+    anyOf?: IJsonSchema[]
+    oneOf?: IJsonSchema[]
+    not?: IJsonSchema
+}
diff --git a/express-partials/express-partials.d.ts b/express-partials/express-partials.d.ts
index c12b7c05f2..281796a84a 100644
--- a/express-partials/express-partials.d.ts
+++ b/express-partials/express-partials.d.ts
@@ -5,10 +5,9 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-partials" {
-    import express = require('express');
 
-    function expressPartials(options?: any): express.RequestHandler;
+import express = require('express');
 
-    export = expressPartials;
-}
\ No newline at end of file
+declare function expressPartials(options?: any): express.RequestHandler;
+
+export = expressPartials;
diff --git a/express-route-fs/express-route-fs.d.ts b/express-route-fs/express-route-fs.d.ts
index 0b9cdc2fc8..a16f7dd171 100644
--- a/express-route-fs/express-route-fs.d.ts
+++ b/express-route-fs/express-route-fs.d.ts
@@ -3,12 +3,11 @@
 // Definitions by: Kristóf Poduszló <https://github.com/kripod>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "express-route-fs" {
-    /**
-     Sets up file system-based routing in Express.
-     @param {Object} app Express application object.
-     @param {Object[]} [options] Options for setting up routes.
-     */
-    function routeFs(app: any, options?: any): void;
-    export = routeFs;
-}
+
+/**
+ Sets up file system-based routing in Express.
+ @param {Object} app Express application object.
+ @param {Object[]} [options] Options for setting up routes.
+ */
+declare function routeFs(app: any, options?: any): void;
+export = routeFs;
diff --git a/express-unless/express-unless.d.ts b/express-unless/express-unless.d.ts
index 81b3b08d02..dca00b5cb5 100644
--- a/express-unless/express-unless.d.ts
+++ b/express-unless/express-unless.d.ts
@@ -5,22 +5,21 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "express-unless" {
-    import express = require('express');
 
-    function unless(options:unless.Options): express.RequestHandler;
+import express = require('express');
 
-    namespace unless {
-        export interface Options {
-            custom?: (req: express.Request) => boolean;
-            path?: any; // TODO: union type 'string|string[]' is not supported yet
-            ext?: any; // TODO: union type 'string|string[]' is not supported yet
-            method?: any; // TODO: union type 'string|string[]' is not supported yet
-        }
-        export interface RequestHandler extends express.RequestHandler {
-            unless?: typeof unless;
-        }
+declare function unless(options: unless.Options): express.RequestHandler;
+
+declare namespace unless {
+    export interface Options {
+        custom?: (req: express.Request) => boolean;
+        path?: any; // TODO: union type 'string|string[]' is not supported yet
+        ext?: any; // TODO: union type 'string|string[]' is not supported yet
+        method?: any; // TODO: union type 'string|string[]' is not supported yet
+    }
+    export interface RequestHandler extends express.RequestHandler {
+        unless?: typeof unless;
     }
-
-    export = unless;
 }
+
+export = unless;
diff --git a/express/express.d.ts b/express/express.d.ts
index 4ab7eb1c90..4730827427 100644
--- a/express/express.d.ts
+++ b/express/express.d.ts
@@ -13,42 +13,41 @@
 /// <reference path="../serve-static/serve-static.d.ts" />
 /// <reference path="../express-serve-static-core/express-serve-static-core.d.ts" />
 
-declare module "express" {
-    import * as serveStatic from "serve-static";
-    import * as core from "express-serve-static-core";
+
+import * as serveStatic from "serve-static";
+import * as core from "express-serve-static-core";
+
+/**
+ * Creates an Express application. The express() function is a top-level function exported by the express module.
+ */
+declare function e(): core.Express;
+
+declare namespace e {
 
     /**
-     * Creates an Express application. The express() function is a top-level function exported by the express module.
+     * This is the only built-in middleware function in Express. It serves static files and is based on serve-static.
      */
-    function e(): core.Express;
+    var static: typeof serveStatic;
 
-    namespace e {
+    export function Router(options?: any): core.Router;
 
-        /**
-         * This is the only built-in middleware function in Express. It serves static files and is based on serve-static.
-         */
-        var static: typeof serveStatic;
-
-        export function Router(options?: any): core.Router;
-
-        interface Application extends core.Application { }
-        interface CookieOptions extends core.CookieOptions { }
-        interface Errback extends core.Errback { }
-        interface ErrorRequestHandler extends core.ErrorRequestHandler { }
-        interface Express extends core.Express { }
-        interface Handler extends core.Handler { }
-        interface IRoute extends core.IRoute { }
-        interface IRouter<T> extends core.IRouter<T> { }
-        interface IRouterMatcher<T> extends core.IRouterMatcher<T> { }
-        interface MediaType extends core.MediaType { }
-        interface NextFunction extends core.NextFunction { }
-        interface Request extends core.Request { }
-        interface RequestHandler extends core.RequestHandler { }
-        interface RequestParamHandler extends core.RequestParamHandler { }
-        export interface Response extends core.Response { }
-        interface Router extends core.Router { }
-        interface Send extends core.Send { }
-    }
-
-    export = e;
+    interface Application extends core.Application { }
+    interface CookieOptions extends core.CookieOptions { }
+    interface Errback extends core.Errback { }
+    interface ErrorRequestHandler extends core.ErrorRequestHandler { }
+    interface Express extends core.Express { }
+    interface Handler extends core.Handler { }
+    interface IRoute extends core.IRoute { }
+    interface IRouter<T> extends core.IRouter<T> { }
+    interface IRouterMatcher<T> extends core.IRouterMatcher<T> { }
+    interface MediaType extends core.MediaType { }
+    interface NextFunction extends core.NextFunction { }
+    interface Request extends core.Request { }
+    interface RequestHandler extends core.RequestHandler { }
+    interface RequestParamHandler extends core.RequestParamHandler { }
+    export interface Response extends core.Response { }
+    interface Router extends core.Router { }
+    interface Send extends core.Send { }
 }
+
+export = e;
diff --git a/extend/extend.d.ts b/extend/extend.d.ts
index cda9f07a13..e0af478a47 100644
--- a/extend/extend.d.ts
+++ b/extend/extend.d.ts
@@ -2,9 +2,8 @@
 // Project: https://www.npmjs.com/package/extend
 // Definitions by: Stefan Steinhart <https://github.com/reppners>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "extend" {
 
-    function extend(deepOrObject:boolean | Object, ...objectN: Object[]): any;
-    namespace extend {}
-    export = extend;
-}
+
+declare function extend(deepOrObject: boolean | Object, ...objectN: Object[]): any;
+declare namespace extend { }
+export = extend;
diff --git a/eyes/eyes.d.ts b/eyes/eyes.d.ts
index a2b103ccad..7c61fbdb94 100644
--- a/eyes/eyes.d.ts
+++ b/eyes/eyes.d.ts
@@ -5,50 +5,45 @@
 
 ///<reference path="../node/node.d.ts"/>
 
-declare module "eyes"
-{
-    import stream = require('stream');
 
-    export function inspector(options?:EyesOptions): InspectorFunction;
-    export function inspect(thing:any, label?:string): void;
+import stream = require('stream');
 
-    export interface InspectorFunction {
-        (thing:any, label?:string): string;
-    }
+declare export function inspector(options?: EyesOptions): InspectorFunction;
+declare export function inspect(thing: any, label?: string): void;
 
-    export interface EyesOptions
-    {
-        /** Styles applied to stdout */
-        styles?: {                
-            /** Overall base style applied to everything */
-            all?: string;
-            /** Style when printing inspection labels, like 'array' in `array: [1, 2, 3]` */
-            label?: string;
-            /** Style when printing objects which don't have a literal representation, such as functions */
-            other?: string;
-            /** Style when printing the keys in object literals, like 'a' in `{a: 1}` */
-            key?: string;
-            /** Style when printing `null`, `undefined`, etc. */
-            special?: string;
-            /** Style when printing strings */
-            string?: string;
-            /** Style when printing numbers */
-            number?: string;
-            /** Style when printing booleans */
-            bool?: string;
-            /** Style when printing RegExps */
-            regexp?: string;
-        };
-
-        /** Indent object literals */
-        pretty?: boolean;         
-        /** Don't output functions at all */
-        hideFunctions?: boolean;  
-        /** Stream to write to, or null */
-        stream?: stream.Writable; 
-        /** Truncate output if longer */
-        maxLength?: number;       
-    }
+export interface InspectorFunction {
+    (thing: any, label?: string): string;
 }
 
+export interface EyesOptions {
+    /** Styles applied to stdout */
+    styles?: {
+        /** Overall base style applied to everything */
+        all?: string;
+        /** Style when printing inspection labels, like 'array' in `array: [1, 2, 3]` */
+        label?: string;
+        /** Style when printing objects which don't have a literal representation, such as functions */
+        other?: string;
+        /** Style when printing the keys in object literals, like 'a' in `{a: 1}` */
+        key?: string;
+        /** Style when printing `null`, `undefined`, etc. */
+        special?: string;
+        /** Style when printing strings */
+        string?: string;
+        /** Style when printing numbers */
+        number?: string;
+        /** Style when printing booleans */
+        bool?: string;
+        /** Style when printing RegExps */
+        regexp?: string;
+    };
 
+    /** Indent object literals */
+    pretty?: boolean;
+    /** Don't output functions at all */
+    hideFunctions?: boolean;
+    /** Stream to write to, or null */
+    stream?: stream.Writable;
+    /** Truncate output if longer */
+    maxLength?: number;
+}
diff --git a/falcor-express/falcor-express.d.ts b/falcor-express/falcor-express.d.ts
index c5d638a107..bfd3162a27 100644
--- a/falcor-express/falcor-express.d.ts
+++ b/falcor-express/falcor-express.d.ts
@@ -6,9 +6,7 @@
 /// <reference path="../falcor/falcor.d.ts" />
 /// <reference path="../express/express.d.ts" />
 
-declare module 'falcor-express' {
-    import {Request, Response, Handler} from 'express';
-    import {DataSource} from 'falcor';
-    function dataSourceRoute(getDataSource: (req: Request, res: Response) => DataSource): Handler;
-}
 
+import {Request, Response, Handler} from 'express';
+import {DataSource} from 'falcor';
+declare function dataSourceRoute(getDataSource: (req: Request, res: Response) => DataSource): Handler;
diff --git a/fast-stats/fast-stats.d.ts b/fast-stats/fast-stats.d.ts
index e0324ee31a..65a53d1ad0 100644
--- a/fast-stats/fast-stats.d.ts
+++ b/fast-stats/fast-stats.d.ts
@@ -3,184 +3,183 @@
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'fast-stats' {
 
-	export interface StatsOpts {
-		/**
-		 * Tells fast-stats to maintain a histogram of your dataset using this parameter as the least count, or precision.
-		 * By default, fast-stats will not maintain buckets since it does not know the least count and range of your dataset in advance.
-		 * This option is required if you need to use the distribution() method.
-		 */
-		bucket_precision?: number;
-		
-		/**
-		 * Tells fast-stats to maintain a histogram of your dataset using these custom buckets.
-		 * Each number in the array is the upper limit of a bucket. The lower limit of the first bucket is 0, the lower limit for all other buckets is the upper limit of the previous bucket.
-		 * If you use both bucket_precision and buckets, buckets takes precedence.
-		 */
-		buckets?: number[];
-		
-		/**
-		 * Tells fast-stats how to extend the pre-defined buckets if data exceeding the range is added. This is useful to capture data above your range, in multiple buckets, but with low precision so you do not end up with a large number of empty buckets.
-		 * By default this is not defined, so buckets will not be extended and all data beyond the end range will end up in the last bucket.
-		 */
-		bucket_extension_interval?: number;
-		
-		/**
-		 * Tells fast-stats not to store actual data values. This is useful to reduce memory utilisation for large datasets, however it comes with a few caveats.
-		 * - You can no longer get an exact median or other percentile value out of your dataset, however you could use bucketing (see bucket_precision above) to get an approximate percentile value.
-		 * - You can no longer run an exact iqr filter or a band_pass filter on the data, however you could use bucketing to get an approximate filtered object.
-		 * - You can no longer get at the entire dataset or remove data from the dataset.
-		 * The mean, standard deviation and margin of error calculations are unaffected by this parameter. If you use bucketing, and only care about the mean, standard deviation and margin of error or an approximate median or percentile value, set this option to false.
-		 * By default, store_data is true.
-		 */
-		store_data?: boolean;
-		
-		/**
-		 * Tells fast-stats whether the data you pass in is a sample (true) or the entire (false default) population.
-		 * The standard deviation algorithm differs for populations v/s samples.
-		 */
-		sampling?: boolean; 
-	}
-	
-	/**
-	 * Distribution bucket
-	 */
-	export interface Bucket {
-		/**
-		 * Bucket midpoint
-		 */
-		bucket: number;
-		/**
-		 * [<bucket low>, <bucket high>],
-		 */
-		range:  number[];
-		/**
-		 * Number of datapoints
-		 */
-		count:  number;
-	}		
 
-	/**
-	 * A NodeJS library to do statistical analysis of numeric datasets.
-	 * When doing statistical analysis of data, the most common usage pattern is to run multiple statistical methods on the same set of data. Some of these methods use others. For example, to calculate the standard deviation of a dataset, we first need the mean.
-	 * Additionally, some methods can be calculated quickly as data is inserted, thereby reducing the number of loops required to run through the data during processing.
-	 * Fast stats maintains a running cache of several summary values as data is inserted making final calculation very fast. It trades off a small amount of additional memory usage for a large reduction in execution time.	 
-	 */
-	export class Stats {
-		constructor(opts?: StatsOpts);
-		
-		/**
-		 * Add elements to back
-		 */
-		push(...args: number[]): void;
-		push(args: number[]): void;		
+export interface StatsOpts {
+    /**
+     * Tells fast-stats to maintain a histogram of your dataset using this parameter as the least count, or precision.
+     * By default, fast-stats will not maintain buckets since it does not know the least count and range of your dataset in advance.
+     * This option is required if you need to use the distribution() method.
+     */
+    bucket_precision?: number;
 
-		/**
-		 * Remove element from back
-		 */
-		pop(): number;
-		
-		/**
-		 * Remove element from front
-		 */
-		shift(): number;
+    /**
+     * Tells fast-stats to maintain a histogram of your dataset using these custom buckets.
+     * Each number in the array is the upper limit of a bucket. The lower limit of the first bucket is 0, the lower limit for all other buckets is the upper limit of the previous bucket.
+     * If you use both bucket_precision and buckets, buckets takes precedence.
+     */
+    buckets?: number[];
 
-		/**
-		 * Add elements to front
-		 */
-		unshift(...args: number[]): void;
-		
-		/**
-		 * Number of elements
-		 */
-		length: number;
-		
-		/**
-		 * Clear all data
-		 */
-		reset(): void;
-		
-		/**
-		 * Fresh copy
-		 */
-		copy(): Stats;
-		
-		
-		/**
-		 * Arithmetic Mean
-		 * The arithmetic mean is calculated as the sum of all data points divided by the number of data points. This is useful for data sets that are fairly uniform, following a linear or binomial distribution. Use the amean() method or the `µ()? method to get at it:
-		 */
-		amean(): number;
-				
-		/**
-		 * Geometric Mean
-		 * The geometric mean is the nth root of the product of all data points where n is the number of data points. This is useful for data sets that follow an exponential or log-normal distribution. Use the gmean() method to get at it:
-		 */
-		gmean(): number;
-		 
-		/**
-		 * Median
-		 * The median is the middle point of the dataset when sorted in ascending order. This is useful if your dataset has a lot of outliers and noise that would not normally be found in a complete population. Use the median() method to get at it:
-		 * If your data set contains an odd number of points, the median will be the middle point. If it contains an even number of points, then the median will be the arithmetic mean of the two middle points.
-		 * If your Stats object is configured to use buckets and has store_data set to false, then the median will be an approximation of the actual median.
-		 */
-		median(): number;
-		
-		/**
-		 * Any Percentile
-		 * You can also get at any percentile value within the data. Use the percentile() method to get at this data. The percentile() method takes in a single argument. This is a number between 0 and 100 (both inclusive) that specifies which percentile point you want.
-		 * Passing in 50 as an argument will return the median, while 25 and 75 will return the first and third quartiles respectively. These three special values may be arithmetic means of two other values within the set. All other arguments will return a number from the data set.
-		 * If your Stats object is configured to use buckets and has store_data set to false, then the percentile value returned will be an approximation of the actual percentile based on the configured bucket_precision or buckets.
-		 */
-		percentile(n: number): number;
-		
-		/**
-		 * Range
-		 * The range() method tells you the minimum and maximum values of your data set. It returns an array of two values. The first is the lower bound and the second is the upper bound.
-		 */
-		range(): number[];
-		
-		/**
-		 * The distribution() method tells you how your data is distributed. You need to set the bucket_precision or buckets configuration options if you plan on using this method. It will then split your data into buckets based on the value of bucket_precision or buckets and tell you how many data points fall into each bucket. You can use this to plot a histogram of your data, or to compare it to commonly known distribution functions.
-		 * The return value is a sparse array of buckets with counts of datapoints per bucket. To save on memory, any empty buckets are undefined. You should treat an undefined bucket as if it had 0 datapoints.
-		 */
-		distribution(): Bucket[];
-		
-		/**
-		 * Arithmetic Standard Deviation
-		 * Also commonly just called the Standard Deviation, with the symbol s. This tells you the spread of your data if it follows a normal (or close to normal) distribution, ie, the bell curve. fast-stats is really fast at calculating the standard deviation of a dataset
-		 * The arithmetic standard deviation is used in conjunction with the arithmetic mean to tell you the spread of your dataset: [amean-stddev, amean+stddev]. Note that you could also use 2 or 3 standard deviations for different spreads.
-		 */
-		stddev(): number;
-		
-		/**
-		 * Geometric Standard Deviation
-		 * The geometric standard deviation tells you the spread of your data if it follows a log-normal or exponential distribution. Use the gstddev() method to get at it.
-		 */
-		gstddev(): number;
-		
-		/**
-		 * 95% Confidence Margin of Error
-		 * The Margin of Error value tells you the range within which the real arithmetic mean of the population is likely to be with 95% confidence. Use the moe() method to get at it.
-		 * This value suggests that we are 95% certain that the real mean of the population is within 2.60 of the calculated arithmetic mean of 4.67. We could use this to find out the percent error in our sample. In this case there is a 55.71% error.
-		 * The margin of error is inversely proportional to the square root of the number of data points, so increasing the size of your sample will reduce the margin of error. It is good to strive for a margin of error of less than 5%.
-		 */
-		moe(): number;
-		
-		/**
-		 * Band-pass filtering
-		 * The band_pass() filter method returns a new Stats object with all its data points within the specified range. This method takes in three arguments. The first is the lower bound of the range, the second is the upper bound of the range. Both these arguments are required.
-		 * The third argument specifies whether the range is open or closed. An open range does not include the upper and lower bounds while a closed range includes them. If not specified (or set to false), the range is closed. If set to true the range is open.
-		 * Band pass filtering should be used if the range for your data is rigid and never changes.
-		 */
-		band_pass(low: number, high: number, open?: boolean): Stats
-		
-		/**
-		 * IQR Filtering
-		 * IQR, or Inter Quartile Range filtering filters data based on the spread of the data. It is much more adaptive to changes in data ranges. Use the iqr() method to IQR filter a dataset. The iqr() method does not accept any arguments.
-		 * In some cases, IQR filtering may not filter out anything. This can happen if the acceptable range is wider than the bounds of your dataset.
-		 */
-		iqr(): Stats;
-	}
+    /**
+     * Tells fast-stats how to extend the pre-defined buckets if data exceeding the range is added. This is useful to capture data above your range, in multiple buckets, but with low precision so you do not end up with a large number of empty buckets.
+     * By default this is not defined, so buckets will not be extended and all data beyond the end range will end up in the last bucket.
+     */
+    bucket_extension_interval?: number;
+
+    /**
+     * Tells fast-stats not to store actual data values. This is useful to reduce memory utilisation for large datasets, however it comes with a few caveats.
+     * - You can no longer get an exact median or other percentile value out of your dataset, however you could use bucketing (see bucket_precision above) to get an approximate percentile value.
+     * - You can no longer run an exact iqr filter or a band_pass filter on the data, however you could use bucketing to get an approximate filtered object.
+     * - You can no longer get at the entire dataset or remove data from the dataset.
+     * The mean, standard deviation and margin of error calculations are unaffected by this parameter. If you use bucketing, and only care about the mean, standard deviation and margin of error or an approximate median or percentile value, set this option to false.
+     * By default, store_data is true.
+     */
+    store_data?: boolean;
+
+    /**
+     * Tells fast-stats whether the data you pass in is a sample (true) or the entire (false default) population.
+     * The standard deviation algorithm differs for populations v/s samples.
+     */
+    sampling?: boolean;
+}
+
+/**
+ * Distribution bucket
+ */
+export interface Bucket {
+    /**
+     * Bucket midpoint
+     */
+    bucket: number;
+    /**
+     * [<bucket low>, <bucket high>],
+     */
+    range: number[];
+    /**
+     * Number of datapoints
+     */
+    count: number;
+}
+
+/**
+ * A NodeJS library to do statistical analysis of numeric datasets.
+ * When doing statistical analysis of data, the most common usage pattern is to run multiple statistical methods on the same set of data. Some of these methods use others. For example, to calculate the standard deviation of a dataset, we first need the mean.
+ * Additionally, some methods can be calculated quickly as data is inserted, thereby reducing the number of loops required to run through the data during processing.
+ * Fast stats maintains a running cache of several summary values as data is inserted making final calculation very fast. It trades off a small amount of additional memory usage for a large reduction in execution time.	 
+ */
+declare export class Stats {
+    constructor(opts?: StatsOpts);
+
+    /**
+     * Add elements to back
+     */
+    push(...args: number[]): void;
+    push(args: number[]): void;
+
+    /**
+     * Remove element from back
+     */
+    pop(): number;
+
+    /**
+     * Remove element from front
+     */
+    shift(): number;
+
+    /**
+     * Add elements to front
+     */
+    unshift(...args: number[]): void;
+
+    /**
+     * Number of elements
+     */
+    length: number;
+
+    /**
+     * Clear all data
+     */
+    reset(): void;
+
+    /**
+     * Fresh copy
+     */
+    copy(): Stats;
+
+
+    /**
+     * Arithmetic Mean
+     * The arithmetic mean is calculated as the sum of all data points divided by the number of data points. This is useful for data sets that are fairly uniform, following a linear or binomial distribution. Use the amean() method or the `�()? method to get at it:
+     */
+    amean(): number;
+
+    /**
+     * Geometric Mean
+     * The geometric mean is the nth root of the product of all data points where n is the number of data points. This is useful for data sets that follow an exponential or log-normal distribution. Use the gmean() method to get at it:
+     */
+    gmean(): number;
+
+    /**
+     * Median
+     * The median is the middle point of the dataset when sorted in ascending order. This is useful if your dataset has a lot of outliers and noise that would not normally be found in a complete population. Use the median() method to get at it:
+     * If your data set contains an odd number of points, the median will be the middle point. If it contains an even number of points, then the median will be the arithmetic mean of the two middle points.
+     * If your Stats object is configured to use buckets and has store_data set to false, then the median will be an approximation of the actual median.
+     */
+    median(): number;
+
+    /**
+     * Any Percentile
+     * You can also get at any percentile value within the data. Use the percentile() method to get at this data. The percentile() method takes in a single argument. This is a number between 0 and 100 (both inclusive) that specifies which percentile point you want.
+     * Passing in 50 as an argument will return the median, while 25 and 75 will return the first and third quartiles respectively. These three special values may be arithmetic means of two other values within the set. All other arguments will return a number from the data set.
+     * If your Stats object is configured to use buckets and has store_data set to false, then the percentile value returned will be an approximation of the actual percentile based on the configured bucket_precision or buckets.
+     */
+    percentile(n: number): number;
+
+    /**
+     * Range
+     * The range() method tells you the minimum and maximum values of your data set. It returns an array of two values. The first is the lower bound and the second is the upper bound.
+     */
+    range(): number[];
+
+    /**
+     * The distribution() method tells you how your data is distributed. You need to set the bucket_precision or buckets configuration options if you plan on using this method. It will then split your data into buckets based on the value of bucket_precision or buckets and tell you how many data points fall into each bucket. You can use this to plot a histogram of your data, or to compare it to commonly known distribution functions.
+     * The return value is a sparse array of buckets with counts of datapoints per bucket. To save on memory, any empty buckets are undefined. You should treat an undefined bucket as if it had 0 datapoints.
+     */
+    distribution(): Bucket[];
+
+    /**
+     * Arithmetic Standard Deviation
+     * Also commonly just called the Standard Deviation, with the symbol s. This tells you the spread of your data if it follows a normal (or close to normal) distribution, ie, the bell curve. fast-stats is really fast at calculating the standard deviation of a dataset
+     * The arithmetic standard deviation is used in conjunction with the arithmetic mean to tell you the spread of your dataset: [amean-stddev, amean+stddev]. Note that you could also use 2 or 3 standard deviations for different spreads.
+     */
+    stddev(): number;
+
+    /**
+     * Geometric Standard Deviation
+     * The geometric standard deviation tells you the spread of your data if it follows a log-normal or exponential distribution. Use the gstddev() method to get at it.
+     */
+    gstddev(): number;
+
+    /**
+     * 95% Confidence Margin of Error
+     * The Margin of Error value tells you the range within which the real arithmetic mean of the population is likely to be with 95% confidence. Use the moe() method to get at it.
+     * This value suggests that we are 95% certain that the real mean of the population is within 2.60 of the calculated arithmetic mean of 4.67. We could use this to find out the percent error in our sample. In this case there is a 55.71% error.
+     * The margin of error is inversely proportional to the square root of the number of data points, so increasing the size of your sample will reduce the margin of error. It is good to strive for a margin of error of less than 5%.
+     */
+    moe(): number;
+
+    /**
+     * Band-pass filtering
+     * The band_pass() filter method returns a new Stats object with all its data points within the specified range. This method takes in three arguments. The first is the lower bound of the range, the second is the upper bound of the range. Both these arguments are required.
+     * The third argument specifies whether the range is open or closed. An open range does not include the upper and lower bounds while a closed range includes them. If not specified (or set to false), the range is closed. If set to true the range is open.
+     * Band pass filtering should be used if the range for your data is rigid and never changes.
+     */
+    band_pass(low: number, high: number, open?: boolean): Stats
+
+    /**
+     * IQR Filtering
+     * IQR, or Inter Quartile Range filtering filters data based on the spread of the data. It is much more adaptive to changes in data ranges. Use the iqr() method to IQR filter a dataset. The iqr() method does not accept any arguments.
+     * In some cases, IQR filtering may not filter out anything. This can happen if the acceptable range is wider than the bounds of your dataset.
+     */
+    iqr(): Stats;
 }
diff --git a/fbemitter/fbemitter.d.ts b/fbemitter/fbemitter.d.ts
index b26b1a3162..79904d12cc 100644
--- a/fbemitter/fbemitter.d.ts
+++ b/fbemitter/fbemitter.d.ts
@@ -3,65 +3,63 @@
 // Definitions by: kmxz <https://github.com/kmxz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'fbemitter' {
-    
-    export class EventSubscription {
-        
-        listener: Function;
-        context: any;
-        
-        /**
-         * Removes this subscription from the subscriber that controls it.
-         */
-        remove(): void;
-        
-    }
 
-    export class EventEmitter {
-        
-         constructor();
-         
-         /**
-          * Adds a listener to be invoked when events of the specified type are
-          * emitted. An optional calling context may be provided. The data arguments
-          * emitted will be passed to the listener function.
-          */
-         addListener(eventType: string, listener: Function, context?: any): EventSubscription;
-     
-         /**
-          * Similar to addListener, except that the listener is removed after it is
-          * invoked once.
-          */
-         once(eventType: string, listener: Function, context?: any): EventSubscription;
-         
-         /**
-          * Removes all of the registered listeners, including those registered as
-          * listener maps.
-          */
-         removeAllListeners(eventType?: string): void;
-         
-         /**
-          * Provides an API that can be called during an eventing cycle to remove the
-          * last listener that was invoked. This allows a developer to provide an event
-          * object that can remove the listener (or listener map) during the
-          * invocation.
-          *
-          * If it is called when not inside of an emitting cycle it will throw.
-          */
-         removeCurrentListener(): void;
-               
-         /**
-          * Returns an array of listeners that are currently registered for the given
-          * event.
-          */
-         listeners(eventType: string): Function[];
-         
-         /**
-          * Emits an event of the given type with the given data. All handlers of that
-          * particular type will be notified.
-          */
-         emit(eventType: string, ...data: any[]): void;
-         
-    }
-    
-}
\ No newline at end of file
+
+declare export class EventSubscription {
+
+    listener: Function;
+    context: any;
+
+    /**
+     * Removes this subscription from the subscriber that controls it.
+     */
+    remove(): void;
+
+}
+
+declare export class EventEmitter {
+
+    constructor();
+
+    /**
+     * Adds a listener to be invoked when events of the specified type are
+     * emitted. An optional calling context may be provided. The data arguments
+     * emitted will be passed to the listener function.
+     */
+    addListener(eventType: string, listener: Function, context?: any): EventSubscription;
+
+    /**
+     * Similar to addListener, except that the listener is removed after it is
+     * invoked once.
+     */
+    once(eventType: string, listener: Function, context?: any): EventSubscription;
+
+    /**
+     * Removes all of the registered listeners, including those registered as
+     * listener maps.
+     */
+    removeAllListeners(eventType?: string): void;
+
+    /**
+     * Provides an API that can be called during an eventing cycle to remove the
+     * last listener that was invoked. This allows a developer to provide an event
+     * object that can remove the listener (or listener map) during the
+     * invocation.
+     *
+     * If it is called when not inside of an emitting cycle it will throw.
+     */
+    removeCurrentListener(): void;
+
+    /**
+     * Returns an array of listeners that are currently registered for the given
+     * event.
+     */
+    listeners(eventType: string): Function[];
+
+    /**
+     * Emits an event of the given type with the given data. All handlers of that
+     * particular type will be notified.
+     */
+    emit(eventType: string, ...data: any[]): void;
+
+}
diff --git a/fibers/fibers.d.ts b/fibers/fibers.d.ts
index 4bef5a760b..fec81954f8 100644
--- a/fibers/fibers.d.ts
+++ b/fibers/fibers.d.ts
@@ -5,20 +5,19 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/fibers.d.ts
 
-declare module "fibers" {
 
-	function fibers(callback: () => void): fibers.Fiber;
 
-	namespace fibers {
-		export var poolSize: number;
-		export var fibersCreated: number;
-		export var current: fibers.Fiber;
-		export function yield(value: any): any;
+declare function fibers(callback: () => void): fibers.Fiber;
 
-		export interface Fiber {
-			run(step?: number): any;
-		}
-	}
+declare namespace fibers {
+    export var poolSize: number;
+    export var fibersCreated: number;
+    export var current: fibers.Fiber;
+    export function yield(value: any): any;
 
-	export = fibers;
+    export interface Fiber {
+        run(step?: number): any;
+    }
 }
+
+export = fibers;
diff --git a/field/field.d.ts b/field/field.d.ts
index 75b1c8d396..3990dff5b0 100644
--- a/field/field.d.ts
+++ b/field/field.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Leo Liang <https://github.com/aleung/DefinitelyTyped>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'field' {
-    export function get(topObj: any, fields: string): any;
-    export function set(topObj: any, fields: string, value: any): any;
-}
+
+declare export function get(topObj: any, fields: string): any;
+declare export function set(topObj: any, fields: string, value: any): any;
diff --git a/finalhandler/finalhandler.d.ts b/finalhandler/finalhandler.d.ts
index 092952f858..d56b5b8f1a 100644
--- a/finalhandler/finalhandler.d.ts
+++ b/finalhandler/finalhandler.d.ts
@@ -5,16 +5,15 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "finalhandler" {
-	import {ServerRequest, ServerResponse} from "http";
 
-	export interface Options {
-		message?: boolean|((err: any, status: number) => string);
-		onerror?: (err: any, req: ServerRequest, res: ServerResponse) => void;
-		stacktrace?: boolean;
-	}
+import {ServerRequest, ServerResponse} from "http";
 
-	function finalHandler(req: ServerRequest, res: ServerResponse, options?: Options): (err: any) => void;
-
-	export default finalHandler;
+export interface Options {
+    message?: boolean | ((err: any, status: number) => string);
+    onerror?: (err: any, req: ServerRequest, res: ServerResponse) => void;
+    stacktrace?: boolean;
 }
+
+declare function finalHandler(req: ServerRequest, res: ServerResponse, options?: Options): (err: any) => void;
+
+export default finalHandler;
diff --git a/findup-sync/findup-sync.d.ts b/findup-sync/findup-sync.d.ts
index 71ff2672cd..2ab787295c 100644
--- a/findup-sync/findup-sync.d.ts
+++ b/findup-sync/findup-sync.d.ts
@@ -5,14 +5,13 @@
 
 /// <reference path="../minimatch/minimatch.d.ts" />
 
-declare module 'findup-sync' {
-	import minimatch = require('minimatch');
 
-	interface IOptions extends minimatch.IOptions {
-		cwd?: string;
-	}
+import minimatch = require('minimatch');
 
-	function mod(pattern: string[] | string, opts?: IOptions): string;
-
-	export = mod;
+interface IOptions extends minimatch.IOptions {
+    cwd?: string;
 }
+
+declare function mod(pattern: string[] | string, opts?: IOptions): string;
+
+export = mod;
diff --git a/flake-idgen/flake-idgen.d.ts b/flake-idgen/flake-idgen.d.ts
index 05f023e04e..7004246362 100644
--- a/flake-idgen/flake-idgen.d.ts
+++ b/flake-idgen/flake-idgen.d.ts
@@ -5,18 +5,17 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'flake-idgen' {
-	interface ConstructorOptions {
-		datacenter?: number;
-		worker?: number;
-		id?: number;
-		epoch?: number;
-		seqMask?: number;
-	}
 
-	class FlakeId {
-		constructor(options?: ConstructorOptions);
-		next(callback?: (err: Error, id: Buffer) => void): Buffer;
-	}
-	export = FlakeId;
+interface ConstructorOptions {
+    datacenter?: number;
+    worker?: number;
+    id?: number;
+    epoch?: number;
+    seqMask?: number;
 }
+
+declare class FlakeId {
+    constructor(options?: ConstructorOptions);
+    next(callback?: (err: Error, id: Buffer) => void): Buffer;
+}
+export = FlakeId;
diff --git a/flux-standard-action/flux-standard-action.d.ts b/flux-standard-action/flux-standard-action.d.ts
index 0f46f24972..a73c4803a0 100644
--- a/flux-standard-action/flux-standard-action.d.ts
+++ b/flux-standard-action/flux-standard-action.d.ts
@@ -3,29 +3,27 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "flux-standard-action" {
-    export interface ErrorAction extends Action<Error> {
-        error: boolean;
-    }
 
-    export interface Action<T> {
-        type: string;
-        payload?: T;
-        error?: boolean;
-    }
-
-    // Usage: var action: Action<sring> & AnyMeta;
-    export interface AnyMeta {
-        meta: any
-    }
-
-    // Usage: var action: Action<sring> & TypedMeta<string>;
-    export interface TypedMeta<T> {
-        meta: T
-    }
-
-    export function isFSA(action: any): boolean;
-
-    export function isError(action: any): boolean;
+export interface ErrorAction extends Action<Error> {
+    error: boolean;
 }
 
+export interface Action<T> {
+    type: string;
+    payload?: T;
+    error?: boolean;
+}
+
+// Usage: var action: Action<sring> & AnyMeta;
+export interface AnyMeta {
+    meta: any
+}
+
+// Usage: var action: Action<sring> & TypedMeta<string>;
+export interface TypedMeta<T> {
+    meta: T
+}
+
+declare export function isFSA(action: any): boolean;
+
+declare export function isError(action: any): boolean;
diff --git a/forge-di/forge-di.d.ts b/forge-di/forge-di.d.ts
index 99d0b197dc..90d50bfdfb 100644
--- a/forge-di/forge-di.d.ts
+++ b/forge-di/forge-di.d.ts
@@ -3,204 +3,203 @@
 // Definitions by: Adam Carr <https://github.com/adamcarr/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "forge-di" {
-	/**
-	 * Implementation of the forge dependency injection manager.
-	 */
-	class Forge {
-		/**
-		 * Creates a new instance
-		 * @returns {Forge} a new instance.
-		 */
-		new(): Forge;
 
-		/**
-		 * The bindings mapped to this forge instance.
-		 */
-		bindings: Forge.IBindingMap;
+/**
+ * Implementation of the forge dependency injection manager.
+ */
+declare class Forge {
+    /**
+     * Creates a new instance
+     * @returns {Forge} a new instance.
+     */
+    new(): Forge;
 
-		/**
-		 * Creates a new binding.
-		 * @param {string} name The binding name.
-		 */
-		bind(name: string): Forge.IBinding;
-		/**
-		 * Unbinds then recreates a binding for this name.
-		 * @param {string} name The binding name.
-		 */
-		rebind(name: string): Forge.IBinding;
-		/**
-		 * Unbinds all bindings for this name. Returns the number of bindings removed.
-		 * @param {string} name The binding name.
-		 */
-		unbind(name: string): number;
-		/**
-		 * Get instance or instances of type registered under the provided name and optional hint.
-		 * @param {string} name The binding name.
-		 * @param {string} hint The binding hint.
-		 * @param {...args} args Additional args.
-		 */
-		get<T>(name: string, hint?: string, ...args: any[]): T;
-		/**
-		 * Get a single instance of type registered under the provided name and optional hint.
-		 * @param {string} name The binding name.
-		 * @param {string} hint The binding hint.
-		 * @param {...args} args Additional args.
-		 */
-		getOne<T>(name: string, hint?: string, ...args: any[]): T;
-		/**
-		 * Gets all instances of the type registered under the provided name.
-		 * @param {string} name The binding name.
-		 * @param {...args} args Additional args.
-		 */
-		getAll<T>(name: string, ...args: any[]): T | T[];
-		/**
-		 * Creates an instance of the target type attempting to resolve any dependencies.
-		 * @param {T} target The target type.
-		 * @param {...args} args Additional args.
-		 */
-		create<T>(target: T, ...args: any[]): T;
-		/**
-		 * Get all bindings registered under a binding name and optional hint.
-		 * @param {string} name The binding name.
-		 * @param {string} hint The binding hint.
-		 */
-		getMatchingBindings(name: string, hint?: string): Forge.IBinding[];
-		/**
-		 * Returns a string that represents all bindings within this forge instance.
-		 */
-		inspect(): string;
+    /**
+     * The bindings mapped to this forge instance.
+     */
+    bindings: Forge.IBindingMap;
 
-		resolve<T>(name: string, context?: Forge.IContext, hint?: string, all?: boolean, ...args: any[]): T | T[];
-		resolveBindings(context: Forge.IContext, bindings: Forge.IBinding[], hint: string, args: any[], unwrap: boolean): Forge.IBinding[];
-	}
+    /**
+     * Creates a new binding.
+     * @param {string} name The binding name.
+     */
+    bind(name: string): Forge.IBinding;
+    /**
+     * Unbinds then recreates a binding for this name.
+     * @param {string} name The binding name.
+     */
+    rebind(name: string): Forge.IBinding;
+    /**
+     * Unbinds all bindings for this name. Returns the number of bindings removed.
+     * @param {string} name The binding name.
+     */
+    unbind(name: string): number;
+    /**
+     * Get instance or instances of type registered under the provided name and optional hint.
+     * @param {string} name The binding name.
+     * @param {string} hint The binding hint.
+     * @param {...args} args Additional args.
+     */
+    get<T>(name: string, hint?: string, ...args: any[]): T;
+    /**
+     * Get a single instance of type registered under the provided name and optional hint.
+     * @param {string} name The binding name.
+     * @param {string} hint The binding hint.
+     * @param {...args} args Additional args.
+     */
+    getOne<T>(name: string, hint?: string, ...args: any[]): T;
+    /**
+     * Gets all instances of the type registered under the provided name.
+     * @param {string} name The binding name.
+     * @param {...args} args Additional args.
+     */
+    getAll<T>(name: string, ...args: any[]): T | T[];
+    /**
+     * Creates an instance of the target type attempting to resolve any dependencies.
+     * @param {T} target The target type.
+     * @param {...args} args Additional args.
+     */
+    create<T>(target: T, ...args: any[]): T;
+    /**
+     * Get all bindings registered under a binding name and optional hint.
+     * @param {string} name The binding name.
+     * @param {string} hint The binding hint.
+     */
+    getMatchingBindings(name: string, hint?: string): Forge.IBinding[];
+    /**
+     * Returns a string that represents all bindings within this forge instance.
+     */
+    inspect(): string;
 
-	namespace Forge {
-		interface IContext {
-			new (): IContext;
-			bindings: IBinding[];
-			has(binding: IBinding): boolean;
-			push(binding: IBinding): void;
-			pop(): IBinding;
-			toString(indent: number): string;
-		}
-
-		interface IType {
-			new (...args: any[]): any;
-		}
-
-		/**
-		 * Represents arguments to help with resolving a binding.
-		 */
-		interface IBindingArguments {
-			[name: string]: any;
-		}
-
-		/**
-		 * Represents a binding between a name, type/instance/function and optional hint.
-		 */
-		interface IBinding {
-			/** The forge that contains this binding. */
-			forge: Forge;
-			/** The binding name. */
-			name: string;
-			/** Alias mapping to this binding. */
-			to: IBinding;
-			/** Alias mapping to this binding. */
-			as: IBinding;
-			/** Whether or not this binding is currently resolving. */
-			isResolving: boolean;
-			/** The resolver for this binding. */
-			resolver: IResolver;
-			/** The lifecycle associated with this binding. Defaults to singleton. */
-			lifecycle: ILifecycle;
-			/** The predicate associated with this binding. Used to support hints. */
-			predicate: IPredicate;
-			/** The additional binding arguments to help resolve dependencies. */
-			arguments: IBindingArguments;
-
-			/**
-			 * Checks whether or not this binding matches the hint by executing the predicate.
-			 * @param {string} hint The hint to check against.
-			 */
-			matches(hint: string): boolean;
-			/**
-			 * Registers a type to a binding. This type must have a constructor.
-			 * @param {T} target The target type.
-			 */
-			type<T extends IType>(target: T): IBinding;
-			/**
-			 * Registers a type to a binding. This must be a callable function.
-			 * @param {T} target The target function.
-			 */
-			function<T extends{(...args: any[]):any}>(target: T): IBinding;
-			/**
-			 * Registeres an instance to a binding. This instance will always be returned.
-			 * @param {T} target The target instance.
-			 */
-			instance<T extends Object>(target: T): IBinding;
-			/**
-			 * Configures this binding lifecycle as a singleton. This is the default lifecycle.
-			 */
-			singleton(): IBinding;
-			/**
-			 * Configures this binding lifecycle as transient.
-			 * New instances will be created, if this is a type based binding, on each get.
-			 */
-			transient(): IBinding;
-			/**
-			 * Registers a predicate for this binding.
-			 * @param {IPredicate} predicate The predicate.
-			 */
-			when(predicate:IPredicate): IBinding;
-			/**
-			 * Registers a hint for this binding.
-			 * @param {string} hint The hint.
-			 */
-			when(hint: string): IBinding;
-			/**
-			 * Registers additional binding arguments to help with resolving.
-			 * @param {IBindingArguments} args The additional binding arguments.
-			 */
-			with(args: IBindingArguments): IBinding;
-			/**
-			 * Returns a string representing this binding.
-			 */
-			toString(): string;
-		}
-
-		/** Represents a binding map. */
-		interface IBindingMap {
-			/** Gets a binding by name. */
-			[name: string]: IBinding[];
-		}
-
-		/** Represents a predicate. */
-		interface IPredicate {
-			/**
-			 * Returns whether or not the hit satisfies this predicate.
-			 * @param {string} hint The hint to check against.
-			 */
-			(hint: string): boolean;
-		}
-
-		/** Represents a resolver. */
-		interface IResolver {
-			/**
-			 * Resolves a specific type.
-			 */
-			resolve<T>(): T;
-		}
-
-		/** Represents a binding lifecycle. */
-		interface ILifecycle {
-			/**
-			 * Returns the instance from a resolver based on the configured lifecycle.
-			 * @param {IResolver} resolver The type resolver.
-			 */
-			getInstance<T>(resolver: IResolver): T;
-		}
-	}
-
-	export = Forge;
+    resolve<T>(name: string, context?: Forge.IContext, hint?: string, all?: boolean, ...args: any[]): T | T[];
+    resolveBindings(context: Forge.IContext, bindings: Forge.IBinding[], hint: string, args: any[], unwrap: boolean): Forge.IBinding[];
 }
+
+declare namespace Forge {
+    interface IContext {
+        new (): IContext;
+        bindings: IBinding[];
+        has(binding: IBinding): boolean;
+        push(binding: IBinding): void;
+        pop(): IBinding;
+        toString(indent: number): string;
+    }
+
+    interface IType {
+        new (...args: any[]): any;
+    }
+
+    /**
+     * Represents arguments to help with resolving a binding.
+     */
+    interface IBindingArguments {
+        [name: string]: any;
+    }
+
+    /**
+     * Represents a binding between a name, type/instance/function and optional hint.
+     */
+    interface IBinding {
+        /** The forge that contains this binding. */
+        forge: Forge;
+        /** The binding name. */
+        name: string;
+        /** Alias mapping to this binding. */
+        to: IBinding;
+        /** Alias mapping to this binding. */
+        as: IBinding;
+        /** Whether or not this binding is currently resolving. */
+        isResolving: boolean;
+        /** The resolver for this binding. */
+        resolver: IResolver;
+        /** The lifecycle associated with this binding. Defaults to singleton. */
+        lifecycle: ILifecycle;
+        /** The predicate associated with this binding. Used to support hints. */
+        predicate: IPredicate;
+        /** The additional binding arguments to help resolve dependencies. */
+        arguments: IBindingArguments;
+
+        /**
+         * Checks whether or not this binding matches the hint by executing the predicate.
+         * @param {string} hint The hint to check against.
+         */
+        matches(hint: string): boolean;
+        /**
+         * Registers a type to a binding. This type must have a constructor.
+         * @param {T} target The target type.
+         */
+        type<T extends IType>(target: T): IBinding;
+        /**
+         * Registers a type to a binding. This must be a callable function.
+         * @param {T} target The target function.
+         */
+        function<T extends { (...args: any[]): any }>(target: T): IBinding;
+        /**
+         * Registeres an instance to a binding. This instance will always be returned.
+         * @param {T} target The target instance.
+         */
+        instance<T extends Object>(target: T): IBinding;
+        /**
+         * Configures this binding lifecycle as a singleton. This is the default lifecycle.
+         */
+        singleton(): IBinding;
+        /**
+         * Configures this binding lifecycle as transient.
+         * New instances will be created, if this is a type based binding, on each get.
+         */
+        transient(): IBinding;
+        /**
+         * Registers a predicate for this binding.
+         * @param {IPredicate} predicate The predicate.
+         */
+        when(predicate: IPredicate): IBinding;
+        /**
+         * Registers a hint for this binding.
+         * @param {string} hint The hint.
+         */
+        when(hint: string): IBinding;
+        /**
+         * Registers additional binding arguments to help with resolving.
+         * @param {IBindingArguments} args The additional binding arguments.
+         */
+        with(args: IBindingArguments): IBinding;
+        /**
+         * Returns a string representing this binding.
+         */
+        toString(): string;
+    }
+
+    /** Represents a binding map. */
+    interface IBindingMap {
+        /** Gets a binding by name. */
+        [name: string]: IBinding[];
+    }
+
+    /** Represents a predicate. */
+    interface IPredicate {
+        /**
+         * Returns whether or not the hit satisfies this predicate.
+         * @param {string} hint The hint to check against.
+         */
+        (hint: string): boolean;
+    }
+
+    /** Represents a resolver. */
+    interface IResolver {
+        /**
+         * Resolves a specific type.
+         */
+        resolve<T>(): T;
+    }
+
+    /** Represents a binding lifecycle. */
+    interface ILifecycle {
+        /**
+         * Returns the instance from a resolver based on the configured lifecycle.
+         * @param {IResolver} resolver The type resolver.
+         */
+        getInstance<T>(resolver: IResolver): T;
+    }
+}
+
+export = Forge;
diff --git a/form-data/form-data.d.ts b/form-data/form-data.d.ts
index f3a19b16f7..a2662ccb8e 100644
--- a/form-data/form-data.d.ts
+++ b/form-data/form-data.d.ts
@@ -5,12 +5,11 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/form-data.d.ts
 
-declare module "form-data" {
-	export class FormData {
-		append(key: string, value: any, options?: any): FormData;
-		getHeaders(): Object;
-		// TODO expand pipe
-		pipe(to: any): any;
-		submit(params: string|Object, callback: (error: any, response: any) => void): any;
-	}
+
+declare export class FormData {
+    append(key: string, value: any, options?: any): FormData;
+    getHeaders(): Object;
+    // TODO expand pipe
+    pipe(to: any): any;
+    submit(params: string | Object, callback: (error: any, response: any) => void): any;
 }
diff --git a/formidable/formidable.d.ts b/formidable/formidable.d.ts
index 2468f6a628..f48311811a 100644
--- a/formidable/formidable.d.ts
+++ b/formidable/formidable.d.ts
@@ -5,52 +5,51 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "formidable" {
-	import http = require("http");
-	import stream = require("stream");
-	import events = require("events");
 
-	export class IncomingForm extends events.EventEmitter {
-		encoding: string;
-		uploadDir: string;
-		keepExtensions: boolean;
-		maxFieldsSize: number;
-		maxFields: number;
-		hash: string | boolean;
-		multiples: boolean;
-		type: string;
-		bytesReceived: number;
-		bytesExpected: number;
+import http = require("http");
+import stream = require("stream");
+import events = require("events");
 
-		onPart: (part: Part) => void;
+declare export class IncomingForm extends events.EventEmitter {
+    encoding: string;
+    uploadDir: string;
+    keepExtensions: boolean;
+    maxFieldsSize: number;
+    maxFields: number;
+    hash: string | boolean;
+    multiples: boolean;
+    type: string;
+    bytesReceived: number;
+    bytesExpected: number;
 
-		handlePart(part: Part): void;
-		parse(req: http.IncomingMessage, callback?: (err: any, fields: Fields, files: Files) => any): void;
-	}
+    onPart: (part: Part) => void;
 
-	export interface Fields {
-		[key: string]: string;
-	}
-
-	export interface Files {
-		[key: string]: File; // | File[];
-	}
-
-	export interface Part extends stream.Stream {
-		headers: { [key: string]: string };
-		name: string;
-		filename?: string;
-		mime?: string;
-	}
-
-	export interface File {
-		size: number;
-		path: string;
-		name: string;
-		type: string;
-		lastModifiedDate?: Date;
-		hash?: string;
-
-		toJSON(): Object;
-	}
+    handlePart(part: Part): void;
+    parse(req: http.IncomingMessage, callback?: (err: any, fields: Fields, files: Files) => any): void;
+}
+
+export interface Fields {
+    [key: string]: string;
+}
+
+export interface Files {
+    [key: string]: File; // | File[];
+}
+
+export interface Part extends stream.Stream {
+    headers: { [key: string]: string };
+    name: string;
+    filename?: string;
+    mime?: string;
+}
+
+export interface File {
+    size: number;
+    path: string;
+    name: string;
+    type: string;
+    lastModifiedDate?: Date;
+    hash?: string;
+
+    toJSON(): Object;
 }
diff --git a/freeport/freeport.d.ts b/freeport/freeport.d.ts
index ced31149c1..c6e8891f52 100644
--- a/freeport/freeport.d.ts
+++ b/freeport/freeport.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Arne Schubert <https://github.com/atd-schubert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'freeport' {
-	function freeport(cb: (err: Error, port: number) => void): void;
-	
-	export = freeport;
-}
+
+declare function freeport(cb: (err: Error, port: number) => void): void;
+
+export = freeport;
diff --git a/from/from.d.ts b/from/from.d.ts
index 9152930813..6ae1aa3b7b 100644
--- a/from/from.d.ts
+++ b/from/from.d.ts
@@ -5,17 +5,16 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'from' {
 
-	var mod: mod.From;
 
-	namespace mod {
-		interface From {
-			(getChunk: (count: number, next: () => any) => any): NodeJS.ReadableStream;
-			(chunks: any[]): NodeJS.ReadableStream;
-			emit(type: string, data: any): void;
-		}
-	}
+declare var mod: mod.From;
 
-	export  = mod;
+declare namespace mod {
+    interface From {
+        (getChunk: (count: number, next: () => any) => any): NodeJS.ReadableStream;
+        (chunks: any[]): NodeJS.ReadableStream;
+        emit(type: string, data: any): void;
+    }
 }
+
+export = mod;
diff --git a/fs-ext/fs-ext.d.ts b/fs-ext/fs-ext.d.ts
index 351d260466..423ca497f7 100644
--- a/fs-ext/fs-ext.d.ts
+++ b/fs-ext/fs-ext.d.ts
@@ -5,98 +5,97 @@
 
 ///<reference path="../node/node.d.ts"/>
 
-declare module "fs-ext" {
-	export * from "fs";
- 
-	/**
-	* Asynchronous flock(2). No arguments other than a possible error are passed to the callback. 
-	* @param fd File Descriptor
-	* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
-	**/
-	export function flock(fd: number, flags: string, callback: (err: Error) => void): void;
 
-	/**
-	* Synchronous flock(2). Throws an exception on error.
-	* @param fd File Descriptor
-	* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
- 	**/
-	export function flockSync(fd: number, flags: string):void;
-	
-	/**
-	* Asynchronous fcntl(2).
-	* @param fd File Descriptor
-	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
-	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
-	* @param arg arg
-	**/
-	export function fcntl(fd: number, cmd: string, arg: number, callback: (err: Error, result: number) => void):void;
+export * from "fs";
 
-	/**
-	* Asynchronous fcntl(2).
-	* @param fd File Descriptor
-	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
-	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
-	**/
-	export function fcntl(fd: number, cmd: string, callback: (err: Error, result: number) => void):void;
+/**
+* Asynchronous flock(2). No arguments other than a possible error are passed to the callback. 
+* @param fd File Descriptor
+* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
+**/
+declare export function flock(fd: number, flags: string, callback: (err: Error) => void): void;
 
-	/**
-	* Synchronous fcntl(2). Throws an exception on error.
-	* @param fd File Descriptor
-	* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
-	* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
-	* @param arg arg
-	* @return Returns flags
-	**/
-	export function fcntlSync(fd: number, cmd: string, arg?: number): number;
+/**
+* Synchronous flock(2). Throws an exception on error.
+* @param fd File Descriptor
+* @param flags Flags can be 'sh', 'ex', 'shnb', 'exnb', 'un' and correspond to the various LOCK_SH, LOCK_EX, LOCK_SH|LOCK_NB, etc.
+  **/
+declare export function flockSync(fd: number, flags: string): void;
 
-	/**
-	* Asynchronous lseek(2).
-	* @param fd File Descriptor
-	* @param offset Offset
-	* @param whence 
-	* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
-	* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
-	* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
-	**/
-	export function seek(fd: number, offset: number, whence: number, callback: (err: Error, currFilePos: number) => void): void;
-  
-	/**
-	* Synchronous lseek(2). Throws an exception on error. Returns current file position.
-	* @param fd File Descriptor
-	* @param offset Offset
-	* @param whence 
-	* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
-	* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
-	* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
-	* @returns Returns current file position.
-	**/
-	export function seekSync(fd: number, offset: number, whence: number): number;
+/**
+* Asynchronous fcntl(2).
+* @param fd File Descriptor
+* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+* @param arg arg
+**/
+declare export function fcntl(fd: number, cmd: string, arg: number, callback: (err: Error, result: number) => void): void;
 
-	/**
-	* Asynchronous utime(2).
-	* @param path File path
-	* @param atime
-	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
-	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
-	* Just like for utime(2), the absence of the atime and mtime means 'now'.
-	* @param mtime
-	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
-	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
-	* Just like for utime(2), the absence of the atime and mtime means 'now'.
-	**/
-	export function utime(path: string, atime: number, mtime: number, callback: (err: Error) => void):void;
+/**
+* Asynchronous fcntl(2).
+* @param fd File Descriptor
+* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+**/
+declare export function fcntl(fd: number, cmd: string, callback: (err: Error, result: number) => void): void;
 
-	/**
-	* Synchronous version of utime(). Throws an exception on error.
-	* @param path File path
-	* @param atime
-	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
-	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
-	* Just like for utime(2), the absence of the atime and mtime means 'now'.
-	* @param mtime
-	* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
-	* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
-	* Just like for utime(2), the absence of the atime and mtime means 'now'.
-	**/
-	export function utimeSync(path: string, atime: number, mtime: number):void;
-}
+/**
+* Synchronous fcntl(2). Throws an exception on error.
+* @param fd File Descriptor
+* @param cmd The supported commands are: 'getfd' ( F_GETFD ) , 'setfd' ( F_SETFD )
+* Requiring this module adds FD_CLOEXEC to the constants module, for use with F_SETFD.
+* @param arg arg
+* @return Returns flags
+**/
+declare export function fcntlSync(fd: number, cmd: string, arg?: number): number;
+
+/**
+* Asynchronous lseek(2).
+* @param fd File Descriptor
+* @param offset Offset
+* @param whence 
+* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
+* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
+* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
+**/
+declare export function seek(fd: number, offset: number, whence: number, callback: (err: Error, currFilePos: number) => void): void;
+
+/**
+* Synchronous lseek(2). Throws an exception on error. Returns current file position.
+* @param fd File Descriptor
+* @param offset Offset
+* @param whence 
+* Whence can be 0 (SEEK_SET) to set the new position in bytes to offset, 1 (SEEK_CUR) to set the new 
+* position to the current position plus offset bytes (can be negative), or 2 (SEEK_END) to set to the end 
+* of the file plus offset bytes (usually negative or zero to seek to the end of the file).
+* @returns Returns current file position.
+**/
+declare export function seekSync(fd: number, offset: number, whence: number): number;
+
+/**
+* Asynchronous utime(2).
+* @param path File path
+* @param atime
+* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+* Just like for utime(2), the absence of the atime and mtime means 'now'.
+* @param mtime
+* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+* Just like for utime(2), the absence of the atime and mtime means 'now'.
+**/
+declare export function utime(path: string, atime: number, mtime: number, callback: (err: Error) => void): void;
+
+/**
+* Synchronous version of utime(). Throws an exception on error.
+* @param path File path
+* @param atime
+* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+* Just like for utime(2), the absence of the atime and mtime means 'now'.
+* @param mtime
+* Arguments atime and mtime are in seconds as for the system call.Note that the number value of Date() is in milliseconds,
+* so to use the 'now' value with fs.utime() you would have to divide by 1000 first, e.g. Date.now()/1000
+* Just like for utime(2), the absence of the atime and mtime means 'now'.
+**/
+declare export function utimeSync(path: string, atime: number, mtime: number): void;
diff --git a/fs-extra-promise/fs-extra-promise.d.ts b/fs-extra-promise/fs-extra-promise.d.ts
index 2243a4d1c5..3d56401301 100644
--- a/fs-extra-promise/fs-extra-promise.d.ts
+++ b/fs-extra-promise/fs-extra-promise.d.ts
@@ -8,257 +8,255 @@
 ///<reference path="../node/node.d.ts"/>
 ///<reference path="../bluebird/bluebird.d.ts"/>
 
-declare module "fs-extra-promise" {
-	import stream = require("stream");
-	import Promise = require("bluebird");
 
-	export interface Stats {
-		isFile(): boolean;
-		isDirectory(): boolean;
-		isBlockDevice(): boolean;
-		isCharacterDevice(): boolean;
-		isSymbolicLink(): boolean;
-		isFIFO(): boolean;
-		isSocket(): boolean;
-		dev: number;
-		ino: number;
-		mode: number;
-		nlink: number;
-		uid: number;
-		gid: number;
-		rdev: number;
-		size: number;
-		blksize: number;
-		blocks: number;
-		atime: Date;
-		mtime: Date;
-		ctime: Date;
-	}
+import stream = require("stream");
+import Promise = require("bluebird");
 
-	export interface FSWatcher {
-		close(): void;
-	}
-
-	export class ReadStream extends stream.Readable { }
-	export class WriteStream extends stream.Writable { }
-
-	//extended methods
-	export function copy(src: string, dest: string, callback?: (err: Error) => void): void;
-	export function copy(src: string, dest: string, filter: (src: string) => boolean, callback?: (err: Error) => void): void;
-
-	export function copySync(src: string, dest: string): void;
-	export function copySync(src: string, dest: string, filter: (src: string) => boolean): void;
-
-	export function createFile(file: string, callback?: (err: Error) => void): void;
-	export function createFileSync(file: string): void;
-
-	export function mkdirs(dir: string, callback?: (err: Error) => void): void;
-	export function mkdirp(dir: string, callback?: (err: Error) => void): void;
-	export function mkdirsSync(dir: string): void;
-	export function mkdirpSync(dir: string): void;
-
-	export function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputFileSync(file: string, data: any): void;
-
-	export function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputJsonSync(file: string, data: any): void;
-	export function outputJSONSync(file: string, data: any): void;
-
-	export function readJson(file: string, callback?: (err: Error) => void): void;
-	export function readJson(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function readJSON(file: string, callback?: (err: Error) => void): void;
-	export function readJSON(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
-
-	export function readJsonSync(file: string, options?: OpenOptions): void;
-	export function readJSONSync(file: string, options?: OpenOptions): void;
-
-	export function remove(dir: string, callback?: (err: Error) => void): void;
-	export function removeSync(dir: string): void;
-	// export function delete(dir: string, callback?: (err: Error) => void): void;
-	// export function deleteSync(dir: string): void;
-
-	export function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
-	export function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
-	export function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-
-	export function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
-	export function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
-
-	export function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
-	export function renameSync(oldPath: string, newPath: string): void;
-	export function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
-	export function truncateSync(fd: number, len: number): void;
-	export function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function chownSync(path: string, uid: number, gid: number): void;
-	export function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function fchownSync(fd: number, uid: number, gid: number): void;
-	export function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function lchownSync(path: string, uid: number, gid: number): void;
-	export function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
-	export function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
-	export function chmodSync(path: string, mode: number): void;
-	export function chmodSync(path: string, mode: string): void;
-	export function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
-	export function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
-	export function fchmodSync(fd: number, mode: number): void;
-	export function fchmodSync(fd: number, mode: string): void;
-	export function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
-	export function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
-	export function lchmodSync(path: string, mode: number): void;
-	export function lchmodSync(path: string, mode: string): void;
-	export function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-	export function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-	export function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
-	export function statSync(path: string): Stats;
-	export function lstatSync(path: string): Stats;
-	export function fstatSync(fd: number): Stats;
-	export function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
-	export function linkSync(srcpath: string, dstpath: string): void;
-	export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
-	export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-	export function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
-	export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
-	export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
-	export function realpathSync(path: string, cache?: boolean): string;
-	export function unlink(path: string, callback?: (err: Error) => void): void;
-	export function unlinkSync(path: string): void;
-	export function rmdir(path: string, callback?: (err: Error) => void): void;
-	export function rmdirSync(path: string): void;
-	export function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
-	export function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
-	export function mkdirSync(path: string, mode?: number): void;
-	export function mkdirSync(path: string, mode?: string): void;
-	export function readdir(path: string, callback?: (err: Error, files: string[]) => void): void;
-	export function readdirSync(path: string): string[];
-	export function close(fd: number, callback?: (err: Error) => void): void;
-	export function closeSync(fd: number): void;
-	export function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
-	export function openSync(path: string, flags: string, mode?: string): number;
-	export function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
-	export function utimesSync(path: string, atime: number, mtime: number): void;
-	export function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
-	export function futimesSync(fd: number, atime: number, mtime: number): void;
-	export function fsync(fd: number, callback?: (err: Error) => void): void;
-	export function fsyncSync(fd: number): void;
-	export function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
-	export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-	export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
-	export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-	export function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void): void;
-	export function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void): void;
-	export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
-	export function readFileSync(filename: string): NodeBuffer;
-	export function readFileSync(filename: string, encoding: string): string;
-	export function readFileSync(filename: string, options: OpenOptions): string;
-	export function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-	export function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function writeFileSync(filename: string, data: any, encoding?: string): void;
-	export function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
-	export function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-	export function appendFile(filename: string, data: any, option?: OpenOptions, callback?: (err: Error) => void): void;
-	export function appendFileSync(filename: string, data: any, encoding?: string): void;
-	export function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
-	export function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
-	export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
-	export function unwatchFile(filename: string, listener?: Stats): void;
-	export function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
-	export function exists(path: string, callback?: (exists: boolean) => void): void;
-	export function existsSync(path: string): boolean;
-    	export function ensureDir(path: string, cb: (err: Error) => void): void;
-    	export function ensureDirSync(path: string): void;
-
-	export interface OpenOptions {
-		encoding?: string;
-		flag?: string;
-	}
-
-	export interface ReadStreamOptions {
-		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		bufferSize?: number;
-	}
-	export interface WriteStreamOptions {
-		flags?: string;
-		encoding?: string;
-		string?: string;
-	}
-	export function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
-	export function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
-
-
-
-	//promisified versions
-	export function copyAsync(src: string, dest: string): Promise<void>;
-	export function copyAsync(src: string, dest: string, filter: (src: string) => boolean): Promise<void>;
-
-	export function createFileAsync(file: string): Promise<void>;
-
-	export function mkdirsAsync(dir: string): Promise<void>;
-	export function mkdirpAsync(dir: string): Promise<void>;
-
-	export function outputFileAsync(file: string, data: any): Promise<void>;
-
-	export function outputJsonAsync(file: string, data: any): Promise<void>;
-	export function outputJSONAsync(file: string, data: any): Promise<void>;
-
-	export function readJsonAsync(file: string): Promise<void>;
-	export function readJsonAsync(file: string, options?: OpenOptions): Promise<void>;
-	export function readJSONAsync(file: string): Promise<void>;
-	export function readJSONAsync(file: string, options?: OpenOptions): Promise<void>;
-
-
-	export function removeAsync(dir: string): Promise<void>;
-	// export function deleteAsync(dir: string):Promise<void>;
-
-	export function writeJsonAsync(file: string, object: any): Promise<void>;
-	export function writeJsonAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
-	export function writeJSONAsync(file: string, object: any): Promise<void>;
-	export function writeJSONAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
-
-	export function renameAsync(oldPath: string, newPath: string): Promise<void>;
-	export function truncateAsync(fd: number, len: number): Promise<void>;
-	export function chownAsync(path: string, uid: number, gid: number): Promise<void>;
-	export function fchownAsync(fd: number, uid: number, gid: number): Promise<void>;
-	export function lchownAsync(path: string, uid: number, gid: number): Promise<void>;
-	export function chmodAsync(path: string, mode: number): Promise<void>;
-	export function chmodAsync(path: string, mode: string): Promise<void>;
-	export function fchmodAsync(fd: number, mode: number): Promise<void>;
-	export function fchmodAsync(fd: number, mode: string): Promise<void>;
-	export function lchmodAsync(path: string, mode: string): Promise<void>;
-	export function lchmodAsync(path: string, mode: number): Promise<void>;
-	export function statAsync(path: string): Promise<Stats>;
-	export function lstatAsync(path: string): Promise<Stats>;
-	export function fstatAsync(fd: number): Promise<Stats>;
-	export function linkAsync(srcpath: string, dstpath: string): Promise<void>;
-	export function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
-	export function readlinkAsync(path: string): Promise<string>;
-	export function realpathAsync(path: string): Promise<string>;
-	export function realpathAsync(path: string, cache: string): Promise<string>;
-	export function unlinkAsync(path: string): Promise<void>;
-	export function rmdirAsync(path: string): Promise<void>;
-	export function mkdirAsync(path: string, mode?: number): Promise<void>;
-	export function mkdirAsync(path: string, mode?: string): Promise<void>;
-	export function readdirAsync(path: string): Promise<string[]>;
-	export function closeAsync(fd: number): Promise<void>;
-	export function openAsync(path: string, flags: string, mode?: string): Promise<number>;
-	export function utimesAsync(path: string, atime: number, mtime: number): Promise<void>;
-	export function futimesAsync(fd: number, atime: number, mtime: number): Promise<void>;
-	export function fsyncAsync(fd: number): Promise<void>;
-	export function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-	export function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
-	export function readFileAsync(filename: string, encoding: string): Promise<string>;
-	export function readFileAsync(filename: string, options: OpenOptions): Promise<string>;
-	export function readFileAsync(filename: string): Promise<NodeBuffer>;
-	export function writeFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
-	export function writeFileAsync(filename: string, data: any, options?: OpenOptions): Promise<void>;
-	export function appendFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
-	export function appendFileAsync(filename: string, data: any, option?: OpenOptions): Promise<void>;
-
-	export function existsAsync(path: string): Promise<boolean>;
-    export function ensureDirAsync(path: string): Promise<void>;
+export interface Stats {
+    isFile(): boolean;
+    isDirectory(): boolean;
+    isBlockDevice(): boolean;
+    isCharacterDevice(): boolean;
+    isSymbolicLink(): boolean;
+    isFIFO(): boolean;
+    isSocket(): boolean;
+    dev: number;
+    ino: number;
+    mode: number;
+    nlink: number;
+    uid: number;
+    gid: number;
+    rdev: number;
+    size: number;
+    blksize: number;
+    blocks: number;
+    atime: Date;
+    mtime: Date;
+    ctime: Date;
 }
 
+export interface FSWatcher {
+    close(): void;
+}
+
+declare export class ReadStream extends stream.Readable { }
+declare export class WriteStream extends stream.Writable { }
+
+//extended methods
+declare export function copy(src: string, dest: string, callback?: (err: Error) => void): void;
+declare export function copy(src: string, dest: string, filter: (src: string) => boolean, callback?: (err: Error) => void): void;
+
+declare export function copySync(src: string, dest: string): void;
+declare export function copySync(src: string, dest: string, filter: (src: string) => boolean): void;
+
+declare export function createFile(file: string, callback?: (err: Error) => void): void;
+declare export function createFileSync(file: string): void;
+
+declare export function mkdirs(dir: string, callback?: (err: Error) => void): void;
+declare export function mkdirp(dir: string, callback?: (err: Error) => void): void;
+declare export function mkdirsSync(dir: string): void;
+declare export function mkdirpSync(dir: string): void;
+
+declare export function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
+declare export function outputFileSync(file: string, data: any): void;
+
+declare export function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
+declare export function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
+declare export function outputJsonSync(file: string, data: any): void;
+declare export function outputJSONSync(file: string, data: any): void;
+
+declare export function readJson(file: string, callback?: (err: Error) => void): void;
+declare export function readJson(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
+declare export function readJSON(file: string, callback?: (err: Error) => void): void;
+declare export function readJSON(file: string, options?: OpenOptions, callback?: (err: Error) => void): void;
+
+declare export function readJsonSync(file: string, options?: OpenOptions): void;
+declare export function readJSONSync(file: string, options?: OpenOptions): void;
+
+declare export function remove(dir: string, callback?: (err: Error) => void): void;
+declare export function removeSync(dir: string): void;
+// export function delete(dir: string, callback?: (err: Error) => void): void;
+// export function deleteSync(dir: string): void;
+
+declare export function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
+declare export function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+declare export function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
+declare export function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+
+declare export function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
+declare export function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
+
+declare export function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
+declare export function renameSync(oldPath: string, newPath: string): void;
+declare export function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
+declare export function truncateSync(fd: number, len: number): void;
+declare export function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+declare export function chownSync(path: string, uid: number, gid: number): void;
+declare export function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
+declare export function fchownSync(fd: number, uid: number, gid: number): void;
+declare export function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+declare export function lchownSync(path: string, uid: number, gid: number): void;
+declare export function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
+declare export function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
+declare export function chmodSync(path: string, mode: number): void;
+declare export function chmodSync(path: string, mode: string): void;
+declare export function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
+declare export function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
+declare export function fchmodSync(fd: number, mode: number): void;
+declare export function fchmodSync(fd: number, mode: string): void;
+declare export function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
+declare export function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
+declare export function lchmodSync(path: string, mode: number): void;
+declare export function lchmodSync(path: string, mode: string): void;
+declare export function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+declare export function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+declare export function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
+declare export function statSync(path: string): Stats;
+declare export function lstatSync(path: string): Stats;
+declare export function fstatSync(fd: number): Stats;
+declare export function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
+declare export function linkSync(srcpath: string, dstpath: string): void;
+declare export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
+declare export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+declare export function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
+declare export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
+declare export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
+declare export function realpathSync(path: string, cache?: boolean): string;
+declare export function unlink(path: string, callback?: (err: Error) => void): void;
+declare export function unlinkSync(path: string): void;
+declare export function rmdir(path: string, callback?: (err: Error) => void): void;
+declare export function rmdirSync(path: string): void;
+declare export function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
+declare export function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
+declare export function mkdirSync(path: string, mode?: number): void;
+declare export function mkdirSync(path: string, mode?: string): void;
+declare export function readdir(path: string, callback?: (err: Error, files: string[]) => void): void;
+declare export function readdirSync(path: string): string[];
+declare export function close(fd: number, callback?: (err: Error) => void): void;
+declare export function closeSync(fd: number): void;
+declare export function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
+declare export function openSync(path: string, flags: string, mode?: string): number;
+declare export function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
+declare export function utimesSync(path: string, atime: number, mtime: number): void;
+declare export function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
+declare export function futimesSync(fd: number, atime: number, mtime: number): void;
+declare export function fsync(fd: number, callback?: (err: Error) => void): void;
+declare export function fsyncSync(fd: number): void;
+declare export function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
+declare export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+declare export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
+declare export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+declare export function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void): void;
+declare export function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void): void;
+declare export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
+declare export function readFileSync(filename: string): NodeBuffer;
+declare export function readFileSync(filename: string, encoding: string): string;
+declare export function readFileSync(filename: string, options: OpenOptions): string;
+declare export function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
+declare export function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+declare export function writeFileSync(filename: string, data: any, encoding?: string): void;
+declare export function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
+declare export function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
+declare export function appendFile(filename: string, data: any, option?: OpenOptions, callback?: (err: Error) => void): void;
+declare export function appendFileSync(filename: string, data: any, encoding?: string): void;
+declare export function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
+declare export function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
+declare export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
+declare export function unwatchFile(filename: string, listener?: Stats): void;
+declare export function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
+declare export function exists(path: string, callback?: (exists: boolean) => void): void;
+declare export function existsSync(path: string): boolean;
+declare export function ensureDir(path: string, cb: (err: Error) => void): void;
+declare export function ensureDirSync(path: string): void;
+
+export interface OpenOptions {
+    encoding?: string;
+    flag?: string;
+}
+
+export interface ReadStreamOptions {
+    flags?: string;
+    encoding?: string;
+    fd?: number;
+    mode?: number;
+    bufferSize?: number;
+}
+export interface WriteStreamOptions {
+    flags?: string;
+    encoding?: string;
+    string?: string;
+}
+declare export function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
+declare export function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
+
+
+
+//promisified versions
+declare export function copyAsync(src: string, dest: string): Promise<void>;
+declare export function copyAsync(src: string, dest: string, filter: (src: string) => boolean): Promise<void>;
+
+declare export function createFileAsync(file: string): Promise<void>;
+
+declare export function mkdirsAsync(dir: string): Promise<void>;
+declare export function mkdirpAsync(dir: string): Promise<void>;
+
+declare export function outputFileAsync(file: string, data: any): Promise<void>;
+
+declare export function outputJsonAsync(file: string, data: any): Promise<void>;
+declare export function outputJSONAsync(file: string, data: any): Promise<void>;
+
+declare export function readJsonAsync(file: string): Promise<void>;
+declare export function readJsonAsync(file: string, options?: OpenOptions): Promise<void>;
+declare export function readJSONAsync(file: string): Promise<void>;
+declare export function readJSONAsync(file: string, options?: OpenOptions): Promise<void>;
+
+
+declare export function removeAsync(dir: string): Promise<void>;
+// export function deleteAsync(dir: string):Promise<void>;
+
+declare export function writeJsonAsync(file: string, object: any): Promise<void>;
+declare export function writeJsonAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
+declare export function writeJSONAsync(file: string, object: any): Promise<void>;
+declare export function writeJSONAsync(file: string, object: any, options?: OpenOptions): Promise<void>;
+
+declare export function renameAsync(oldPath: string, newPath: string): Promise<void>;
+declare export function truncateAsync(fd: number, len: number): Promise<void>;
+declare export function chownAsync(path: string, uid: number, gid: number): Promise<void>;
+declare export function fchownAsync(fd: number, uid: number, gid: number): Promise<void>;
+declare export function lchownAsync(path: string, uid: number, gid: number): Promise<void>;
+declare export function chmodAsync(path: string, mode: number): Promise<void>;
+declare export function chmodAsync(path: string, mode: string): Promise<void>;
+declare export function fchmodAsync(fd: number, mode: number): Promise<void>;
+declare export function fchmodAsync(fd: number, mode: string): Promise<void>;
+declare export function lchmodAsync(path: string, mode: string): Promise<void>;
+declare export function lchmodAsync(path: string, mode: number): Promise<void>;
+declare export function statAsync(path: string): Promise<Stats>;
+declare export function lstatAsync(path: string): Promise<Stats>;
+declare export function fstatAsync(fd: number): Promise<Stats>;
+declare export function linkAsync(srcpath: string, dstpath: string): Promise<void>;
+declare export function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
+declare export function readlinkAsync(path: string): Promise<string>;
+declare export function realpathAsync(path: string): Promise<string>;
+declare export function realpathAsync(path: string, cache: string): Promise<string>;
+declare export function unlinkAsync(path: string): Promise<void>;
+declare export function rmdirAsync(path: string): Promise<void>;
+declare export function mkdirAsync(path: string, mode?: number): Promise<void>;
+declare export function mkdirAsync(path: string, mode?: string): Promise<void>;
+declare export function readdirAsync(path: string): Promise<string[]>;
+declare export function closeAsync(fd: number): Promise<void>;
+declare export function openAsync(path: string, flags: string, mode?: string): Promise<number>;
+declare export function utimesAsync(path: string, atime: number, mtime: number): Promise<void>;
+declare export function futimesAsync(fd: number, atime: number, mtime: number): Promise<void>;
+declare export function fsyncAsync(fd: number): Promise<void>;
+declare export function writeAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
+declare export function readAsync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): Promise<[number, NodeBuffer]>;
+declare export function readFileAsync(filename: string, encoding: string): Promise<string>;
+declare export function readFileAsync(filename: string, options: OpenOptions): Promise<string>;
+declare export function readFileAsync(filename: string): Promise<NodeBuffer>;
+declare export function writeFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
+declare export function writeFileAsync(filename: string, data: any, options?: OpenOptions): Promise<void>;
+declare export function appendFileAsync(filename: string, data: any, encoding?: string): Promise<void>;
+declare export function appendFileAsync(filename: string, data: any, option?: OpenOptions): Promise<void>;
+
+declare export function existsAsync(path: string): Promise<boolean>;
+declare export function ensureDirAsync(path: string): Promise<void>;
diff --git a/fs-extra/fs-extra.d.ts b/fs-extra/fs-extra.d.ts
index b133047dec..8ec6bdf5f7 100644
--- a/fs-extra/fs-extra.d.ts
+++ b/fs-extra/fs-extra.d.ts
@@ -7,213 +7,212 @@
 
 ///<reference path="../node/node.d.ts"/>
 
-declare module "fs-extra" {
-	import stream = require("stream");
 
-	export interface Stats {
-		isFile(): boolean;
-		isDirectory(): boolean;
-		isBlockDevice(): boolean;
-		isCharacterDevice(): boolean;
-		isSymbolicLink(): boolean;
-		isFIFO(): boolean;
-		isSocket(): boolean;
-		dev: number;
-		ino: number;
-		mode: number;
-		nlink: number;
-		uid: number;
-		gid: number;
-		rdev: number;
-		size: number;
-		blksize: number;
-		blocks: number;
-		atime: Date;
-		mtime: Date;
-		ctime: Date;
-	}
+import stream = require("stream");
 
-	export interface FSWatcher {
-		close(): void;
-	}
-
-	export class ReadStream extends stream.Readable { }
-	export class WriteStream extends stream.Writable { }
-
-	//extended methods
-	export function copy(src: string, dest: string, callback?: (err: Error) => void): void;
-	export function copy(src: string, dest: string, filter: CopyFilter, callback?: (err: Error) => void): void;
-	export function copy(src: string, dest: string, options: CopyOptions, callback?: (err: Error) => void): void;
-
-	export function copySync(src: string, dest: string): void;
-	export function copySync(src: string, dest: string, filter: CopyFilter): void;
-	export function copySync(src: string, dest: string, options: CopyOptions): void;
-
-	export function createFile(file: string, callback?: (err: Error) => void): void;
-	export function createFileSync(file: string): void;
-
-	export function mkdirs(dir: string, callback?: (err: Error) => void): void;
-	export function mkdirp(dir: string, callback?: (err: Error) => void): void;
-	export function mkdirs(dir: string, options?: MkdirOptions, callback?: (err: Error) => void): void;
-	export function mkdirp(dir: string, options?: MkdirOptions, callback?: (err: Error) => void): void;
-	export function mkdirsSync(dir: string, options?: MkdirOptions): void;
-	export function mkdirpSync(dir: string, options?: MkdirOptions): void;
-
-	export function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputFileSync(file: string, data: any): void;
-
-	export function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
-	export function outputJsonSync(file: string, data: any): void;
-	export function outputJSONSync(file: string, data: any): void;
-
-	export function readJson(file: string, callback: (err: Error, jsonObject: any) => void): void;
-	export function readJson(file: string, options: OpenOptions, callback: (err: Error, jsonObject: any) => void): void;
-	export function readJSON(file: string, callback: (err: Error, jsonObject: any) => void): void;
-	export function readJSON(file: string, options: OpenOptions, callback: (err: Error, jsonObject: any) => void): void;
-
-	export function readJsonSync(file: string, options?: OpenOptions): any;
-	export function readJSONSync(file: string, options?: OpenOptions): any;
-
-	export function remove(dir: string, callback?: (err: Error) => void): void;
-	export function removeSync(dir: string): void;
-	// export function delete(dir: string, callback?: (err: Error) => void): void;
-	// export function deleteSync(dir: string): void;
-
-	export function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
-	export function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
-	export function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-
-	export function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
-	export function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
-
-	export function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
-	export function renameSync(oldPath: string, newPath: string): void;
-	export function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
-	export function truncateSync(fd: number, len: number): void;
-	export function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function chownSync(path: string, uid: number, gid: number): void;
-	export function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function fchownSync(fd: number, uid: number, gid: number): void;
-	export function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
-	export function lchownSync(path: string, uid: number, gid: number): void;
-	export function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
-	export function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
-	export function chmodSync(path: string, mode: number): void;
-	export function chmodSync(path: string, mode: string): void;
-	export function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
-	export function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
-	export function fchmodSync(fd: number, mode: number): void;
-	export function fchmodSync(fd: number, mode: string): void;
-	export function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
-	export function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
-	export function lchmodSync(path: string, mode: number): void;
-	export function lchmodSync(path: string, mode: string): void;
-	export function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-	export function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
-	export function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
-	export function statSync(path: string): Stats;
-	export function lstatSync(path: string): Stats;
-	export function fstatSync(fd: number): Stats;
-	export function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
-	export function linkSync(srcpath: string, dstpath: string): void;
-	export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
-	export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-	export function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
-	export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
-	export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
-	export function realpathSync(path: string, cache?: boolean): string;
-	export function unlink(path: string, callback?: (err: Error) => void): void;
-	export function unlinkSync(path: string): void;
-	export function rmdir(path: string, callback?: (err: Error) => void): void;
-	export function rmdirSync(path: string): void;
-	export function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
-	export function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
-	export function mkdirSync(path: string, mode?: number): void;
-	export function mkdirSync(path: string, mode?: string): void;
-	export function readdir(path: string, callback?: (err: Error, files: string[]) => void ): void;
-	export function readdirSync(path: string): string[];
-	export function close(fd: number, callback?: (err: Error) => void): void;
-	export function closeSync(fd: number): void;
-	export function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
-	export function openSync(path: string, flags: string, mode?: string): number;
-	export function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
-	export function utimesSync(path: string, atime: number, mtime: number): void;
-	export function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
-	export function futimesSync(fd: number, atime: number, mtime: number): void;
-	export function fsync(fd: number, callback?: (err: Error) => void): void;
-	export function fsyncSync(fd: number): void;
-	export function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
-	export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-	export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void ): void;
-	export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
-	export function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void ): void;
-	export function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void ): void;
-	export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void ): void;
-	export function readFileSync(filename: string): NodeBuffer;
-	export function readFileSync(filename: string, encoding: string): string;
-	export function readFileSync(filename: string, options: OpenOptions): string;
-	export function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-	export function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
-	export function writeFileSync(filename: string, data: any, encoding?: string): void;
-	export function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
-	export function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
-	export function appendFile(filename: string, data: any,option?: OpenOptions, callback?: (err: Error) => void): void;
-	export function appendFileSync(filename: string, data: any, encoding?: string): void;
-	export function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
-	export function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
-	export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
-	export function unwatchFile(filename: string, listener?: Stats): void;
-	export function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
-	export function exists(path: string, callback?: (exists: boolean) => void ): void;
-	export function existsSync(path: string): boolean;
-    export function ensureDir(path: string, cb: (err: Error) => void): void;
-    export function ensureDirSync(path: string): void;
-	export function ensureFile(path: string, cb: (err: Error) => void): void;
-	export function ensureFileSync(path: string): void;
-	export function ensureLink(path: string, cb: (err: Error) => void): void;
-	export function ensureLinkSync(path: string): void;
-	export function ensureSymlink(path: string, cb: (err: Error) => void): void;
-	export function ensureSymlinkSync(path: string): void;
-    export function emptyDir(path: string, callback?: (err: Error) => void): void;
-    export function emptyDirSync(path: string): boolean;
-
-	export interface CopyFilterFunction {
-		(src: string): boolean
-	}
-
-	export type CopyFilter = CopyFilterFunction | RegExp;
-
-	export interface CopyOptions {
-		clobber?: boolean
-		preserveTimestamps?: boolean
-		filter?: CopyFilter
-	}
-
-	export interface OpenOptions {
-		encoding?: string;
-		flag?: string;
-	}
-
-	export interface MkdirOptions {
-		fs?: any;
-		mode?: number;
-	}
-
-	export interface ReadStreamOptions {
-		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		bufferSize?: number;
-	}
-	export interface WriteStreamOptions {
-		flags?: string;
-		encoding?: string;
-		string?: string;
-	}
-	export function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
-	export function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
-	export function createOutputStream(path: string, options?: WriteStreamOptions): WriteStream;
+export interface Stats {
+    isFile(): boolean;
+    isDirectory(): boolean;
+    isBlockDevice(): boolean;
+    isCharacterDevice(): boolean;
+    isSymbolicLink(): boolean;
+    isFIFO(): boolean;
+    isSocket(): boolean;
+    dev: number;
+    ino: number;
+    mode: number;
+    nlink: number;
+    uid: number;
+    gid: number;
+    rdev: number;
+    size: number;
+    blksize: number;
+    blocks: number;
+    atime: Date;
+    mtime: Date;
+    ctime: Date;
 }
+
+export interface FSWatcher {
+    close(): void;
+}
+
+declare export class ReadStream extends stream.Readable { }
+declare export class WriteStream extends stream.Writable { }
+
+//extended methods
+declare export function copy(src: string, dest: string, callback?: (err: Error) => void): void;
+declare export function copy(src: string, dest: string, filter: CopyFilter, callback?: (err: Error) => void): void;
+declare export function copy(src: string, dest: string, options: CopyOptions, callback?: (err: Error) => void): void;
+
+declare export function copySync(src: string, dest: string): void;
+declare export function copySync(src: string, dest: string, filter: CopyFilter): void;
+declare export function copySync(src: string, dest: string, options: CopyOptions): void;
+
+declare export function createFile(file: string, callback?: (err: Error) => void): void;
+declare export function createFileSync(file: string): void;
+
+declare export function mkdirs(dir: string, callback?: (err: Error) => void): void;
+declare export function mkdirp(dir: string, callback?: (err: Error) => void): void;
+declare export function mkdirs(dir: string, options?: MkdirOptions, callback?: (err: Error) => void): void;
+declare export function mkdirp(dir: string, options?: MkdirOptions, callback?: (err: Error) => void): void;
+declare export function mkdirsSync(dir: string, options?: MkdirOptions): void;
+declare export function mkdirpSync(dir: string, options?: MkdirOptions): void;
+
+declare export function outputFile(file: string, data: any, callback?: (err: Error) => void): void;
+declare export function outputFileSync(file: string, data: any): void;
+
+declare export function outputJson(file: string, data: any, callback?: (err: Error) => void): void;
+declare export function outputJSON(file: string, data: any, callback?: (err: Error) => void): void;
+declare export function outputJsonSync(file: string, data: any): void;
+declare export function outputJSONSync(file: string, data: any): void;
+
+declare export function readJson(file: string, callback: (err: Error, jsonObject: any) => void): void;
+declare export function readJson(file: string, options: OpenOptions, callback: (err: Error, jsonObject: any) => void): void;
+declare export function readJSON(file: string, callback: (err: Error, jsonObject: any) => void): void;
+declare export function readJSON(file: string, options: OpenOptions, callback: (err: Error, jsonObject: any) => void): void;
+
+declare export function readJsonSync(file: string, options?: OpenOptions): any;
+declare export function readJSONSync(file: string, options?: OpenOptions): any;
+
+declare export function remove(dir: string, callback?: (err: Error) => void): void;
+declare export function removeSync(dir: string): void;
+// export function delete(dir: string, callback?: (err: Error) => void): void;
+// export function deleteSync(dir: string): void;
+
+declare export function writeJson(file: string, object: any, callback?: (err: Error) => void): void;
+declare export function writeJson(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+declare export function writeJSON(file: string, object: any, callback?: (err: Error) => void): void;
+declare export function writeJSON(file: string, object: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+
+declare export function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
+declare export function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
+
+declare export function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
+declare export function renameSync(oldPath: string, newPath: string): void;
+declare export function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
+declare export function truncateSync(fd: number, len: number): void;
+declare export function chown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+declare export function chownSync(path: string, uid: number, gid: number): void;
+declare export function fchown(fd: number, uid: number, gid: number, callback?: (err: Error) => void): void;
+declare export function fchownSync(fd: number, uid: number, gid: number): void;
+declare export function lchown(path: string, uid: number, gid: number, callback?: (err: Error) => void): void;
+declare export function lchownSync(path: string, uid: number, gid: number): void;
+declare export function chmod(path: string, mode: number, callback?: (err: Error) => void): void;
+declare export function chmod(path: string, mode: string, callback?: (err: Error) => void): void;
+declare export function chmodSync(path: string, mode: number): void;
+declare export function chmodSync(path: string, mode: string): void;
+declare export function fchmod(fd: number, mode: number, callback?: (err: Error) => void): void;
+declare export function fchmod(fd: number, mode: string, callback?: (err: Error) => void): void;
+declare export function fchmodSync(fd: number, mode: number): void;
+declare export function fchmodSync(fd: number, mode: string): void;
+declare export function lchmod(path: string, mode: string, callback?: (err: Error) => void): void;
+declare export function lchmod(path: string, mode: number, callback?: (err: Error) => void): void;
+declare export function lchmodSync(path: string, mode: number): void;
+declare export function lchmodSync(path: string, mode: string): void;
+declare export function stat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+declare export function lstat(path: string, callback?: (err: Error, stats: Stats) => void): void;
+declare export function fstat(fd: number, callback?: (err: Error, stats: Stats) => void): void;
+declare export function statSync(path: string): Stats;
+declare export function lstatSync(path: string): Stats;
+declare export function fstatSync(fd: number): Stats;
+declare export function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
+declare export function linkSync(srcpath: string, dstpath: string): void;
+declare export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
+declare export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+declare export function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
+declare export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
+declare export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
+declare export function realpathSync(path: string, cache?: boolean): string;
+declare export function unlink(path: string, callback?: (err: Error) => void): void;
+declare export function unlinkSync(path: string): void;
+declare export function rmdir(path: string, callback?: (err: Error) => void): void;
+declare export function rmdirSync(path: string): void;
+declare export function mkdir(path: string, mode?: number, callback?: (err: Error) => void): void;
+declare export function mkdir(path: string, mode?: string, callback?: (err: Error) => void): void;
+declare export function mkdirSync(path: string, mode?: number): void;
+declare export function mkdirSync(path: string, mode?: string): void;
+declare export function readdir(path: string, callback?: (err: Error, files: string[]) => void): void;
+declare export function readdirSync(path: string): string[];
+declare export function close(fd: number, callback?: (err: Error) => void): void;
+declare export function closeSync(fd: number): void;
+declare export function open(path: string, flags: string, mode?: string, callback?: (err: Error, fs: number) => void): void;
+declare export function openSync(path: string, flags: string, mode?: string): number;
+declare export function utimes(path: string, atime: number, mtime: number, callback?: (err: Error) => void): void;
+declare export function utimesSync(path: string, atime: number, mtime: number): void;
+declare export function futimes(fd: number, atime: number, mtime: number, callback?: (err: Error) => void): void;
+declare export function futimesSync(fd: number, atime: number, mtime: number): void;
+declare export function fsync(fd: number, callback?: (err: Error) => void): void;
+declare export function fsyncSync(fd: number): void;
+declare export function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, written: number, buffer: NodeBuffer) => void): void;
+declare export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+declare export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: Error, bytesRead: number, buffer: NodeBuffer) => void): void;
+declare export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number;
+declare export function readFile(filename: string, encoding: string, callback: (err: Error, data: string) => void): void;
+declare export function readFile(filename: string, options: OpenOptions, callback: (err: Error, data: string) => void): void;
+declare export function readFile(filename: string, callback: (err: Error, data: NodeBuffer) => void): void;
+declare export function readFileSync(filename: string): NodeBuffer;
+declare export function readFileSync(filename: string, encoding: string): string;
+declare export function readFileSync(filename: string, options: OpenOptions): string;
+declare export function writeFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
+declare export function writeFile(filename: string, data: any, options?: OpenOptions, callback?: (err: Error) => void): void;
+declare export function writeFileSync(filename: string, data: any, encoding?: string): void;
+declare export function writeFileSync(filename: string, data: any, option?: OpenOptions): void;
+declare export function appendFile(filename: string, data: any, encoding?: string, callback?: (err: Error) => void): void;
+declare export function appendFile(filename: string, data: any, option?: OpenOptions, callback?: (err: Error) => void): void;
+declare export function appendFileSync(filename: string, data: any, encoding?: string): void;
+declare export function appendFileSync(filename: string, data: any, option?: OpenOptions): void;
+declare export function watchFile(filename: string, listener: { curr: Stats; prev: Stats; }): void;
+declare export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: { curr: Stats; prev: Stats; }): void;
+declare export function unwatchFile(filename: string, listener?: Stats): void;
+declare export function watch(filename: string, options?: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher;
+declare export function exists(path: string, callback?: (exists: boolean) => void): void;
+declare export function existsSync(path: string): boolean;
+declare export function ensureDir(path: string, cb: (err: Error) => void): void;
+declare export function ensureDirSync(path: string): void;
+declare export function ensureFile(path: string, cb: (err: Error) => void): void;
+declare export function ensureFileSync(path: string): void;
+declare export function ensureLink(path: string, cb: (err: Error) => void): void;
+declare export function ensureLinkSync(path: string): void;
+declare export function ensureSymlink(path: string, cb: (err: Error) => void): void;
+declare export function ensureSymlinkSync(path: string): void;
+declare export function emptyDir(path: string, callback?: (err: Error) => void): void;
+declare export function emptyDirSync(path: string): boolean;
+
+export interface CopyFilterFunction {
+    (src: string): boolean
+}
+
+export type CopyFilter = CopyFilterFunction | RegExp;
+
+export interface CopyOptions {
+    clobber?: boolean
+    preserveTimestamps?: boolean
+    filter?: CopyFilter
+}
+
+export interface OpenOptions {
+    encoding?: string;
+    flag?: string;
+}
+
+export interface MkdirOptions {
+    fs?: any;
+    mode?: number;
+}
+
+export interface ReadStreamOptions {
+    flags?: string;
+    encoding?: string;
+    fd?: number;
+    mode?: number;
+    bufferSize?: number;
+}
+export interface WriteStreamOptions {
+    flags?: string;
+    encoding?: string;
+    string?: string;
+}
+declare export function createReadStream(path: string, options?: ReadStreamOptions): ReadStream;
+declare export function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream;
+declare export function createOutputStream(path: string, options?: WriteStreamOptions): WriteStream;
diff --git a/fs-mock/fs-mock.d.ts b/fs-mock/fs-mock.d.ts
index fa92c99e20..617035e7ff 100644
--- a/fs-mock/fs-mock.d.ts
+++ b/fs-mock/fs-mock.d.ts
@@ -5,140 +5,138 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "fs-mock" {
-	import stream = require("stream");
-	import events = require("events");
-	import fs = require("fs");
 
-	namespace FS {
-		export interface Opts {
-			windows?: boolean;
-			drives?: string[];
-			root?: string;
-		}
-	}
-
-	class FS {
-		constructor(content: any, opts?: FS.Opts)
-
-		rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		renameSync(oldPath: string, newPath: string): void;
-		truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		truncateSync(path: string, len?: number): void;
-		ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		ftruncateSync(fd: number, len?: number): void;
-		chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		chownSync(path: string, uid: number, gid: number): void;
-		fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		fchownSync(fd: number, uid: number, gid: number): void;
-		lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		lchownSync(path: string, uid: number, gid: number): void;
-		chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		chmodSync(path: string, mode: number): void;
-		chmodSync(path: string, mode: string): void;
-		fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		fchmodSync(fd: number, mode: number): void;
-		fchmodSync(fd: number, mode: string): void;
-		lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		lchmodSync(path: string, mode: number): void;
-		lchmodSync(path: string, mode: string): void;
-		stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
-		lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
-		fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
-		statSync(path: string): fs.Stats;
-		lstatSync(path: string): fs.Stats;
-		fstatSync(fd: number): fs.Stats;
-		link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		linkSync(srcpath: string, dstpath: string): void;
-		symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		symlinkSync(srcpath: string, dstpath: string, type?: string): void;
-		readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
-		readlinkSync(path: string): string;
-		realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
-		realpath(path: string, cache: {[path: string]: string}, callback: (err: NodeJS.ErrnoException, resolvedPath: string) =>any): void;
-		realpathSync(path: string, cache?: {[path: string]: string}): string;
-		unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		unlinkSync(path: string): void;
-		rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		rmdirSync(path: string): void;
-		mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		mkdirSync(path: string, mode?: number): void;
-		mkdirSync(path: string, mode?: string): void;
-		readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
-		readdirSync(path: string): string[];
-		close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		closeSync(fd: number): void;
-		open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-		open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-		open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
-		openSync(path: string, flags: string, mode?: number): number;
-		openSync(path: string, flags: string, mode?: string): number;
-		utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		utimesSync(path: string, atime: number, mtime: number): void;
-		utimesSync(path: string, atime: Date, mtime: Date): void;
-		futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		futimesSync(fd: number, atime: number, mtime: number): void;
-		futimesSync(fd: number, atime: Date, mtime: Date): void;
-		fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
-		fsyncSync(fd: number): void;
-		write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
-		writeSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
-		read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
-		readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
-		readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-		readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
-		readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
-		readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void ): void;
-		readFileSync(filename: string, encoding: string): string;
-		readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
-		readFileSync(filename: string, options?: { flag?: string; }): Buffer;
-		writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-		writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-		writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-		writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-		writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-		appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-		appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
-		appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-		appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
-		appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-		watchFile(filename: string, listener: (curr: fs.Stats, prev: fs.Stats) => void): void;
-		watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: fs.Stats, prev: fs.Stats) => void): void;
-		unwatchFile(filename: string, listener?: (curr: fs.Stats, prev: fs.Stats) => void): void;
-		watch(filename: string, listener?: (event: string, filename: string) => any): fs.FSWatcher;
-		watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): fs.FSWatcher;
-		exists(path: string, callback?: (exists: boolean) => void): void;
-		existsSync(path: string): boolean;
-		createReadStream(path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			fd?: string;
-			mode?: number;
-			bufferSize?: number;
-		}): fs.ReadStream;
-		createReadStream(path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			fd?: string;
-			mode?: string;
-			bufferSize?: number;
-		}): fs.ReadStream;
-		createWriteStream(path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			string?: string;
-		}): fs.WriteStream;
-	}
-
-	export = FS;
+import stream = require("stream");
+import events = require("events");
+import fs = require("fs");
 
+declare namespace FS {
+    export interface Opts {
+        windows?: boolean;
+        drives?: string[];
+        root?: string;
+    }
 }
+
+declare class FS {
+    constructor(content: any, opts?: FS.Opts)
+
+    rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    renameSync(oldPath: string, newPath: string): void;
+    truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    truncateSync(path: string, len?: number): void;
+    ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    ftruncateSync(fd: number, len?: number): void;
+    chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    chownSync(path: string, uid: number, gid: number): void;
+    fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    fchownSync(fd: number, uid: number, gid: number): void;
+    lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    lchownSync(path: string, uid: number, gid: number): void;
+    chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    chmodSync(path: string, mode: number): void;
+    chmodSync(path: string, mode: string): void;
+    fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    fchmodSync(fd: number, mode: number): void;
+    fchmodSync(fd: number, mode: string): void;
+    lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    lchmodSync(path: string, mode: number): void;
+    lchmodSync(path: string, mode: string): void;
+    stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
+    lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
+    fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
+    statSync(path: string): fs.Stats;
+    lstatSync(path: string): fs.Stats;
+    fstatSync(fd: number): fs.Stats;
+    link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    linkSync(srcpath: string, dstpath: string): void;
+    symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+    readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
+    readlinkSync(path: string): string;
+    realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+    realpath(path: string, cache: { [path: string]: string }, callback: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void;
+    realpathSync(path: string, cache?: { [path: string]: string }): string;
+    unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    unlinkSync(path: string): void;
+    rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    rmdirSync(path: string): void;
+    mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    mkdirSync(path: string, mode?: number): void;
+    mkdirSync(path: string, mode?: string): void;
+    readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void;
+    readdirSync(path: string): string[];
+    close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    closeSync(fd: number): void;
+    open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void;
+    openSync(path: string, flags: string, mode?: number): number;
+    openSync(path: string, flags: string, mode?: string): number;
+    utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    utimesSync(path: string, atime: number, mtime: number): void;
+    utimesSync(path: string, atime: Date, mtime: Date): void;
+    futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    futimesSync(fd: number, atime: number, mtime: number): void;
+    futimesSync(fd: number, atime: Date, mtime: Date): void;
+    fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void;
+    fsyncSync(fd: number): void;
+    write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void;
+    writeSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
+    read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void;
+    readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number;
+    readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+    readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void;
+    readFileSync(filename: string, encoding: string): string;
+    readFileSync(filename: string, options: { encoding: string; flag?: string; }): string;
+    readFileSync(filename: string, options?: { flag?: string; }): Buffer;
+    writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    watchFile(filename: string, listener: (curr: fs.Stats, prev: fs.Stats) => void): void;
+    watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: fs.Stats, prev: fs.Stats) => void): void;
+    unwatchFile(filename: string, listener?: (curr: fs.Stats, prev: fs.Stats) => void): void;
+    watch(filename: string, listener?: (event: string, filename: string) => any): fs.FSWatcher;
+    watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): fs.FSWatcher;
+    exists(path: string, callback?: (exists: boolean) => void): void;
+    existsSync(path: string): boolean;
+    createReadStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: string;
+        mode?: number;
+        bufferSize?: number;
+    }): fs.ReadStream;
+    createReadStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: string;
+        mode?: string;
+        bufferSize?: number;
+    }): fs.ReadStream;
+    createWriteStream(path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        string?: string;
+    }): fs.WriteStream;
+}
+
+export = FS;
diff --git a/ftp/ftp.d.ts b/ftp/ftp.d.ts
index 2b393a46ea..5f6d1983e5 100644
--- a/ftp/ftp.d.ts
+++ b/ftp/ftp.d.ts
@@ -5,290 +5,289 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "ftp" {
 
-	import events = require("events");
-	import tls = require("tls");
 
-	namespace Client {
+import events = require("events");
+import tls = require("tls");
 
-		/**
-		 * Options for Client#connect()
-		 */
-		export interface Options {
-			/**
-			 * The hostname or IP address of the FTP server. Default: 'localhost'
-			 */
-			host?: string;
-			/**
-			 * The port of the FTP server. Default: 21
-			 */
-			port?: number;
-			/**
-			 * Set to true for both control and data connection encryption, 'control' for control connection encryption only, or 'implicit' for
-			 * implicitly encrypted control connection (this mode is deprecated in modern times, but usually uses port 990) Default: false
-			 */
-			secure?: string|boolean;
-			/**
-			 * Additional options to be passed to tls.connect(). Default: (none)
-			 */
-			secureOptions?: tls.ConnectionOptions;
-			/**
-			 * Username for authentication. Default: 'anonymous'
-			 */
-			user?: string;
-			/**
-			 * Password for authentication. Default: 'anonymous@'
-			 */
-			password?: string;
-			/**
-			 * How long (in milliseconds) to wait for the control connection to be established. Default: 10000
-			 */
-			connTimeout?: number;
-			/**
-			 * How long (in milliseconds) to wait for a PASV data connection to be established. Default: 10000
-			 */
-			pasvTimeout?: number;
-			/**
-			 * How often (in milliseconds) to send a 'dummy' (NOOP) command to keep the connection alive. Default: 10000
-			 */
-			keepalive?: number;
-		}
+declare namespace Client {
 
-		/**
-		 * Element returned by Client#list()
-		 */
-		export interface ListingElement {
-			/**
-			 * A single character denoting the entry type: 'd' for directory, '-' for file (or 'l' for symlink on **\*NIX only**).
-			 */
-			"type": string;
-			/**
-			 * The name of the entry
-			 */
-			name: string;
-			/**
-			 * The size of the entry in bytes
-			 */
-			size: string;
-			/**
-			 * The last modified date of the entry
-			 */
-			date: Date;
-			/**
-			 * The various permissions for this entry **(*NIX only)**
-			 */
-			rights?: {
+    /**
+     * Options for Client#connect()
+     */
+    export interface Options {
+        /**
+         * The hostname or IP address of the FTP server. Default: 'localhost'
+         */
+        host?: string;
+        /**
+         * The port of the FTP server. Default: 21
+         */
+        port?: number;
+        /**
+         * Set to true for both control and data connection encryption, 'control' for control connection encryption only, or 'implicit' for
+         * implicitly encrypted control connection (this mode is deprecated in modern times, but usually uses port 990) Default: false
+         */
+        secure?: string | boolean;
+        /**
+         * Additional options to be passed to tls.connect(). Default: (none)
+         */
+        secureOptions?: tls.ConnectionOptions;
+        /**
+         * Username for authentication. Default: 'anonymous'
+         */
+        user?: string;
+        /**
+         * Password for authentication. Default: 'anonymous@'
+         */
+        password?: string;
+        /**
+         * How long (in milliseconds) to wait for the control connection to be established. Default: 10000
+         */
+        connTimeout?: number;
+        /**
+         * How long (in milliseconds) to wait for a PASV data connection to be established. Default: 10000
+         */
+        pasvTimeout?: number;
+        /**
+         * How often (in milliseconds) to send a 'dummy' (NOOP) command to keep the connection alive. Default: 10000
+         */
+        keepalive?: number;
+    }
+
+    /**
+     * Element returned by Client#list()
+     */
+    export interface ListingElement {
+        /**
+         * A single character denoting the entry type: 'd' for directory, '-' for file (or 'l' for symlink on **\*NIX only**).
+         */
+        "type": string;
+        /**
+         * The name of the entry
+         */
+        name: string;
+        /**
+         * The size of the entry in bytes
+         */
+        size: string;
+        /**
+         * The last modified date of the entry
+         */
+        date: Date;
+        /**
+         * The various permissions for this entry **(*NIX only)**
+         */
+        rights?: {
 			/**
 			 * An empty string or any combination of 'r', 'w', 'x'.
 			 */
-				user: string;
+            user: string;
 			/**
 			 * An empty string or any combination of 'r', 'w', 'x'.
 			 */
-				group: string;
+            group: string;
 			/**
 			 * An empty string or any combination of 'r', 'w', 'x'.
 			 */
-				other: string;
-			};
-			/**
-			 * The user name or ID that this entry belongs to **(*NIX only)**.
-			 */
-			owner?: string;
-			/**
-			 * The group name or ID that this entry belongs to **(*NIX only)**.
-			 */
-			group?: string;
-			/**
-			 * For symlink entries, this is the symlink's target **(*NIX only)**.
-			 */
-			target?: string;
-			/**
-			 * True if the sticky bit is set for this entry **(*NIX only)**.
-			 */
-			sticky?: boolean;
-		}
-	}
-
-
-	/**
-	 * FTP client.
-	 *
-	 * Events:
-	 * @event greeting(< string >msg) - Emitted after connection. msg is the text the server sent upon connection.
-	 * @event ready() - Emitted when connection and authentication were sucessful.
-	 * @event close(< boolean >hadErr) - Emitted when the connection has fully closed.
-	 * @event end() - Emitted when the connection has ended.
-	 * @event error(< Error >err) - Emitted when an error occurs. In case of protocol-level errors, err contains
-	 *                              a 'code' property that references the related 3-digit FTP response code.
-	 */
-	class Client extends events.EventEmitter {
-
-		/**
-		 * Creates and returns a new FTP client instance.
-		 */
-		constructor();
-
-		/**
-		 * Connects to an FTP server.
-		 */
-		connect(config?: Client.Options): void;
-
-		/**
-		 * Closes the connection to the server after any/all enqueued commands have been executed.
-		 */
-		end(): void;
-
-		/**
-		 * Closes the connection to the server immediately.
-		 */
-		destroy(): void;
-
-		/**
-		 * Retrieves the directory listing of path.
-		 * @param path defaults to the current working directory.
-		 * @param useCompression defaults to false.
-		 */
-		list(path: string, useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		list(path: string, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		list(useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		list(callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-
-		/**
-		 * Retrieves a file at path from the server. useCompression defaults to false
-		 */
-		get(path: string, callback: (error: Error, stream: NodeJS.ReadableStream) => void): void;
-		get(path: string, useCompression: boolean, callback: (error: Error, stream: NodeJS.ReadableStream) => void): void;
-
-		/**
-		 * Sends data to the server to be stored as destPath.
-		 * @param input can be a ReadableStream, a Buffer, or a path to a local file.
-		 * @param destPath
-		 * @param useCompression defaults to false.
-		 */
-		put(input: NodeJS.ReadableStream|Buffer|string, destPath: string, useCompression: boolean, callback: (error: Error) => void): void;
-		put(input: NodeJS.ReadableStream|Buffer|string, destPath: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Same as put(), except if destPath already exists, it will be appended to instead of overwritten.
-		 * @param input can be a ReadableStream, a Buffer, or a path to a local file.
-		 * @param destPath
-		 * @param useCompression defaults to false.
-		 */
-		append(input: NodeJS.ReadableStream|Buffer|string, destPath: string, useCompression: boolean, callback: (error: Error) => void): void;
-		append(input: NodeJS.ReadableStream|Buffer|string, destPath: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Renames oldPath to newPath on the server
-		 */
-		rename(oldPath: string, newPath: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Logout the user from the server.
-		 */
-		logout(callback: (error: Error) => void): void;
-
-		/**
-		 * Delete a file on the server
-		 */
-		delete(path: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Changes the current working directory to path. callback has 2 parameters: < Error >err, < string >currentDir.
-		 * Note: currentDir is only given if the server replies with the path in the response text.
-		 */
-		cwd(path: string, callback: (error: Error, currentDir?: string) => void): void;
-
-		/**
-		 * Aborts the current data transfer (e.g. from get(), put(), or list())
-		 */
-		abort(callback: (error: Error) => void): void;
-
-		/**
-		 * Sends command (e.g. 'CHMOD 755 foo', 'QUOTA') using SITE. callback has 3 parameters:
-		 * < Error >err, < _string >responseText, < integer >responseCode.
-		 */
-		site(command: string, callback: (error: Error, responseText: string, responseCode: number) => void): void;
-
-		/**
-		 * Retrieves human-readable information about the server's status.
-		 */
-		status(callback: (error: Error, status: string) => void): void;
-
-		/**
-		 * Sets the transfer data type to ASCII.
-		 */
-		ascii(callback: (error: Error) => void): void;
-
-		/**
-		 * Sets the transfer data type to binary (default at time of connection).
-		 */
-		binary(callback: (error: Error) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Creates a new directory, path, on the server. recursive is for enabling a 'mkdir -p' algorithm and defaults to false
-		 */
-		mkdir(path: string, recursive: boolean, callback: (error: Error) => void): void;
-		mkdir(path: string, callback: (error: Error) => void): void;
-
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Removes a directory, path, on the server. If recursive, this call will delete the contents of the directory if it is not empty
-		 */
-		rmdir(path: string, recursive: boolean, callback: (error: Error) => void): void;
-		rmdir(path: string, callback: (error: Error) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Changes the working directory to the parent of the current directory
-		 */
-		cdup(callback: (error: Error) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Retrieves the current working directory
-		 */
-		pwd(callback: (error: Error, path: string) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Retrieves the server's operating system.
-		 */
-		system(callback: (error: Error, OS: string) => void): void;
-
-		/**
-		 * Optional "standard" commands (RFC 959)
-		 * Similar to list(), except the directory is temporarily changed to path to retrieve the directory listing.
-		 * This is useful for servers that do not handle characters like spaces and quotes in directory names well for the LIST command.
-		 * This function is "optional" because it relies on pwd() being available.
-		 */
-		listSafe(path: string, useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		listSafe(path: string, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		listSafe(useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-		listSafe(callback: (error: Error, listing: Client.ListingElement[]) => void): void;
-
-		/**
-		 * Extended commands (RFC 3659)
-		 * Retrieves the size of path
-		 */
-		size(path: string, callback: (error: Error, size: number) => void): void;
-
-		/**
-		 * Extended commands (RFC 3659)
-		 * Retrieves the last modified date and time for path
-		 */
-		lastMod(path: string, callback: (error: Error, lastMod: Date) => void): void;
-
-		/**
-		 * Extended commands (RFC 3659)
-		 * Sets the file byte offset for the next file transfer action (get/put) to byteOffset
-		 */
-		restart(byteOffset: number, callback: (error: Error) => void): void;
-
-	}
-
-	export = Client;
+            other: string;
+        };
+        /**
+         * The user name or ID that this entry belongs to **(*NIX only)**.
+         */
+        owner?: string;
+        /**
+         * The group name or ID that this entry belongs to **(*NIX only)**.
+         */
+        group?: string;
+        /**
+         * For symlink entries, this is the symlink's target **(*NIX only)**.
+         */
+        target?: string;
+        /**
+         * True if the sticky bit is set for this entry **(*NIX only)**.
+         */
+        sticky?: boolean;
+    }
 }
+
+
+/**
+ * FTP client.
+ *
+ * Events:
+ * @event greeting(< string >msg) - Emitted after connection. msg is the text the server sent upon connection.
+ * @event ready() - Emitted when connection and authentication were sucessful.
+ * @event close(< boolean >hadErr) - Emitted when the connection has fully closed.
+ * @event end() - Emitted when the connection has ended.
+ * @event error(< Error >err) - Emitted when an error occurs. In case of protocol-level errors, err contains
+ *                              a 'code' property that references the related 3-digit FTP response code.
+ */
+declare class Client extends events.EventEmitter {
+
+    /**
+     * Creates and returns a new FTP client instance.
+     */
+    constructor();
+
+    /**
+     * Connects to an FTP server.
+     */
+    connect(config?: Client.Options): void;
+
+    /**
+     * Closes the connection to the server after any/all enqueued commands have been executed.
+     */
+    end(): void;
+
+    /**
+     * Closes the connection to the server immediately.
+     */
+    destroy(): void;
+
+    /**
+     * Retrieves the directory listing of path.
+     * @param path defaults to the current working directory.
+     * @param useCompression defaults to false.
+     */
+    list(path: string, useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    list(path: string, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    list(useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    list(callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+
+    /**
+     * Retrieves a file at path from the server. useCompression defaults to false
+     */
+    get(path: string, callback: (error: Error, stream: NodeJS.ReadableStream) => void): void;
+    get(path: string, useCompression: boolean, callback: (error: Error, stream: NodeJS.ReadableStream) => void): void;
+
+    /**
+     * Sends data to the server to be stored as destPath.
+     * @param input can be a ReadableStream, a Buffer, or a path to a local file.
+     * @param destPath
+     * @param useCompression defaults to false.
+     */
+    put(input: NodeJS.ReadableStream | Buffer | string, destPath: string, useCompression: boolean, callback: (error: Error) => void): void;
+    put(input: NodeJS.ReadableStream | Buffer | string, destPath: string, callback: (error: Error) => void): void;
+
+    /**
+     * Same as put(), except if destPath already exists, it will be appended to instead of overwritten.
+     * @param input can be a ReadableStream, a Buffer, or a path to a local file.
+     * @param destPath
+     * @param useCompression defaults to false.
+     */
+    append(input: NodeJS.ReadableStream | Buffer | string, destPath: string, useCompression: boolean, callback: (error: Error) => void): void;
+    append(input: NodeJS.ReadableStream | Buffer | string, destPath: string, callback: (error: Error) => void): void;
+
+    /**
+     * Renames oldPath to newPath on the server
+     */
+    rename(oldPath: string, newPath: string, callback: (error: Error) => void): void;
+
+    /**
+     * Logout the user from the server.
+     */
+    logout(callback: (error: Error) => void): void;
+
+    /**
+     * Delete a file on the server
+     */
+    delete(path: string, callback: (error: Error) => void): void;
+
+    /**
+     * Changes the current working directory to path. callback has 2 parameters: < Error >err, < string >currentDir.
+     * Note: currentDir is only given if the server replies with the path in the response text.
+     */
+    cwd(path: string, callback: (error: Error, currentDir?: string) => void): void;
+
+    /**
+     * Aborts the current data transfer (e.g. from get(), put(), or list())
+     */
+    abort(callback: (error: Error) => void): void;
+
+    /**
+     * Sends command (e.g. 'CHMOD 755 foo', 'QUOTA') using SITE. callback has 3 parameters:
+     * < Error >err, < _string >responseText, < integer >responseCode.
+     */
+    site(command: string, callback: (error: Error, responseText: string, responseCode: number) => void): void;
+
+    /**
+     * Retrieves human-readable information about the server's status.
+     */
+    status(callback: (error: Error, status: string) => void): void;
+
+    /**
+     * Sets the transfer data type to ASCII.
+     */
+    ascii(callback: (error: Error) => void): void;
+
+    /**
+     * Sets the transfer data type to binary (default at time of connection).
+     */
+    binary(callback: (error: Error) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Creates a new directory, path, on the server. recursive is for enabling a 'mkdir -p' algorithm and defaults to false
+     */
+    mkdir(path: string, recursive: boolean, callback: (error: Error) => void): void;
+    mkdir(path: string, callback: (error: Error) => void): void;
+
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Removes a directory, path, on the server. If recursive, this call will delete the contents of the directory if it is not empty
+     */
+    rmdir(path: string, recursive: boolean, callback: (error: Error) => void): void;
+    rmdir(path: string, callback: (error: Error) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Changes the working directory to the parent of the current directory
+     */
+    cdup(callback: (error: Error) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Retrieves the current working directory
+     */
+    pwd(callback: (error: Error, path: string) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Retrieves the server's operating system.
+     */
+    system(callback: (error: Error, OS: string) => void): void;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Similar to list(), except the directory is temporarily changed to path to retrieve the directory listing.
+     * This is useful for servers that do not handle characters like spaces and quotes in directory names well for the LIST command.
+     * This function is "optional" because it relies on pwd() being available.
+     */
+    listSafe(path: string, useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    listSafe(path: string, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    listSafe(useCompression: boolean, callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+    listSafe(callback: (error: Error, listing: Client.ListingElement[]) => void): void;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Retrieves the size of path
+     */
+    size(path: string, callback: (error: Error, size: number) => void): void;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Retrieves the last modified date and time for path
+     */
+    lastMod(path: string, callback: (error: Error, lastMod: Date) => void): void;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Sets the file byte offset for the next file transfer action (get/put) to byteOffset
+     */
+    restart(byteOffset: number, callback: (error: Error) => void): void;
+
+}
+
+export = Client;
diff --git a/ftpd/ftpd.d.ts b/ftpd/ftpd.d.ts
index 6812e54673..590563dedb 100644
--- a/ftpd/ftpd.d.ts
+++ b/ftpd/ftpd.d.ts
@@ -5,198 +5,194 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "ftpd" {
-
-	import events = require("events");
-	import fs = require("fs");
-	import net = require("net");
-	import tls = require("tls");
-
-	/**
-	 * Options for FtpServer constructor
-	 */
-	export interface FtpServerOptions {
-		/**
-		 * Gets the initial working directory for the user. Called after user is authenticated
-		 * Typical cases where you would want/need the callback involve retrieving configurations from external datasources and suchlike.
-		 */
-		getInitialCwd: (connection: FtpConnection, callback?: (error: Error, path: string) => void) => void|string;
-		/**
-		 * Gets the root directory for the user relative to the CWD. Called after getInitialCwd. The user is not able to escape this directory.
-		 * Typical cases where you would want/need the callback involve retrieving configurations from external datasources and suchlike.
-		 */
-		getRoot: (connection: FtpConnection, callback?: (error: Error, path: string) => void) => void|string;
-		/**
-		 * If set to true, then files which the client uploads are buffered in memory and then written to disk using writeFile.
-		 * If false, files are written using writeStream.
-		 */
-		useWriteFile?: boolean;
-		/**
-		 * If set to true, then files which the client uploads are slurped using 'readFile'.
-		 * If false, files are read using readStream.
-		 */
-		useReadFile?: boolean;
-		/**
-		 * Determines the maximum file size (in bytes) for which uploads are buffered in memory before being written to disk.
-		 * Has an effect only if useWriteFile is set to true.
-		 * If uploadMaxSlurpSize is not set, then there is no limit on buffer size.
-		 */
-		uploadMaxSlurpSize?: number;
-		/**
-		 * The maximum number of concurrent calls to fs.stat which will be made when processing a LIST request. Default 5.
-		 */
-		maxStatsAtOnce?: number;
-		/**
-		 * A function which can be used as the argument of an array's sort method. Used to sort filenames for directory listings.
-		 * See [https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/sort] for more info.
-		 */
-		filenameSortFunc?: (a: string, b: string) => number;
-		/**
-		 * A function which is applied to each filename before sorting.
-		 * If set to false, filenames are unaltered.
-		 */
-		filenameSortMap?: ((a: string) => string) | boolean;
-		/**
-		 * If this is set, then filenames are not sorted in responses to the LIST and NLST commands.
-		 */
-		dontSortFilenames?: boolean;
-		/**
-		 * If set to true, then LIST and NLST treat the characters ? and * as literals instead of as wildcards.
-		 */
-		noWildcards?: boolean;
-		/**
-		 * If this is set, the server will allow explicit TLS authentication. Value should be a dictionary which is suitable as the options argument of tls.createServer.
-		 */
-		tlsOptions?: tls.TlsOptions;
-		/**
-		 * If this is set to true, and tlsOptions is also set, then the server will not allow logins over non-secure connections.
-		 * Default false
-		 */
-		tlsOnly?: boolean;
-		/**
-		 * I obviously set this to true when tlsOnly is on -someone needs to update this.
-		 */
-		allowUnauthorizedTls?: boolean;
-		/**
-		 * Integer, specifies the lower-bound port (min port) for creating PASV connections
-		 */
-		pasvPortRangeStart?: number;
-		/**
-		 * Integer, specifies the upper-bound port (max port) for creating PASV connections
-		 */
-		pasvPortRangeEnd?: number;
-	}
-
-	/**
-	 * Represents one Ftp connection. Incomplete type definition.
-	 *
-	 * @event command:user (username: string, success: () => void, failure: () => void)
-	 * @event command:pass (password: string, success: (username: string, fs?: FtpFileSystem) => void, failure: () => void)
-	 *                     The server raises a command:pass event which is given pass, success and failure arguments.
-	 *                     On successful login, success should be called with a username argument. It may also optionally
-	 *                     be given a second argument, which should be an object providing an implementation of the API for Node's fs module.
-	 */
-	export class FtpConnection extends events.EventEmitter {
-		server: FtpServer;
-		socket: net.Socket;
-		pasv: net.Server;
-		dataSocket: net.Socket; // the actual data socket
-		mode: string;
-		username: string;
-		cwd: string;
-		root: string;
-		hasQuit: boolean;
-		// State for handling TLS upgrades.
-		secure: boolean;
-		pbszReceived: boolean;
-	}
 
 
-	/**
-	 * Optional mock fs implementation to set in the command:pass event of FtpConnection
-	 */
-	export interface FtpFileSystem {
-		unlink: (path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
-		readdir: (path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void) => void;
-		mkdir: ((path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void)
-			| ((path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void) => void)
-			| ((path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void) => void);
-		open: ((path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void)
-			| ((path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void)
-			| ((path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void);
-		close: (fd: number, callback?: (err?: NodeJS.ErrnoException) => void) => void;
-		rmdir: (path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
-		rename: (oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
-		/**
-		 * specific object properties: { mode, isDirectory(), size, mtime }
-		 */
-		stat: (path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any) => void;
-		/**
-		 * if useReadFile option is not set or is false
-		 */
-		createReadStream?: (path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			fd?: string;
-			mode?: string;
-			bufferSize?: number;
-		}) => fs.ReadStream;
-		/**
-		 * if useWriteFile option is not set or is false
-		 */
-		createWriteStream?: (path: string, options?: {
-			flags?: string;
-			encoding?: string;
-			string?: string;
-		}) => fs.WriteStream;
-		/**
-		 * if useReadFile option is set to 'true'
-		 */
-		readFile?:
-			  ((filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void) => void)
-			| ((filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void) => void)
-			| ((filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void) => void)
-			| ((filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void ) => void);
-		/**
-		 * if useWriteFile option is set to 'true'
-		 */
-		writeFile?:
-			  ((filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void) => void)
-			| ((filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void) => void)
-			| ((filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void) => void);
+import events = require("events");
+import fs = require("fs");
+import net = require("net");
+import tls = require("tls");
 
-	}
+/**
+ * Options for FtpServer constructor
+ */
+export interface FtpServerOptions {
+    /**
+     * Gets the initial working directory for the user. Called after user is authenticated
+     * Typical cases where you would want/need the callback involve retrieving configurations from external datasources and suchlike.
+     */
+    getInitialCwd: (connection: FtpConnection, callback?: (error: Error, path: string) => void) => void | string;
+    /**
+     * Gets the root directory for the user relative to the CWD. Called after getInitialCwd. The user is not able to escape this directory.
+     * Typical cases where you would want/need the callback involve retrieving configurations from external datasources and suchlike.
+     */
+    getRoot: (connection: FtpConnection, callback?: (error: Error, path: string) => void) => void | string;
+    /**
+     * If set to true, then files which the client uploads are buffered in memory and then written to disk using writeFile.
+     * If false, files are written using writeStream.
+     */
+    useWriteFile?: boolean;
+    /**
+     * If set to true, then files which the client uploads are slurped using 'readFile'.
+     * If false, files are read using readStream.
+     */
+    useReadFile?: boolean;
+    /**
+     * Determines the maximum file size (in bytes) for which uploads are buffered in memory before being written to disk.
+     * Has an effect only if useWriteFile is set to true.
+     * If uploadMaxSlurpSize is not set, then there is no limit on buffer size.
+     */
+    uploadMaxSlurpSize?: number;
+    /**
+     * The maximum number of concurrent calls to fs.stat which will be made when processing a LIST request. Default 5.
+     */
+    maxStatsAtOnce?: number;
+    /**
+     * A function which can be used as the argument of an array's sort method. Used to sort filenames for directory listings.
+     * See [https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/sort] for more info.
+     */
+    filenameSortFunc?: (a: string, b: string) => number;
+    /**
+     * A function which is applied to each filename before sorting.
+     * If set to false, filenames are unaltered.
+     */
+    filenameSortMap?: ((a: string) => string) | boolean;
+    /**
+     * If this is set, then filenames are not sorted in responses to the LIST and NLST commands.
+     */
+    dontSortFilenames?: boolean;
+    /**
+     * If set to true, then LIST and NLST treat the characters ? and * as literals instead of as wildcards.
+     */
+    noWildcards?: boolean;
+    /**
+     * If this is set, the server will allow explicit TLS authentication. Value should be a dictionary which is suitable as the options argument of tls.createServer.
+     */
+    tlsOptions?: tls.TlsOptions;
+    /**
+     * If this is set to true, and tlsOptions is also set, then the server will not allow logins over non-secure connections.
+     * Default false
+     */
+    tlsOnly?: boolean;
+    /**
+     * I obviously set this to true when tlsOnly is on -someone needs to update this.
+     */
+    allowUnauthorizedTls?: boolean;
+    /**
+     * Integer, specifies the lower-bound port (min port) for creating PASV connections
+     */
+    pasvPortRangeStart?: number;
+    /**
+     * Integer, specifies the upper-bound port (max port) for creating PASV connections
+     */
+    pasvPortRangeEnd?: number;
+}
 
-	/**
-	 * FTP server
-	 *
-	 * Events:
-	 * @event close	net.Server close event
-	 * @event error net.Server error event
-	 * @event client:connected  (connection: FtpConnection)
-	 */
-	export class FtpServer extends events.EventEmitter {
-
-		/**
-		 * @param host host is a string representation of the IP address clients use to connect to the FTP server.
-		 *             It's imperative that this actually reflects the remote IP the clients use to access the server,
-		 *             as this IP will be used in the establishment of PASV data connections. If this IP is not the one clients use to connect,
-		 *             you will see some strange behavior from the client side (hangs).
-		 * @param options See test.js for a simple example.
-		 */
-		constructor(host: string, options: FtpServerOptions);
-
-		/**
-		 * Start listening, see net.Server.listen()
-		 */
-		public listen(port: number, host?: string, backlog?: number, listeningListener?: () => void): void;
-
-		/**
-		 * Stop listening
-		 */
-		public close(callback?: () => void): void;
-	}
+/**
+ * Represents one Ftp connection. Incomplete type definition.
+ *
+ * @event command:user (username: string, success: () => void, failure: () => void)
+ * @event command:pass (password: string, success: (username: string, fs?: FtpFileSystem) => void, failure: () => void)
+ *                     The server raises a command:pass event which is given pass, success and failure arguments.
+ *                     On successful login, success should be called with a username argument. It may also optionally
+ *                     be given a second argument, which should be an object providing an implementation of the API for Node's fs module.
+ */
+declare export class FtpConnection extends events.EventEmitter {
+    server: FtpServer;
+    socket: net.Socket;
+    pasv: net.Server;
+    dataSocket: net.Socket; // the actual data socket
+    mode: string;
+    username: string;
+    cwd: string;
+    root: string;
+    hasQuit: boolean;
+    // State for handling TLS upgrades.
+    secure: boolean;
+    pbszReceived: boolean;
+}
 
 
+/**
+ * Optional mock fs implementation to set in the command:pass event of FtpConnection
+ */
+export interface FtpFileSystem {
+    unlink: (path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
+    readdir: (path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void) => void;
+    mkdir: ((path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void)
+    | ((path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void) => void)
+    | ((path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void) => void);
+    open: ((path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void)
+    | ((path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void)
+    | ((path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any) => void);
+    close: (fd: number, callback?: (err?: NodeJS.ErrnoException) => void) => void;
+    rmdir: (path: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
+    rename: (oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void) => void;
+    /**
+     * specific object properties: { mode, isDirectory(), size, mtime }
+     */
+    stat: (path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any) => void;
+    /**
+     * if useReadFile option is not set or is false
+     */
+    createReadStream?: (path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        fd?: string;
+        mode?: string;
+        bufferSize?: number;
+    }) => fs.ReadStream;
+    /**
+     * if useWriteFile option is not set or is false
+     */
+    createWriteStream?: (path: string, options?: {
+        flags?: string;
+        encoding?: string;
+        string?: string;
+    }) => fs.WriteStream;
+    /**
+     * if useReadFile option is set to 'true'
+     */
+    readFile?:
+    ((filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void) => void)
+    | ((filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void) => void)
+    | ((filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void) => void)
+    | ((filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void) => void);
+    /**
+     * if useWriteFile option is set to 'true'
+     */
+    writeFile?:
+    ((filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void) => void)
+    | ((filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void) => void)
+    | ((filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void) => void);
 
 }
+
+/**
+ * FTP server
+ *
+ * Events:
+ * @event close	net.Server close event
+ * @event error net.Server error event
+ * @event client:connected  (connection: FtpConnection)
+ */
+declare export class FtpServer extends events.EventEmitter {
+
+    /**
+     * @param host host is a string representation of the IP address clients use to connect to the FTP server.
+     *             It's imperative that this actually reflects the remote IP the clients use to access the server,
+     *             as this IP will be used in the establishment of PASV data connections. If this IP is not the one clients use to connect,
+     *             you will see some strange behavior from the client side (hangs).
+     * @param options See test.js for a simple example.
+     */
+    constructor(host: string, options: FtpServerOptions);
+
+    /**
+     * Start listening, see net.Server.listen()
+     */
+    public listen(port: number, host?: string, backlog?: number, listeningListener?: () => void): void;
+
+    /**
+     * Stop listening
+     */
+    public close(callback?: () => void): void;
+}
diff --git a/fullname/fullname.d.ts b/fullname/fullname.d.ts
index affa09f3ab..0d3fba6c4b 100644
--- a/fullname/fullname.d.ts
+++ b/fullname/fullname.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Klaus Reimer <https://github.com/kayahr/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "fullname" {
-    function fullname(): Promise<string>;
-    export = fullname;
-}
+
+declare function fullname(): Promise<string>;
+export = fullname;
diff --git a/gently/gently.d.ts b/gently/gently.d.ts
index b8b23e4c2c..c9409bb09a 100644
--- a/gently/gently.d.ts
+++ b/gently/gently.d.ts
@@ -5,22 +5,21 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/gently.d.ts
 
-declare module "gently" {
-	export = Gently;
 
-	class Gently {
-		constructor();
-		hijacked: any[];
+export = Gently;
 
-		expect(obj: any, method: string, stubFn?: (...args: any[]) => any): (...args: any[]) => any;
-		expect(obj: any, method: string, count: number, stubFn: (...args: any[]) => any): (...args: any[]) => any;
+declare class Gently {
+    constructor();
+    hijacked: any[];
 
-		restore(obj: any, method: string): void;
+    expect(obj: any, method: string, stubFn?: (...args: any[]) => any): (...args: any[]) => any;
+    expect(obj: any, method: string, count: number, stubFn: (...args: any[]) => any): (...args: any[]) => any;
 
-		hijack(realRequire: (id: string) => any): (id: string) => any;
+    restore(obj: any, method: string): void;
 
-		stub(location: string, exportsName?: string): any;
+    hijack(realRequire: (id: string) => any): (id: string) => any;
 
-		verify(msg?: string): void;
-	}
+    stub(location: string, exportsName?: string): any;
+
+    verify(msg?: string): void;
 }
diff --git a/geoip-lite/geoip-lite.d.ts b/geoip-lite/geoip-lite.d.ts
index 9f0c83b8f2..6eea0aea61 100644
--- a/geoip-lite/geoip-lite.d.ts
+++ b/geoip-lite/geoip-lite.d.ts
@@ -3,20 +3,19 @@
 // Definitions by: Yuce Tekol <http://yuce.me/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'geoip-lite' {
-	namespace mod {
-		export interface Lookup {
-			range: Array<number>; // range start, end
-			country: string;
-			region: string;
-			city: string;
-			ll: Array<number>; // latitude, longitude
-		}
 
-		export function lookup(ip: string): Lookup;
-		export function pretty(ip: number): string;
-		export function startWatchingDataUpdate(): void;
-		export function stopWatchingDataUpdate(): void;
-	}
-	export = mod;
+declare namespace mod {
+    export interface Lookup {
+        range: Array<number>; // range start, end
+        country: string;
+        region: string;
+        city: string;
+        ll: Array<number>; // latitude, longitude
+    }
+
+    export function lookup(ip: string): Lookup;
+    export function pretty(ip: number): string;
+    export function startWatchingDataUpdate(): void;
+    export function stopWatchingDataUpdate(): void;
 }
+export = mod;
diff --git a/git-config/git-config.d.ts b/git-config/git-config.d.ts
index f82910186f..71dbf33a96 100644
--- a/git-config/git-config.d.ts
+++ b/git-config/git-config.d.ts
@@ -3,6 +3,5 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "git-config" {
-    export function sync(gitFile?: string): Object; // Synchronous version.
-}
+
+declare export function sync(gitFile?: string): Object;
diff --git a/git/git.d.ts b/git/git.d.ts
index f966734db4..8b2b070d93 100644
--- a/git/git.d.ts
+++ b/git/git.d.ts
@@ -3,682 +3,677 @@
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "git" {
-    // lib/git/git.js
-    export class Git {
 
-        constructor(gitDirectory:any);
+// lib/git/git.js
+declare export class Git {
 
-        refs(options:any, prefix:string, callback:(err:any, data:string)=>void):void;
+    constructor(gitDirectory: any);
 
-        fs_read(gitDirectory:string, file:string, callback:(err:any, data:any)=>void):void;
+    refs(options: any, prefix: string, callback: (err: any, data: string) => void): void;
 
-        transform_options(options:any):string[];
+    fs_read(gitDirectory: string, file: string, callback: (err: any, data: any) => void): void;
 
-        git(functionName:any, options:any, ...args:any[]):void; // last element is callback
+    transform_options(options: any): string[];
 
-        call_git(prefix:string, command:any, postfix:string, options:any, args:any, callback: (error: any, result: string) => void):void;
+    git(functionName: any, options: any, ...args: any[]): void; // last element is callback
 
-        rev_list(callback:Function):void;
+    call_git(prefix: string, command: any, postfix: string, options: any, args: any, callback: (error: any, result: string) => void): void;
 
-        rev_list(options:any, callback:Function):void;
+    rev_list(callback: Function): void;
 
-        rev_list(options:any, reference:string, callback:Function):void;
+    rev_list(options: any, callback: Function): void;
 
-        rev_parse(options:any, str:string, callback:Function):void;
+    rev_list(options: any, reference: string, callback: Function): void;
 
-        rev_parse(options:any, str:string, level:number, callback:Function):void;
+    rev_parse(options: any, str: string, callback: Function): void;
 
-        ls_tree(treeish:any, callback:Function):void;
+    rev_parse(options: any, str: string, level: number, callback: Function): void;
 
-        ls_tree(treeish:any, paths:any[], callback:Function):void;
+    ls_tree(treeish: any, callback: Function): void;
 
-        ls_tree(treeish:any, paths:any[], options:any, callback:Function):void;
+    ls_tree(treeish: any, paths: any[], callback: Function): void;
 
-        cat_file(type:any, ref:any, callback:Function):void;
+    ls_tree(treeish: any, paths: any[], options: any, callback: Function): void;
 
-        file_size(ref:any, callback:Function):void;
+    cat_file(type: any, ref: any, callback: Function): void;
 
-        fs_mkdir(dir:any, callback:Function):void;
+    file_size(ref: any, callback: Function): void;
 
-        init(options:any, callback:Function):void;
+    fs_mkdir(dir: any, callback: Function): void;
 
-        // not implemented!
-        clone(options:any, originalPath:any, targetPath:any, callback:Function):void;
+    init(options: any, callback: Function): void;
 
-        diff(commit1:any, commit2:any, callback: (error: any, patch: string) => void):void;
+    // not implemented!
+    clone(options: any, originalPath: any, targetPath: any, callback: Function): void;
 
-		diff(commit1: any, commit2: any, options: any, callback: (error: any, patch: string) => void):void;
+    diff(commit1: any, commit2: any, callback: (error: any, patch: string) => void): void;
 
-        fs_exist(path:any, callback:Function):void;
+    diff(commit1: any, commit2: any, options: any, callback: (error: any, patch: string) => void): void;
 
-        fs_write(file:any, content:any, callback:Function):void;
+    fs_exist(path: any, callback: Function): void;
 
-        log(commit:any, path:any, options:any, callback:Function):void;
+    fs_write(file: any, content: any, callback: Function): void;
 
-        select_existing_objects(objectIds:any[], callback:Function):void;
+    log(commit: any, path: any, options: any, callback: Function): void;
 
-        format_patch(options:any, reference:any, callback:Function):void;
+    select_existing_objects(objectIds: any[], callback: Function): void;
 
-        blame(callback:Function):void;
+    format_patch(options: any, reference: any, callback: Function): void;
 
-        blame(options:any, callback:Function):void;
+    blame(callback: Function): void;
 
-        blame_tree(commit:any, callback:Function):void;
+    blame(options: any, callback: Function): void;
 
-        blame_tree(commit:any, path:any, callback:Function):void;
+    blame_tree(commit: any, callback: Function): void;
 
-        looking_for(commit:any, callback:Function):void;
+    blame_tree(commit: any, path: any, callback: Function): void;
 
-        looking_for(commit:any, path:any, callback:Function):void;
+    looking_for(commit: any, callback: Function): void;
 
-        commit(...args:any[]):void; // last element is callback
+    looking_for(commit: any, path: any, callback: Function): void;
 
-        commit(options:any, ...args:any[]):void; // last element is callback
+    commit(...args: any[]): void; // last element is callback
 
-        config(...args:any[]):void; // last element is callback
+    commit(options: any, ...args: any[]): void; // last element is callback
 
-        config(options:any, ...args:any[]):void; // last element is callback
+    config(...args: any[]): void; // last element is callback
 
-        add(...args:any[]):void; // last element is callback
+    config(options: any, ...args: any[]): void; // last element is callback
 
-        add(options:any, ...args:any[]):void; // last element is callback
+    add(...args: any[]): void; // last element is callback
 
-        remove(...args:any[]):void; // last element is callback
+    add(options: any, ...args: any[]): void; // last element is callback
 
-        remove(options:any, ...args:any[]):void; // last element is callback
+    remove(...args: any[]): void; // last element is callback
 
-        ls_files(...args:any[]):void; // last element is callback
+    remove(options: any, ...args: any[]): void; // last element is callback
 
-        ls_files(options:any, ...args:any[]):void; // last element is callback
+    ls_files(...args: any[]): void; // last element is callback
 
-        diff_files(...args:any[]):void; // last element is callback
+    ls_files(options: any, ...args: any[]): void; // last element is callback
 
-        diff_files(options:any, ...args:any[]):void; // last element is callback
+    diff_files(...args: any[]): void; // last element is callback
 
-        diff_index(...args:any[]):void; // last element is callback
+    diff_files(options: any, ...args: any[]): void; // last element is callback
 
-        diff_index(options:any, ...args:any[]):void; // last element is callback
+    diff_index(...args: any[]): void; // last element is callback
 
-        file_type(...args:any[]):void; // last element is callback
+    diff_index(options: any, ...args: any[]): void; // last element is callback
 
-        file_type(options:any, ...args:any[]):void; // last element is callback
+    file_type(...args: any[]): void; // last element is callback
 
-        put_raw_object(...args:any[]):void; // last element is callback
+    file_type(options: any, ...args: any[]): void; // last element is callback
 
-        put_raw_object(options:any, ...args:any[]):void; // last element is callback
+    put_raw_object(...args: any[]): void; // last element is callback
 
-        commit_from_sha(id:string):any;
-    }
+    put_raw_object(options: any, ...args: any[]): void; // last element is callback
 
-    // lib/git/actor.js
-    export class Actor {
-        name:string;
-        email:string;
-
-        constructor(name:string, email:string);
-
-        static from_string(str:string):Actor;
-    }
-
-    // lib/git/blame.js
-    export class Blame {
-        repo:Repo;
-        file:string;
-        commit:string;
-        lines:BlameLine[];
-
-        constructor(repo:Repo, file:string, callback:(err:any, blame:Blame)=>void);
-
-        constructor(repo:Repo, file:string, commit:string, callback:(err:any, blame:Blame)=>void);
-    }
-
-    // lib/git/blame_line.js
-    export class BlameLine {
-        lineno:number;
-        oldlineno:number;
-        commit:any;
-        line:string;
-
-        constructor(lineno:number, oldlineno:number, commit:any, line:string);
-    }
-
-    // lib/git/blob.js
-    export class Blob {
-        repo:Repo;
-        id:any;
-        mode:any;
-        name:any;
-        data:any;
-        size:any;
-        mine_type:any;
-        basename:any;
-
-        constructor(repo:any, id:any, mode:any, name:any);
-
-        static blame(repo:any, commit:any, file:any, callback:Function):void;
-    }
-
-    // lib/git/commit.js
-    export class Commit {
-        repo:Repo;
-        id:string;
-        parents:any[];
-        tree:any;
-        author:Actor;
-        sha:string; // synonym to id
-        authored_date:string;
-        committer:Actor;
-        committed_date:string;
-        message:string;
-        filechanges:any;
-        short_message:string;
-        _id_abbrev:any;
-
-        constructor(repo:Repo, id:string, parents:any[], tree:any, author:Actor, authoredDate:string, committer:Actor, committedDate:string, message:string, filechanges:any);
-
-        load(callback:Function):void;
-
-        id_abbrev(callback:Function):void;
-
-        static list_from_string(repo:any, text:any):Commit[];
-
-        static find_all(repo:any, callback:Function):void;
-
-        static find_all(repo:any, reference:any, callback:Function):void;
-
-        static find_all(repo:any, reference:any, options:any, callback:Function):void;
-
-        static count(repo:any, ref:any, callback:Function):void;
-
-        static diff(repo:any, a:any, callback:Function):void;
-
-        static diff(repo:any, a:any, b:any, callback:Function):void;
-
-        static diff(repo:any, a:any, b:any, paths:any, callback:Function):void;
-
-        show(callback:Function):void;
-
-        diffs(callback:Function):void;
-
-        toPatch(callback:Function):void;
-    }
-
-    // lib/git/commit_stats.js
-    export class CommitStats {
-        repo:any;
-        id:any;
-        files:any[];
-        additions:any;
-        deletions:any;
-        total:any;
-
-        constructor(repo:any, id:any, files:any[]);
-
-        static find_all(repo:any, reference:any, callback:Function):void;
-
-        static find_all(repo:any, reference:any, options:any, callback:Function):void;
-
-        static list_from_string(repo:any, text:string):CommitStats[];
-    }
-
-    // lib/git/config.js
-    export class Config {
-        repo:any;
-        data:any;
-
-        constructor(repo:any);
-
-        fetch(key:any, defaultValue:any):any
-
-        set(key:any, value:any, callback:Function):void;
-    }
-
-    // lib/git/diff.js
-    export class Diff {
-        repo:any;
-        a_path:any;
-        b_path:any;
-        a_blob:any;
-        b_blob:any;
-        a_mode:any;
-        b_mode:any;
-        new_file:any;
-        deleted_file:any;
-        diff:any;
-
-        constructor(repo:any, aPath:any, bPath:any, aBlob:any, bBlob:any, aMode:any, bMode:any, newFile:any, deletedFile:any, diff:any);
-
-        static list_from_string(repo:any, text:any, callback:Function):void;
-    }
-
-    // lib/git/file_index/js
-    export class FileIndex {
-        repo_path:any;
-        index_file:any;
-        sha_count:any;
-        commit_index:any;
-        commit_order:any;
-        all_files:any;
-
-        constructor(repoPath:any, callback:Function);
-
-        commits_from(commitSha:any, callback:Function):void;
-
-        sort_commits(shaArray:any[]):any[];
-
-        files(commitSha:any, callback:Function):void;
-
-        count_all(callback:Function):void;
-
-        count(commitSha:any, callback:Function):void;
-
-        commits_for(file:any, callback:Function):void;
-
-        last_commits(commitSha:any, filesMatcher:any, callback:Function):void;
-    }
-
-    // lib/git/file_window.js
-    export class FileWindow {
-        idxfile:any;
-        version:any;
-        global_offset:any;
-        offset:any;
-        seek_offset:any;
-
-        constructor(idxfile:any, version:any);
-
-        unmap():void;
-
-        index(idx:number):void;
-
-        index(idx:any[]):void;
-
-        close():void;
-    }
-
-    // lib/git/git_file_operations.js
-    export class GitFileOperations {
-        static glob_streaming(path:any):any;
-
-        static glob(path:any, callback:Function):void;
-
-        static glob(path:any, files:any, callback:Function):void;
-
-        static fs_read(path:any, file:any, callback:Function):void;
-
-        static fs_mkdir(dir:any, callback:Function):void;
-
-        static fs_exist(dir:any, path:any, callback:Function):void;
-
-        static fs_rmdir_r(dir:any, callback:Function):void;
-
-        static fs_write(dir:any, file:any, content:any, callback:Function):void;
-    }
-
-    // lib/git/git_index.js
-    export class GitIndex {
-        repo:any;
-        tree:any;
-        current_tree:any;
-
-        constructor(repo:any);
-
-        read_tree(tree:any, callback:Function):void;
-
-        add(filePath:any, data:any):void;
-
-        commit(message:any, callback:Function):void;
-
-        commit(message:any, parents:any, callback:Function):void;
-
-        commit(message:any, parents:any, actor:any, callback:Function):void;
-
-        commit(message:any, parents:any, actor:any, lastTree:any, callback:Function):void;
-
-        write_tree(tree:any, callback:Function):any;
-
-        write_tree(tree:any, nowTree:any, callback:Function):any;
-
-        write_blob(data:any):any;
-    }
-
-    // lib/git/git_object.js
-    export class GitObject {
-        static from_raw(rawObject:any, repository:any):any;
-    }
-
-    // lib/git/head.js
-    export class Head {
-        name:string;
-        commit:any; // string or Commit or ...?
-
-        constructor(name:string, commit:any);
-
-        static current(repo:any, callback:Function):void;
-
-        static current(repo:any, options:any, callback:Function):void;
-
-        static find_all(repo:any, callback:Function):void;
-
-        static find_all(repo:any, options:any, callback:Function):void;
-    }
-
-    // lib/git/loose_storage.js
-    export class LooseStorage {
-        directory:any;
-
-        constructor(directory:any);
-
-        find(sha1:any):RawObject;
-
-        get_raw_object(buf:any):RawObject;
-
-        unpack_object_header_gently(buf:any):any[];
-
-        is_legacy_loose_object(buf:any):boolean;
-
-        put_raw_object(content:any, type:any, callback:Function):void;
-
-        static verify_header(type:any, size:any):void;
-    }
-
-    // lib/git/merge.js
-    export class Merge {
-        static STATUS_BOTH:string;
-        static STATUS_OURS:string;
-        static STATUS_THEIRS:string;
-
-        conflicts:any;
-        text:any;
-        sections:any;
-
-        constructor(str:string);
-    }
-
-    // lib/git/pack_storage.js
-    export class PackStorage {
-        name:any;
-        cache:any;
-        version:any;
-        offsets:any;
-        size:any;
-
-        constructor(file:any);
-
-        find(sha1:any):RawObject;
-
-        close():void;
-
-        parse_object(pack:any, offset:any):RawObject;
-
-        unpack_object(pack:any, packfile:any, offset:any, options:any):any[];
-
-        unpack_deltified(packfile:any, type:any, offset:any, objOffset:any, size:any, options:any):any;
-    }
-
-    // lib/git/raw.js
-    export class RawObject {
-        type:any;
-        content:any;
-
-        constructor(type:any, content:any);
-
-        sha1(encoding?:string):any;
-
-        sha1_hex():any;
-    }
-
-    // lib/git/ref.js
-    export class Ref {
-    }
-
-    // lib/git/remote.js
-    export class Remote {
-        constructor(name:any, commit:any);
-
-        find_all(repo:any, callback:Function):void;
-
-        find_all(repo:any, options:any, callback:Function):void;
-    }
-
-    // lib/git/repo.js
-    export class Repo {
-        path:string;
-        options:any;
-        git:any;
-        config_object:any;
-        bare:any;
-        working_directory:any;
-
-        constructor(path:string, callback:(err:any, repo:Repo)=>void);
-
-        constructor(path:string, options:any, callback:(err:any, repo:Repo)=>void);
-
-        head(callback:(err:any, head:Head)=>void):void;
-
-        heads(callback:(err:any, heads:Head[])=>void):void;
-
-        tags(callback:Function):void;
-
-        commits(callback:Function):void;
-
-        commits(start:string, callback:Function):void;
-
-        commits(start:string, maxCount:number, callback:Function):void;
-
-        commits(start:string, maxCount:number, skip:any, callback:Function):void;
-
-        commit(id:string, callback:Function):void;
-
-        commit_count(start:any, callback:Function):void;
-
-        tree(callback:Function):void;
-
-        tree(treeish:string, callback:Function):void;
-
-        tree(treeish:string, paths:any, callback:Function):void;
-
-        blob(id:string, callback:Function):void;
-
-        init_bare(path:any, gitOptions:any, repoOptions:any, callback:Function):void;
-
-        fork_bare(path:any, callback:Function):void;
-
-        fork_bare(path:any, options:any, callback:Function):void;
-
-        // buggy?
-		diff(a: string, callback: (error: any, patch: string) => void):void;
-
-		diff(a: string, b: string, callback: (error: any, patch: string) => void):void;
-
-		diff(a: string, b: string, paths: any, callback: (error: any, patch: string) => void):void;
-
-        commit_diff(commit:string, callback:Function):void;
-
-        alternates(callback:Function):void;
-
-        set_alternates(alts:any, callback:Function):void;
-
-        log(callback:(err:any, commits:Commit[])=>void):void;
-
-        log(commit:string, callback:(err:any, commits:Commit[])=>void):void;
-
-        log(commit:string, path:any, callback:(err:any, commits:Commit[])=>void):void;
-
-        log(commit:string, path:any, options:any, callback:(err:any, commits:Commit[])=>void):void;
-
-        commit_deltas_from(otherRepo:any, callback:Function):void;
-
-        commit_deltas_from(otherRepo:any, reference:any, callback:Function):void;
-
-        commit_deltas_from(otherRepo:any, reference:any, otherReference:any, callback:Function):void;
-
-        refs(callback:Function):void;
-
-        description(callback:Function):void;
-
-        update_ref(head:any, commitSha:any, callback:Function):void;
-
-        get_head(headName:any, callback:Function):void;
-
-        blame(file:string, commit:string, callback:(err:any, blame:Blame)=>void):void;
-
-        commit_stats(callback:Function):void;
-
-        commit_stats(start:any, callback:Function):void;
-
-        commit_stats(start:any, maxCount:any, callback:Function):void;
-
-        commit_stats(start:any, maxCount:any, skip:any, callback:Function):void;
-
-        commit_index(message:any, callback:Function):void;
-
-        commit_all(message:any, callback:Function):void;
-
-        config(callback:Function):void;
-
-        add(files:any, callback:Function):void;
-
-        remove(files:any, callback:Function):void;
-
-        status(callback:Function):void;
-
-        is_head(headName:any, callback:Function):void;
-
-        index(callback:Function):void;
-    }
-
-    // lib/git/repository.js
-    export class Repository {
-        git_directory:any;
-        options:any;
-        already_searched:any;
-        packs:any;
-        loose:any;
-
-        constructor(gitDirectory:any, options?:any);
-
-        get_object_by_sha1(sha1:string):any;
-
-        files_changed(treeSha1:any, treeSha2:any, pathLimiter:any):boolean;
-
-        cat_file(sha:any):any;
-
-        cat_file_size(sha:any):number;
-
-        cat_file_type(sha:any):any;
-
-        ls_tree(sha:any, paths:any, recursive:any):any;
-
-        get_raw_tree(sha:any, recursive:any):any;
-
-        get_raw_trees(sha:any, path:any):string;
-
-        ls_tree_path(sha:any, path:any, append:any):any
-
-        quick_diff(tree1:any, tree2:any, path:any, recurse:any):any[];
-
-        list_tree(sha:any):any;
-
-        rev_list(sha:any, options:any, callback:Function):void;
-
-        object_exists(sha1:any, callback:Function):void;
-
-        in_packs(shaHex:any, callback:Function):void;
-
-        in_loose(shaHex:any, callback:Function):void;
-
-        get_subtree(commitSha:any, path:any, callback:Function):void;
-
-        static init(dir:any, bare:any, callback:Function):void;
-
-        put_raw_object(content:any, type:any, callback:Function):any;
-    }
-
-    // lib/git/status.js
-    export class Status {
-        repo:any;
-        files:any[];
-
-        constructor(repo:any, callback:Function);
-
-        index(file:any):any;
-    }
-
-    // lib/git/status_file.js
-    export class StatusFile {
-        repo:any;
-        path:any;
-        type:any;
-        stage:any;
-        mode_index:any;
-        mode_repo:any;
-        sha_index:any;
-        sha_repo:any;
-        untracked:any;
-
-        constructor(repo:any, hash:any);
-    }
-
-    // lib/git/sub_module.js
-    export class Submodule {
-        repo:any;
-        id:any;
-        mode:any;
-        name:any;
-        basename:any;
-
-        constructor(repo:any, id:any, mode:any, name:any);
-
-        static create(repo:any, attributes:any, callback:Function):void;
-
-        static config(repo:any, ref:any, callback:Function):void;
-    }
-
-    // lib/git/tag.js
-    export class Tag {
-        name:any;
-        commit:any;
-
-        constructor(name:any, commit:any);
-
-        static find_all(repo:any, callback:Function):void;
-
-        static find_all(repo:any, options:any, callback:Function):void;
-    }
-
-    // lib/git/tree.js
-    export class Tree {
-        repo:any;
-        id:any;
-        mode:any;
-        name:any;
-        contents:any;
-        basename:any;
-
-        constructor(repo:any, id:any, mode:any, name:any, contents:any);
-
-        static content_from_string(repo:any, text:any, callback:Function):void;
-
-        find(file:string):any;
-
-        static create(repo:any, callback:Function):void;
-
-        static create(repo:any, attributes:any, callback:Function):void;
-    }
-
-    // lib/git/user_info.js
-    export class UserInfo {
-        name:any;
-        email:any;
-        date:any;
-        offset:any;
-
-        constructor(str:string);
-    }
-
-    // lib/zlib/
-    // lib/sprintf/
-    // lib/diff/
+    commit_from_sha(id: string): any;
+}
+
+// lib/git/actor.js
+declare export class Actor {
+    name: string;
+    email: string;
+
+    constructor(name: string, email: string);
+
+    static from_string(str: string): Actor;
+}
+
+// lib/git/blame.js
+declare export class Blame {
+    repo: Repo;
+    file: string;
+    commit: string;
+    lines: BlameLine[];
+
+    constructor(repo: Repo, file: string, callback: (err: any, blame: Blame) => void);
+
+    constructor(repo: Repo, file: string, commit: string, callback: (err: any, blame: Blame) => void);
+}
+
+// lib/git/blame_line.js
+declare export class BlameLine {
+    lineno: number;
+    oldlineno: number;
+    commit: any;
+    line: string;
+
+    constructor(lineno: number, oldlineno: number, commit: any, line: string);
+}
+
+// lib/git/blob.js
+declare export class Blob {
+    repo: Repo;
+    id: any;
+    mode: any;
+    name: any;
+    data: any;
+    size: any;
+    mine_type: any;
+    basename: any;
+
+    constructor(repo: any, id: any, mode: any, name: any);
+
+    static blame(repo: any, commit: any, file: any, callback: Function): void;
+}
+
+// lib/git/commit.js
+declare export class Commit {
+    repo: Repo;
+    id: string;
+    parents: any[];
+    tree: any;
+    author: Actor;
+    sha: string; // synonym to id
+    authored_date: string;
+    committer: Actor;
+    committed_date: string;
+    message: string;
+    filechanges: any;
+    short_message: string;
+    _id_abbrev: any;
+
+    constructor(repo: Repo, id: string, parents: any[], tree: any, author: Actor, authoredDate: string, committer: Actor, committedDate: string, message: string, filechanges: any);
+
+    load(callback: Function): void;
+
+    id_abbrev(callback: Function): void;
+
+    static list_from_string(repo: any, text: any): Commit[];
+
+    static find_all(repo: any, callback: Function): void;
+
+    static find_all(repo: any, reference: any, callback: Function): void;
+
+    static find_all(repo: any, reference: any, options: any, callback: Function): void;
+
+    static count(repo: any, ref: any, callback: Function): void;
+
+    static diff(repo: any, a: any, callback: Function): void;
+
+    static diff(repo: any, a: any, b: any, callback: Function): void;
+
+    static diff(repo: any, a: any, b: any, paths: any, callback: Function): void;
+
+    show(callback: Function): void;
+
+    diffs(callback: Function): void;
+
+    toPatch(callback: Function): void;
+}
+
+// lib/git/commit_stats.js
+declare export class CommitStats {
+    repo: any;
+    id: any;
+    files: any[];
+    additions: any;
+    deletions: any;
+    total: any;
+
+    constructor(repo: any, id: any, files: any[]);
+
+    static find_all(repo: any, reference: any, callback: Function): void;
+
+    static find_all(repo: any, reference: any, options: any, callback: Function): void;
+
+    static list_from_string(repo: any, text: string): CommitStats[];
+}
+
+// lib/git/config.js
+declare export class Config {
+    repo: any;
+    data: any;
+
+    constructor(repo: any);
+
+    fetch(key: any, defaultValue: any): any
+
+    set(key: any, value: any, callback: Function): void;
+}
+
+// lib/git/diff.js
+declare export class Diff {
+    repo: any;
+    a_path: any;
+    b_path: any;
+    a_blob: any;
+    b_blob: any;
+    a_mode: any;
+    b_mode: any;
+    new_file: any;
+    deleted_file: any;
+    diff: any;
+
+    constructor(repo: any, aPath: any, bPath: any, aBlob: any, bBlob: any, aMode: any, bMode: any, newFile: any, deletedFile: any, diff: any);
+
+    static list_from_string(repo: any, text: any, callback: Function): void;
+}
+
+// lib/git/file_index/js
+declare export class FileIndex {
+    repo_path: any;
+    index_file: any;
+    sha_count: any;
+    commit_index: any;
+    commit_order: any;
+    all_files: any;
+
+    constructor(repoPath: any, callback: Function);
+
+    commits_from(commitSha: any, callback: Function): void;
+
+    sort_commits(shaArray: any[]): any[];
+
+    files(commitSha: any, callback: Function): void;
+
+    count_all(callback: Function): void;
+
+    count(commitSha: any, callback: Function): void;
+
+    commits_for(file: any, callback: Function): void;
+
+    last_commits(commitSha: any, filesMatcher: any, callback: Function): void;
+}
+
+// lib/git/file_window.js
+declare export class FileWindow {
+    idxfile: any;
+    version: any;
+    global_offset: any;
+    offset: any;
+    seek_offset: any;
+
+    constructor(idxfile: any, version: any);
+
+    unmap(): void;
+
+    index(idx: number): void;
+
+    index(idx: any[]): void;
+
+    close(): void;
+}
+
+// lib/git/git_file_operations.js
+declare export class GitFileOperations {
+    static glob_streaming(path: any): any;
+
+    static glob(path: any, callback: Function): void;
+
+    static glob(path: any, files: any, callback: Function): void;
+
+    static fs_read(path: any, file: any, callback: Function): void;
+
+    static fs_mkdir(dir: any, callback: Function): void;
+
+    static fs_exist(dir: any, path: any, callback: Function): void;
+
+    static fs_rmdir_r(dir: any, callback: Function): void;
+
+    static fs_write(dir: any, file: any, content: any, callback: Function): void;
+}
+
+// lib/git/git_index.js
+declare export class GitIndex {
+    repo: any;
+    tree: any;
+    current_tree: any;
+
+    constructor(repo: any);
+
+    read_tree(tree: any, callback: Function): void;
+
+    add(filePath: any, data: any): void;
+
+    commit(message: any, callback: Function): void;
+
+    commit(message: any, parents: any, callback: Function): void;
+
+    commit(message: any, parents: any, actor: any, callback: Function): void;
+
+    commit(message: any, parents: any, actor: any, lastTree: any, callback: Function): void;
+
+    write_tree(tree: any, callback: Function): any;
+
+    write_tree(tree: any, nowTree: any, callback: Function): any;
+
+    write_blob(data: any): any;
+}
+
+// lib/git/git_object.js
+declare export class GitObject {
+    static from_raw(rawObject: any, repository: any): any;
+}
+
+// lib/git/head.js
+declare export class Head {
+    name: string;
+    commit: any; // string or Commit or ...?
+
+    constructor(name: string, commit: any);
+
+    static current(repo: any, callback: Function): void;
+
+    static current(repo: any, options: any, callback: Function): void;
+
+    static find_all(repo: any, callback: Function): void;
+
+    static find_all(repo: any, options: any, callback: Function): void;
+}
+
+// lib/git/loose_storage.js
+declare export class LooseStorage {
+    directory: any;
+
+    constructor(directory: any);
+
+    find(sha1: any): RawObject;
+
+    get_raw_object(buf: any): RawObject;
+
+    unpack_object_header_gently(buf: any): any[];
+
+    is_legacy_loose_object(buf: any): boolean;
+
+    put_raw_object(content: any, type: any, callback: Function): void;
+
+    static verify_header(type: any, size: any): void;
+}
+
+// lib/git/merge.js
+declare export class Merge {
+    static STATUS_BOTH: string;
+    static STATUS_OURS: string;
+    static STATUS_THEIRS: string;
+
+    conflicts: any;
+    text: any;
+    sections: any;
+
+    constructor(str: string);
+}
+
+// lib/git/pack_storage.js
+declare export class PackStorage {
+    name: any;
+    cache: any;
+    version: any;
+    offsets: any;
+    size: any;
+
+    constructor(file: any);
+
+    find(sha1: any): RawObject;
+
+    close(): void;
+
+    parse_object(pack: any, offset: any): RawObject;
+
+    unpack_object(pack: any, packfile: any, offset: any, options: any): any[];
+
+    unpack_deltified(packfile: any, type: any, offset: any, objOffset: any, size: any, options: any): any;
+}
+
+// lib/git/raw.js
+declare export class RawObject {
+    type: any;
+    content: any;
+
+    constructor(type: any, content: any);
+
+    sha1(encoding?: string): any;
+
+    sha1_hex(): any;
+}
+
+// lib/git/ref.js
+declare export class Ref {
+}
+
+// lib/git/remote.js
+declare export class Remote {
+    constructor(name: any, commit: any);
+
+    find_all(repo: any, callback: Function): void;
+
+    find_all(repo: any, options: any, callback: Function): void;
+}
+
+// lib/git/repo.js
+declare export class Repo {
+    path: string;
+    options: any;
+    git: any;
+    config_object: any;
+    bare: any;
+    working_directory: any;
+
+    constructor(path: string, callback: (err: any, repo: Repo) => void);
+
+    constructor(path: string, options: any, callback: (err: any, repo: Repo) => void);
+
+    head(callback: (err: any, head: Head) => void): void;
+
+    heads(callback: (err: any, heads: Head[]) => void): void;
+
+    tags(callback: Function): void;
+
+    commits(callback: Function): void;
+
+    commits(start: string, callback: Function): void;
+
+    commits(start: string, maxCount: number, callback: Function): void;
+
+    commits(start: string, maxCount: number, skip: any, callback: Function): void;
+
+    commit(id: string, callback: Function): void;
+
+    commit_count(start: any, callback: Function): void;
+
+    tree(callback: Function): void;
+
+    tree(treeish: string, callback: Function): void;
+
+    tree(treeish: string, paths: any, callback: Function): void;
+
+    blob(id: string, callback: Function): void;
+
+    init_bare(path: any, gitOptions: any, repoOptions: any, callback: Function): void;
+
+    fork_bare(path: any, callback: Function): void;
+
+    fork_bare(path: any, options: any, callback: Function): void;
+
+    // buggy?
+    diff(a: string, callback: (error: any, patch: string) => void): void;
+
+    diff(a: string, b: string, callback: (error: any, patch: string) => void): void;
+
+    diff(a: string, b: string, paths: any, callback: (error: any, patch: string) => void): void;
+
+    commit_diff(commit: string, callback: Function): void;
+
+    alternates(callback: Function): void;
+
+    set_alternates(alts: any, callback: Function): void;
+
+    log(callback: (err: any, commits: Commit[]) => void): void;
+
+    log(commit: string, callback: (err: any, commits: Commit[]) => void): void;
+
+    log(commit: string, path: any, callback: (err: any, commits: Commit[]) => void): void;
+
+    log(commit: string, path: any, options: any, callback: (err: any, commits: Commit[]) => void): void;
+
+    commit_deltas_from(otherRepo: any, callback: Function): void;
+
+    commit_deltas_from(otherRepo: any, reference: any, callback: Function): void;
+
+    commit_deltas_from(otherRepo: any, reference: any, otherReference: any, callback: Function): void;
+
+    refs(callback: Function): void;
+
+    description(callback: Function): void;
+
+    update_ref(head: any, commitSha: any, callback: Function): void;
+
+    get_head(headName: any, callback: Function): void;
+
+    blame(file: string, commit: string, callback: (err: any, blame: Blame) => void): void;
+
+    commit_stats(callback: Function): void;
+
+    commit_stats(start: any, callback: Function): void;
+
+    commit_stats(start: any, maxCount: any, callback: Function): void;
+
+    commit_stats(start: any, maxCount: any, skip: any, callback: Function): void;
+
+    commit_index(message: any, callback: Function): void;
+
+    commit_all(message: any, callback: Function): void;
+
+    config(callback: Function): void;
+
+    add(files: any, callback: Function): void;
+
+    remove(files: any, callback: Function): void;
+
+    status(callback: Function): void;
+
+    is_head(headName: any, callback: Function): void;
+
+    index(callback: Function): void;
+}
+
+// lib/git/repository.js
+declare export class Repository {
+    git_directory: any;
+    options: any;
+    already_searched: any;
+    packs: any;
+    loose: any;
+
+    constructor(gitDirectory: any, options?: any);
+
+    get_object_by_sha1(sha1: string): any;
+
+    files_changed(treeSha1: any, treeSha2: any, pathLimiter: any): boolean;
+
+    cat_file(sha: any): any;
+
+    cat_file_size(sha: any): number;
+
+    cat_file_type(sha: any): any;
+
+    ls_tree(sha: any, paths: any, recursive: any): any;
+
+    get_raw_tree(sha: any, recursive: any): any;
+
+    get_raw_trees(sha: any, path: any): string;
+
+    ls_tree_path(sha: any, path: any, append: any): any
+
+    quick_diff(tree1: any, tree2: any, path: any, recurse: any): any[];
+
+    list_tree(sha: any): any;
+
+    rev_list(sha: any, options: any, callback: Function): void;
+
+    object_exists(sha1: any, callback: Function): void;
+
+    in_packs(shaHex: any, callback: Function): void;
+
+    in_loose(shaHex: any, callback: Function): void;
+
+    get_subtree(commitSha: any, path: any, callback: Function): void;
+
+    static init(dir: any, bare: any, callback: Function): void;
+
+    put_raw_object(content: any, type: any, callback: Function): any;
+}
+
+// lib/git/status.js
+declare export class Status {
+    repo: any;
+    files: any[];
+
+    constructor(repo: any, callback: Function);
+
+    index(file: any): any;
+}
+
+// lib/git/status_file.js
+declare export class StatusFile {
+    repo: any;
+    path: any;
+    type: any;
+    stage: any;
+    mode_index: any;
+    mode_repo: any;
+    sha_index: any;
+    sha_repo: any;
+    untracked: any;
+
+    constructor(repo: any, hash: any);
+}
+
+// lib/git/sub_module.js
+declare export class Submodule {
+    repo: any;
+    id: any;
+    mode: any;
+    name: any;
+    basename: any;
+
+    constructor(repo: any, id: any, mode: any, name: any);
+
+    static create(repo: any, attributes: any, callback: Function): void;
+
+    static config(repo: any, ref: any, callback: Function): void;
+}
+
+// lib/git/tag.js
+declare export class Tag {
+    name: any;
+    commit: any;
+
+    constructor(name: any, commit: any);
+
+    static find_all(repo: any, callback: Function): void;
+
+    static find_all(repo: any, options: any, callback: Function): void;
+}
+
+// lib/git/tree.js
+declare export class Tree {
+    repo: any;
+    id: any;
+    mode: any;
+    name: any;
+    contents: any;
+    basename: any;
+
+    constructor(repo: any, id: any, mode: any, name: any, contents: any);
+
+    static content_from_string(repo: any, text: any, callback: Function): void;
+
+    find(file: string): any;
+
+    static create(repo: any, callback: Function): void;
+
+    static create(repo: any, attributes: any, callback: Function): void;
+}
+
+// lib/git/user_info.js
+declare export class UserInfo {
+    name: any;
+    email: any;
+    date: any;
+    offset: any;
+
+    constructor(str: string);
 }
diff --git a/glob-expand/glob-expand.d.ts b/glob-expand/glob-expand.d.ts
index 3efec2b5cd..c27c90d7fd 100644
--- a/glob-expand/glob-expand.d.ts
+++ b/glob-expand/glob-expand.d.ts
@@ -5,23 +5,22 @@
 
 /// <reference path="../glob/glob.d.ts" />
 
-declare module "glob-expand" {
-    import * as _glob from "glob";
 
-    interface Option {
-        filter?: string | ((filePath: string) => boolean);
-        cwd?: string;
-		  }
+import * as _glob from "glob";
 
-    namespace expand {
-        var glob: typeof _glob;
-        var VERSION: string;
-    }
-
-    function expand(opts: Option, patterns: (string | RegExp)[]): string[];
-    function expand(opts: Option, ...patterns: (string | RegExp)[]): string[];
-    function expand(patterns: (string | RegExp)[]): string[];
-    function expand(...patterns: (string | RegExp)[]): string[];
-
-    export = expand;
+interface Option {
+    filter?: string | ((filePath: string) => boolean);
+    cwd?: string;
 }
+
+declare namespace expand {
+    var glob: typeof _glob;
+    var VERSION: string;
+}
+
+declare function expand(opts: Option, patterns: (string | RegExp)[]): string[];
+declare function expand(opts: Option, ...patterns: (string | RegExp)[]): string[];
+declare function expand(patterns: (string | RegExp)[]): string[];
+declare function expand(...patterns: (string | RegExp)[]): string[];
+
+export = expand;
diff --git a/glob-stream/glob-stream.d.ts b/glob-stream/glob-stream.d.ts
index 9c417146b6..7921891349 100644
--- a/glob-stream/glob-stream.d.ts
+++ b/glob-stream/glob-stream.d.ts
@@ -6,21 +6,20 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../glob/glob.d.ts" />
 
-declare module 'glob-stream' {
-	import glob = require('glob');
 
-	export interface Options extends glob.IOptions {
-		cwd?: string;
-		base?: string;
-		cwdbase?: boolean;
-	}
+import glob = require('glob');
 
-	export interface Element {
-		cwd: string;
-		base: string;
-		path: string;
-	}
-
-	export function create(glob:string, opts?: Options): NodeJS.ReadableStream;
-	export function create(globs:string[], opts?: Options): NodeJS.ReadableStream;
+export interface Options extends glob.IOptions {
+    cwd?: string;
+    base?: string;
+    cwdbase?: boolean;
 }
+
+export interface Element {
+    cwd: string;
+    base: string;
+    path: string;
+}
+
+declare export function create(glob: string, opts?: Options): NodeJS.ReadableStream;
+declare export function create(globs: string[], opts?: Options): NodeJS.ReadableStream;
diff --git a/glob/glob.d.ts b/glob/glob.d.ts
index 2957204f2c..430022e525 100644
--- a/glob/glob.d.ts
+++ b/glob/glob.d.ts
@@ -6,107 +6,106 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../minimatch/minimatch.d.ts" />
 
-declare module "glob" {
 
-	import events = require("events");
-	import fs = require('fs');
-	import minimatch = require("minimatch");
 
-	function G(pattern: string, cb: (err: Error, matches: string[]) => void): void;
-	function G(pattern: string, options: G.IOptions, cb: (err: Error, matches: string[]) => void): void;
+import events = require("events");
+import fs = require('fs');
+import minimatch = require("minimatch");
 
-	namespace G {
-		function sync(pattern: string, options?: IOptions): string[];
+declare function G(pattern: string, cb: (err: Error, matches: string[]) => void): void;
+declare function G(pattern: string, options: G.IOptions, cb: (err: Error, matches: string[]) => void): void;
 
-		function hasMagic(pattern: string, options?: IOptions): boolean;
+declare namespace G {
+    function sync(pattern: string, options?: IOptions): string[];
 
-		var Glob: IGlobStatic;
-		var GlobSync: IGlobSyncStatic;
+    function hasMagic(pattern: string, options?: IOptions): boolean;
 
-		interface IOptions extends minimatch.IOptions {
-			cwd?: string;
-			root?: string;
-			dot?: boolean;
-			nomount?: boolean;
-			mark?: boolean;
-			nosort?: boolean;
-			stat?: boolean;
-			silent?: boolean;
-			strict?: boolean;
-			cache?: { [path: string]: any /* boolean | string | string[] */ };
-			statCache?: { [path: string]: fs.Stats };
-			symlinks?: any;
-			sync?: boolean;
-			nounique?: boolean;
-			nonull?: boolean;
-			debug?: boolean;
-			nobrace?: boolean;
-			noglobstar?: boolean;
-			noext?: boolean;
-			nocase?: boolean;
-			matchBase?: any;
-			nodir?: boolean;
-			ignore?: any; /* string | string[] */
-			follow?: boolean;
-			realpath?: boolean;
-			nonegate?: boolean;
-			nocomment?: boolean;
+    var Glob: IGlobStatic;
+    var GlobSync: IGlobSyncStatic;
 
-			/** Deprecated. */
-			globDebug?: boolean;
-		}
+    interface IOptions extends minimatch.IOptions {
+        cwd?: string;
+        root?: string;
+        dot?: boolean;
+        nomount?: boolean;
+        mark?: boolean;
+        nosort?: boolean;
+        stat?: boolean;
+        silent?: boolean;
+        strict?: boolean;
+        cache?: { [path: string]: any /* boolean | string | string[] */ };
+        statCache?: { [path: string]: fs.Stats };
+        symlinks?: any;
+        sync?: boolean;
+        nounique?: boolean;
+        nonull?: boolean;
+        debug?: boolean;
+        nobrace?: boolean;
+        noglobstar?: boolean;
+        noext?: boolean;
+        nocase?: boolean;
+        matchBase?: any;
+        nodir?: boolean;
+        ignore?: any; /* string | string[] */
+        follow?: boolean;
+        realpath?: boolean;
+        nonegate?: boolean;
+        nocomment?: boolean;
 
-		interface IGlobStatic extends events.EventEmitter {
-			new (pattern: string, cb?: (err: Error, matches: string[]) => void): IGlob;
-			new (pattern: string, options: IOptions, cb?: (err: Error, matches: string[]) => void): IGlob;
-			prototype: IGlob;
-		}
+        /** Deprecated. */
+        globDebug?: boolean;
+    }
 
-		interface IGlobSyncStatic {
-			new (pattern: string, options?: IOptions): IGlobBase
-			prototype: IGlobBase;
-		}
+    interface IGlobStatic extends events.EventEmitter {
+        new (pattern: string, cb?: (err: Error, matches: string[]) => void): IGlob;
+        new (pattern: string, options: IOptions, cb?: (err: Error, matches: string[]) => void): IGlob;
+        prototype: IGlob;
+    }
 
-		interface IGlobBase {
-			minimatch: minimatch.IMinimatch;
-			options: IOptions;
-			aborted: boolean;
-			cache: { [path: string]: any /* boolean | string | string[] */ };
-			statCache: { [path: string]: fs.Stats };
-			symlinks: { [path: string]: boolean };
-			realpathCache: { [path: string]: string };
-			found: string[];
-		}
+    interface IGlobSyncStatic {
+        new (pattern: string, options?: IOptions): IGlobBase
+        prototype: IGlobBase;
+    }
 
-		interface IGlob extends IGlobBase, events.EventEmitter {
-			pause(): void;
-			resume(): void;
-			abort(): void;
+    interface IGlobBase {
+        minimatch: minimatch.IMinimatch;
+        options: IOptions;
+        aborted: boolean;
+        cache: { [path: string]: any /* boolean | string | string[] */ };
+        statCache: { [path: string]: fs.Stats };
+        symlinks: { [path: string]: boolean };
+        realpathCache: { [path: string]: string };
+        found: string[];
+    }
 
-			/** Deprecated. */
-			EOF: any;
-			/** Deprecated. */
-			paused: boolean;
-			/** Deprecated. */
-			maxDepth: number;
-			/** Deprecated. */
-			maxLength: number;
-			/** Deprecated. */
-			changedCwd: boolean;
-			/** Deprecated. */
-			cwd: string;
-			/** Deprecated. */
-			root: string;
-			/** Deprecated. */
-			error: any;
-			/** Deprecated. */
-			matches: string[];
-			/** Deprecated. */
-			log(...args: any[]): void;
-			/** Deprecated. */
-			emitMatch(m: any): void;
-		}
-	}
+    interface IGlob extends IGlobBase, events.EventEmitter {
+        pause(): void;
+        resume(): void;
+        abort(): void;
 
-	export = G;
+        /** Deprecated. */
+        EOF: any;
+        /** Deprecated. */
+        paused: boolean;
+        /** Deprecated. */
+        maxDepth: number;
+        /** Deprecated. */
+        maxLength: number;
+        /** Deprecated. */
+        changedCwd: boolean;
+        /** Deprecated. */
+        cwd: string;
+        /** Deprecated. */
+        root: string;
+        /** Deprecated. */
+        error: any;
+        /** Deprecated. */
+        matches: string[];
+        /** Deprecated. */
+        log(...args: any[]): void;
+        /** Deprecated. */
+        emitMatch(m: any): void;
+    }
 }
+
+export = G;
diff --git a/gm/gm.d.ts b/gm/gm.d.ts
index 964decdee5..565ec79dc5 100644
--- a/gm/gm.d.ts
+++ b/gm/gm.d.ts
@@ -5,623 +5,622 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gm" {
-	import stream = require('stream');
 
-	function m(image: string): m.State;
-	function m(stream:NodeJS.ReadableStream, image?: string): m.State;
-	function m(buffer:Buffer, image?: string): m.State;
-	function m(width:number, height:number, color?:string): m.State;
+import stream = require('stream');
 
-	namespace m {
-		export interface ClassOptions {
-			imageMagick?: boolean;
-			nativeAutoOrient?: boolean;
-		}
+declare function m(image: string): m.State;
+declare function m(stream: NodeJS.ReadableStream, image?: string): m.State;
+declare function m(buffer: Buffer, image?: string): m.State;
+declare function m(width: number, height: number, color?: string): m.State;
 
-		export interface CompareCallback {
-			(err: Error, isEqual: boolean, equality: number, raw: number): any;
-		}
+declare namespace m {
+    export interface ClassOptions {
+        imageMagick?: boolean;
+        nativeAutoOrient?: boolean;
+    }
 
-		export interface GetterCallback<T> {
-			(err: Error, value: T): any;
-		}
+    export interface CompareCallback {
+        (err: Error, isEqual: boolean, equality: number, raw: number): any;
+    }
 
-		export interface WriteCallback {
-			(err: Error, stdout: string, stderr: string, cmd: string): any;
-		}
+    export interface GetterCallback<T> {
+        (err: Error, value: T): any;
+    }
 
-		export interface ChannelInfo<T> {
-			Red: T;
-			Green: T;
-			Blue: T;
-		}
+    export interface WriteCallback {
+        (err: Error, stdout: string, stderr: string, cmd: string): any;
+    }
 
-		export interface CompareOptions {
-			file?: string;
-			highlightColor?: string;
-			highlightStyle?: string;
-			tolerance?: number;
-		}
+    export interface ChannelInfo<T> {
+        Red: T;
+        Green: T;
+        Blue: T;
+    }
 
-		export interface ColorStatistics {
-			Minimum: string;
-			Maximum: string;
-			Mean: string;
-			'Standard Deviation': string;
-		}
+    export interface CompareOptions {
+        file?: string;
+        highlightColor?: string;
+        highlightStyle?: string;
+        tolerance?: number;
+    }
 
-		export interface Dimensions {
-			width: number;
-			height: number;
-		}
+    export interface ColorStatistics {
+        Minimum: string;
+        Maximum: string;
+        Mean: string;
+        'Standard Deviation': string;
+    }
 
-		export interface ImageInfo {
-			'Background Color': string;
-			'Border Color': string;
-			'Channel Depths': ChannelInfo<string>;
-			'Channel Statistics': ChannelInfo<ColorStatistics>;
-			Class: string;
-			color: number;
-			Compose: string;
-			Compression: string;
-			depth: number;
-			Depth: string;
-			Dispose: string;
-			Filesize: string;
-			format: string;
-			Format: string;
-			Geometry: string;
-			Interlace: string;
-			Iterations: string;
-			'JPEG-Quality'?: string;
-			'JPEG-Colorspace'?: string;
-			'JPEG-Colorspace-Name'?: string;
-			'JPEG-Sampling-factors'?: string;
-			'Matte Color': string;
-			Orientation: string;
-			'Page geometry': string;
-			path: string;
+    export interface Dimensions {
+        width: number;
+        height: number;
+    }
 
-			'Profile-color'?: string;
-			'Profile-iptc'?: {
-				[key: string]: string;
-			};
-			'Profile-EXIF'?: {
-				[key: string]: string;
-			};
-			'Profile-XMP'?: string;
-			Resolution?: string;
-			size: Dimensions;
-			Signature: string;
-			Software: string;
-			Tainted: string;
-			Type: string;
-		}
+    export interface ImageInfo {
+        'Background Color': string;
+        'Border Color': string;
+        'Channel Depths': ChannelInfo<string>;
+        'Channel Statistics': ChannelInfo<ColorStatistics>;
+        Class: string;
+        color: number;
+        Compose: string;
+        Compression: string;
+        depth: number;
+        Depth: string;
+        Dispose: string;
+        Filesize: string;
+        format: string;
+        Format: string;
+        Geometry: string;
+        Interlace: string;
+        Iterations: string;
+        'JPEG-Quality'?: string;
+        'JPEG-Colorspace'?: string;
+        'JPEG-Colorspace-Name'?: string;
+        'JPEG-Sampling-factors'?: string;
+        'Matte Color': string;
+        Orientation: string;
+        'Page geometry': string;
+        path: string;
 
-		export interface State {
-			// Image Operations
-			adjoin(): State;
-			affine(matrix: string): State;
-			antialias(enable: boolean): State;
-			append(image: string, ltr?: boolean): State;
-			authenticate(password: string): State;
-			autoOrient(): State;
-			backdrop(): State;
-			bitdepth(bits: number): State;
-			blackThreshold(intensity: number): State;
-			blackThreshold(red: number, green: number, blue: number, opacity?: number): State;
-			bluePrimary(x: number, y: number): State;
-			blur(radius: number, sigma?: number): State;
-			border(width: number, height: number): State;
-			borderColor(color: string): State;
-			box(color: string): State;
-			channel(type: 'Red'): State;
-			channel(type: 'Green'): State;
-			channel(type: 'Blue'): State;
-			channel(type: 'Opacity'): State;
-			channel(type: 'Matte'): State;
-			channel(type: 'Cyan'): State;
-			channel(type: 'Magenta'): State;
-			channel(type: 'Yellow'): State;
-			channel(type: 'Black'): State;
-			channel(type: 'Gray'): State;
-			channel(type: string): State;
-			charcoal(factor: number): State;
-			chop(width: number, height: number, x?: number, y?: number): State;
-			clip(): State;
-			coalesce(): State;
-			colorize(red: number, green: number, blue: number): State;
-			colorMap(type: 'shared'): State;
-			colorMap(type: 'private'): State;
-			colorMap(type: string): State;
-			colors(colors: number): State;
-			colorspace(space: 'CineonLog'): State;
-			colorspace(space: 'CMYK'): State;
-			colorspace(space: 'GRAY'): State;
-			colorspace(space: 'HSL'): State;
-			colorspace(space: 'HSB'): State;
-			colorspace(space: 'OHTA'): State;
-			colorspace(space: 'RGB'): State;
-			colorspace(space: 'Rec601Luma'): State;
-			colorspace(space: 'Rec709Luma'): State;
-			colorspace(space: 'Rec601YCbCr'): State;
-			colorspace(space: 'Rec709YCbCr'): State;
-			colorspace(space: 'Transparent'): State;
-			colorspace(space: 'XYZ'): State;
-			colorspace(space: 'YCbCr'): State;
-			colorspace(space: 'YIQ'): State;
-			colorspace(space: 'YPbPr'): State;
-			colorspace(space: 'YUV'): State;
-			colorspace(space: string): State;
-			compose(operator: 'Over'): State;
-			compose(operator: 'In'): State;
-			compose(operator: 'Out'): State;
-			compose(operator: 'Atop'): State;
-			compose(operator: 'Xor'): State;
-			compose(operator: 'Plus'): State;
-			compose(operator: 'Minus'): State;
-			compose(operator: 'Add'): State;
-			compose(operator: 'Subtract'): State;
-			compose(operator: 'Difference'): State;
-			compose(operator: 'Divide'): State;
-			compose(operator: 'Multiply'): State;
-			compose(operator: 'Bumpmap'): State;
-			compose(operator: 'Copy'): State;
-			compose(operator: 'CopyRed'): State;
-			compose(operator: 'CopyGreen'): State;
-			compose(operator: 'CopyBlue'): State;
-			compose(operator: 'CopyOpacity'): State;
-			compose(operator: 'CopyCyan'): State;
-			compose(operator: 'CopyMagenta'): State;
-			compose(operator: 'CopyYellow'): State;
-			compose(operator: 'CopyBlack'): State;
-			compose(operator: string): State;
-			compress(type: 'None'): State;
-			compress(type: 'BZip'): State;
-			compress(type: 'Fax'): State;
-			compress(type: 'Group4'): State;
-			compress(type: 'JPEG'): State;
-			compress(type: 'Lossless'): State;
-			compress(type: 'LZW'): State;
-			compress(type: 'RLE'): State;
-			compress(type: 'Zip'): State;
-			compress(type: 'LZMA'): State;
-			compress(type: string): State;
-			contrast(multiplier: number): State;
-			convolve(kernel: string): State;
-			createDirectories(): State;
-			crop(width: number, height: number, x?: number, y?: number, percent?: boolean): State;
-			cycle(amount: number): State;
-			deconstruct(): State;
-			define(): State;
-			delay(milliseconds: number): State;
-			density(width: number, height: number): State;
-			despeckle(): State;
-			displace(horizontal: number, vertical: number): State;
-			display(xServer: string): State;
-			dispose(method: 'Undefined'): State;
-			dispose(method: 'None'): State;
-			dispose(method: 'Background'): State;
-			dispose(method: 'Previous'): State;
-			dispose(method: string): State;
-			dissolve(percent: number): State;
-			dither(enable?: boolean): State;
-			edge(radius?: number): State;
-			emboss(radius?: number): State;
-			encoding(encoding: 'AdobeCustom'): State;
-			encoding(encoding: 'AdobeExpert'): State;
-			encoding(encoding: 'AdobeStandard'): State;
-			encoding(encoding: 'AppleRoman'): State;
-			encoding(encoding: 'BIG5'): State;
-			encoding(encoding: 'GB2312'): State;
-			encoding(encoding: 'Latin 2'): State;
-			encoding(encoding: 'None'): State;
-			encoding(encoding: 'SJIScode'): State;
-			encoding(encoding: 'Symbol'): State;
-			encoding(encoding: 'Unicode'): State;
-			encoding(encoding: 'Wansung'): State;
-			encoding(encoding: string): State;
-			endian(type: 'MSB'): State;
-			endian(type: 'LSB'): State;
-			endian(type: 'Native'): State;
-			endian(type: string): State;
-			enhance(): State;
-			equalize(): State;
-			extent(width: number, height: number, options?: string): State;
-			file(filename: string): State;
-			filter(type: 'Point'): State;
-			filter(type: 'Box'): State;
-			filter(type: 'Triangle'): State;
-			filter(type: 'Hermite'): State;
-			filter(type: 'Hanning'): State;
-			filter(type: 'Hamming'): State;
-			filter(type: 'Blackman'): State;
-			filter(type: 'Gaussian'): State;
-			filter(type: 'Quadratic'): State;
-			filter(type: 'Cubic'): State;
-			filter(type: 'Catrom'): State;
-			filter(type: 'Mitchell'): State;
-			filter(type: 'Lanczos'): State;
-			filter(type: 'Bessel'): State;
-			filter(type: 'Sinc'): State;
-			filter(type: string): State;
-			flatten(): State;
-			flip(): State;
-			flop(): State;
-			foreground(color: string): State;
-			frame(width: number, height: number, outerBevelWidth: number, outBevelHeight: number): State;
-			fuzz(distance: number, percent?: boolean): State;
-			gamma(r: number, g: number, b: number): State;
-			gaussian(radius: number, sigma?: number): State;
-			/** Width and height are specified in percents */
-			geometry(width: number, height: number, option: '%'): State;
-			/** Specify maximum area in pixels */
-			geometry(width: number, height: number, option: '@'): State;
-			/** Ignore aspect ratio */
-			geometry(width: number, height: number, option: '!'): State;
-			/** Width and height are minimum values */
-			geometry(width: number, height: number, option: '^'): State;
-			/** Change dimensions only if image is smaller than width or height */
-			geometry(width: number, height: number, option: '<'): State;
-			/** Change dimensions only if image is larger than width or height */
-			geometry(width: number, height: number, option: '>'): State;
-			geometry(width: number, height?: number, option?: string): State;
-			geometry(geometry: string): State;
-			greenPrimary(x: number, y: number): State;
-			gravity(direction: 'NorthWest'): State;
-			gravity(direction: 'North'): State;
-			gravity(direction: 'NorthEast'): State;
-			gravity(direction: 'West'): State;
-			gravity(direction: 'Center'): State;
-			gravity(direction: 'East'): State;
-			gravity(direction: 'SouthWest'): State;
-			gravity(direction: 'South'): State;
-			gravity(direction: 'SouthEast'): State;
-			gravity(direction: string): State;
-			highlightColor(color: string): State;
-			highlightStyle(style: 'Assign'): State;
-			highlightStyle(style: 'Threshold'): State;
-			highlightStyle(style: 'Tint'): State;
-			highlightStyle(style: 'XOR'): State;
-			highlightStyle(style: string): State;
-			iconGeometry(geometry: string): State;
-			implode(factor?: number): State;
-			intent(type: 'Absolute'): State;
-			intent(type: 'Perceptual'): State;
-			intent(type: 'Relative'): State;
-			intent(type: 'Saturation'): State;
-			intent(type: string): State;
-			interlace(type: 'None'): State;
-			interlace(type: 'Line'): State;
-			interlace(type: 'Plane'): State;
-			interlace(type: 'Partition'): State;
-			interlace(type: string): State;
-			label(name: string): State;
-			lat(width: number, height: number, offset: number, percent?: boolean): State;
-			level(blackPoint: number, gamma: number, whitePoint: number, percent?: boolean): State;
-			limit(type: 'disk', val: string): State;
-			limit(type: 'file', val: string): State;
-			limit(type: 'map', val: string): State;
-			limit(type: 'memory', val: string): State;
-			limit(type: 'pixels', val: string): State;
-			limit(type: 'threads', val: string): State;
-			limit(type: string, val: string): State;
-			list(type: string): State;
-			list(type: 'Color'): State;
-			list(type: 'Delegate'): State;
-			list(type: 'Format'): State;
-			list(type: 'Magic'): State;
-			list(type: 'Module'): State;
-			list(type: 'Resource'): State;
-			list(type: 'Type'): State;
-			log(format: string): State;
-			loop(iterations: number): State;
-			lower(width: number, height: number): State;
-			magnify(factor: number): State;
-			map(filename: string): State;
-			mask(filename: string): State;
-			matte(): State;
-			matteColor(color: string): State;
-			maximumError(limit: number): State;
-			median(radius?: number): State;
-			minify(factor: number): State;
-			mode(mode: 'frame'): State;
-			mode(mode: 'unframe'): State;
-			mode(mode: 'concatenate'): State;
-			mode(mode: string): State;
-			modulate(b: number, s: number, h: number): State;
-			monitor(): State;
-			monochrome(): State;
-			morph(otherImg: string, outName: string, callback?: WriteCallback): State;
-			morph(otherImg: string[], outName: string, callback?: WriteCallback): State;
-			mosaic(): State;
-			motionBlur(radius: number, sigma?: number, angle?: number): State;
-			name(): State;
-			negative(): State;
-			noise(type: 'uniform'): State;
-			noise(type: 'gaussian'): State;
-			noise(type: 'multiplicative'): State;
-			noise(type: 'impulse'): State;
-			noise(type: 'laplacian'): State;
-			noise(type: 'poisson'): State;
-			noise(type: string): State;
-			noise(radius: number): State;
-			noop(): State;
-			normalize(): State;
-			opaque(color: string): State;
-			operator(channel: string, operator: 'Add', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'And', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Assign', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Depth', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Divide', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Gamma', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Negate', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'LShift', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Log', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Max', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Min', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Multiply', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Or', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Pow', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'RShift', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Subtract', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold-White', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold-White-Negate', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold-Black', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Threshold-Black-Negate', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Xor', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Gaussian', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Impulse', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Laplacian', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Multiplicative', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Poisson', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Random', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: 'Noise-Uniform', rvalue: number, percent?: boolean): State;
-			operator(channel: string, operator: string, rvalue: number, percent?: boolean): State;
-			orderedDither(channelType: 'All', NxN: string): State;
-			orderedDither(channelType: 'Intensity', NxN: string): State;
-			orderedDither(channelType: 'Red', NxN: string): State;
-			orderedDither(channelType: 'Green', NxN: string): State;
-			orderedDither(channelType: 'Blue', NxN: string): State;
-			orderedDither(channelType: 'Cyan', NxN: string): State;
-			orderedDither(channelType: 'Magenta', NxN: string): State;
-			orderedDither(channelType: 'Yellow', NxN: string): State;
-			orderedDither(channelType: 'Black', NxN: string): State;
-			orderedDither(channelType: 'Opacity', NxN: string): State;
-			orderedDither(channelType: string, NxN: string): State;
-			outputDirectory(directory: string): State;
-			page(width: number, height: number, arg?: '%'): State;
-			page(width: number, height: number, arg?: '!'): State;
-			page(width: number, height: number, arg?: '<'): State;
-			page(width: number, height: number, arg?: '>'): State;
-			page(width: number, height: number, arg?: string): State;
-			pause(seconds: number): State;
-			pen(color: string): State;
-			ping(): State;
-			pointSize(size: number): State;
-			noProfile(): State;
-			preview(type: 'Rotate'): State;
-			preview(type: 'Shear'): State;
-			preview(type: 'Roll'): State;
-			preview(type: 'Hue'): State;
-			preview(type: 'Saturation'): State;
-			preview(type: 'Brightness'): State;
-			preview(type: 'Gamma'): State;
-			preview(type: 'Spiff'): State;
-			preview(type: 'Dull'): State;
-			preview(type: 'Grayscale'): State;
-			preview(type: 'Quantize'): State;
-			preview(type: 'Despeckle'): State;
-			preview(type: 'ReduceNoise'): State;
-			preview(type: 'AddNoise'): State;
-			preview(type: 'Sharpen'): State;
-			preview(type: 'Blur'): State;
-			preview(type: 'Threshold'): State;
-			preview(type: 'EdgeDetect'): State;
-			preview(type: 'Spread'): State;
-			preview(type: 'Shade'): State;
-			preview(type: 'Raise'): State;
-			preview(type: 'Segment'): State;
-			preview(type: 'Solarize'): State;
-			preview(type: 'Swirl'): State;
-			preview(type: 'Implode'): State;
-			preview(type: 'Wave'): State;
-			preview(type: 'OilPaint'): State;
-			preview(type: 'CharcoalDrawing'): State;
-			preview(type: 'JPEG'): State;
-			preview(type: string): State;
-			paint(radius: number): State;
-			process(command: string): State;
-			profile(filename: string): State;
-			progress(): State;
-			randomThreshold(channelType: 'All', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Intensity', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Red', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Green', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Blue', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Cyan', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Magenta', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Yellow', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Black', LOWxHIGH: string): State;
-			randomThreshold(channelType: 'Opacity', LOWxHIGH: string): State;
-			randomThreshold(channelType: string, LOWxHIGH: string): State;
-			quality(level: number): State;
-			raise(width: number, height: number): State;
-			recolor(matrix: string): State;
-			redPrimary(x: number, y: number): State;
-			region(width: number, height: number, x?: number, y?: number): State;
-			remote(): State;
-			render(): State;
-			repage(reset: '+'): State;
-			repage(reset: string): State;
-			repage(width: number, height: number, xoff: number, yoff: number, arg?: string): State;
-			sample(geometry: string): State;
-			samplingFactor(horizontalFactor: number, verticalFactor: number): State;
-			rawSize(width: number, height: number, offset?: number): State;
-			resample(horizontal: number, vertical: number): State;
-			/** Width and height are specified in percents */
-			resize(width: number, height: number, option: '%'): State;
-			/** Specify maximum area in pixels */
-			resize(width: number, height: number, option: '@'): State;
-			/** Ignore aspect ratio */
-			resize(width: number, height: number, option: '!'): State;
-			/** Width and height are minimum values */
-			resize(width: number, height: number, option: '^'): State;
-			/** Change dimensions only if image is smaller than width or height */
-			resize(width: number, height: number, option: '<'): State;
-			/** Change dimensions only if image is larger than width or height */
-			resize(width: number, height: number, option: '>'): State;
-			resize(width: number, height?: number, option?: string): State;
-			roll(horizontal: number, vertical: number): State;
-			rotate(backgroundColor: string, degrees: number): State;
-			scene(index: number): State;
-			scenes(start: number, end: number): State;
-			scale(width: number, height: number): State;
-			screen(): State;
-			segment(clustherThreshold: number, smoothingThreshold: number): State;
-			sepia(): State;
-			set(attribute: string, value: string): State;
-			setFormat(format: string): State;
-			shade(azimuth: number, elevation: number): State;
-			shadow(radius: number, sigma?: number): State;
-			sharedMemory(): State;
-			shave(width: number, height: number, percent?: boolean): State;
-			sharpen(radius: number, sigma?: number): State;
-			shear(xDegrees: number, yDegress: number): State;
-			silent(): State;
-			snaps(count: number): State;
-			solarize(threshold: number): State;
-			spread(amount: number): State;
-			stegano(offset: number): State;
-			stereo(): State;
-			strip(): State;
-			swirl(degrees: number): State;
-			textFont(font: string): State;
-			threshold(value: number, percent?: boolean): State;
-			thumb(width: number, height: number, outName: string, callback: WriteCallback): State;
-			thumb(width: number, height: number, outName: string, quality: number, callback: WriteCallback): State;
-			thumb(width: number, height: number, outName: string, quality: number, align: 'topleft', callback: WriteCallback): State;
-			thumb(width: number, height: number, outName: string, quality: number, align: 'center', callback: WriteCallback): State;
-			thumb(width: number, height: number, outName: string, quality: number, align: string, callback: WriteCallback): State;
-			tile(filename: string): State;
-			title(title: string): State;
-			transform(color: string): State;
-			transparent(color: string): State;
-			treeDepth(depth: number): State;
-			trim(): State;
-			type(type: 'Bilevel'): State;
-			type(type: 'Grayscale'): State;
-			type(type: 'Palette'): State;
-			type(type: 'PaletteMatte'): State;
-			type(type: 'TrueColor'): State;
-			type(type: 'TrueColorMatte'): State;
-			type(type: 'ColorSeparation'): State;
-			type(type: 'ColorSeparationMatte'): State;
-			type(type: 'Optimize'): State;
-			type(type: string): State;
-			update(seconds: number): State;
-			units(type: 'Undefined'): State;
-			units(type: 'PixelsPerInch'): State;
-			units(type: 'PixelsPerCentimeter'): State;
-			units(type: string): State;
-			unsharp(radius: number, sigma?: number, amount?: number, threshold?: number): State;
-			usePixmap(): State;
-			view(): State;
-			virtualPixel(method: 'Constant'): State;
-			virtualPixel(method: 'Edge'): State;
-			virtualPixel(method: 'Mirror'): State;
-			virtualPixel(method: 'Tile'): State;
-			virtualPixel(method: string): State;
-			visual(type: 'StaticGray'): State;
-			visual(type: 'GrayScale'): State;
-			visual(type: 'StaticColor'): State;
-			visual(type: 'PseudoColor'): State;
-			visual(type: 'TrueColor'): State;
-			visual(type: 'DirectColor'): State;
-			visual(type: 'default'): State;
-			visual(type: string): State;
-			watermark(brightness: number, saturation: number): State;
-			wave(amplitude: number, wavelength: number): State;
-			whitePoint(x: number, y: number): State;
-			whiteThreshold(intensity: number): State;
-			whiteThreshold(red: number, green: number, blue: number, opacity?: number): State;
-			window(id: string): State;
-			windowGroup(): State;
+        'Profile-color'?: string;
+        'Profile-iptc'?: {
+            [key: string]: string;
+        };
+        'Profile-EXIF'?: {
+            [key: string]: string;
+        };
+        'Profile-XMP'?: string;
+        Resolution?: string;
+        size: Dimensions;
+        Signature: string;
+        Software: string;
+        Tainted: string;
+        Type: string;
+    }
 
-			// Getters
-			color(callback: GetterCallback<number>): State;
-			depth(callback: GetterCallback<number>): State;
-			filesize(callback: GetterCallback<string>): State;
-			format(callback: GetterCallback<string>): State;
-			identify(callback: GetterCallback<ImageInfo>): State;
-			res(callback: GetterCallback<string>): State;
-			size(callback: GetterCallback<Dimensions>): State;
-			orientation(callback: GetterCallback<string>): State;
+    export interface State {
+        // Image Operations
+        adjoin(): State;
+        affine(matrix: string): State;
+        antialias(enable: boolean): State;
+        append(image: string, ltr?: boolean): State;
+        authenticate(password: string): State;
+        autoOrient(): State;
+        backdrop(): State;
+        bitdepth(bits: number): State;
+        blackThreshold(intensity: number): State;
+        blackThreshold(red: number, green: number, blue: number, opacity?: number): State;
+        bluePrimary(x: number, y: number): State;
+        blur(radius: number, sigma?: number): State;
+        border(width: number, height: number): State;
+        borderColor(color: string): State;
+        box(color: string): State;
+        channel(type: 'Red'): State;
+        channel(type: 'Green'): State;
+        channel(type: 'Blue'): State;
+        channel(type: 'Opacity'): State;
+        channel(type: 'Matte'): State;
+        channel(type: 'Cyan'): State;
+        channel(type: 'Magenta'): State;
+        channel(type: 'Yellow'): State;
+        channel(type: 'Black'): State;
+        channel(type: 'Gray'): State;
+        channel(type: string): State;
+        charcoal(factor: number): State;
+        chop(width: number, height: number, x?: number, y?: number): State;
+        clip(): State;
+        coalesce(): State;
+        colorize(red: number, green: number, blue: number): State;
+        colorMap(type: 'shared'): State;
+        colorMap(type: 'private'): State;
+        colorMap(type: string): State;
+        colors(colors: number): State;
+        colorspace(space: 'CineonLog'): State;
+        colorspace(space: 'CMYK'): State;
+        colorspace(space: 'GRAY'): State;
+        colorspace(space: 'HSL'): State;
+        colorspace(space: 'HSB'): State;
+        colorspace(space: 'OHTA'): State;
+        colorspace(space: 'RGB'): State;
+        colorspace(space: 'Rec601Luma'): State;
+        colorspace(space: 'Rec709Luma'): State;
+        colorspace(space: 'Rec601YCbCr'): State;
+        colorspace(space: 'Rec709YCbCr'): State;
+        colorspace(space: 'Transparent'): State;
+        colorspace(space: 'XYZ'): State;
+        colorspace(space: 'YCbCr'): State;
+        colorspace(space: 'YIQ'): State;
+        colorspace(space: 'YPbPr'): State;
+        colorspace(space: 'YUV'): State;
+        colorspace(space: string): State;
+        compose(operator: 'Over'): State;
+        compose(operator: 'In'): State;
+        compose(operator: 'Out'): State;
+        compose(operator: 'Atop'): State;
+        compose(operator: 'Xor'): State;
+        compose(operator: 'Plus'): State;
+        compose(operator: 'Minus'): State;
+        compose(operator: 'Add'): State;
+        compose(operator: 'Subtract'): State;
+        compose(operator: 'Difference'): State;
+        compose(operator: 'Divide'): State;
+        compose(operator: 'Multiply'): State;
+        compose(operator: 'Bumpmap'): State;
+        compose(operator: 'Copy'): State;
+        compose(operator: 'CopyRed'): State;
+        compose(operator: 'CopyGreen'): State;
+        compose(operator: 'CopyBlue'): State;
+        compose(operator: 'CopyOpacity'): State;
+        compose(operator: 'CopyCyan'): State;
+        compose(operator: 'CopyMagenta'): State;
+        compose(operator: 'CopyYellow'): State;
+        compose(operator: 'CopyBlack'): State;
+        compose(operator: string): State;
+        compress(type: 'None'): State;
+        compress(type: 'BZip'): State;
+        compress(type: 'Fax'): State;
+        compress(type: 'Group4'): State;
+        compress(type: 'JPEG'): State;
+        compress(type: 'Lossless'): State;
+        compress(type: 'LZW'): State;
+        compress(type: 'RLE'): State;
+        compress(type: 'Zip'): State;
+        compress(type: 'LZMA'): State;
+        compress(type: string): State;
+        contrast(multiplier: number): State;
+        convolve(kernel: string): State;
+        createDirectories(): State;
+        crop(width: number, height: number, x?: number, y?: number, percent?: boolean): State;
+        cycle(amount: number): State;
+        deconstruct(): State;
+        define(): State;
+        delay(milliseconds: number): State;
+        density(width: number, height: number): State;
+        despeckle(): State;
+        displace(horizontal: number, vertical: number): State;
+        display(xServer: string): State;
+        dispose(method: 'Undefined'): State;
+        dispose(method: 'None'): State;
+        dispose(method: 'Background'): State;
+        dispose(method: 'Previous'): State;
+        dispose(method: string): State;
+        dissolve(percent: number): State;
+        dither(enable?: boolean): State;
+        edge(radius?: number): State;
+        emboss(radius?: number): State;
+        encoding(encoding: 'AdobeCustom'): State;
+        encoding(encoding: 'AdobeExpert'): State;
+        encoding(encoding: 'AdobeStandard'): State;
+        encoding(encoding: 'AppleRoman'): State;
+        encoding(encoding: 'BIG5'): State;
+        encoding(encoding: 'GB2312'): State;
+        encoding(encoding: 'Latin 2'): State;
+        encoding(encoding: 'None'): State;
+        encoding(encoding: 'SJIScode'): State;
+        encoding(encoding: 'Symbol'): State;
+        encoding(encoding: 'Unicode'): State;
+        encoding(encoding: 'Wansung'): State;
+        encoding(encoding: string): State;
+        endian(type: 'MSB'): State;
+        endian(type: 'LSB'): State;
+        endian(type: 'Native'): State;
+        endian(type: string): State;
+        enhance(): State;
+        equalize(): State;
+        extent(width: number, height: number, options?: string): State;
+        file(filename: string): State;
+        filter(type: 'Point'): State;
+        filter(type: 'Box'): State;
+        filter(type: 'Triangle'): State;
+        filter(type: 'Hermite'): State;
+        filter(type: 'Hanning'): State;
+        filter(type: 'Hamming'): State;
+        filter(type: 'Blackman'): State;
+        filter(type: 'Gaussian'): State;
+        filter(type: 'Quadratic'): State;
+        filter(type: 'Cubic'): State;
+        filter(type: 'Catrom'): State;
+        filter(type: 'Mitchell'): State;
+        filter(type: 'Lanczos'): State;
+        filter(type: 'Bessel'): State;
+        filter(type: 'Sinc'): State;
+        filter(type: string): State;
+        flatten(): State;
+        flip(): State;
+        flop(): State;
+        foreground(color: string): State;
+        frame(width: number, height: number, outerBevelWidth: number, outBevelHeight: number): State;
+        fuzz(distance: number, percent?: boolean): State;
+        gamma(r: number, g: number, b: number): State;
+        gaussian(radius: number, sigma?: number): State;
+        /** Width and height are specified in percents */
+        geometry(width: number, height: number, option: '%'): State;
+        /** Specify maximum area in pixels */
+        geometry(width: number, height: number, option: '@'): State;
+        /** Ignore aspect ratio */
+        geometry(width: number, height: number, option: '!'): State;
+        /** Width and height are minimum values */
+        geometry(width: number, height: number, option: '^'): State;
+        /** Change dimensions only if image is smaller than width or height */
+        geometry(width: number, height: number, option: '<'): State;
+        /** Change dimensions only if image is larger than width or height */
+        geometry(width: number, height: number, option: '>'): State;
+        geometry(width: number, height?: number, option?: string): State;
+        geometry(geometry: string): State;
+        greenPrimary(x: number, y: number): State;
+        gravity(direction: 'NorthWest'): State;
+        gravity(direction: 'North'): State;
+        gravity(direction: 'NorthEast'): State;
+        gravity(direction: 'West'): State;
+        gravity(direction: 'Center'): State;
+        gravity(direction: 'East'): State;
+        gravity(direction: 'SouthWest'): State;
+        gravity(direction: 'South'): State;
+        gravity(direction: 'SouthEast'): State;
+        gravity(direction: string): State;
+        highlightColor(color: string): State;
+        highlightStyle(style: 'Assign'): State;
+        highlightStyle(style: 'Threshold'): State;
+        highlightStyle(style: 'Tint'): State;
+        highlightStyle(style: 'XOR'): State;
+        highlightStyle(style: string): State;
+        iconGeometry(geometry: string): State;
+        implode(factor?: number): State;
+        intent(type: 'Absolute'): State;
+        intent(type: 'Perceptual'): State;
+        intent(type: 'Relative'): State;
+        intent(type: 'Saturation'): State;
+        intent(type: string): State;
+        interlace(type: 'None'): State;
+        interlace(type: 'Line'): State;
+        interlace(type: 'Plane'): State;
+        interlace(type: 'Partition'): State;
+        interlace(type: string): State;
+        label(name: string): State;
+        lat(width: number, height: number, offset: number, percent?: boolean): State;
+        level(blackPoint: number, gamma: number, whitePoint: number, percent?: boolean): State;
+        limit(type: 'disk', val: string): State;
+        limit(type: 'file', val: string): State;
+        limit(type: 'map', val: string): State;
+        limit(type: 'memory', val: string): State;
+        limit(type: 'pixels', val: string): State;
+        limit(type: 'threads', val: string): State;
+        limit(type: string, val: string): State;
+        list(type: string): State;
+        list(type: 'Color'): State;
+        list(type: 'Delegate'): State;
+        list(type: 'Format'): State;
+        list(type: 'Magic'): State;
+        list(type: 'Module'): State;
+        list(type: 'Resource'): State;
+        list(type: 'Type'): State;
+        log(format: string): State;
+        loop(iterations: number): State;
+        lower(width: number, height: number): State;
+        magnify(factor: number): State;
+        map(filename: string): State;
+        mask(filename: string): State;
+        matte(): State;
+        matteColor(color: string): State;
+        maximumError(limit: number): State;
+        median(radius?: number): State;
+        minify(factor: number): State;
+        mode(mode: 'frame'): State;
+        mode(mode: 'unframe'): State;
+        mode(mode: 'concatenate'): State;
+        mode(mode: string): State;
+        modulate(b: number, s: number, h: number): State;
+        monitor(): State;
+        monochrome(): State;
+        morph(otherImg: string, outName: string, callback?: WriteCallback): State;
+        morph(otherImg: string[], outName: string, callback?: WriteCallback): State;
+        mosaic(): State;
+        motionBlur(radius: number, sigma?: number, angle?: number): State;
+        name(): State;
+        negative(): State;
+        noise(type: 'uniform'): State;
+        noise(type: 'gaussian'): State;
+        noise(type: 'multiplicative'): State;
+        noise(type: 'impulse'): State;
+        noise(type: 'laplacian'): State;
+        noise(type: 'poisson'): State;
+        noise(type: string): State;
+        noise(radius: number): State;
+        noop(): State;
+        normalize(): State;
+        opaque(color: string): State;
+        operator(channel: string, operator: 'Add', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'And', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Assign', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Depth', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Divide', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Gamma', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Negate', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'LShift', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Log', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Max', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Min', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Multiply', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Or', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Pow', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'RShift', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Subtract', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold-White', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold-White-Negate', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold-Black', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Threshold-Black-Negate', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Xor', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Gaussian', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Impulse', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Laplacian', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Multiplicative', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Poisson', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Random', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: 'Noise-Uniform', rvalue: number, percent?: boolean): State;
+        operator(channel: string, operator: string, rvalue: number, percent?: boolean): State;
+        orderedDither(channelType: 'All', NxN: string): State;
+        orderedDither(channelType: 'Intensity', NxN: string): State;
+        orderedDither(channelType: 'Red', NxN: string): State;
+        orderedDither(channelType: 'Green', NxN: string): State;
+        orderedDither(channelType: 'Blue', NxN: string): State;
+        orderedDither(channelType: 'Cyan', NxN: string): State;
+        orderedDither(channelType: 'Magenta', NxN: string): State;
+        orderedDither(channelType: 'Yellow', NxN: string): State;
+        orderedDither(channelType: 'Black', NxN: string): State;
+        orderedDither(channelType: 'Opacity', NxN: string): State;
+        orderedDither(channelType: string, NxN: string): State;
+        outputDirectory(directory: string): State;
+        page(width: number, height: number, arg?: '%'): State;
+        page(width: number, height: number, arg?: '!'): State;
+        page(width: number, height: number, arg?: '<'): State;
+        page(width: number, height: number, arg?: '>'): State;
+        page(width: number, height: number, arg?: string): State;
+        pause(seconds: number): State;
+        pen(color: string): State;
+        ping(): State;
+        pointSize(size: number): State;
+        noProfile(): State;
+        preview(type: 'Rotate'): State;
+        preview(type: 'Shear'): State;
+        preview(type: 'Roll'): State;
+        preview(type: 'Hue'): State;
+        preview(type: 'Saturation'): State;
+        preview(type: 'Brightness'): State;
+        preview(type: 'Gamma'): State;
+        preview(type: 'Spiff'): State;
+        preview(type: 'Dull'): State;
+        preview(type: 'Grayscale'): State;
+        preview(type: 'Quantize'): State;
+        preview(type: 'Despeckle'): State;
+        preview(type: 'ReduceNoise'): State;
+        preview(type: 'AddNoise'): State;
+        preview(type: 'Sharpen'): State;
+        preview(type: 'Blur'): State;
+        preview(type: 'Threshold'): State;
+        preview(type: 'EdgeDetect'): State;
+        preview(type: 'Spread'): State;
+        preview(type: 'Shade'): State;
+        preview(type: 'Raise'): State;
+        preview(type: 'Segment'): State;
+        preview(type: 'Solarize'): State;
+        preview(type: 'Swirl'): State;
+        preview(type: 'Implode'): State;
+        preview(type: 'Wave'): State;
+        preview(type: 'OilPaint'): State;
+        preview(type: 'CharcoalDrawing'): State;
+        preview(type: 'JPEG'): State;
+        preview(type: string): State;
+        paint(radius: number): State;
+        process(command: string): State;
+        profile(filename: string): State;
+        progress(): State;
+        randomThreshold(channelType: 'All', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Intensity', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Red', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Green', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Blue', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Cyan', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Magenta', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Yellow', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Black', LOWxHIGH: string): State;
+        randomThreshold(channelType: 'Opacity', LOWxHIGH: string): State;
+        randomThreshold(channelType: string, LOWxHIGH: string): State;
+        quality(level: number): State;
+        raise(width: number, height: number): State;
+        recolor(matrix: string): State;
+        redPrimary(x: number, y: number): State;
+        region(width: number, height: number, x?: number, y?: number): State;
+        remote(): State;
+        render(): State;
+        repage(reset: '+'): State;
+        repage(reset: string): State;
+        repage(width: number, height: number, xoff: number, yoff: number, arg?: string): State;
+        sample(geometry: string): State;
+        samplingFactor(horizontalFactor: number, verticalFactor: number): State;
+        rawSize(width: number, height: number, offset?: number): State;
+        resample(horizontal: number, vertical: number): State;
+        /** Width and height are specified in percents */
+        resize(width: number, height: number, option: '%'): State;
+        /** Specify maximum area in pixels */
+        resize(width: number, height: number, option: '@'): State;
+        /** Ignore aspect ratio */
+        resize(width: number, height: number, option: '!'): State;
+        /** Width and height are minimum values */
+        resize(width: number, height: number, option: '^'): State;
+        /** Change dimensions only if image is smaller than width or height */
+        resize(width: number, height: number, option: '<'): State;
+        /** Change dimensions only if image is larger than width or height */
+        resize(width: number, height: number, option: '>'): State;
+        resize(width: number, height?: number, option?: string): State;
+        roll(horizontal: number, vertical: number): State;
+        rotate(backgroundColor: string, degrees: number): State;
+        scene(index: number): State;
+        scenes(start: number, end: number): State;
+        scale(width: number, height: number): State;
+        screen(): State;
+        segment(clustherThreshold: number, smoothingThreshold: number): State;
+        sepia(): State;
+        set(attribute: string, value: string): State;
+        setFormat(format: string): State;
+        shade(azimuth: number, elevation: number): State;
+        shadow(radius: number, sigma?: number): State;
+        sharedMemory(): State;
+        shave(width: number, height: number, percent?: boolean): State;
+        sharpen(radius: number, sigma?: number): State;
+        shear(xDegrees: number, yDegress: number): State;
+        silent(): State;
+        snaps(count: number): State;
+        solarize(threshold: number): State;
+        spread(amount: number): State;
+        stegano(offset: number): State;
+        stereo(): State;
+        strip(): State;
+        swirl(degrees: number): State;
+        textFont(font: string): State;
+        threshold(value: number, percent?: boolean): State;
+        thumb(width: number, height: number, outName: string, callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, align: 'topleft', callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, align: 'center', callback: WriteCallback): State;
+        thumb(width: number, height: number, outName: string, quality: number, align: string, callback: WriteCallback): State;
+        tile(filename: string): State;
+        title(title: string): State;
+        transform(color: string): State;
+        transparent(color: string): State;
+        treeDepth(depth: number): State;
+        trim(): State;
+        type(type: 'Bilevel'): State;
+        type(type: 'Grayscale'): State;
+        type(type: 'Palette'): State;
+        type(type: 'PaletteMatte'): State;
+        type(type: 'TrueColor'): State;
+        type(type: 'TrueColorMatte'): State;
+        type(type: 'ColorSeparation'): State;
+        type(type: 'ColorSeparationMatte'): State;
+        type(type: 'Optimize'): State;
+        type(type: string): State;
+        update(seconds: number): State;
+        units(type: 'Undefined'): State;
+        units(type: 'PixelsPerInch'): State;
+        units(type: 'PixelsPerCentimeter'): State;
+        units(type: string): State;
+        unsharp(radius: number, sigma?: number, amount?: number, threshold?: number): State;
+        usePixmap(): State;
+        view(): State;
+        virtualPixel(method: 'Constant'): State;
+        virtualPixel(method: 'Edge'): State;
+        virtualPixel(method: 'Mirror'): State;
+        virtualPixel(method: 'Tile'): State;
+        virtualPixel(method: string): State;
+        visual(type: 'StaticGray'): State;
+        visual(type: 'GrayScale'): State;
+        visual(type: 'StaticColor'): State;
+        visual(type: 'PseudoColor'): State;
+        visual(type: 'TrueColor'): State;
+        visual(type: 'DirectColor'): State;
+        visual(type: 'default'): State;
+        visual(type: string): State;
+        watermark(brightness: number, saturation: number): State;
+        wave(amplitude: number, wavelength: number): State;
+        whitePoint(x: number, y: number): State;
+        whiteThreshold(intensity: number): State;
+        whiteThreshold(red: number, green: number, blue: number, opacity?: number): State;
+        window(id: string): State;
+        windowGroup(): State;
 
-			// Drawing Operations
-			draw(args: string): State;
-			drawArc(x0: number, y0: number, x1: number, y1: number, r0: number, r1: number): State;
-			drawBezier(x0: number, y0: number, x1: number, y1: number): State;
-			drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
-			drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
-			drawCircle(x0: number, y0: number, x1: number, y1: number): State;
-			drawEllipse(x0: number, y0: number, rx: number, ry: number, a0: number, a1: number): State;
-			drawLine(x0: number, y0: number, x1: number, y1: number): State;
-			drawPoint(x: number, y: number): State;
-			drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
-			drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
-			drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
-			drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
-			drawRectangle(x0: number, y0: number, x1: number, y1: number): State;
-			drawRectangle(x0: number, y0: number, x1: number, y1: number, rc: number): State;
-			drawRectangle(x0: number, y0: number, x1: number, y1: number, wc: number, hc: number): State;
-			drawText(x: number, y: number, text: string, gravity: 'NorthWest'): State;
-			drawText(x: number, y: number, text: string, gravity: 'North'): State;
-			drawText(x: number, y: number, text: string, gravity: 'NorthEast'): State;
-			drawText(x: number, y: number, text: string, gravity: 'West'): State;
-			drawText(x: number, y: number, text: string, gravity: 'Center'): State;
-			drawText(x: number, y: number, text: string, gravity: 'East'): State;
-			drawText(x: number, y: number, text: string, gravity: 'SouthWest'): State;
-			drawText(x: number, y: number, text: string, gravity: 'South'): State;
-			drawText(x: number, y: number, text: string, gravity: 'SouthEast'): State;
-			drawText(x: number, y: number, text: string, gravity?: string): State;
-			fill(color: string): State;
-			font(name: string, size?: number): State;
-			fontSize(size: number): State;
-			stroke(color: string, width?: number): State;
-			strokeWidth(width: number): State;
-			setDraw(property: 'color', x: number, y: number, method: 'point'): State;
-			setDraw(property: 'color', x: number, y: number, method: 'replace'): State;
-			setDraw(property: 'color', x: number, y: number, method: 'floodfill'): State;
-			setDraw(property: 'color', x: number, y: number, method: 'filltoborder'): State;
-			setDraw(property: 'color', x: number, y: number, method: 'reset'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'point'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'replace'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'floodfill'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'filltoborder'): State;
-			setDraw(property: 'matte', x: number, y: number, method: 'reset'): State;
-			setDraw(property: string, x: number, y: number, method: string): State;
+        // Getters
+        color(callback: GetterCallback<number>): State;
+        depth(callback: GetterCallback<number>): State;
+        filesize(callback: GetterCallback<string>): State;
+        format(callback: GetterCallback<string>): State;
+        identify(callback: GetterCallback<ImageInfo>): State;
+        res(callback: GetterCallback<string>): State;
+        size(callback: GetterCallback<Dimensions>): State;
+        orientation(callback: GetterCallback<string>): State;
 
-			// Commands
-			stream(callback?: WriteCallback): stream.PassThrough;
-			stream(format: string, callback?: WriteCallback): stream.PassThrough;
-			toBuffer(callback: (err: Error, buffer: Buffer) => any): stream.PassThrough;
-			toBuffer(format: string, callback: (err: Error, buffer: Buffer) => any): stream.PassThrough;
-			write(filename: string, callback: WriteCallback): void;
-		}
+        // Drawing Operations
+        draw(args: string): State;
+        drawArc(x0: number, y0: number, x1: number, y1: number, r0: number, r1: number): State;
+        drawBezier(x0: number, y0: number, x1: number, y1: number): State;
+        drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
+        drawBezier(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
+        drawCircle(x0: number, y0: number, x1: number, y1: number): State;
+        drawEllipse(x0: number, y0: number, rx: number, ry: number, a0: number, a1: number): State;
+        drawLine(x0: number, y0: number, x1: number, y1: number): State;
+        drawPoint(x: number, y: number): State;
+        drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
+        drawPolygon(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
+        drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number): State;
+        drawPolyline(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, ...coords: number[]): State;
+        drawRectangle(x0: number, y0: number, x1: number, y1: number): State;
+        drawRectangle(x0: number, y0: number, x1: number, y1: number, rc: number): State;
+        drawRectangle(x0: number, y0: number, x1: number, y1: number, wc: number, hc: number): State;
+        drawText(x: number, y: number, text: string, gravity: 'NorthWest'): State;
+        drawText(x: number, y: number, text: string, gravity: 'North'): State;
+        drawText(x: number, y: number, text: string, gravity: 'NorthEast'): State;
+        drawText(x: number, y: number, text: string, gravity: 'West'): State;
+        drawText(x: number, y: number, text: string, gravity: 'Center'): State;
+        drawText(x: number, y: number, text: string, gravity: 'East'): State;
+        drawText(x: number, y: number, text: string, gravity: 'SouthWest'): State;
+        drawText(x: number, y: number, text: string, gravity: 'South'): State;
+        drawText(x: number, y: number, text: string, gravity: 'SouthEast'): State;
+        drawText(x: number, y: number, text: string, gravity?: string): State;
+        fill(color: string): State;
+        font(name: string, size?: number): State;
+        fontSize(size: number): State;
+        stroke(color: string, width?: number): State;
+        strokeWidth(width: number): State;
+        setDraw(property: 'color', x: number, y: number, method: 'point'): State;
+        setDraw(property: 'color', x: number, y: number, method: 'replace'): State;
+        setDraw(property: 'color', x: number, y: number, method: 'floodfill'): State;
+        setDraw(property: 'color', x: number, y: number, method: 'filltoborder'): State;
+        setDraw(property: 'color', x: number, y: number, method: 'reset'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'point'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'replace'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'floodfill'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'filltoborder'): State;
+        setDraw(property: 'matte', x: number, y: number, method: 'reset'): State;
+        setDraw(property: string, x: number, y: number, method: string): State;
 
-		export interface SubClass {
-			(image: string): State;
-		}
+        // Commands
+        stream(callback?: WriteCallback): stream.PassThrough;
+        stream(format: string, callback?: WriteCallback): stream.PassThrough;
+        toBuffer(callback: (err: Error, buffer: Buffer) => any): stream.PassThrough;
+        toBuffer(format: string, callback: (err: Error, buffer: Buffer) => any): stream.PassThrough;
+        write(filename: string, callback: WriteCallback): void;
+    }
 
-		export function compare(filename1: string, filename2: string, callback: CompareCallback): void;
-		export function compare(filename1: string, filename2: string, tolerance: number, callback: CompareCallback): void;
-		export function compare(filename1: string, filename2: string, options: CompareOptions, callback: CompareCallback): void;
+    export interface SubClass {
+        (image: string): State;
+    }
 
-		export function subClass(options: ClassOptions): SubClass;
-	}
+    export function compare(filename1: string, filename2: string, callback: CompareCallback): void;
+    export function compare(filename1: string, filename2: string, tolerance: number, callback: CompareCallback): void;
+    export function compare(filename1: string, filename2: string, options: CompareOptions, callback: CompareCallback): void;
 
-	export = m;
+    export function subClass(options: ClassOptions): SubClass;
 }
+
+export = m;
diff --git a/google-closure-compiler/google-closure-compiler.d.ts b/google-closure-compiler/google-closure-compiler.d.ts
index e1a21ab106..f6238d6adc 100644
--- a/google-closure-compiler/google-closure-compiler.d.ts
+++ b/google-closure-compiler/google-closure-compiler.d.ts
@@ -5,34 +5,33 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'google-closure-compiler' {
-    import * as child_process from 'child_process';
 
-    // The "json_streams" compiler flag lets the compiler accept/produce
-    // arrays of JSON objects in this shape for input/output.
-    interface JSONStreamFile {
-        path: string;
-        src: string;
-        srcmap?: string;  // TODO(evan): pass through source maps.
-    }
+import * as child_process from 'child_process';
 
-    interface Compiler {
-        javaPath: string;
-        logger: (...args: any[]) => void;
-        spawnOptions: {[key:string]: string};
-
-        run(callback?: (exitCode: number, stdout: string, stderr: string) => void):
-        child_process.ChildProcess;
-        
-        getFullCommand(): string;
-    }
-    type CompileOptions = {[key: string]: string};
-    var compiler: {
-        new (opts: (CompileOptions|string[]),
-             extraCommandArgs?: string[]): Compiler;
-
-        JAR_PATH: string;
-        COMPILER_PATH: string;
-        CONTRIB_PATH: string;
-    };
+// The "json_streams" compiler flag lets the compiler accept/produce
+// arrays of JSON objects in this shape for input/output.
+interface JSONStreamFile {
+    path: string;
+    src: string;
+    srcmap?: string;  // TODO(evan): pass through source maps.
 }
+
+interface Compiler {
+    javaPath: string;
+    logger: (...args: any[]) => void;
+    spawnOptions: { [key: string]: string };
+
+    run(callback?: (exitCode: number, stdout: string, stderr: string) => void):
+        child_process.ChildProcess;
+
+    getFullCommand(): string;
+}
+type CompileOptions = { [key: string]: string };
+declare var compiler: {
+    new (opts: (CompileOptions | string[]),
+        extraCommandArgs?: string[]): Compiler;
+
+    JAR_PATH: string;
+    COMPILER_PATH: string;
+    CONTRIB_PATH: string;
+};
diff --git a/graceful-fs/graceful-fs.d.ts b/graceful-fs/graceful-fs.d.ts
index 7278caf487..f635d20cd6 100644
--- a/graceful-fs/graceful-fs.d.ts
+++ b/graceful-fs/graceful-fs.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'graceful-fs' {
-	import fs = require('fs');
-	export = fs;
-}
+
+import fs = require('fs');
+export = fs;
diff --git a/graphene-pk11/graphene-pk11.d.ts b/graphene-pk11/graphene-pk11.d.ts
index 5c0c5c5142..44c8625d37 100644
--- a/graphene-pk11/graphene-pk11.d.ts
+++ b/graphene-pk11/graphene-pk11.d.ts
@@ -10,2710 +10,2708 @@
  * v2.0.0
  */
 
-declare module "graphene-pk11" {
 
-    type Callback = (err: Error, rv: number) => void;
-    type CK_PTR = Buffer;
 
-    class Pkcs11 {
-        lib: any;
-        /**
-         * load a library with PKCS11 interface
-         * @param {string} libFile path to PKCS11 library
-         */
-        constructor(libFile: string);
-        protected callFunction(funcName: string, args: any[]): number;
-        /**
-         * C_Initialize initializes the Cryptoki library.
-         * @param pInitArgs   if this is not NULL_PTR, it gets
-         *                    cast to CK_C_INITIALIZE_ARGS_PTR
-         *                    and dereferenced
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Initialize(pInitArgs?: CK_PTR): number;
-        C_Initialize(pInitArgs: CK_PTR, cllback: Callback): void;
-        /**
-         * C_Finalize indicates that an application is done with the Cryptoki library.
-         * @param pReserved   reserved. Should be NULL_PTR
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Finalize(pReserved?: CK_PTR): number;
-        C_Finalize(pReserved: CK_PTR, callback: Callback): void;
-        /**
-         * C_GetInfo returns general information about Cryptoki.
-         * @param pInfo       location that receives information
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetInfo(pInfo: CK_PTR): number;
-        C_GetInfo(pInfo: CK_PTR, callback: Callback): void;
-        /**
-         * C_GetSlotList obtains a list of slots in the system.
-         * @param {boolean} tokenPresent only slots with tokens?
-         * @param pSlotList receives array of slot IDs
-         * @param pulCount receives number of slots
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetSlotList(tokenPresent: boolean, pSlotList: CK_PTR, pulCount: CK_PTR): number;
-        C_GetSlotList(tokenPresent: boolean, pSlotList: CK_PTR, pulCount: CK_PTR, callback: Callback): void;
-        /**
-         * C_GetSlotInfo obtains information about a particular slot in
-         * the system.
-         * @param {number} slotID the ID of the slot
-         * @param {Buffer} pInfo receives the slot information
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetSlotInfo(slotID: number, pInfo: CK_PTR): number;
-        C_GetSlotInfo(slotID: number, pInfo: CK_PTR, callback: Callback): void;
-        /**
-         * C_GetTokenInfo obtains information about a particular token
-         * in the system.
-         * @param {number} slotID ID of the token's slot
-         * @param {Buffer} pInfo receives the token information
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetTokenInfo(slotID: number, pInfo: Buffer): number;
-        C_GetTokenInfo(slotID: number, pInfo: Buffer, callback: Callback): void;
-        /**
-         * C_GetMechanismList obtains a list of mechanism types
-         * supported by a token.
-         * @param {number} slotID ID of the token's slot
-         * @param {number} pMechanismList gets mech. array
-         * @param {number} pulCount gets # of mechs
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetMechanismList(slotID: number, pMechanismList: Buffer, pulCount: Buffer): number;
-        C_GetMechanismList(slotID: number, pMechanismList: Buffer, pulCount: Buffer, callback: Callback): void;
-        /** C_GetMechanismInfo obtains information about a particular
-         * mechanism possibly supported by a token.
-         * @param {number} slotID ID of the token's slot
-         * @param {number} type type of mechanism
-         * @param {Buffer} pInfo receives mechanism info
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetMechanismInfo(slotID: number, type: number, pInfo: Buffer): number;
-        C_GetMechanismInfo(slotID: number, type: number, pInfo: Buffer, callback: Callback): void;
-        /**
-         * C_InitToken initializes a token.
-         * @param {number} slotID ID of the token's slot
-         * @param {Buffer} pPin the SO's initial PIN
-         * @param {number} ulPinLen length in bytes of the PIN
-         * @param {number} pLabel 32-byte token label (blank padded)
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_InitToken(slotID: number, pPin: Buffer, ulPinLen: number, pLabel: Buffer): number;
-        C_InitToken(slotID: number, pPin: Buffer, ulPinLen: number, pLabel: Buffer, callback: Callback): void;
-        /**
-         * C_InitPIN initializes the normal user's PIN.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPin the normal user's PIN
-         * @param {number} ulPinLen length in bytes of the PIN
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_InitPIN(hSession: number, pPin: Buffer, ulPinLen: number): number;
-        C_InitPIN(hSession: number, pPin: Buffer, ulPinLen: number, callback: Callback): void;
-        /**
-         * C_SetPIN modifies the PIN of the user who is logged in.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pOldPin the old PIN
-         * @param {number} ulOldLen length of the old PIN
-         * @param {Buffer} pNewPin the new PIN
-         * @param {number} ulNewLen length of the new PIN
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SetPIN(hSession: any, pOldPin: Buffer, ulOldLen: number, pNewPin: Buffer, ulNewLen: number): number;
-        C_SetPIN(hSession: any, pOldPin: Buffer, ulOldLen: number, pNewPin: Buffer, ulNewLen: number, callback: Callback): void;
-        /**
-         * C_OpenSession opens a session between an application and a
-         * token.
-         * @param {number} slotID ID of the token's slot
-         * @param {number} flags from CK_SESSION_INFO
-         * @param {Buffer} pApplication passed to callback
-         * @param {Buffer} Notify callback function
-         * @param {Buffer} phSession gets session handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_OpenSession(slotID: number, flags: number, pApplication?: Buffer, notify?: Buffer, phSession?: Buffer): number;
-        C_OpenSession(slotID: number, flags: number, pApplication: Buffer, notify: Buffer, phSession: Buffer, callback: Callback): void;
-        /**
-         * C_CloseSession closes a session between an application and a token.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CloseSession(hSession: number): number;
-        C_CloseSession(hSession: number, callback: Callback): void;
-        /**
-         * C_CloseAllSessions closes all sessions with a token.
-         * @param {number} slotID ID of the token's slot
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CloseAllSessions(slotID: number): number;
-        C_CloseAllSessions(slotID: number, callback: Callback): void;
-        /**
-         * C_GetSessionInfo obtains information about the session.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pInfo receives session info
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetSessionInfo(hSession: number, pInfo: Buffer): number;
-        C_GetSessionInfo(hSession: number, pInfo: Buffer, callback: Callback): void;
-        /**
-         * C_GetOperationState obtains the state of the cryptographic operation in a session.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pOperationState gets state
-         * @param {Buffer} pulOperationStateLen gets state length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetOperationState(hSession: number, pOperationState: Buffer, pulOperationStateLen: Buffer): number;
-        C_GetOperationState(hSession: number, pOperationState: Buffer, pulOperationStateLen: Buffer, callback: Callback): void;
-        /**
-         * C_SetOperationState restores the state of the cryptographic operation in a session.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pOperationState holds state
-         * @param {number} ulOperationStateLen holds holds state length
-         * @param {number} hEncryptionKey en/decryption key
-         * @param {number} hAuthenticationKey sign/verify key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SetOperationState(hSession: number, pOperationState: Buffer, ulOperationStateLen: number, hEncryptionKey: number, hAuthenticationKey: number): number;
-        C_SetOperationState(hSession: number, pOperationState: Buffer, ulOperationStateLen: number, hEncryptionKey: number, hAuthenticationKey: number, callback: Callback): void;
-        /**
-         * C_Login logs a user into a token.
-         * @param {number} hSession the session's handle
-         * @param {number} userType the user type
-         * @param {Buffer} pPin the user's PIN
-         * @param {number} ulPinLen the length of the PIN
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Login(hSession: number, userType: number, pPin: Buffer, ulPinLen: number): number;
-        C_Login(hSession: number, userType: number, pPin: Buffer, ulPinLen: number, callback: Callback): void;
-        /**
-         * C_Logout logs a user out from a token.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Logout(hSession: number): number;
-        C_Logout(hSession: number, callback: Callback): void;
-        /**
-         * C_CreateObject creates a new object.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pTemplate the object's template
-         * @param {number} ulCount attributes in template
-         * @param {Buffer} phObject gets new object's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CreateObject(hSession: number, pTemplate: Buffer, ulCount: number, phObject: Buffer): number;
-        C_CreateObject(hSession: number, pTemplate: Buffer, ulCount: number, phObject: Buffer, callback: Callback): void;
-        /**
-         * C_CopyObject copies an object, creating a new object for the copy.
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Buffer} pTemplate template for new object
-         * @param {number} ulCount attributes in template
-         * @param {Buffer} phNewObject receives handle of copy
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CopyObject(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, phNewObject: Buffer): number;
-        C_CopyObject(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, phNewObject: Buffer, callback: Callback): void;
-        /**
-         * C_DestroyObject destroys an object.
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DestroyObject(hSession: number, hObject: number): number;
-        C_DestroyObject(hSession: number, hObject: number, callback: Callback): void;
-        /**
-         * C_GetObjectSize gets the size of an object in bytes.
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Buffer} pulSize receives size of object
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetObjectSize(hSession: number, hObject: number, pulSize: Buffer): number;
-        C_GetObjectSize(hSession: number, hObject: number, pulSize: Buffer, callback: Callback): void;
-        /**
-         * C_GetAttributeValue obtains the value of one or more object attributes.
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Buffer} pTemplate specifies attrs; gets vals
-         * @param {number} ulCount attributes in template
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number): number;
-        C_GetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
-        /**
-         * C_SetAttributeValue modifies the value of one or more object attributes
-         * @param {number} hSession the session's handle
-         * @param {number} hObject the object's handle
-         * @param {Buffer} pTemplate specifies attrs and values
-         * @param {number} ulCount attributes in template
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number): number;
-        C_SetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
-        /**
-         * C_FindObjectsInit initializes a search for token and session
-         * objects that match a template.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pTemplate attribute values to match
-         * @param {number} ulCount attrs in search template
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_FindObjectsInit(hSession: number, pTemplate: Buffer, ulCount: number): number;
-        C_FindObjectsInit(hSession: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
-        /**
-         * C_FindObjects continues a search for token and session
-         * objects that match a template, obtaining additional object
-         * handles.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} phObject gets obj. handles
-         * @param {number} ulMaxObjectCount max handles to get
-         * @param {Buffer} pulObjectCount actual # returned
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_FindObjects(hSession: number, phObject: Buffer, ulMaxObjectCount: number, pulObjectCount: Buffer): number;
-        C_FindObjects(hSession: number, phObject: Buffer, ulMaxObjectCount: number, pulObjectCount: Buffer, callback: Callback): void;
-        /**
-         * C_FindObjectsFinal finishes a search for token and session objects.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_FindObjectsFinal(hSession: number): number;
-        C_FindObjectsFinal(hSession: number, callback: Callback): void;
-        /**
-         * C_EncryptInit initializes an encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the encryption mechanism
-         * @param {number} hKey handle of encryption key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_EncryptInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_EncryptInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_Encrypt encrypts single-part data.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData the plaintext data
-         * @param {number} ulDataLen bytes of plaintext
-         * @param {Buffer} pEncryptedData gets ciphertext
-         * @param {Buffer} pulEncryptedDataLen gets c-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Encrypt(hSession: number, pData: Buffer, ulDataLen: number, pEncryptedData: Buffer, pulEncryptedDataLen: Buffer): number;
-        C_Encrypt(hSession: number, pData: Buffer, ulDataLen: number, pEncryptedData: Buffer, pulEncryptedDataLen: Buffer, callback: Callback): void;
-        /**
-         * C_EncryptUpdate continues a multiple-part encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart the plaintext data
-         * @param {number} ulPartLen plaintext data len
-         * @param {Buffer} pEncryptedPart gets ciphertext
-         * @param {Buffer} pulEncryptedPartLen gets c-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_EncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
-        C_EncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_EncryptFinal finishes a multiple-part encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pLastEncryptedPart last c-text
-         * @param {Buffer} pulLastEncryptedPartLen gets last size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_EncryptFinal(hSession: number, pLastEncryptedPart: Buffer, pulLastEncryptedPartLen: Buffer): number;
-        C_EncryptFinal(hSession: number, pLastEncryptedPart: Buffer, pulLastEncryptedPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptInit initializes a decryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the decryption mechanism
-         * @param {number} hKey handle of decryption key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptInit(hSession: number, pMechanism: Buffer, hKey: number): any;
-        C_DecryptInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_Decrypt decrypts encrypted data in a single part.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pEncryptedData ciphertext
-         * @param {number} ulEncryptedDataLen ciphertext length
-         * @param {Buffer} pData gets plaintext
-         * @param {number} pulDataLen gets p-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Decrypt(hSession: number, pEncryptedData: Buffer, ulEncryptedDataLen: number, pData: Buffer, pulDataLen: Buffer): number;
-        C_Decrypt(hSession: number, pEncryptedData: Buffer, ulEncryptedDataLen: number, pData: Buffer, pulDataLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptUpdate continues a multiple-part decryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pEncryptedPart encrypted data
-         * @param {number} ulEncryptedPartLen input length
-         * @param {Buffer} pPart gets plaintext
-         * @param {Buffer} pulPartLen p-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
-        C_DecryptUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptFinal finishes a multiple-part decryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pLastPart gets plaintext
-         * @param {Buffer} pulLastPartLen p-text size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptFinal(hSession: number, pLastPart: Buffer, pulLastPartLen: Buffer): number;
-        C_DecryptFinal(hSession: number, pLastPart: Buffer, pulLastPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DigestInit initializes a message-digesting operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the digesting mechanism
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestInit(hSession: number, pMechanism: Buffer): number;
-        C_DigestInit(hSession: number, pMechanism: Buffer, callback: Callback): void;
-        /**
-         * C_Digest digests data in a single part.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData data to be digested
-         * @param {number} ulDataLen bytes of data to digest
-         * @param {Buffer} pDigest gets the message digest
-         * @param {Buffer} pulDigestLen gets digest length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Digest(hSession: number, pData: Buffer, ulDataLen: number, pDigest: Buffer, pulDigestLen: Buffer): number;
-        C_Digest(hSession: number, pData: Buffer, ulDataLen: number, pDigest: Buffer, pulDigestLen: Buffer, callback: Callback): void;
-        /**
-         * C_DigestUpdate continues a multiple-part message-digesting operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart data to be digested
-         * @param {number} ulPartLen bytes of data to be digested
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestUpdate(hSession: number, pPart: Buffer, ulPartLen: number): number;
-        C_DigestUpdate(hSession: number, pPart: Buffer, ulPartLen: number, callback: Callback): void;
-        /**
-         * C_DigestKey continues a multi-part message-digesting operation,
-         * by digesting the value of a secret key as part of
-         * the data already digested.
-         * @param {number} hSession the session's handle
-         * @param {number} hKey secret key to digest
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestKey(hSession: number, hKey: number): number;
-        C_DigestKey(hSession: number, hKey: number, callback: Callback): void;
-        /**
-         * C_DigestFinal finishes a multiple-part message-digesting
-         * operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pDigest gets the message digest
-         * @param {Buffer} pulDigestLen gets byte count of digest
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestFinal(hSession: number, pDigest: Buffer, pulDigestLen: Buffer): number;
-        C_DigestFinal(hSession: number, pDigest: Buffer, pulDigestLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignInit initializes a signature (private key encryption)
-         * operation, where the signature is (will be) an appendix to
-         * the data, and plaintext cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the signature mechanism
-         * @param {number} hKey handle of signature key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_SignInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_Sign signs (encrypts with private key) data in a single
-         * part, where the signature is (will be) an appendix to the
-         * data, and plaintext cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData the data to sign
-         * @param {number} ulDataLen count of bytes to sign
-         * @param {Buffer} pSignature gets the signature
-         * @param {Buffer} pulSignatureLen gets signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Sign(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
-        C_Sign(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignUpdate continues a multiple-part signature operation,
-         * where the signature is (will be) an appendix to the data,
-         * and plaintext cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart the data to sign
-         * @param {number} ulPartLen count of bytes to sign
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignUpdate(hSession: number, pPart: Buffer, ulPartLen: Buffer): number;
-        C_SignUpdate(hSession: number, pPart: Buffer, ulPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignFinal finishes a multiple-part signature operation,
-         * returning the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pSignature gets the signature
-         * @param {Buffer} pulSignatureLen gets signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignFinal(hSession: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
-        C_SignFinal(hSession: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignRecoverInit initializes a signature operation, where
-         * the data can be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the signature mechanism
-         * @param {number} hKey handle of the signature key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignRecoverInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_SignRecoverInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_SignRecover signs data in a single operation, where the
-         * data can be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData the data to sign
-         * @param {number} ulDataLen count of bytes to sign
-         * @param {Buffer} pSignature gets the signature
-         * @param {Buffer} pulSignatureLen gets signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignRecover(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
-        C_SignRecover(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
-        /**
-         * C_VerifyInit initializes a verification operation, where the
-         * signature is an appendix to the data, and plaintext cannot
-         * cannot be recovered from the signature (e.g. DSA).
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the verification mechanism
-         * @param {number} hKey verification key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_VerifyInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_Verify verifies a signature in a single-part operation,
-         * where the signature is an appendix to the data, and plaintext
-         * cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pData signed data
-         * @param {number} ulDataLen length of signed data
-         * @param {Buffer} pSignature signature
-         * @param {number} ulSignatureLen signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_Verify(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, ulSignatureLen: Buffer): number;
-        C_Verify(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, ulSignatureLen: Buffer, callback: Callback): void;
-        /**
-         * C_VerifyUpdate continues a multiple-part verification
-         * operation, where the signature is an appendix to the data,
-         * and plaintext cannot be recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart signed data
-         * @param {number} ulPartLen length of signed data
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyUpdate(hSession: number, pPart: Buffer, ulPartLen: number): number;
-        C_VerifyUpdate(hSession: number, pPart: Buffer, ulPartLen: number, callback: Callback): void;
-        /**
-         * C_VerifyFinal finishes a multiple-part verification
-         * operation, checking the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pSignature signature to verify
-         * @param {number} ulSignatureLen signature length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyFinal(hSession: number, pSignature: Buffer, ulSignatureLen: number): number;
-        C_VerifyFinal(hSession: number, pSignature: Buffer, ulSignatureLen: number, callback: Callback): void;
-        /**
-         * C_VerifyRecoverInit initializes a signature verification
-         * operation, where the data is recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the verification mechanism
-         * @param {number} hKey verification key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyRecoverInit(hSession: number, pMechanism: Buffer, hKey: number): number;
-        C_VerifyRecoverInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
-        /**
-         * C_VerifyRecover verifies a signature in a single-part
-         * operation, where the data is recovered from the signature.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pSignature signature to verify
-         * @param {number} ulSignatureLen signature length
-         * @param {Buffer} pData gets signed data
-         * @param {Buffer} pulDataLen gets signed data len
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_VerifyRecover(hSession: number, pSignature: Buffer, ulSignatureLen: number, pData: Buffer, pulDataLen: Buffer): number;
-        C_VerifyRecover(hSession: number, pSignature: Buffer, ulSignatureLen: number, pData: Buffer, pulDataLen: Buffer, callback: Callback): void;
-        /**
-         * C_DigestEncryptUpdate continues a multiple-part digesting
-         * and encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart the plaintext data
-         * @param {number} ulPartLen plaintext length
-         * @param {Buffer} pEncryptedPart gets ciphertext
-         * @param {Buffer} pulEncryptedPartLen gets c-text length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DigestEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
-        C_DigestEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptDigestUpdate continues a multiple-part decryption and
-         * digesting operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pEncryptedPart ciphertext
-         * @param {number} ulEncryptedPartLen ciphertext length
-         * @param {Buffer} pPart gets plaintext
-         * @param {Buffer} pulPartLen gets plaintext len
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptDigestUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
-        C_DecryptDigestUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_SignEncryptUpdate continues a multiple-part signing and
-         * encryption operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pPart the plaintext data
-         * @param {number} ulPartLen plaintext length
-         * @param {Buffer} pEncryptedPart gets ciphertext
-         * @param {Buffer} pulEncryptedPartLen gets c-text length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SignEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
-        C_SignEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_DecryptVerifyUpdate continues a multiple-part decryption and
-         * verify operation.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pEncryptedPart ciphertext
-         * @param {number} ulEncryptedPartLen ciphertext length
-         * @param {Buffer} pPart gets plaintext
-         * @param {Buffer} pulPartLen gets p-text length
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DecryptVerifyUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
-        C_DecryptVerifyUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
-        /**
-         * C_GenerateKey generates a secret key, creating a new key object.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism key generation mech.
-         * @param {Buffer} pTemplate template for new key
-         * @param {number} ulCount # of attrs in template
-         * @param {Buffer} phKey gets handle of new key
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GenerateKey(hSession: number, pMechanism: Buffer, pTemplate: Buffer, ulCount: number, phKey: Buffer): number;
-        C_GenerateKey(hSession: number, pMechanism: Buffer, pTemplate: Buffer, ulCount: number, phKey: Buffer, callback: Callback): any;
-        /**
-         * C_GenerateKeyPair generates a public-key/private-key pair,
-         * creating new key objects.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism key-gen mech.
-         * @param {Buffer} pPublicKeyTemplate template for public key
-         * @param {number} ulPublicKeyAttributeCount public attrs
-         * @param {Buffer} pPrivateKeyTemplate template for private key
-         * @param {number} ulPrivateKeyAttributeCount private attrs
-         * @param {Buffer} phPublicKey gets public key handle
-         * @param {Buffer} phPrivateKey gets private key handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GenerateKeyPair(hSession: number, pMechanism: Buffer, pPublicKeyTemplate: Buffer, ulPublicKeyAttributeCount: number, pPrivateKeyTemplate: Buffer, ulPrivateKeyAttributeCount: number, phPublicKey: Buffer, phPrivateKey: Buffer): number;
-        C_GenerateKeyPair(hSession: number, pMechanism: Buffer, pPublicKeyTemplate: Buffer, ulPublicKeyAttributeCount: number, pPrivateKeyTemplate: Buffer, ulPrivateKeyAttributeCount: number, phPublicKey: Buffer, phPrivateKey: Buffer, callback: Callback): void;
-        /**
-         * C_WrapKey wraps (i.e., encrypts) a key.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism the wrapping mechanism
-         * @param {number} hWrappingKey wrapping key
-         * @param {number} hKey key to be wrapped
-         * @param {Buffer} pWrappedKey gets wrapped key
-         * @param {Buffer} pulWrappedKeyLen gets wrapped key size
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_WrapKey(hSession: number, pMechanism: Buffer, hWrappingKey: number, hKey: number, pWrappedKey: Buffer, pulWrappedKeyLen: Buffer): number;
-        C_WrapKey(hSession: number, pMechanism: Buffer, hWrappingKey: number, hKey: number, pWrappedKey: Buffer, pulWrappedKeyLen: Buffer, callback: Callback): void;
-        /**
-         * C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
-         * key object.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism unwrapping mech.
-         * @param {Buffer} pWrappedKey the wrapped key
-         * @param {number} ulWrappedKeyLen wrapped key len
-         * @param {Buffer} pTemplate new key template
-         * @param {number} ulAttributeCount template length
-         * @param {Buffer} pTemplate new key template
-         * @param {number} ulAttributeCount template length
-         * @param {Buffer} phKey gets new handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_UnwrapKey(hSession: number, pMechanism: Buffer, hUnwrappingKey: number, pWrappedKey: Buffer, ulWrappedKeyLen: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer): number;
-        C_UnwrapKey(hSession: number, pMechanism: Buffer, hUnwrappingKey: number, pWrappedKey: Buffer, ulWrappedKeyLen: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer, callback: Callback): void;
-        /**
-         * C_DeriveKey derives a key from a base key, creating a new key object.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pMechanism key deriv. mech.
-         * @param {number} hBaseKey base key
-         * @param {Buffer} pTemplate new key template
-         * @param {number} ulAttributeCount template length
-         * @param {Buffer} phKey gets new handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_DeriveKey(hSession: number, pMechanism: Buffer, hBaseKey: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer): number;
-        C_DeriveKey(hSession: number, pMechanism: Buffer, hBaseKey: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer, callback: Callback): void;
-        /**
-         * C_SeedRandom mixes additional seed material into the token's
-         * random number generator.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pSeed the seed material
-         * @param {number} ulSeedLen length of seed material
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_SeedRandom(hSession: number, pSeed: Buffer, ulSeedLen: number): number;
-        C_SeedRandom(hSession: number, pSeed: Buffer, ulSeedLen: number, callback: Callback): void;
-        /**
-         * C_GenerateRandom generates random data.
-         * @param {number} hSession the session's handle
-         * @param {Buffer} pRandomData receives the random data
-         * @param {number} ulRandomLen # of bytes to generate
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GenerateRandom(hSession: number, pRandomData: Buffer, ulRandomLen: number): number;
-        C_GenerateRandom(hSession: number, pRandomData: Buffer, ulRandomLen: number, callback: Callback): void;
-        /**
-         * C_GetFunctionStatus is a legacy function; it obtains an
-         * updated status of a function running in parallel with an
-         * application.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_GetFunctionStatus(hSession: number): number;
-        C_GetFunctionStatus(hSession: number, callback: Callback): void;
-        /**
-         * C_CancelFunction is a legacy function; it cancels a function
-         * running in parallel.
-         * @param {number} hSession the session's handle
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_CancelFunction(hSession: number): number;
-        C_CancelFunction(hSession: number, callback: Callback): void;
-        /**
-         * C_WaitForSlotEvent waits for a slot event (token insertion,
-         * removal, etc.) to occur.
-         * @param {number} flags blocking/nonblocking flag
-         * @param {Buffer} pSlot location that receives the slot ID
-         * @param {Buffer} pRserved reserved.  Should be NULL_PTR
-         * @param {Callback} callback callback function with PKCS11 result value
-         * @returns void PKCS11 result value
-         */
-        C_WaitForSlotEvent(flags: number, pSlot: Buffer, pRserved: Buffer): number;
-        C_WaitForSlotEvent(flags: number, pSlot: Buffer, pRserved: Buffer, callback: Callback): number;
-    }
-
-    enum KeyType {
-        RSA,
-        DSA,
-        DH,
-        ECDSA,
-        EC,
-        X9_42_DH,
-        KEA,
-        GENERIC_SECRET,
-        RC2,
-        RC4,
-        DES,
-        DES2,
-        DES3,
-        CAST,
-        CAST3,
-        CAST5,
-        CAST128,
-        RC5,
-        IDEA,
-        SKIPJACK,
-        BATON,
-        JUNIPER,
-        CDMF,
-        AES,
-        GOSTR3410,
-        GOSTR3411,
-        GOST28147,
-        BLOWFISH,
-        TWOFISH,
-        SECURID,
-        HOTP,
-        ACTI,
-        CAMELLIA,
-        ARIA,
-    }
-    enum KeyGenMechanism {
-        AES,
-        RSA,
-        RSA_X9_31,
-        DSA,
-        DH_PKCS,
-        DH_X9_42,
-        GOSTR3410,
-        GOST28147,
-        RC2,
-        RC4,
-        DES,
-        DES2,
-        SECURID,
-        ACTI,
-        CAST,
-        CAST3,
-        CAST5,
-        CAST128,
-        RC5,
-        IDEA,
-        GENERIC_SECRET,
-        SSL3_PRE_MASTER,
-        CAMELLIA,
-        ARIA,
-        SKIPJACK,
-        KEA,
-        BATON,
-        ECDSA,
-        EC,
-        JUNIPER,
-        TWOFISH,
-    }
-
-    enum MechanismEnum {
-        RSA_PKCS_KEY_PAIR_GEN,
-        RSA_PKCS,
-        RSA_9796,
-        RSA_X_509,
-        MD2_RSA_PKCS,
-        MD5_RSA_PKCS,
-        SHA1_RSA_PKCS,
-        RIPEMD128_RSA_PKCS,
-        RIPEMD160_RSA_PKCS,
-        RSA_PKCS_OAEP,
-        RSA_X9_31_KEY_PAIR_GEN,
-        RSA_X9_31,
-        SHA1_RSA_X9_31,
-        RSA_PKCS_PSS,
-        SHA1_RSA_PKCS_PSS,
-        DSA_KEY_PAIR_GEN,
-        DSA,
-        DSA_SHA1,
-        DH_PKCS_KEY_PAIR_GEN,
-        DH_PKCS_DERIVE,
-        X9_42_DH_KEY_PAIR_GEN,
-        X9_42_DH_DERIVE,
-        X9_42_DH_HYBRID_DERIVE,
-        X9_42_MQV_DERIVE,
-        SHA256_RSA_PKCS,
-        SHA384_RSA_PKCS,
-        SHA512_RSA_PKCS,
-        SHA256_RSA_PKCS_PSS,
-        SHA384_RSA_PKCS_PSS,
-        SHA512_RSA_PKCS_PSS,
-        SHA224_RSA_PKCS,
-        SHA224_RSA_PKCS_PSS,
-        RC2_KEY_GEN,
-        RC2_ECB,
-        RC2_CBC,
-        RC2_MAC,
-        RC2_MAC_GENERAL,
-        RC2_CBC_PAD,
-        RC4_KEY_GEN,
-        RC4,
-        DES_KEY_GEN,
-        DES_ECB,
-        DES_CBC,
-        DES_MAC,
-        DES_MAC_GENERAL,
-        DES_CBC_PAD,
-        DES2_KEY_GEN,
-        DES3_KEY_GEN,
-        DES3_ECB,
-        DES3_CBC,
-        DES3_MAC,
-        DES3_MAC_GENERAL,
-        DES3_CBC_PAD,
-        CDMF_KEY_GEN,
-        CDMF_ECB,
-        CDMF_CBC,
-        CDMF_MAC,
-        CDMF_MAC_GENERAL,
-        CDMF_CBC_PAD,
-        DES_OFB64,
-        DES_OFB8,
-        DES_CFB64,
-        DES_CFB8,
-        MD2,
-        MD2_HMAC,
-        MD2_HMAC_GENERAL,
-        MD5,
-        MD5_HMAC,
-        MD5_HMAC_GENERAL,
-        SHA1,
-        SHA,
-        SHA_1,
-        SHA_1_HMAC,
-        SHA_1_HMAC_GENERAL,
-        RIPEMD128,
-        RIPEMD128_HMAC,
-        RIPEMD128_HMAC_GENERAL,
-        RIPEMD160,
-        RIPEMD160_HMAC,
-        RIPEMD160_HMAC_GENERAL,
-        SHA256,
-        SHA256_HMAC,
-        SHA256_HMAC_GENERAL,
-        SHA224,
-        SHA224_HMAC,
-        SHA224_HMAC_GENERAL,
-        SHA384,
-        SHA384_HMAC,
-        SHA384_HMAC_GENERAL,
-        SHA512,
-        SHA512_HMAC,
-        SHA512_HMAC_GENERAL,
-        SECURID_KEY_GEN,
-        SECURID,
-        HOTP_KEY_GEN,
-        HOTP,
-        ACTI,
-        ACTI_KEY_GEN,
-        CAST_KEY_GEN,
-        CAST_ECB,
-        CAST_CBC,
-        CAST_MAC,
-        CAST_MAC_GENERAL,
-        CAST_CBC_PAD,
-        CAST3_KEY_GEN,
-        CAST3_ECB,
-        CAST3_CBC,
-        CAST3_MAC,
-        CAST3_MAC_GENERAL,
-        CAST3_CBC_PAD,
-        CAST5_KEY_GEN,
-        CAST128_KEY_GEN,
-        CAST5_ECB,
-        CAST128_ECB,
-        CAST5_CBC,
-        CAST128_CBC,
-        CAST5_MAC,
-        CAST128_MAC,
-        CAST5_MAC_GENERAL,
-        CAST128_MAC_GENERAL,
-        CAST5_CBC_PAD,
-        CAST128_CBC_PAD,
-        RC5_KEY_GEN,
-        RC5_ECB,
-        RC5_CBC,
-        RC5_MAC,
-        RC5_MAC_GENERAL,
-        RC5_CBC_PAD,
-        IDEA_KEY_GEN,
-        IDEA_ECB,
-        IDEA_CBC,
-        IDEA_MAC,
-        IDEA_MAC_GENERAL,
-        IDEA_CBC_PAD,
-        GENERIC_SECRET_KEY_GEN,
-        CONCATENATE_BASE_AND_KEY,
-        CONCATENATE_BASE_AND_DATA,
-        CONCATENATE_DATA_AND_BASE,
-        XOR_BASE_AND_DATA,
-        EXTRACT_KEY_FROM_KEY,
-        SSL3_PRE_MASTER_KEY_GEN,
-        SSL3_MASTER_KEY_DERIVE,
-        SSL3_KEY_AND_MAC_DERIVE,
-        SSL3_MASTER_KEY_DERIVE_DH,
-        TLS_PRE_MASTER_KEY_GEN,
-        TLS_MASTER_KEY_DERIVE,
-        TLS_KEY_AND_MAC_DERIVE,
-        TLS_MASTER_KEY_DERIVE_DH,
-        TLS_PRF,
-        SSL3_MD5_MAC,
-        SSL3_SHA1_MAC,
-        MD5_KEY_DERIVATION,
-        MD2_KEY_DERIVATION,
-        SHA1_KEY_DERIVATION,
-        SHA256_KEY_DERIVATION,
-        SHA384_KEY_DERIVATION,
-        SHA512_KEY_DERIVATION,
-        SHA224_KEY_DERIVATION,
-        PBE_MD2_DES_CBC,
-        PBE_MD5_DES_CBC,
-        PBE_MD5_CAST_CBC,
-        PBE_MD5_CAST3_CBC,
-        PBE_MD5_CAST5_CBC,
-        PBE_MD5_CAST128_CBC,
-        PBE_SHA1_CAST5_CBC,
-        PBE_SHA1_CAST128_CBC,
-        PBE_SHA1_RC4_128,
-        PBE_SHA1_RC4_40,
-        PBE_SHA1_DES3_EDE_CBC,
-        PBE_SHA1_DES2_EDE_CBC,
-        PBE_SHA1_RC2_128_CBC,
-        PBE_SHA1_RC2_40_CBC,
-        PKCS5_PBKD2,
-        PBA_SHA1_WITH_SHA1_HMAC,
-        WTLS_PRE_MASTER_KEY_GEN,
-        WTLS_MASTER_KEY_DERIVE,
-        WTLS_MASTER_KEY_DERIVE_DH_ECC,
-        WTLS_PRF,
-        WTLS_SERVER_KEY_AND_MAC_DERIVE,
-        WTLS_CLIENT_KEY_AND_MAC_DERIVE,
-        KEY_WRAP_LYNKS,
-        KEY_WRAP_SET_OAEP,
-        CMS_SIG,
-        KIP_DERIVE,
-        KIP_WRAP,
-        KIP_MAC,
-        CAMELLIA_KEY_GEN,
-        CAMELLIA_ECB,
-        CAMELLIA_CBC,
-        CAMELLIA_MAC,
-        CAMELLIA_MAC_GENERAL,
-        CAMELLIA_CBC_PAD,
-        CAMELLIA_ECB_ENCRYPT_DATA,
-        CAMELLIA_CBC_ENCRYPT_DATA,
-        CAMELLIA_CTR,
-        ARIA_KEY_GEN,
-        ARIA_ECB,
-        ARIA_CBC,
-        ARIA_MAC,
-        ARIA_MAC_GENERAL,
-        ARIA_CBC_PAD,
-        ARIA_ECB_ENCRYPT_DATA,
-        ARIA_CBC_ENCRYPT_DATA,
-        SKIPJACK_KEY_GEN,
-        SKIPJACK_ECB64,
-        SKIPJACK_CBC64,
-        SKIPJACK_OFB64,
-        SKIPJACK_CFB64,
-        SKIPJACK_CFB32,
-        SKIPJACK_CFB16,
-        SKIPJACK_CFB8,
-        SKIPJACK_WRAP,
-        SKIPJACK_PRIVATE_WRAP,
-        SKIPJACK_RELAYX,
-        KEA_KEY_PAIR_GEN,
-        KEA_KEY_DERIVE,
-        FORTEZZA_TIMESTAMP,
-        BATON_KEY_GEN,
-        BATON_ECB128,
-        BATON_ECB96,
-        BATON_CBC128,
-        BATON_COUNTER,
-        BATON_SHUFFLE,
-        BATON_WRAP,
-        ECDSA_KEY_PAIR_GEN,
-        EC_KEY_PAIR_GEN,
-        ECDSA,
-        ECDSA_SHA1,
-        ECDSA_SHA224,
-        ECDSA_SHA256,
-        ECDSA_SHA384,
-        ECDSA_SHA512,
-        ECDH1_DERIVE,
-        ECDH1_COFACTOR_DERIVE,
-        ECMQV_DERIVE,
-        JUNIPER_KEY_GEN,
-        JUNIPER_ECB128,
-        JUNIPER_CBC128,
-        JUNIPER_COUNTER,
-        JUNIPER_SHUFFLE,
-        JUNIPER_WRAP,
-        FASTHASH,
-        AES_KEY_GEN,
-        AES_ECB,
-        AES_CBC,
-        AES_MAC,
-        AES_MAC_GENERAL,
-        AES_CBC_PAD,
-        AES_CTR,
-        AES_CMAC,
-        AES_CMAC_GENERAL,
-        BLOWFISH_KEY_GEN,
-        BLOWFISH_CBC,
-        TWOFISH_KEY_GEN,
-        TWOFISH_CBC,
-        AES_GCM,
-        AES_CCM,
-        AES_KEY_WRAP,
-        AES_KEY_WRAP_PAD,
-        DES_ECB_ENCRYPT_DATA,
-        DES_CBC_ENCRYPT_DATA,
-        DES3_ECB_ENCRYPT_DATA,
-        DES3_CBC_ENCRYPT_DATA,
-        AES_ECB_ENCRYPT_DATA,
-        AES_CBC_ENCRYPT_DATA,
-        GOSTR3410_KEY_PAIR_GEN,
-        GOSTR3410,
-        GOSTR3410_WITH_GOSTR3411,
-        GOSTR3410_KEY_WRAP,
-        GOSTR3410_DERIVE,
-        GOSTR3411,
-        GOSTR3411_HMAC,
-        GOST28147_KEY_GEN,
-        GOST28147_ECB,
-        GOST28147,
-        GOST28147_MAC,
-        GOST28147_KEY_WRAP,
-        DSA_PARAMETER_GEN,
-        DH_PKCS_PARAMETER_GEN,
-        X9_42_DH_PARAMETER_GEN,
-        VENDOR_DEFINED,
-    }
-
-    interface IParams {
-        toCKI(): Buffer;
-    }
-
-    interface IAlgorithm {
-        name: string;
-        params: Buffer | IParams;
-    }
-
-    type MechanismType = MechanismEnum | KeyGenMechanism | IAlgorithm | string;
-
-    enum MechanismFlag {
-        /**
-         * `True` if the mechanism is performed by the device; `false` if the mechanism is performed in software
-         */
-        HW,
-        /**
-         * `True` if the mechanism can be used with encrypt function
-         */
-        ENCRYPT,
-        /**
-         * `True` if the mechanism can be used with decrypt function
-         */
-        DECRYPT,
-        /**
-         * `True` if the mechanism can be used with digest function
-         */
-        DIGEST,
-        /**
-         * `True` if the mechanism can be used with sign function
-         */
-        SIGN,
-        /**
-         * `True` if the mechanism can be used with sign recover function
-         */
-        SIGN_RECOVER,
-        /**
-         * `True` if the mechanism can be used with verify function
-         */
-        VERIFY,
-        /**
-         * `True` if the mechanism can be used with verify recover function
-         */
-        VERIFY_RECOVER,
-        /**
-         * `True` if the mechanism can be used with geberate function
-         */
-        GENERATE,
-        /**
-         * `True` if the mechanism can be used with generate key pair function
-         */
-        GENERATE_KEY_PAIR,
-        /**
-         * `True` if the mechanism can be used with wrap function
-         */
-        WRAP,
-        /**
-         * `True` if the mechanism can be used with unwrap function
-         */
-        UNWRAP,
-        /**
-         * `True` if the mechanism can be used with derive function
-         */
-        DERIVE,
-    }
-    class Mechanism extends HandleObject {
-        protected slotHandle: number;
-        /**
-         * the minimum size of the key for the mechanism
-         * _whether this is measured in bits or in bytes is mechanism-dependent_
-         */
-        minKeySize: number;
-        /**
-         * the maximum size of the key for the mechanism
-         * _whether this is measured in bits or in bytes is mechanism-dependent_
-         */
-        maxKeySize: number;
-        /**
-         * bit flag specifying mechanism capabilities
-         */
-        flags: number;
-        /**
-         * returns string name from MechanismEnum
-         */
-        name: string;
-        constructor(handle: number, slotHandle: number, lib: Pkcs11);
-        protected getInfo(): void;
-        static create(alg: MechanismType): Buffer;
-        static vendor(jsonFile: string): any;
-        static vendor(name: string, value: number): any;
-    }
-
-    class MechanismCollection extends Collection<Mechanism> {
-        protected slotHandle: number;
-        constructor(items: Array<number>, slotHandle: number, lib: Pkcs11, classType?: typeof Mechanism);
-        /**
-         * returns item from collection by index
-         * @param {number} index of element in collection `[0..n]`
-         */
-        items(index: number): Mechanism;
-    }
+type Callback = (err: Error, rv: number) => void;
+type CK_PTR = Buffer;
 
+declare class Pkcs11 {
+    lib: any;
     /**
-     * Definition for the base key object class
-     * - defines the object class `CKO_PUBLIC_KEY`, `CKO_PRIVATE_KEY` and `CKO_SECRET_KEY` for type `CK_OBJECT_CLASS`
-     * as used in the `CKA_CLASS` attribute of objects
+     * load a library with PKCS11 interface
+     * @param {string} libFile path to PKCS11 library
      */
-    class Key extends Storage {
-        /**
-         * Type of key
-         * - Must be specified when object is created with `C_CreateObject`
-         * - Must be specified when object is unwrapped with `C_UnwrapKey`
-         */
-        type: KeyType;
-        /**
-         * Key identifier for key (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification
-         * of the attribute during the course of a `C_CopyObject` call.
-         */
-        id: Buffer;
-        /**
-         * Start date for the key (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification
-         * of the attribute during the course of a `C_CopyObject` call.
-         */
-        startDate: Date;
-        /**
-         * End date for the key (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification
-         * of the attribute during the course of a `C_CopyObject` call.
-         */
-        endDate: Date;
-        /**
-         * `CK_TRUE` if key supports key derivation
-         * (i.e., if other keys can be derived from this one (default `CK_FALSE`)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification
-         * of the attribute during the course of a `C_CopyObject` call.
-         * @returns boolean
-         */
-        derive: boolean;
-        /**
-         * `CK_TRUE` only if key was either * generated locally (i.e., on the token)
-         * with a `C_GenerateKey` or `C_GenerateKeyPair` call * created with a `C_CopyObject` call
-         * as a copy of a key which had its `CKA_LOCAL` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        local: boolean;
-        /**
-         * Identifier of the mechanism used to generate the key material.
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        mechanism: KeyGenMechanism;
-        allowedMechanisms: void;
-    }
-
-
-    class DomainParameters extends Storage {
-        /**
-         * Type of key the domain parameters can be used to generate.
-         */
-        keyType: KeyType;
-        /**
-         * `CK_TRUE` only if domain parameters were either * generated locally (i.e., on the token)
-         * with a `C_GenerateKey` * created with a `C_CopyObject` call as a copy of domain parameters
-         * which had its `CKA_LOCAL` attribute set to `CK_TRUE`
-         */
-        local: boolean;
-    }
-
+    constructor(libFile: string);
+    protected callFunction(funcName: string, args: any[]): number;
     /**
-     * Data objects (object class `CKO_DATA`) hold information defined by an application.
-     * Other than providing access to it, Cryptoki does not attach any special meaning to a data object
+     * C_Initialize initializes the Cryptoki library.
+     * @param pInitArgs   if this is not NULL_PTR, it gets
+     *                    cast to CK_C_INITIALIZE_ARGS_PTR
+     *                    and dereferenced
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
-    class Data extends Storage {
-        /**
-         * Description of the application that manages the object (default empty)
-         */
-        application: string;
-        /**
-         * DER-encoding of the object identifier indicating the data object type (default empty)
-         */
-        objectId: Buffer;
-        /**
-         * Value of the object (default empty)
-         */
-        value: Buffer;
-    }
-
-    interface ITemplate {
-        /**
-         * CKA_CLASS
-         */
-        class?: number;
-        /**
-         * CKA_TOKEN
-         */
-        token?: boolean;
-        /**
-         * CKA_PRIVATE
-         */
-        private?: boolean;
-        /**
-         * CKA_LABEL
-         */
-        label?: string;
-        /**
-         * CKA_APPLICATION
-         */
-        application?: string;
-        /**
-         * CKA_VALUE
-         */
-        value?: Buffer;
-        /**
-         * CKA_OBJECT_ID
-         */
-        objectId?: Buffer;
-        /**
-         * CKA_CERTIFICATE_TYPE
-         */
-        certType?: number;
-        /**
-         * CKA_ISSUER
-         */
-        issuer?: Buffer;
-        /**
-         * CKA_SERIAL_NUMBER
-         */
-        serial?: Buffer;
-        /**
-         * CKA_AC_ISSUER
-         */
-        issuerAC?: Buffer;
-        /**
-         * CKA_OWNER
-         */
-        owner?: Buffer;
-        /**
-         * CKA_ATTR_TYPES
-         */
-        attrTypes?: Buffer;
-        /**
-         * CKA_TRUSTED
-         */
-        trusted?: boolean;
-        /**
-         * CKA_CERTIFICATE_CATEGORY
-         */
-        certCategory?: number;
-        /**
-         * CKA_JAVA_MIDP_SECURITY_DOMAIN
-         */
-        javaDomain?: number;
-        /**
-         * CKA_URL
-         */
-        url?: string;
-        /**
-         * CKA_HASH_OF_SUBJECT_PUBLIC_KEY
-         */
-        ski?: Buffer;
-        /**
-         * CKA_HASH_OF_ISSUER_PUBLIC_KEY
-         */
-        aki?: Buffer;
-        /**
-         * CKA_NAME_HASH_ALGORITHM
-         */
-        digestName?: number;
-        /**
-         * CKA_CHECK_VALUE
-         */
-        checkValue?: Buffer;
-        /**
-         * CKA_KEY_TYPE
-         */
-        keyType?: number;
-        /**
-         * CKA_SUBJECT
-         */
-        subject?: Buffer;
-        /**
-         * CKA_ID
-         */
-        id?: Buffer;
-        /**
-         * CKA_SENSITIVE
-         */
-        sensitive?: boolean;
-        /**
-         * CKA_ENCRYPT
-         */
-        encrypt?: boolean;
-        /**
-         * CKA_DECRYPT
-         */
-        decrypt?: boolean;
-        /**
-         * CKA_WRAP
-         */
-        wrap?: boolean;
-        /**
-         * CKA_UNWRAP
-         */
-        unwrap?: boolean;
-        /**
-         * CKA_SIGN
-         */
-        sign?: boolean;
-        /**
-         * CKA_SIGN_RECOVER
-         */
-        signRecover?: boolean;
-        /**
-         * CKA_VERIFY
-         */
-        verify?: boolean;
-        /**
-         * CKA_VERIFY_RECOVER
-         */
-        verifyRecover?: boolean;
-        /**
-         * CKA_DERIVE
-         */
-        derive?: boolean;
-        /**
-         * CKA_START_DATE
-         */
-        startDate?: Date;
-        /**
-         * CKA_END_DATE
-         */
-        endDate?: Date;
-        /**
-         * CKA_MODULUS
-         */
-        modulus?: Buffer;
-        /**
-         * CKA_MODULUS_BITS
-         */
-        modulusBits?: number;
-        /**
-         * CKA_PUBLIC_EXPONENT
-         */
-        publicExponent?: Buffer;
-        /**
-         * CKA_PRIVATE_EXPONEN
-         */
-        privateExponent?: Buffer;
-        /**
-         * CKA_PRIME_1
-         */
-        prime1?: Buffer;
-        /**
-         * CKA_PRIME_2
-         */
-        prime2?: Buffer;
-        /**
-         * CKA_EXPONENT_1
-         */
-        exp1?: Buffer;
-        /**
-         * CKA_EXPONENT_2
-         */
-        exp2?: Buffer;
-        /**
-         * CKA_COEFFICIEN
-         */
-        coefficient?: Buffer;
-        /**
-         * CKA_PRIME
-         */
-        prime?: Buffer;
-        /**
-         * CKA_SUBPRIME
-         */
-        subprime?: Buffer;
-        /**
-         * CKA_BASE
-         */
-        base?: Buffer;
-        /**
-         * CKA_PRIME_BITS
-         */
-        primeBits?: number;
-        /**
-         * CKA_SUBPRIME_BITS
-         */
-        subprimeBits?: number;
-        /**
-         * CKA_VALUE_BITS
-         */
-        valueBits?: number;
-        /**
-         * CKA_VALUE_LEN
-         */
-        valueLen?: number;
-        /**
-         * CKA_EXTRACTABLE
-         */
-        extractable?: boolean;
-        /**
-         * CKA_LOCAL
-         */
-        local?: boolean;
-        /**
-         * CKA_NEVER_EXTRACTABLE
-         */
-        neverExtractable?: boolean;
-        /**
-         * CKA_ALWAYS_SENSITIVE
-         */
-        alwaysSensitive?: boolean;
-        /**
-         * CKA_KEY_GEN_MECHANISM
-         */
-        keyGenMechanism?: number;
-        /**
-         * CKA_MODIFIABLE
-         */
-        modifiable?: boolean;
-        /**
-         * CKA_COPYABLE
-         */
-        copyable?: boolean;
-        /**
-         * CKA_ECDSA_PARAMS
-         */
-        paramsECDSA?: Buffer;
-        paramsEC?: Buffer;
-        /**
-         * CKA_EC_POINT
-         */
-        pointEC?: Buffer;
-        /**
-         * CKA_SECONDARY_AUTH
-         */
-        secondaryAuth?: boolean;
-        /**
-         * CKA_AUTH_PIN_FLAGS
-         */
-        authPinFlags?: Buffer;
-        /**
-         * CKA_ALWAYS_AUTHENTICATE
-         */
-        alwaysAuth?: boolean;
-        /**
-         * CKA_WRAP_WITH_TRUSTED
-         */
-        wrapWithTrusted?: boolean;
-        /**
-         * CKA_WRAP_TEMPLATE
-         */
-        wrapTemplate?: any;
-        /**
-         * CKA_UNWRAP_TEMPLATE
-         */
-        unwrapTemplate?: any;
-        /**
-         * CKA_OTP_FORMAT
-         */
-        otpFormat?: any;
-        /**
-         * CKA_OTP_LENGTH
-         */
-        otpLength?: any;
-        /**
-         * CKA_OTP_TIME_INTERVAL
-         */
-        otpTimeInterval?: any;
-        /**
-         * CKA_OTP_USER_FRIENDLY_MODE
-         */
-        otpUserFriendlyMode?: any;
-        /**
-         * CKA_OTP_CHALLENGE_REQUIREMENT
-         */
-        otpChallengeReq?: any;
-        /**
-         * CKA_OTP_TIME_REQUIREMENT
-         */
-        otpTimeReq?: any;
-        /**
-         * CKA_OTP_COUNTER_REQUIREMENT
-         */
-        otpCounterReq?: any;
-        /**
-         * CKA_OTP_PIN_REQUIREMENT
-         */
-        otppinReq?: any;
-        /**
-         * CKA_OTP_COUNTER
-         */
-        otpCounter?: any;
-        /**
-         * CKA_OTP_TIME
-         */
-        otpTime?: any;
-        /**
-         * CKA_OTP_USER_IDENTIFIER
-         */
-        OtpUserId?: any;
-        /**
-         * CKA_OTP_SERVICE_IDENTIFIER
-         */
-        otpServiceId?: any;
-        /**
-         * CKA_OTP_SERVICE_LOGO
-         */
-        otpServiceLogo?: any;
-        /**
-         * CKA_OTP_SERVICE_LOGO_TYPE
-         */
-        otpServiceLogoType?: any;
-        /**
-         * CKA_HW_FEATURE_TYPE
-         */
-        hwFeatureType?: any;
-        /**
-         * CKA_RESET_ON_INIT
-         */
-        resetOnInit?: any;
-        /**
-         * CKA_HAS_RESET
-         */
-        hasReset?: any;
-        /**
-         * CKA_PIXEL_X
-         */
-        pixelX?: any;
-        /**
-         * CKA_PIXEL_Y
-         */
-        pixelY?: any;
-        /**
-         * CKA_RESOLUTION
-         */
-        resolution?: any;
-        /**
-         * CKA_CHAR_ROWS
-         */
-        charRows?: any;
-        /**
-         * CKA_CHAR_COLUMNS
-         */
-        charCols?: any;
-        /**
-         * CKA_COLOR
-         */
-        color?: any;
-        /**
-         * CKA_BITS_PER_PIXEL
-         */
-        bitsPerPixel?: any;
-        /**
-         * CKA_CHAR_SETS
-         */
-        charSets?: any;
-        /**
-         * CKA_ENCODING_METHODS
-         */
-        encMethod?: any;
-        /**
-         * CKA_MIME_TYPES
-         */
-        mimeTypes?: any;
-        /**
-         * CKA_MECHANISM_TYPE
-         */
-        mechanismType?: any;
-        /**
-         * CKA_REQUIRED_CMS_ATTRIBUTES
-         */
-        requiredCmsAttrs?: any;
-        /**
-         * CKA_DEFAULT_CMS_ATTRIBUTES
-         */
-        defaultCmsAttrs?: any;
-        /**
-         * CKA_SUPPORTED_CMS_ATTRIBUTES
-         */
-        suportedCmsAttrs?: any;
-        /**
-         * CKA_ALLOWED_MECHANISMS
-         */
-        allowedMechanisms?: any;
-    }
-    class Attribute {
-        protected $value: Buffer;
-        type: number;
-        name: string;
-        convertType: string;
-        length: number;
-        value: any;
-        constructor(type: number, value?: any);
-        constructor(type: string, value?: any);
-        get(): any;
-        set(template: any): void;
-    }
-    class Template {
-        protected attrs: Attribute[];
-        length: number;
-        constructor(template: string);
-        constructor(template: ITemplate);
-        set(v: any): Template;
-        ref(): Buffer;
-        serialize(): any;
-    }
-
-    class BaseObject {
-        protected lib: Pkcs11;
-        constructor(lib?: Pkcs11);
-    }
-    class HandleObject extends BaseObject {
-        /**
-         * handle to pkcs11 object
-         */
-        handle: number;
-        constructor(handle: number, lib: Pkcs11);
-        protected getInfo(): void;
-    }
-
-    enum ObjectClass {
-        DATA,
-        CERTIFICATE,
-        PUBLIC_KEY,
-        PRIVATE_KEY,
-        SECRET_KEY,
-        HW_FEATURE,
-        DOMAIN_PARAMETERS,
-        MECHANISM,
-        OTP_KEY,
-    }
-
-    class SessionObject extends HandleObject {
-        /**
-         * Session
-         */
-        session: Session;
-        /**
-         * gets the size of an object in bytes
-         */
-        size: number;
-        constructor(object: SessionObject);
-        constructor(handle: number, session: Session, lib: Pkcs11);
-        /**
-         * copies an object, creating a new object for the copy
-         * @param {ITemplate} template template for the new object
-         */
-        copy(template: ITemplate): SessionObject;
-        /**
-         * destroys an object
-         */
-        destroy(): void;
-        getAttribute(attr: string): ITemplate;
-        getAttribute(attrs: ITemplate): ITemplate;
-        setAttribute(attrs: string, value: any): any;
-        setAttribute(attrs: ITemplate): any;
-        protected get(name: string): any;
-        protected set(name: string, value: any): void;
-        class: ObjectClass;
-        toType<T extends SessionObject>(): T;
-    }
-
-    class SessionObjectCollection extends Collection<SessionObject> {
-        session: Session;
-        items(index: number): SessionObject;
-        constructor(items: Array<number>, session: Session, lib: Pkcs11, classType?: any);
-    }
-
+    C_Initialize(pInitArgs?: CK_PTR): number;
+    C_Initialize(pInitArgs: CK_PTR, cllback: Callback): void;
     /**
-     * Private key objects (object class `CKO_PRIVATE_KEY`) hold private keys
+     * C_Finalize indicates that an application is done with the Cryptoki library.
+     * @param pReserved   reserved. Should be NULL_PTR
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
-    class PrivateKey extends Key {
-        /**
-         * DER-encoding of the key subject name (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         */
-        subject: Buffer;
-        /**
-         * `CK_TRUE` if key is sensitive
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Attribute cannot be changed once set to CK_TRUE. It becomes a read only attribute.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        sensitive: boolean;
-        /**
-         * `CK_TRUE` if key supports decryption
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        decrypt: boolean;
-        /**
-         * `CK_TRUE` if key supports signatures where the signature is an appendix to the data
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        sign: boolean;
-        /**
-         * `CK_TRUE` if key supports signatures where the data can be recovered from the signature
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        signRecover: boolean;
-        /**
-         * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        unwrap: boolean;
-        /**
-         * `CK_TRUE` if key is extractable and can be wrapped
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        extractable: boolean;
-        /**
-         * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        alwaysSensitive: boolean;
-        /**
-         * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        neverExtractable: boolean;
-        /**
-         * `CK_TRUE` if the key can only be wrapped with a wrapping key
-         * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
-         * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-         */
-        wrapTrusted: boolean;
-        /**
-         * For wrapping keys. The attribute template to apply to any keys unwrapped
-         * using this wrapping key. Any user supplied template is applied after this template
-         * as if the object has already been created.
-         */
-        template: void;
-        alwaysAuthenticate: boolean;
-    }
-
+    C_Finalize(pReserved?: CK_PTR): number;
+    C_Finalize(pReserved: CK_PTR, callback: Callback): void;
     /**
-     * Public key objects (object class CKO_PUBLIC_KEY) hold public keys
+     * C_GetInfo returns general information about Cryptoki.
+     * @param pInfo       location that receives information
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
-    class PublicKey extends Key {
-        /**
-         * DER-encoding of the key subject name (default empty)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         */
-        subject: Buffer;
-        /**
-         * `CK_TRUE` if key supports encryption
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        encrypt: boolean;
-        /**
-         * `CK_TRUE` if key supports verification where the signature is an appendix to the data
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        verify: boolean;
-        /**
-         * `CK_TRUE` if key supports verification where the data is recovered from the signature
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        verifyRecover: boolean;
-        /**
-         * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        wrap: boolean;
-        /**
-         * The key can be trusted for the application that it was created.
-         * - The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
-         * - Can only be set to CK_TRUE by the SO user.
-         */
-        trusted: boolean;
-        /**
-         * For wrapping keys. The attribute template to match against any keys wrapped using this wrapping key.
-         * Keys that do not match cannot be wrapped.
-         */
-        template: void;
-    }
-
+    C_GetInfo(pInfo: CK_PTR): number;
+    C_GetInfo(pInfo: CK_PTR, callback: Callback): void;
     /**
-     * Secret key objects (object class `CKO_SECRET_KEY`) hold secret keys.
+     * C_GetSlotList obtains a list of slots in the system.
+     * @param {boolean} tokenPresent only slots with tokens?
+     * @param pSlotList receives array of slot IDs
+     * @param pulCount receives number of slots
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
-    class SecretKey extends Key {
-        /**
-         * `CK_TRUE` if key is sensitive
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-         */
-        sensitive: boolean;
-        /**
-         * `CK_TRUE` if key supports encryption
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        encrypt: boolean;
-        /**
-         * `CK_TRUE` if key supports decryption
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        decrypt: boolean;
-        /**
-         * `CK_TRUE` if key supports verification (i.e., of authentication codes) where the signature is an appendix to the data
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        verify: boolean;
-        /**
-         * 	`CK_TRUE` if key supports signatures (i.e., authentication codes) where the signature is an appendix to the data
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        sign: boolean;
-        /**
-         * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        wrap: boolean;
-        /**
-         * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        unwrap: boolean;
-        /**
-         * `CK_TRUE` if key is extractable and can be wrapped
-         * - May be modified after object is created with a `C_SetAttributeValue` call,
-         * or in the process of copying object with a `C_CopyObject` call.
-         * However, it is possible that a particular token may not permit modification of the attribute
-         * during the course of a `C_CopyObject` call.
-         * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
-         * - Default value is token-specific, and may depend on the values of other attributes.
-         */
-        extractable: boolean;
-        /**
-         * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        alwaysSensitive: boolean;
-        /**
-         * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
-         * - Must not be specified when object is created with `C_CreateObject`.
-         * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
-         * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
-         */
-        neverExtractable: boolean;
-        /**
-         * Key checksum
-         */
-        checkValue: Buffer;
-        /**
-         * `CK_TRUE` if the key can only be wrapped with a wrapping key
-         * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
-         * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
-         */
-        wrapTrusted: boolean;
-        /**
-         * The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
-         * - Can only be set to CK_TRUE by the SO user.
-         */
-        trusted: boolean;
-        /**
-         * For wrapping keys.
-         * The attribute template to match against any keys wrapped using this wrapping key.
-         * Keys that do not match cannot be wrapped.
-         */
-        wrapTemplate: void;
-        /**
-         * For wrapping keys.
-         * The attribute template to apply to any keys unwrapped using this wrapping key.
-         * Any user supplied template is applied after this template as if the object has already been created.
-         */
-        unwrapTemplate: void;
-    }
-
-
-    interface ISlotInfo {
-        slotDescription: string;
-        manufacturerID: string;
-        flags: number;
-        hardwareVersion: IVersion;
-        firmwareVersion: IVersion;
-    }
-
-    enum SlotFlag {
-        /**
-         * `True` if a token is present in the slot (e.g., a device is in the reader)
-         */
-        TOKEN_PRESENT,
-        /**
-         * `True` if the reader supports removable devices
-         */
-        REMOVABLE_DEVICE,
-        /**
-         * True if the slot is a hardware slot, as opposed to a software slot implementing a "soft token"
-         */
-        HW_SLOT,
-    }
-
-    interface IVersion {
-        major: number;
-        minor: number;
-    }
-    interface IModuleInfo {
-        cryptokiVersion: IVersion;
-        manufacturerID: string;
-        flags: number;
-        libraryDescription: string;
-        libraryVersion: IVersion;
-    }
-
-    class Collection<T extends HandleObject> {
-        protected items_: Array<number>;
-        protected classType: any;
-        protected lib: Pkcs11;
-        constructor(items: Array<number>, lib: Pkcs11, classType: any);
-        /**
-         * returns length of collection
-         */
-        length: number;
-        /**
-         * returns item from collection by index
-         * @param {number} index of element in collection `[0..n]`
-         */
-        items(index: number): T;
-    }
-
-    enum SessionOpenFlag {
-        /**
-         * session is r/w
-         */
-        RW_SESSION,
-        /**
-         * no parallel
-         */
-        SERIAL_SESSION,
-    }
-    enum SessionFlag {
-        /**
-         * `True` if the session is read/write; `false` if the session is read-only
-         */
-        RW_SESSION,
-        /**
-         * This flag is provided for backward compatibility, and should always be set to `true`
-         */
-        SERIAL_SESSION,
-    }
-    enum UserType {
-        /**
-         * Security Officer
-         */
-        SO,
-        /**
-         * User
-         */
-        USER,
-        /**
-         * Context specific
-         */
-        CONTEXT_SPECIFIC,
-    }
-    interface IKeyPair {
-        privateKey: PrivateKey;
-        publicKey: PublicKey;
-    }
+    C_GetSlotList(tokenPresent: boolean, pSlotList: CK_PTR, pulCount: CK_PTR): number;
+    C_GetSlotList(tokenPresent: boolean, pSlotList: CK_PTR, pulCount: CK_PTR, callback: Callback): void;
     /**
-     * provides information about a session
+     * C_GetSlotInfo obtains information about a particular slot in
+     * the system.
+     * @param {number} slotID the ID of the slot
+     * @param {Buffer} pInfo receives the slot information
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
-    class Session extends HandleObject {
-        constructor(handle: number, slot: Slot, lib: Pkcs11);
-        slot: Slot;
-        /**
-         * the state of the session
-         */
-        state: number;
-        /**
-         * bit flags that define the type of session
-         */
-        flags: number;
-        /**
-         * an error code defined by the cryptographic device. Used for errors not covered by Cryptoki
-         */
-        deviceError: number;
-        protected getInfo(): void;
-        /**
-         * closes a session between an application and a token
-         */
-        close(): void;
-        /**
-         * initializes the normal user's PIN
-         * @param {string} pin the normal user's PIN
-         */
-        initPin(pin: string): void;
-        /**
-         * modifies the PIN of the user who is logged in
-         * @param {string} oldPin
-         * @param {string} newPin
-         */
-        setPin(oldPin: string, newPin: string): void;
-        /**
-         * obtains a copy of the cryptographic operations state of a session, encoded as a string of bytes
-         */
-        getOperationState(): Buffer;
-        /**
-         * restores the cryptographic operations state of a session
-         * from a string of bytes obtained with getOperationState
-         * @param {Buffer} state the saved state
-         * @param {number} encryptionKey holds key which will be used for an ongoing encryption
-         * or decryption operation in the restored session
-         * (or 0 if no encryption or decryption key is needed,
-         * either because no such operation is ongoing in the stored session
-         * or because all the necessary key information is present in the saved state)
-         * @param {number} authenticationKey holds a handle to the key which will be used for an ongoing signature,
-         * MACing, or verification operation in the restored session
-         * (or 0 if no such key is needed, either because no such operation is ongoing in the stored session
-         * or because all the necessary key information is present in the saved state)
-         */
-        setOperationState(state: Buffer, encryptionKey?: number, authenticationKey?: number): void;
-        /**
-         * logs a user into a token
-         * @param {string} pin the user's PIN.
-         * - This standard allows PIN values to contain any valid `UTF8` character,
-         * but the token may impose subset restrictions
-         * @param {} userType the user type. Default is `USER`
-         */
-        login(pin: string, userType?: UserType): void;
-        /**
-         * logs a user out from a token
-         */
-        logout(): void;
-        /**
-         * creates a new object
-         * - Only session objects can be created during a read-only session.
-         * - Only public objects can be created unless the normal user is logged in.
-         * @param {ITemplate} template the object's template
-         */
-        create(template: ITemplate): SessionObject;
-        /**
-         * removes all session objects matched to template
-         * - if template is null, removes all session objects
-         * - returns a number of destroied session objects
-         * @param {ITemplate} template template
-         */
-        destroy(template: ITemplate): number;
-        /**
-         * @param {SessionObject} object
-         */
-        destroy(object: SessionObject): number;
-        destroy(): number;
-        /**
-         * removes all session objects
-         * - returns a number of destroied session objects
-         */
-        clear(): number;
-        /**
-         * returns a collection of session objects mached to template
-         * @param template template
-         * @param callback optional callback function wich is called for each founded object
-         * - if callback function returns false, it breaks find function.
-         */
-        find(callback?: (obj: SessionObject) => void): SessionObjectCollection;
-        find(template: ITemplate, callback?: (obj: SessionObject) => void): SessionObjectCollection;
-        /**
-         * Returns object from session by handle
-         * @param  {number} handle handle of object
-         * @returns T
-         */
-        getObject<T extends SessionObject>(handle: number): T;
-        /**
-         * generates a secret key or set of domain parameters, creating a new object.
-         * @param mechanism generation mechanism
-         * @param template template for the new key or set of domain parameters
-         */
-        generateKey(mechanism: MechanismType, template?: ITemplate): SecretKey;
-        generateKey(mechanism: MechanismType, template: ITemplate, callback: (err: Error, key: SecretKey) => void): void;
-        generateKeyPair(mechanism: MechanismType, publicTemplate: ITemplate, privateTemplate: ITemplate): IKeyPair;
-        createSign(alg: MechanismType, key: Key): Sign;
-        createVerify(alg: MechanismType, key: Key): Verify;
-        createCipher(alg: MechanismType, key: Key): Cipher;
-        createDecipher(alg: MechanismType, key: Key): Decipher;
-        createDigest(alg: MechanismType): Digest;
-        wrapKey(alg: MechanismType, wrappingKey: Key, key: Key): Buffer;
-        unwrapKey(alg: MechanismType, unwrappingKey: Key, wrappedKey: Buffer, template: ITemplate): Key;
-        /**
-         * derives a key from a base key, creating a new key object
-         * @param {MechanismType} alg key deriv. mech
-         * @param {Key} baseKey base key
-         * @param {ITemplate} template new key template
-         */
-        deriveKey(alg: MechanismType, baseKey: Key, template: ITemplate): SecretKey;
-        /**
-         * generates random data
-         * @param {number} size \# of bytes to generate
-         */
-        generateRandom(size: number): Buffer;
-    }
-
-    enum TokenFlag {
-        RNG,
-        WRITE_PROTECTED,
-        LOGIN_REQUIRED,
-        USER_PIN_INITIALIZED,
-        RESTORE_KEY_NOT_NEEDED,
-        CLOCK_ON_TOKEN,
-        PROTECTED_AUTHENTICATION_PATH,
-        DUAL_CRYPTO_OPERATIONS,
-        TOKEN_INITIALIZED,
-        SECONDARY_AUTHENTICATION,
-        USER_PIN_COUNT_LOW,
-        USER_PIN_FINAL_TRY,
-        USER_PIN_LOCKED,
-        USER_PIN_TO_BE_CHANGED,
-        SO_PIN_COUNT_LOW,
-        SO_PIN_FINAL_TRY,
-        SO_PIN_LOCKED,
-        SO_PIN_TO_BE_CHANGED,
-    }
-    class Token extends HandleObject {
-        /**
-         * application-defined label, assigned during token initialization.
-         * - Must be padded with the blank character (' ').
-         * - Should __not__ be null-terminated.
-         */
-        label: string;
-        /**
-         * ID of the device manufacturer.
-         * - Must be padded with the blank character (' ').
-         * - Should __not__ be null-terminated.
-         */
-        manufacturerID: string;
-        /**
-         * model of the device.
-         * - Must be padded with the blank character (' ').
-         * - Should __not__ be null-terminated.
-         */
-        model: string;
-        /**
-         * character-string serial number of the device.
-         * - Must be padded with the blank character (' ').
-         * - Should __not__ be null-terminated.
-         */
-        serialNumber: string;
-        /**
-         * bit flags indicating capabilities and status of the device
-         */
-        flags: number;
-        /**
-         * maximum number of sessions that can be opened with the token at one time by a single application
-         */
-        maxSessionCount: number;
-        /**
-         * number of sessions that this application currently has open with the token
-         */
-        sessionCount: number;
-        /**
-         * maximum number of read/write sessions that can be opened
-         * with the token at one time by a single application
-         */
-        maxRwSessionCount: number;
-        /**
-         * number of read/write sessions that this application currently has open with the token
-         */
-        rwSessionCount: number;
-        /**
-         * maximum length in bytes of the PIN
-         */
-        maxPinLen: number;
-        /**
-         * minimum length in bytes of the PIN
-         */
-        minPinLen: number;
-        /**
-         * the total amount of memory on the token in bytes in which public objects may be stored
-         */
-        totalPublicMemory: number;
-        /**
-         * the amount of free (unused) memory on the token in bytes for public objects
-         */
-        freePublicMemory: number;
-        /**
-         * the total amount of memory on the token in bytes in which private objects may be stored
-         */
-        totalPrivateMemory: number;
-        /**
-         * the amount of free (unused) memory on the token in bytes for private objects
-         */
-        freePrivateMemory: number;
-        /**
-         * version number of hardware
-         */
-        hardwareVersion: IVersion;
-        /**
-         * version number of firmware
-         */
-        firmwareVersion: IVersion;
-        /**
-         * current time as a character-string of length 16,
-         * represented in the format YYYYMMDDhhmmssxx
-         */
-        utcTime: Date;
-        constructor(handle: number, lib: Pkcs11);
-        protected getInfo(): void;
-    }
-
-    class Slot extends HandleObject implements ISlotInfo {
-        slotDescription: string;
-        manufacturerID: string;
-        flags: number;
-        hardwareVersion: IVersion;
-        firmwareVersion: IVersion;
-        module: Module;
-        constructor(handle: number, module: Module, lib: Pkcs11);
-        protected getInfo(): void;
-        getToken(): Token;
-        /**
-         * returns list of `MechanismInfo`
-         */
-        getMechanisms(): MechanismCollection;
-        /**
-         * initializes a token
-         * @param {string} pin the SO's initial PIN
-         * @param {string} label label of the token
-         */
-        initToken(pin: string, label: string): void;
-        /**
-         * opens a session between an application and a token in a particular slot
-         * @parsm flags indicates the type of session
-         */
-        open(flags?: number): Session;
-        /**
-         * closes all sessions an application has with a token
-         */
-        closeAll(): void;
-    }
-
-    class SlotCollection extends Collection<Slot> {
-        module: Module;
-        items(index: number): Slot;
-        constructor(items: Array<number>, module: Module, lib: Pkcs11, classType?: any);
-    }
-
-    class Module extends BaseObject implements IModuleInfo {
-        libFile: string;
-        libName: string;
-        /**
-         * Cryptoki interface version
-         */
-        cryptokiVersion: IVersion;
-        /**
-         * blank padded manufacturer ID
-         */
-        manufacturerID: string;
-        /**
-         * must be zero
-         */
-        flags: number;
-        /**
-         * blank padded library description
-         */
-        libraryDescription: string;
-        /**
-         * version of library
-         */
-        libraryVersion: IVersion;
-        constructor(lib: Pkcs11);
-        protected getInfo(): void;
-        /**
-         * initializes the Cryptoki library
-         */
-        initialize(): void;
-        /**
-         * indicates that an application is done with the Cryptoki library
-         */
-        finalize(): void;
-        /**
-         * obtains a list of slots in the system
-         * @param {number} index index of an element in collection
-         * @param {number} tokenPresent only slots with tokens. Default `True`
-         */
-        getSlots(index: number, tokenPresent?: boolean): Slot;
-        /**
-         * @param {number} tokenPresent only slots with tokens. Default `True`
-         */
-        getSlots(tokenPresent?: boolean): SlotCollection;
-        /**
-         * loads pkcs11 lib
-         */
-        static load(libFile: string, libName?: string): Module;
-    }
-
-    class Cipher {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
-        protected init(alg: MechanismType, key: Key): void;
-        update(text: string): Buffer;
-        update(data: Buffer): Buffer;
-        final(): Buffer;
-    }
-
-    class Decipher {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
-        protected init(alg: MechanismType, key: Key): void;
-        update(text: string): Buffer;
-        update(data: Buffer): Buffer;
-        final(): Buffer;
-    }
-
-    class Digest {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, lib: Pkcs11);
-        protected init(alg: MechanismType): void;
-        update(text: string): void;
-        update(data: Buffer): void;
-        final(): Buffer;
-    }
-
-    class Sign {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
-        protected init(alg: MechanismType, key: Key): void;
-        update(text: string): void;
-        update(data: Buffer): void;
-        final(): Buffer;
-    }
-
-    class Verify {
-        session: Session;
-        lib: Pkcs11;
-        constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
-        protected init(alg: MechanismType, key: Key): void;
-        update(text: string): void;
-        update(data: Buffer): void;
-        final(signature: Buffer): boolean;
-    }
-
+    C_GetSlotInfo(slotID: number, pInfo: CK_PTR): number;
+    C_GetSlotInfo(slotID: number, pInfo: CK_PTR, callback: Callback): void;
     /**
-     * 
-     * EC
-     * 
+     * C_GetTokenInfo obtains information about a particular token
+     * in the system.
+     * @param {number} slotID ID of the token's slot
+     * @param {Buffer} pInfo receives the token information
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
-
+    C_GetTokenInfo(slotID: number, pInfo: Buffer): number;
+    C_GetTokenInfo(slotID: number, pInfo: Buffer, callback: Callback): void;
     /**
-     * EcKdf is used to indicate the Key Derivation Function (KDF)
-     * applied to derive keying data from a shared secret.
-     * The key derivation function will be used by the EC key agreement schemes.
+     * C_GetMechanismList obtains a list of mechanism types
+     * supported by a token.
+     * @param {number} slotID ID of the token's slot
+     * @param {number} pMechanismList gets mech. array
+     * @param {number} pulCount gets # of mechs
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
-    enum EcKdf {
-        NULL,
-        SHA1,
-        SHA224,
-        SHA256,
-        SHA384,
-        SHA512,
-    }
-
-    class EcdhParams implements IParams {
-        /**
-         * key derivation function used on the shared secret value
-         */
-        kdf: EcKdf;
-        /**
-         * some data shared between the two parties
-         */
-        sharedData: Buffer;
-        /**
-         * other party's EC public key value
-         */
-        publicData: Buffer;
-        /**
-         * @param  {EcKdf} kdf key derivation function used on the shared secret value
-         * @param  {Buffer=null} sharedData some data shared between the two parties
-         * @param  {Buffer=null} publicData other party's EC public key value
-         */
-        constructor(kdf: EcKdf, sharedData?: Buffer, publicData?: Buffer);
-        toCKI(): Buffer;
-    }
-
-    export interface INamedCurve {
-        name: string;
-        oid: string;
-        value: Buffer;
-        size: number;
-    }
-
-    class NamedCurve {
-        static getByName(name: string): INamedCurve;
-        static getByOid(oid: string): INamedCurve;
-    }
-
+    C_GetMechanismList(slotID: number, pMechanismList: Buffer, pulCount: Buffer): number;
+    C_GetMechanismList(slotID: number, pMechanismList: Buffer, pulCount: Buffer, callback: Callback): void;
+    /** C_GetMechanismInfo obtains information about a particular
+     * mechanism possibly supported by a token.
+     * @param {number} slotID ID of the token's slot
+     * @param {number} type type of mechanism
+     * @param {Buffer} pInfo receives mechanism info
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetMechanismInfo(slotID: number, type: number, pInfo: Buffer): number;
+    C_GetMechanismInfo(slotID: number, type: number, pInfo: Buffer, callback: Callback): void;
     /**
-     * 
-     * AES
-     * 
+     * C_InitToken initializes a token.
+     * @param {number} slotID ID of the token's slot
+     * @param {Buffer} pPin the SO's initial PIN
+     * @param {number} ulPinLen length in bytes of the PIN
+     * @param {number} pLabel 32-byte token label (blank padded)
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
-
-    class AesCbcParams implements IParams {
-        /**
-         * initialization vector
-         * - must have a fixed size of 16 bytes
-         */
-        iv: Buffer;
-        /**
-         * the data
-         */
-        data: Buffer;
-        constructor(iv: Buffer, data: Buffer);
-        toCKI(): Buffer;
-    }
-
-    class AesCcmParams implements IParams {
-        /**
-         * length of the data where 0 <= dataLength < 2^8L
-         */
-        dataLength: number;
-        /**
-         * the nonce
-         */
-        nonce: Buffer;
-        /**
-         * the additional authentication data
-         * - This data is authenticated but not encrypted
-         */
-        aad: Buffer;
-        /**
-         * length of authentication tag (output following cipher text) in bits.
-         * - Can be any value between 0 and 128
-         */
-        macLength: number;
-        constructor(dataLength: number, nonce: Buffer, aad?: Buffer, macLength?: number);
-        toCKI(): Buffer;
-    }
-
-    class AesGcmParams implements IParams {
-        /**
-         * initialization vector
-         * - The length of the initialization vector can be any number between 1 and 256.
-         * 96-bit (12 byte) IV values can be processed more efficiently,
-         * so that length is recommended for situations in which efficiency is critical.
-         */
-        iv: Buffer;
-        /**
-         * pointer to additional authentication data.
-         * This data is authenticated but not encrypted.
-         */
-        aad: Buffer;
-        /**
-         * length of authentication tag (output following cipher text) in bits.
-         * Can be any value between 0 and 128. Default 128
-         */
-        tagBits: number;
-        constructor(iv: Buffer, aad?: Buffer, tagBits?: number);
-        toCKI(): Buffer;
-    }
-
+    C_InitToken(slotID: number, pPin: Buffer, ulPinLen: number, pLabel: Buffer): number;
+    C_InitToken(slotID: number, pPin: Buffer, ulPinLen: number, pLabel: Buffer, callback: Callback): void;
     /**
-     * 
-     * RSA
-     * 
+     * C_InitPIN initializes the normal user's PIN.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPin the normal user's PIN
+     * @param {number} ulPinLen length in bytes of the PIN
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
      */
+    C_InitPIN(hSession: number, pPin: Buffer, ulPinLen: number): number;
+    C_InitPIN(hSession: number, pPin: Buffer, ulPinLen: number, callback: Callback): void;
+    /**
+     * C_SetPIN modifies the PIN of the user who is logged in.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pOldPin the old PIN
+     * @param {number} ulOldLen length of the old PIN
+     * @param {Buffer} pNewPin the new PIN
+     * @param {number} ulNewLen length of the new PIN
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SetPIN(hSession: any, pOldPin: Buffer, ulOldLen: number, pNewPin: Buffer, ulNewLen: number): number;
+    C_SetPIN(hSession: any, pOldPin: Buffer, ulOldLen: number, pNewPin: Buffer, ulNewLen: number, callback: Callback): void;
+    /**
+     * C_OpenSession opens a session between an application and a
+     * token.
+     * @param {number} slotID ID of the token's slot
+     * @param {number} flags from CK_SESSION_INFO
+     * @param {Buffer} pApplication passed to callback
+     * @param {Buffer} Notify callback function
+     * @param {Buffer} phSession gets session handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_OpenSession(slotID: number, flags: number, pApplication?: Buffer, notify?: Buffer, phSession?: Buffer): number;
+    C_OpenSession(slotID: number, flags: number, pApplication: Buffer, notify: Buffer, phSession: Buffer, callback: Callback): void;
+    /**
+     * C_CloseSession closes a session between an application and a token.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CloseSession(hSession: number): number;
+    C_CloseSession(hSession: number, callback: Callback): void;
+    /**
+     * C_CloseAllSessions closes all sessions with a token.
+     * @param {number} slotID ID of the token's slot
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CloseAllSessions(slotID: number): number;
+    C_CloseAllSessions(slotID: number, callback: Callback): void;
+    /**
+     * C_GetSessionInfo obtains information about the session.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pInfo receives session info
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetSessionInfo(hSession: number, pInfo: Buffer): number;
+    C_GetSessionInfo(hSession: number, pInfo: Buffer, callback: Callback): void;
+    /**
+     * C_GetOperationState obtains the state of the cryptographic operation in a session.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pOperationState gets state
+     * @param {Buffer} pulOperationStateLen gets state length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetOperationState(hSession: number, pOperationState: Buffer, pulOperationStateLen: Buffer): number;
+    C_GetOperationState(hSession: number, pOperationState: Buffer, pulOperationStateLen: Buffer, callback: Callback): void;
+    /**
+     * C_SetOperationState restores the state of the cryptographic operation in a session.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pOperationState holds state
+     * @param {number} ulOperationStateLen holds holds state length
+     * @param {number} hEncryptionKey en/decryption key
+     * @param {number} hAuthenticationKey sign/verify key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SetOperationState(hSession: number, pOperationState: Buffer, ulOperationStateLen: number, hEncryptionKey: number, hAuthenticationKey: number): number;
+    C_SetOperationState(hSession: number, pOperationState: Buffer, ulOperationStateLen: number, hEncryptionKey: number, hAuthenticationKey: number, callback: Callback): void;
+    /**
+     * C_Login logs a user into a token.
+     * @param {number} hSession the session's handle
+     * @param {number} userType the user type
+     * @param {Buffer} pPin the user's PIN
+     * @param {number} ulPinLen the length of the PIN
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Login(hSession: number, userType: number, pPin: Buffer, ulPinLen: number): number;
+    C_Login(hSession: number, userType: number, pPin: Buffer, ulPinLen: number, callback: Callback): void;
+    /**
+     * C_Logout logs a user out from a token.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Logout(hSession: number): number;
+    C_Logout(hSession: number, callback: Callback): void;
+    /**
+     * C_CreateObject creates a new object.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pTemplate the object's template
+     * @param {number} ulCount attributes in template
+     * @param {Buffer} phObject gets new object's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CreateObject(hSession: number, pTemplate: Buffer, ulCount: number, phObject: Buffer): number;
+    C_CreateObject(hSession: number, pTemplate: Buffer, ulCount: number, phObject: Buffer, callback: Callback): void;
+    /**
+     * C_CopyObject copies an object, creating a new object for the copy.
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Buffer} pTemplate template for new object
+     * @param {number} ulCount attributes in template
+     * @param {Buffer} phNewObject receives handle of copy
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CopyObject(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, phNewObject: Buffer): number;
+    C_CopyObject(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, phNewObject: Buffer, callback: Callback): void;
+    /**
+     * C_DestroyObject destroys an object.
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DestroyObject(hSession: number, hObject: number): number;
+    C_DestroyObject(hSession: number, hObject: number, callback: Callback): void;
+    /**
+     * C_GetObjectSize gets the size of an object in bytes.
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Buffer} pulSize receives size of object
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetObjectSize(hSession: number, hObject: number, pulSize: Buffer): number;
+    C_GetObjectSize(hSession: number, hObject: number, pulSize: Buffer, callback: Callback): void;
+    /**
+     * C_GetAttributeValue obtains the value of one or more object attributes.
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Buffer} pTemplate specifies attrs; gets vals
+     * @param {number} ulCount attributes in template
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number): number;
+    C_GetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
+    /**
+     * C_SetAttributeValue modifies the value of one or more object attributes
+     * @param {number} hSession the session's handle
+     * @param {number} hObject the object's handle
+     * @param {Buffer} pTemplate specifies attrs and values
+     * @param {number} ulCount attributes in template
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number): number;
+    C_SetAttributeValue(hSession: number, hObject: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
+    /**
+     * C_FindObjectsInit initializes a search for token and session
+     * objects that match a template.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pTemplate attribute values to match
+     * @param {number} ulCount attrs in search template
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_FindObjectsInit(hSession: number, pTemplate: Buffer, ulCount: number): number;
+    C_FindObjectsInit(hSession: number, pTemplate: Buffer, ulCount: number, callback: Callback): void;
+    /**
+     * C_FindObjects continues a search for token and session
+     * objects that match a template, obtaining additional object
+     * handles.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} phObject gets obj. handles
+     * @param {number} ulMaxObjectCount max handles to get
+     * @param {Buffer} pulObjectCount actual # returned
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_FindObjects(hSession: number, phObject: Buffer, ulMaxObjectCount: number, pulObjectCount: Buffer): number;
+    C_FindObjects(hSession: number, phObject: Buffer, ulMaxObjectCount: number, pulObjectCount: Buffer, callback: Callback): void;
+    /**
+     * C_FindObjectsFinal finishes a search for token and session objects.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_FindObjectsFinal(hSession: number): number;
+    C_FindObjectsFinal(hSession: number, callback: Callback): void;
+    /**
+     * C_EncryptInit initializes an encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the encryption mechanism
+     * @param {number} hKey handle of encryption key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_EncryptInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_EncryptInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_Encrypt encrypts single-part data.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData the plaintext data
+     * @param {number} ulDataLen bytes of plaintext
+     * @param {Buffer} pEncryptedData gets ciphertext
+     * @param {Buffer} pulEncryptedDataLen gets c-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Encrypt(hSession: number, pData: Buffer, ulDataLen: number, pEncryptedData: Buffer, pulEncryptedDataLen: Buffer): number;
+    C_Encrypt(hSession: number, pData: Buffer, ulDataLen: number, pEncryptedData: Buffer, pulEncryptedDataLen: Buffer, callback: Callback): void;
+    /**
+     * C_EncryptUpdate continues a multiple-part encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart the plaintext data
+     * @param {number} ulPartLen plaintext data len
+     * @param {Buffer} pEncryptedPart gets ciphertext
+     * @param {Buffer} pulEncryptedPartLen gets c-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_EncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
+    C_EncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_EncryptFinal finishes a multiple-part encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pLastEncryptedPart last c-text
+     * @param {Buffer} pulLastEncryptedPartLen gets last size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_EncryptFinal(hSession: number, pLastEncryptedPart: Buffer, pulLastEncryptedPartLen: Buffer): number;
+    C_EncryptFinal(hSession: number, pLastEncryptedPart: Buffer, pulLastEncryptedPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptInit initializes a decryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the decryption mechanism
+     * @param {number} hKey handle of decryption key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptInit(hSession: number, pMechanism: Buffer, hKey: number): any;
+    C_DecryptInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_Decrypt decrypts encrypted data in a single part.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pEncryptedData ciphertext
+     * @param {number} ulEncryptedDataLen ciphertext length
+     * @param {Buffer} pData gets plaintext
+     * @param {number} pulDataLen gets p-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Decrypt(hSession: number, pEncryptedData: Buffer, ulEncryptedDataLen: number, pData: Buffer, pulDataLen: Buffer): number;
+    C_Decrypt(hSession: number, pEncryptedData: Buffer, ulEncryptedDataLen: number, pData: Buffer, pulDataLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptUpdate continues a multiple-part decryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pEncryptedPart encrypted data
+     * @param {number} ulEncryptedPartLen input length
+     * @param {Buffer} pPart gets plaintext
+     * @param {Buffer} pulPartLen p-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
+    C_DecryptUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptFinal finishes a multiple-part decryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pLastPart gets plaintext
+     * @param {Buffer} pulLastPartLen p-text size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptFinal(hSession: number, pLastPart: Buffer, pulLastPartLen: Buffer): number;
+    C_DecryptFinal(hSession: number, pLastPart: Buffer, pulLastPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DigestInit initializes a message-digesting operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the digesting mechanism
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestInit(hSession: number, pMechanism: Buffer): number;
+    C_DigestInit(hSession: number, pMechanism: Buffer, callback: Callback): void;
+    /**
+     * C_Digest digests data in a single part.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData data to be digested
+     * @param {number} ulDataLen bytes of data to digest
+     * @param {Buffer} pDigest gets the message digest
+     * @param {Buffer} pulDigestLen gets digest length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Digest(hSession: number, pData: Buffer, ulDataLen: number, pDigest: Buffer, pulDigestLen: Buffer): number;
+    C_Digest(hSession: number, pData: Buffer, ulDataLen: number, pDigest: Buffer, pulDigestLen: Buffer, callback: Callback): void;
+    /**
+     * C_DigestUpdate continues a multiple-part message-digesting operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart data to be digested
+     * @param {number} ulPartLen bytes of data to be digested
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestUpdate(hSession: number, pPart: Buffer, ulPartLen: number): number;
+    C_DigestUpdate(hSession: number, pPart: Buffer, ulPartLen: number, callback: Callback): void;
+    /**
+     * C_DigestKey continues a multi-part message-digesting operation,
+     * by digesting the value of a secret key as part of
+     * the data already digested.
+     * @param {number} hSession the session's handle
+     * @param {number} hKey secret key to digest
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestKey(hSession: number, hKey: number): number;
+    C_DigestKey(hSession: number, hKey: number, callback: Callback): void;
+    /**
+     * C_DigestFinal finishes a multiple-part message-digesting
+     * operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pDigest gets the message digest
+     * @param {Buffer} pulDigestLen gets byte count of digest
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestFinal(hSession: number, pDigest: Buffer, pulDigestLen: Buffer): number;
+    C_DigestFinal(hSession: number, pDigest: Buffer, pulDigestLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignInit initializes a signature (private key encryption)
+     * operation, where the signature is (will be) an appendix to
+     * the data, and plaintext cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the signature mechanism
+     * @param {number} hKey handle of signature key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_SignInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_Sign signs (encrypts with private key) data in a single
+     * part, where the signature is (will be) an appendix to the
+     * data, and plaintext cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData the data to sign
+     * @param {number} ulDataLen count of bytes to sign
+     * @param {Buffer} pSignature gets the signature
+     * @param {Buffer} pulSignatureLen gets signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Sign(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
+    C_Sign(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignUpdate continues a multiple-part signature operation,
+     * where the signature is (will be) an appendix to the data,
+     * and plaintext cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart the data to sign
+     * @param {number} ulPartLen count of bytes to sign
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignUpdate(hSession: number, pPart: Buffer, ulPartLen: Buffer): number;
+    C_SignUpdate(hSession: number, pPart: Buffer, ulPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignFinal finishes a multiple-part signature operation,
+     * returning the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pSignature gets the signature
+     * @param {Buffer} pulSignatureLen gets signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignFinal(hSession: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
+    C_SignFinal(hSession: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignRecoverInit initializes a signature operation, where
+     * the data can be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the signature mechanism
+     * @param {number} hKey handle of the signature key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignRecoverInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_SignRecoverInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_SignRecover signs data in a single operation, where the
+     * data can be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData the data to sign
+     * @param {number} ulDataLen count of bytes to sign
+     * @param {Buffer} pSignature gets the signature
+     * @param {Buffer} pulSignatureLen gets signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignRecover(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer): number;
+    C_SignRecover(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, pulSignatureLen: Buffer, callback: Callback): void;
+    /**
+     * C_VerifyInit initializes a verification operation, where the
+     * signature is an appendix to the data, and plaintext cannot
+     * cannot be recovered from the signature (e.g. DSA).
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the verification mechanism
+     * @param {number} hKey verification key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_VerifyInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_Verify verifies a signature in a single-part operation,
+     * where the signature is an appendix to the data, and plaintext
+     * cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pData signed data
+     * @param {number} ulDataLen length of signed data
+     * @param {Buffer} pSignature signature
+     * @param {number} ulSignatureLen signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_Verify(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, ulSignatureLen: Buffer): number;
+    C_Verify(hSession: number, pData: Buffer, ulDataLen: number, pSignature: Buffer, ulSignatureLen: Buffer, callback: Callback): void;
+    /**
+     * C_VerifyUpdate continues a multiple-part verification
+     * operation, where the signature is an appendix to the data,
+     * and plaintext cannot be recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart signed data
+     * @param {number} ulPartLen length of signed data
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyUpdate(hSession: number, pPart: Buffer, ulPartLen: number): number;
+    C_VerifyUpdate(hSession: number, pPart: Buffer, ulPartLen: number, callback: Callback): void;
+    /**
+     * C_VerifyFinal finishes a multiple-part verification
+     * operation, checking the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pSignature signature to verify
+     * @param {number} ulSignatureLen signature length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyFinal(hSession: number, pSignature: Buffer, ulSignatureLen: number): number;
+    C_VerifyFinal(hSession: number, pSignature: Buffer, ulSignatureLen: number, callback: Callback): void;
+    /**
+     * C_VerifyRecoverInit initializes a signature verification
+     * operation, where the data is recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the verification mechanism
+     * @param {number} hKey verification key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyRecoverInit(hSession: number, pMechanism: Buffer, hKey: number): number;
+    C_VerifyRecoverInit(hSession: number, pMechanism: Buffer, hKey: number, callback: Callback): void;
+    /**
+     * C_VerifyRecover verifies a signature in a single-part
+     * operation, where the data is recovered from the signature.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pSignature signature to verify
+     * @param {number} ulSignatureLen signature length
+     * @param {Buffer} pData gets signed data
+     * @param {Buffer} pulDataLen gets signed data len
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_VerifyRecover(hSession: number, pSignature: Buffer, ulSignatureLen: number, pData: Buffer, pulDataLen: Buffer): number;
+    C_VerifyRecover(hSession: number, pSignature: Buffer, ulSignatureLen: number, pData: Buffer, pulDataLen: Buffer, callback: Callback): void;
+    /**
+     * C_DigestEncryptUpdate continues a multiple-part digesting
+     * and encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart the plaintext data
+     * @param {number} ulPartLen plaintext length
+     * @param {Buffer} pEncryptedPart gets ciphertext
+     * @param {Buffer} pulEncryptedPartLen gets c-text length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DigestEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
+    C_DigestEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptDigestUpdate continues a multiple-part decryption and
+     * digesting operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pEncryptedPart ciphertext
+     * @param {number} ulEncryptedPartLen ciphertext length
+     * @param {Buffer} pPart gets plaintext
+     * @param {Buffer} pulPartLen gets plaintext len
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptDigestUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
+    C_DecryptDigestUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_SignEncryptUpdate continues a multiple-part signing and
+     * encryption operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pPart the plaintext data
+     * @param {number} ulPartLen plaintext length
+     * @param {Buffer} pEncryptedPart gets ciphertext
+     * @param {Buffer} pulEncryptedPartLen gets c-text length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SignEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer): number;
+    C_SignEncryptUpdate(hSession: number, pPart: Buffer, ulPartLen: number, pEncryptedPart: Buffer, pulEncryptedPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_DecryptVerifyUpdate continues a multiple-part decryption and
+     * verify operation.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pEncryptedPart ciphertext
+     * @param {number} ulEncryptedPartLen ciphertext length
+     * @param {Buffer} pPart gets plaintext
+     * @param {Buffer} pulPartLen gets p-text length
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DecryptVerifyUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer): number;
+    C_DecryptVerifyUpdate(hSession: number, pEncryptedPart: Buffer, ulEncryptedPartLen: number, pPart: Buffer, pulPartLen: Buffer, callback: Callback): void;
+    /**
+     * C_GenerateKey generates a secret key, creating a new key object.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism key generation mech.
+     * @param {Buffer} pTemplate template for new key
+     * @param {number} ulCount # of attrs in template
+     * @param {Buffer} phKey gets handle of new key
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GenerateKey(hSession: number, pMechanism: Buffer, pTemplate: Buffer, ulCount: number, phKey: Buffer): number;
+    C_GenerateKey(hSession: number, pMechanism: Buffer, pTemplate: Buffer, ulCount: number, phKey: Buffer, callback: Callback): any;
+    /**
+     * C_GenerateKeyPair generates a public-key/private-key pair,
+     * creating new key objects.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism key-gen mech.
+     * @param {Buffer} pPublicKeyTemplate template for public key
+     * @param {number} ulPublicKeyAttributeCount public attrs
+     * @param {Buffer} pPrivateKeyTemplate template for private key
+     * @param {number} ulPrivateKeyAttributeCount private attrs
+     * @param {Buffer} phPublicKey gets public key handle
+     * @param {Buffer} phPrivateKey gets private key handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GenerateKeyPair(hSession: number, pMechanism: Buffer, pPublicKeyTemplate: Buffer, ulPublicKeyAttributeCount: number, pPrivateKeyTemplate: Buffer, ulPrivateKeyAttributeCount: number, phPublicKey: Buffer, phPrivateKey: Buffer): number;
+    C_GenerateKeyPair(hSession: number, pMechanism: Buffer, pPublicKeyTemplate: Buffer, ulPublicKeyAttributeCount: number, pPrivateKeyTemplate: Buffer, ulPrivateKeyAttributeCount: number, phPublicKey: Buffer, phPrivateKey: Buffer, callback: Callback): void;
+    /**
+     * C_WrapKey wraps (i.e., encrypts) a key.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism the wrapping mechanism
+     * @param {number} hWrappingKey wrapping key
+     * @param {number} hKey key to be wrapped
+     * @param {Buffer} pWrappedKey gets wrapped key
+     * @param {Buffer} pulWrappedKeyLen gets wrapped key size
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_WrapKey(hSession: number, pMechanism: Buffer, hWrappingKey: number, hKey: number, pWrappedKey: Buffer, pulWrappedKeyLen: Buffer): number;
+    C_WrapKey(hSession: number, pMechanism: Buffer, hWrappingKey: number, hKey: number, pWrappedKey: Buffer, pulWrappedKeyLen: Buffer, callback: Callback): void;
+    /**
+     * C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
+     * key object.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism unwrapping mech.
+     * @param {Buffer} pWrappedKey the wrapped key
+     * @param {number} ulWrappedKeyLen wrapped key len
+     * @param {Buffer} pTemplate new key template
+     * @param {number} ulAttributeCount template length
+     * @param {Buffer} pTemplate new key template
+     * @param {number} ulAttributeCount template length
+     * @param {Buffer} phKey gets new handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_UnwrapKey(hSession: number, pMechanism: Buffer, hUnwrappingKey: number, pWrappedKey: Buffer, ulWrappedKeyLen: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer): number;
+    C_UnwrapKey(hSession: number, pMechanism: Buffer, hUnwrappingKey: number, pWrappedKey: Buffer, ulWrappedKeyLen: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer, callback: Callback): void;
+    /**
+     * C_DeriveKey derives a key from a base key, creating a new key object.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pMechanism key deriv. mech.
+     * @param {number} hBaseKey base key
+     * @param {Buffer} pTemplate new key template
+     * @param {number} ulAttributeCount template length
+     * @param {Buffer} phKey gets new handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_DeriveKey(hSession: number, pMechanism: Buffer, hBaseKey: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer): number;
+    C_DeriveKey(hSession: number, pMechanism: Buffer, hBaseKey: number, pTemplate: Buffer, ulAttributeCount: number, phKey: Buffer, callback: Callback): void;
+    /**
+     * C_SeedRandom mixes additional seed material into the token's
+     * random number generator.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pSeed the seed material
+     * @param {number} ulSeedLen length of seed material
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_SeedRandom(hSession: number, pSeed: Buffer, ulSeedLen: number): number;
+    C_SeedRandom(hSession: number, pSeed: Buffer, ulSeedLen: number, callback: Callback): void;
+    /**
+     * C_GenerateRandom generates random data.
+     * @param {number} hSession the session's handle
+     * @param {Buffer} pRandomData receives the random data
+     * @param {number} ulRandomLen # of bytes to generate
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GenerateRandom(hSession: number, pRandomData: Buffer, ulRandomLen: number): number;
+    C_GenerateRandom(hSession: number, pRandomData: Buffer, ulRandomLen: number, callback: Callback): void;
+    /**
+     * C_GetFunctionStatus is a legacy function; it obtains an
+     * updated status of a function running in parallel with an
+     * application.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_GetFunctionStatus(hSession: number): number;
+    C_GetFunctionStatus(hSession: number, callback: Callback): void;
+    /**
+     * C_CancelFunction is a legacy function; it cancels a function
+     * running in parallel.
+     * @param {number} hSession the session's handle
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_CancelFunction(hSession: number): number;
+    C_CancelFunction(hSession: number, callback: Callback): void;
+    /**
+     * C_WaitForSlotEvent waits for a slot event (token insertion,
+     * removal, etc.) to occur.
+     * @param {number} flags blocking/nonblocking flag
+     * @param {Buffer} pSlot location that receives the slot ID
+     * @param {Buffer} pRserved reserved.  Should be NULL_PTR
+     * @param {Callback} callback callback function with PKCS11 result value
+     * @returns void PKCS11 result value
+     */
+    C_WaitForSlotEvent(flags: number, pSlot: Buffer, pRserved: Buffer): number;
+    C_WaitForSlotEvent(flags: number, pSlot: Buffer, pRserved: Buffer, callback: Callback): number;
+}
 
-    enum RsaMgf {
-        MGF1_SHA1,
-        MGF1_SHA224,
-        MGF1_SHA256,
-        MGF1_SHA384,
-        MGF1_SHA512,
-    }
+declare enum KeyType {
+    RSA,
+    DSA,
+    DH,
+    ECDSA,
+    EC,
+    X9_42_DH,
+    KEA,
+    GENERIC_SECRET,
+    RC2,
+    RC4,
+    DES,
+    DES2,
+    DES3,
+    CAST,
+    CAST3,
+    CAST5,
+    CAST128,
+    RC5,
+    IDEA,
+    SKIPJACK,
+    BATON,
+    JUNIPER,
+    CDMF,
+    AES,
+    GOSTR3410,
+    GOSTR3411,
+    GOST28147,
+    BLOWFISH,
+    TWOFISH,
+    SECURID,
+    HOTP,
+    ACTI,
+    CAMELLIA,
+    ARIA,
+}
+declare enum KeyGenMechanism {
+    AES,
+    RSA,
+    RSA_X9_31,
+    DSA,
+    DH_PKCS,
+    DH_X9_42,
+    GOSTR3410,
+    GOST28147,
+    RC2,
+    RC4,
+    DES,
+    DES2,
+    SECURID,
+    ACTI,
+    CAST,
+    CAST3,
+    CAST5,
+    CAST128,
+    RC5,
+    IDEA,
+    GENERIC_SECRET,
+    SSL3_PRE_MASTER,
+    CAMELLIA,
+    ARIA,
+    SKIPJACK,
+    KEA,
+    BATON,
+    ECDSA,
+    EC,
+    JUNIPER,
+    TWOFISH,
+}
 
-    class RsaOaepParams implements IParams {
-        hashAlgorithm: MechanismEnum;
-        mgf: RsaMgf;
-        source: number;
-        sourceData: Buffer;
-        constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, sourceData?: Buffer);
-        toCKI(): Buffer;
-    }
+declare enum MechanismEnum {
+    RSA_PKCS_KEY_PAIR_GEN,
+    RSA_PKCS,
+    RSA_9796,
+    RSA_X_509,
+    MD2_RSA_PKCS,
+    MD5_RSA_PKCS,
+    SHA1_RSA_PKCS,
+    RIPEMD128_RSA_PKCS,
+    RIPEMD160_RSA_PKCS,
+    RSA_PKCS_OAEP,
+    RSA_X9_31_KEY_PAIR_GEN,
+    RSA_X9_31,
+    SHA1_RSA_X9_31,
+    RSA_PKCS_PSS,
+    SHA1_RSA_PKCS_PSS,
+    DSA_KEY_PAIR_GEN,
+    DSA,
+    DSA_SHA1,
+    DH_PKCS_KEY_PAIR_GEN,
+    DH_PKCS_DERIVE,
+    X9_42_DH_KEY_PAIR_GEN,
+    X9_42_DH_DERIVE,
+    X9_42_DH_HYBRID_DERIVE,
+    X9_42_MQV_DERIVE,
+    SHA256_RSA_PKCS,
+    SHA384_RSA_PKCS,
+    SHA512_RSA_PKCS,
+    SHA256_RSA_PKCS_PSS,
+    SHA384_RSA_PKCS_PSS,
+    SHA512_RSA_PKCS_PSS,
+    SHA224_RSA_PKCS,
+    SHA224_RSA_PKCS_PSS,
+    RC2_KEY_GEN,
+    RC2_ECB,
+    RC2_CBC,
+    RC2_MAC,
+    RC2_MAC_GENERAL,
+    RC2_CBC_PAD,
+    RC4_KEY_GEN,
+    RC4,
+    DES_KEY_GEN,
+    DES_ECB,
+    DES_CBC,
+    DES_MAC,
+    DES_MAC_GENERAL,
+    DES_CBC_PAD,
+    DES2_KEY_GEN,
+    DES3_KEY_GEN,
+    DES3_ECB,
+    DES3_CBC,
+    DES3_MAC,
+    DES3_MAC_GENERAL,
+    DES3_CBC_PAD,
+    CDMF_KEY_GEN,
+    CDMF_ECB,
+    CDMF_CBC,
+    CDMF_MAC,
+    CDMF_MAC_GENERAL,
+    CDMF_CBC_PAD,
+    DES_OFB64,
+    DES_OFB8,
+    DES_CFB64,
+    DES_CFB8,
+    MD2,
+    MD2_HMAC,
+    MD2_HMAC_GENERAL,
+    MD5,
+    MD5_HMAC,
+    MD5_HMAC_GENERAL,
+    SHA1,
+    SHA,
+    SHA_1,
+    SHA_1_HMAC,
+    SHA_1_HMAC_GENERAL,
+    RIPEMD128,
+    RIPEMD128_HMAC,
+    RIPEMD128_HMAC_GENERAL,
+    RIPEMD160,
+    RIPEMD160_HMAC,
+    RIPEMD160_HMAC_GENERAL,
+    SHA256,
+    SHA256_HMAC,
+    SHA256_HMAC_GENERAL,
+    SHA224,
+    SHA224_HMAC,
+    SHA224_HMAC_GENERAL,
+    SHA384,
+    SHA384_HMAC,
+    SHA384_HMAC_GENERAL,
+    SHA512,
+    SHA512_HMAC,
+    SHA512_HMAC_GENERAL,
+    SECURID_KEY_GEN,
+    SECURID,
+    HOTP_KEY_GEN,
+    HOTP,
+    ACTI,
+    ACTI_KEY_GEN,
+    CAST_KEY_GEN,
+    CAST_ECB,
+    CAST_CBC,
+    CAST_MAC,
+    CAST_MAC_GENERAL,
+    CAST_CBC_PAD,
+    CAST3_KEY_GEN,
+    CAST3_ECB,
+    CAST3_CBC,
+    CAST3_MAC,
+    CAST3_MAC_GENERAL,
+    CAST3_CBC_PAD,
+    CAST5_KEY_GEN,
+    CAST128_KEY_GEN,
+    CAST5_ECB,
+    CAST128_ECB,
+    CAST5_CBC,
+    CAST128_CBC,
+    CAST5_MAC,
+    CAST128_MAC,
+    CAST5_MAC_GENERAL,
+    CAST128_MAC_GENERAL,
+    CAST5_CBC_PAD,
+    CAST128_CBC_PAD,
+    RC5_KEY_GEN,
+    RC5_ECB,
+    RC5_CBC,
+    RC5_MAC,
+    RC5_MAC_GENERAL,
+    RC5_CBC_PAD,
+    IDEA_KEY_GEN,
+    IDEA_ECB,
+    IDEA_CBC,
+    IDEA_MAC,
+    IDEA_MAC_GENERAL,
+    IDEA_CBC_PAD,
+    GENERIC_SECRET_KEY_GEN,
+    CONCATENATE_BASE_AND_KEY,
+    CONCATENATE_BASE_AND_DATA,
+    CONCATENATE_DATA_AND_BASE,
+    XOR_BASE_AND_DATA,
+    EXTRACT_KEY_FROM_KEY,
+    SSL3_PRE_MASTER_KEY_GEN,
+    SSL3_MASTER_KEY_DERIVE,
+    SSL3_KEY_AND_MAC_DERIVE,
+    SSL3_MASTER_KEY_DERIVE_DH,
+    TLS_PRE_MASTER_KEY_GEN,
+    TLS_MASTER_KEY_DERIVE,
+    TLS_KEY_AND_MAC_DERIVE,
+    TLS_MASTER_KEY_DERIVE_DH,
+    TLS_PRF,
+    SSL3_MD5_MAC,
+    SSL3_SHA1_MAC,
+    MD5_KEY_DERIVATION,
+    MD2_KEY_DERIVATION,
+    SHA1_KEY_DERIVATION,
+    SHA256_KEY_DERIVATION,
+    SHA384_KEY_DERIVATION,
+    SHA512_KEY_DERIVATION,
+    SHA224_KEY_DERIVATION,
+    PBE_MD2_DES_CBC,
+    PBE_MD5_DES_CBC,
+    PBE_MD5_CAST_CBC,
+    PBE_MD5_CAST3_CBC,
+    PBE_MD5_CAST5_CBC,
+    PBE_MD5_CAST128_CBC,
+    PBE_SHA1_CAST5_CBC,
+    PBE_SHA1_CAST128_CBC,
+    PBE_SHA1_RC4_128,
+    PBE_SHA1_RC4_40,
+    PBE_SHA1_DES3_EDE_CBC,
+    PBE_SHA1_DES2_EDE_CBC,
+    PBE_SHA1_RC2_128_CBC,
+    PBE_SHA1_RC2_40_CBC,
+    PKCS5_PBKD2,
+    PBA_SHA1_WITH_SHA1_HMAC,
+    WTLS_PRE_MASTER_KEY_GEN,
+    WTLS_MASTER_KEY_DERIVE,
+    WTLS_MASTER_KEY_DERIVE_DH_ECC,
+    WTLS_PRF,
+    WTLS_SERVER_KEY_AND_MAC_DERIVE,
+    WTLS_CLIENT_KEY_AND_MAC_DERIVE,
+    KEY_WRAP_LYNKS,
+    KEY_WRAP_SET_OAEP,
+    CMS_SIG,
+    KIP_DERIVE,
+    KIP_WRAP,
+    KIP_MAC,
+    CAMELLIA_KEY_GEN,
+    CAMELLIA_ECB,
+    CAMELLIA_CBC,
+    CAMELLIA_MAC,
+    CAMELLIA_MAC_GENERAL,
+    CAMELLIA_CBC_PAD,
+    CAMELLIA_ECB_ENCRYPT_DATA,
+    CAMELLIA_CBC_ENCRYPT_DATA,
+    CAMELLIA_CTR,
+    ARIA_KEY_GEN,
+    ARIA_ECB,
+    ARIA_CBC,
+    ARIA_MAC,
+    ARIA_MAC_GENERAL,
+    ARIA_CBC_PAD,
+    ARIA_ECB_ENCRYPT_DATA,
+    ARIA_CBC_ENCRYPT_DATA,
+    SKIPJACK_KEY_GEN,
+    SKIPJACK_ECB64,
+    SKIPJACK_CBC64,
+    SKIPJACK_OFB64,
+    SKIPJACK_CFB64,
+    SKIPJACK_CFB32,
+    SKIPJACK_CFB16,
+    SKIPJACK_CFB8,
+    SKIPJACK_WRAP,
+    SKIPJACK_PRIVATE_WRAP,
+    SKIPJACK_RELAYX,
+    KEA_KEY_PAIR_GEN,
+    KEA_KEY_DERIVE,
+    FORTEZZA_TIMESTAMP,
+    BATON_KEY_GEN,
+    BATON_ECB128,
+    BATON_ECB96,
+    BATON_CBC128,
+    BATON_COUNTER,
+    BATON_SHUFFLE,
+    BATON_WRAP,
+    ECDSA_KEY_PAIR_GEN,
+    EC_KEY_PAIR_GEN,
+    ECDSA,
+    ECDSA_SHA1,
+    ECDSA_SHA224,
+    ECDSA_SHA256,
+    ECDSA_SHA384,
+    ECDSA_SHA512,
+    ECDH1_DERIVE,
+    ECDH1_COFACTOR_DERIVE,
+    ECMQV_DERIVE,
+    JUNIPER_KEY_GEN,
+    JUNIPER_ECB128,
+    JUNIPER_CBC128,
+    JUNIPER_COUNTER,
+    JUNIPER_SHUFFLE,
+    JUNIPER_WRAP,
+    FASTHASH,
+    AES_KEY_GEN,
+    AES_ECB,
+    AES_CBC,
+    AES_MAC,
+    AES_MAC_GENERAL,
+    AES_CBC_PAD,
+    AES_CTR,
+    AES_CMAC,
+    AES_CMAC_GENERAL,
+    BLOWFISH_KEY_GEN,
+    BLOWFISH_CBC,
+    TWOFISH_KEY_GEN,
+    TWOFISH_CBC,
+    AES_GCM,
+    AES_CCM,
+    AES_KEY_WRAP,
+    AES_KEY_WRAP_PAD,
+    DES_ECB_ENCRYPT_DATA,
+    DES_CBC_ENCRYPT_DATA,
+    DES3_ECB_ENCRYPT_DATA,
+    DES3_CBC_ENCRYPT_DATA,
+    AES_ECB_ENCRYPT_DATA,
+    AES_CBC_ENCRYPT_DATA,
+    GOSTR3410_KEY_PAIR_GEN,
+    GOSTR3410,
+    GOSTR3410_WITH_GOSTR3411,
+    GOSTR3410_KEY_WRAP,
+    GOSTR3410_DERIVE,
+    GOSTR3411,
+    GOSTR3411_HMAC,
+    GOST28147_KEY_GEN,
+    GOST28147_ECB,
+    GOST28147,
+    GOST28147_MAC,
+    GOST28147_KEY_WRAP,
+    DSA_PARAMETER_GEN,
+    DH_PKCS_PARAMETER_GEN,
+    X9_42_DH_PARAMETER_GEN,
+    VENDOR_DEFINED,
+}
 
-    class RsaPssParams implements IParams {
-        /**
-         * hash algorithm used in the PSS encoding;
-         * - if the signature mechanism does not include message hashing,
-         * then this value must be the mechanism used by the application to generate
-         * the message hash;
-         * - if the signature mechanism includes hashing,
-         * then this value must match the hash algorithm indicated
-         * by the signature mechanism
-         */
-        hashAlgorithm: MechanismEnum;
-        /**
-         * mask generation function to use on the encoded block
-         */
-        mgf: RsaMgf;
-        /**
-         * length, in bytes, of the salt value used in the PSS encoding;
-         * - typical values are the length of the message hash and zero
-         */
-        saltLength: number;
-        constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, saltLen?: number);
-        toCKI(): Buffer;
-    }
+interface IParams {
+    toCKI(): Buffer;
+}
 
-}
\ No newline at end of file
+interface IAlgorithm {
+    name: string;
+    params: Buffer | IParams;
+}
+
+type MechanismType = MechanismEnum | KeyGenMechanism | IAlgorithm | string;
+
+declare enum MechanismFlag {
+    /**
+     * `True` if the mechanism is performed by the device; `false` if the mechanism is performed in software
+     */
+    HW,
+    /**
+     * `True` if the mechanism can be used with encrypt function
+     */
+    ENCRYPT,
+    /**
+     * `True` if the mechanism can be used with decrypt function
+     */
+    DECRYPT,
+    /**
+     * `True` if the mechanism can be used with digest function
+     */
+    DIGEST,
+    /**
+     * `True` if the mechanism can be used with sign function
+     */
+    SIGN,
+    /**
+     * `True` if the mechanism can be used with sign recover function
+     */
+    SIGN_RECOVER,
+    /**
+     * `True` if the mechanism can be used with verify function
+     */
+    VERIFY,
+    /**
+     * `True` if the mechanism can be used with verify recover function
+     */
+    VERIFY_RECOVER,
+    /**
+     * `True` if the mechanism can be used with geberate function
+     */
+    GENERATE,
+    /**
+     * `True` if the mechanism can be used with generate key pair function
+     */
+    GENERATE_KEY_PAIR,
+    /**
+     * `True` if the mechanism can be used with wrap function
+     */
+    WRAP,
+    /**
+     * `True` if the mechanism can be used with unwrap function
+     */
+    UNWRAP,
+    /**
+     * `True` if the mechanism can be used with derive function
+     */
+    DERIVE,
+}
+declare class Mechanism extends HandleObject {
+    protected slotHandle: number;
+    /**
+     * the minimum size of the key for the mechanism
+     * _whether this is measured in bits or in bytes is mechanism-dependent_
+     */
+    minKeySize: number;
+    /**
+     * the maximum size of the key for the mechanism
+     * _whether this is measured in bits or in bytes is mechanism-dependent_
+     */
+    maxKeySize: number;
+    /**
+     * bit flag specifying mechanism capabilities
+     */
+    flags: number;
+    /**
+     * returns string name from MechanismEnum
+     */
+    name: string;
+    constructor(handle: number, slotHandle: number, lib: Pkcs11);
+    protected getInfo(): void;
+    static create(alg: MechanismType): Buffer;
+    static vendor(jsonFile: string): any;
+    static vendor(name: string, value: number): any;
+}
+
+declare class MechanismCollection extends Collection<Mechanism> {
+    protected slotHandle: number;
+    constructor(items: Array<number>, slotHandle: number, lib: Pkcs11, classType?: typeof Mechanism);
+    /**
+     * returns item from collection by index
+     * @param {number} index of element in collection `[0..n]`
+     */
+    items(index: number): Mechanism;
+}
+
+/**
+ * Definition for the base key object class
+ * - defines the object class `CKO_PUBLIC_KEY`, `CKO_PRIVATE_KEY` and `CKO_SECRET_KEY` for type `CK_OBJECT_CLASS`
+ * as used in the `CKA_CLASS` attribute of objects
+ */
+declare class Key extends Storage {
+    /**
+     * Type of key
+     * - Must be specified when object is created with `C_CreateObject`
+     * - Must be specified when object is unwrapped with `C_UnwrapKey`
+     */
+    type: KeyType;
+    /**
+     * Key identifier for key (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification
+     * of the attribute during the course of a `C_CopyObject` call.
+     */
+    id: Buffer;
+    /**
+     * Start date for the key (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification
+     * of the attribute during the course of a `C_CopyObject` call.
+     */
+    startDate: Date;
+    /**
+     * End date for the key (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification
+     * of the attribute during the course of a `C_CopyObject` call.
+     */
+    endDate: Date;
+    /**
+     * `CK_TRUE` if key supports key derivation
+     * (i.e., if other keys can be derived from this one (default `CK_FALSE`)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification
+     * of the attribute during the course of a `C_CopyObject` call.
+     * @returns boolean
+     */
+    derive: boolean;
+    /**
+     * `CK_TRUE` only if key was either * generated locally (i.e., on the token)
+     * with a `C_GenerateKey` or `C_GenerateKeyPair` call * created with a `C_CopyObject` call
+     * as a copy of a key which had its `CKA_LOCAL` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    local: boolean;
+    /**
+     * Identifier of the mechanism used to generate the key material.
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    mechanism: KeyGenMechanism;
+    allowedMechanisms: void;
+}
+
+
+declare class DomainParameters extends Storage {
+    /**
+     * Type of key the domain parameters can be used to generate.
+     */
+    keyType: KeyType;
+    /**
+     * `CK_TRUE` only if domain parameters were either * generated locally (i.e., on the token)
+     * with a `C_GenerateKey` * created with a `C_CopyObject` call as a copy of domain parameters
+     * which had its `CKA_LOCAL` attribute set to `CK_TRUE`
+     */
+    local: boolean;
+}
+
+/**
+ * Data objects (object class `CKO_DATA`) hold information defined by an application.
+ * Other than providing access to it, Cryptoki does not attach any special meaning to a data object
+ */
+declare class Data extends Storage {
+    /**
+     * Description of the application that manages the object (default empty)
+     */
+    application: string;
+    /**
+     * DER-encoding of the object identifier indicating the data object type (default empty)
+     */
+    objectId: Buffer;
+    /**
+     * Value of the object (default empty)
+     */
+    value: Buffer;
+}
+
+interface ITemplate {
+    /**
+     * CKA_CLASS
+     */
+    class?: number;
+    /**
+     * CKA_TOKEN
+     */
+    token?: boolean;
+    /**
+     * CKA_PRIVATE
+     */
+    private?: boolean;
+    /**
+     * CKA_LABEL
+     */
+    label?: string;
+    /**
+     * CKA_APPLICATION
+     */
+    application?: string;
+    /**
+     * CKA_VALUE
+     */
+    value?: Buffer;
+    /**
+     * CKA_OBJECT_ID
+     */
+    objectId?: Buffer;
+    /**
+     * CKA_CERTIFICATE_TYPE
+     */
+    certType?: number;
+    /**
+     * CKA_ISSUER
+     */
+    issuer?: Buffer;
+    /**
+     * CKA_SERIAL_NUMBER
+     */
+    serial?: Buffer;
+    /**
+     * CKA_AC_ISSUER
+     */
+    issuerAC?: Buffer;
+    /**
+     * CKA_OWNER
+     */
+    owner?: Buffer;
+    /**
+     * CKA_ATTR_TYPES
+     */
+    attrTypes?: Buffer;
+    /**
+     * CKA_TRUSTED
+     */
+    trusted?: boolean;
+    /**
+     * CKA_CERTIFICATE_CATEGORY
+     */
+    certCategory?: number;
+    /**
+     * CKA_JAVA_MIDP_SECURITY_DOMAIN
+     */
+    javaDomain?: number;
+    /**
+     * CKA_URL
+     */
+    url?: string;
+    /**
+     * CKA_HASH_OF_SUBJECT_PUBLIC_KEY
+     */
+    ski?: Buffer;
+    /**
+     * CKA_HASH_OF_ISSUER_PUBLIC_KEY
+     */
+    aki?: Buffer;
+    /**
+     * CKA_NAME_HASH_ALGORITHM
+     */
+    digestName?: number;
+    /**
+     * CKA_CHECK_VALUE
+     */
+    checkValue?: Buffer;
+    /**
+     * CKA_KEY_TYPE
+     */
+    keyType?: number;
+    /**
+     * CKA_SUBJECT
+     */
+    subject?: Buffer;
+    /**
+     * CKA_ID
+     */
+    id?: Buffer;
+    /**
+     * CKA_SENSITIVE
+     */
+    sensitive?: boolean;
+    /**
+     * CKA_ENCRYPT
+     */
+    encrypt?: boolean;
+    /**
+     * CKA_DECRYPT
+     */
+    decrypt?: boolean;
+    /**
+     * CKA_WRAP
+     */
+    wrap?: boolean;
+    /**
+     * CKA_UNWRAP
+     */
+    unwrap?: boolean;
+    /**
+     * CKA_SIGN
+     */
+    sign?: boolean;
+    /**
+     * CKA_SIGN_RECOVER
+     */
+    signRecover?: boolean;
+    /**
+     * CKA_VERIFY
+     */
+    verify?: boolean;
+    /**
+     * CKA_VERIFY_RECOVER
+     */
+    verifyRecover?: boolean;
+    /**
+     * CKA_DERIVE
+     */
+    derive?: boolean;
+    /**
+     * CKA_START_DATE
+     */
+    startDate?: Date;
+    /**
+     * CKA_END_DATE
+     */
+    endDate?: Date;
+    /**
+     * CKA_MODULUS
+     */
+    modulus?: Buffer;
+    /**
+     * CKA_MODULUS_BITS
+     */
+    modulusBits?: number;
+    /**
+     * CKA_PUBLIC_EXPONENT
+     */
+    publicExponent?: Buffer;
+    /**
+     * CKA_PRIVATE_EXPONEN
+     */
+    privateExponent?: Buffer;
+    /**
+     * CKA_PRIME_1
+     */
+    prime1?: Buffer;
+    /**
+     * CKA_PRIME_2
+     */
+    prime2?: Buffer;
+    /**
+     * CKA_EXPONENT_1
+     */
+    exp1?: Buffer;
+    /**
+     * CKA_EXPONENT_2
+     */
+    exp2?: Buffer;
+    /**
+     * CKA_COEFFICIEN
+     */
+    coefficient?: Buffer;
+    /**
+     * CKA_PRIME
+     */
+    prime?: Buffer;
+    /**
+     * CKA_SUBPRIME
+     */
+    subprime?: Buffer;
+    /**
+     * CKA_BASE
+     */
+    base?: Buffer;
+    /**
+     * CKA_PRIME_BITS
+     */
+    primeBits?: number;
+    /**
+     * CKA_SUBPRIME_BITS
+     */
+    subprimeBits?: number;
+    /**
+     * CKA_VALUE_BITS
+     */
+    valueBits?: number;
+    /**
+     * CKA_VALUE_LEN
+     */
+    valueLen?: number;
+    /**
+     * CKA_EXTRACTABLE
+     */
+    extractable?: boolean;
+    /**
+     * CKA_LOCAL
+     */
+    local?: boolean;
+    /**
+     * CKA_NEVER_EXTRACTABLE
+     */
+    neverExtractable?: boolean;
+    /**
+     * CKA_ALWAYS_SENSITIVE
+     */
+    alwaysSensitive?: boolean;
+    /**
+     * CKA_KEY_GEN_MECHANISM
+     */
+    keyGenMechanism?: number;
+    /**
+     * CKA_MODIFIABLE
+     */
+    modifiable?: boolean;
+    /**
+     * CKA_COPYABLE
+     */
+    copyable?: boolean;
+    /**
+     * CKA_ECDSA_PARAMS
+     */
+    paramsECDSA?: Buffer;
+    paramsEC?: Buffer;
+    /**
+     * CKA_EC_POINT
+     */
+    pointEC?: Buffer;
+    /**
+     * CKA_SECONDARY_AUTH
+     */
+    secondaryAuth?: boolean;
+    /**
+     * CKA_AUTH_PIN_FLAGS
+     */
+    authPinFlags?: Buffer;
+    /**
+     * CKA_ALWAYS_AUTHENTICATE
+     */
+    alwaysAuth?: boolean;
+    /**
+     * CKA_WRAP_WITH_TRUSTED
+     */
+    wrapWithTrusted?: boolean;
+    /**
+     * CKA_WRAP_TEMPLATE
+     */
+    wrapTemplate?: any;
+    /**
+     * CKA_UNWRAP_TEMPLATE
+     */
+    unwrapTemplate?: any;
+    /**
+     * CKA_OTP_FORMAT
+     */
+    otpFormat?: any;
+    /**
+     * CKA_OTP_LENGTH
+     */
+    otpLength?: any;
+    /**
+     * CKA_OTP_TIME_INTERVAL
+     */
+    otpTimeInterval?: any;
+    /**
+     * CKA_OTP_USER_FRIENDLY_MODE
+     */
+    otpUserFriendlyMode?: any;
+    /**
+     * CKA_OTP_CHALLENGE_REQUIREMENT
+     */
+    otpChallengeReq?: any;
+    /**
+     * CKA_OTP_TIME_REQUIREMENT
+     */
+    otpTimeReq?: any;
+    /**
+     * CKA_OTP_COUNTER_REQUIREMENT
+     */
+    otpCounterReq?: any;
+    /**
+     * CKA_OTP_PIN_REQUIREMENT
+     */
+    otppinReq?: any;
+    /**
+     * CKA_OTP_COUNTER
+     */
+    otpCounter?: any;
+    /**
+     * CKA_OTP_TIME
+     */
+    otpTime?: any;
+    /**
+     * CKA_OTP_USER_IDENTIFIER
+     */
+    OtpUserId?: any;
+    /**
+     * CKA_OTP_SERVICE_IDENTIFIER
+     */
+    otpServiceId?: any;
+    /**
+     * CKA_OTP_SERVICE_LOGO
+     */
+    otpServiceLogo?: any;
+    /**
+     * CKA_OTP_SERVICE_LOGO_TYPE
+     */
+    otpServiceLogoType?: any;
+    /**
+     * CKA_HW_FEATURE_TYPE
+     */
+    hwFeatureType?: any;
+    /**
+     * CKA_RESET_ON_INIT
+     */
+    resetOnInit?: any;
+    /**
+     * CKA_HAS_RESET
+     */
+    hasReset?: any;
+    /**
+     * CKA_PIXEL_X
+     */
+    pixelX?: any;
+    /**
+     * CKA_PIXEL_Y
+     */
+    pixelY?: any;
+    /**
+     * CKA_RESOLUTION
+     */
+    resolution?: any;
+    /**
+     * CKA_CHAR_ROWS
+     */
+    charRows?: any;
+    /**
+     * CKA_CHAR_COLUMNS
+     */
+    charCols?: any;
+    /**
+     * CKA_COLOR
+     */
+    color?: any;
+    /**
+     * CKA_BITS_PER_PIXEL
+     */
+    bitsPerPixel?: any;
+    /**
+     * CKA_CHAR_SETS
+     */
+    charSets?: any;
+    /**
+     * CKA_ENCODING_METHODS
+     */
+    encMethod?: any;
+    /**
+     * CKA_MIME_TYPES
+     */
+    mimeTypes?: any;
+    /**
+     * CKA_MECHANISM_TYPE
+     */
+    mechanismType?: any;
+    /**
+     * CKA_REQUIRED_CMS_ATTRIBUTES
+     */
+    requiredCmsAttrs?: any;
+    /**
+     * CKA_DEFAULT_CMS_ATTRIBUTES
+     */
+    defaultCmsAttrs?: any;
+    /**
+     * CKA_SUPPORTED_CMS_ATTRIBUTES
+     */
+    suportedCmsAttrs?: any;
+    /**
+     * CKA_ALLOWED_MECHANISMS
+     */
+    allowedMechanisms?: any;
+}
+declare class Attribute {
+    protected $value: Buffer;
+    type: number;
+    name: string;
+    convertType: string;
+    length: number;
+    value: any;
+    constructor(type: number, value?: any);
+    constructor(type: string, value?: any);
+    get(): any;
+    set(template: any): void;
+}
+declare class Template {
+    protected attrs: Attribute[];
+    length: number;
+    constructor(template: string);
+    constructor(template: ITemplate);
+    set(v: any): Template;
+    ref(): Buffer;
+    serialize(): any;
+}
+
+declare class BaseObject {
+    protected lib: Pkcs11;
+    constructor(lib?: Pkcs11);
+}
+declare class HandleObject extends BaseObject {
+    /**
+     * handle to pkcs11 object
+     */
+    handle: number;
+    constructor(handle: number, lib: Pkcs11);
+    protected getInfo(): void;
+}
+
+declare enum ObjectClass {
+    DATA,
+    CERTIFICATE,
+    PUBLIC_KEY,
+    PRIVATE_KEY,
+    SECRET_KEY,
+    HW_FEATURE,
+    DOMAIN_PARAMETERS,
+    MECHANISM,
+    OTP_KEY,
+}
+
+declare class SessionObject extends HandleObject {
+    /**
+     * Session
+     */
+    session: Session;
+    /**
+     * gets the size of an object in bytes
+     */
+    size: number;
+    constructor(object: SessionObject);
+    constructor(handle: number, session: Session, lib: Pkcs11);
+    /**
+     * copies an object, creating a new object for the copy
+     * @param {ITemplate} template template for the new object
+     */
+    copy(template: ITemplate): SessionObject;
+    /**
+     * destroys an object
+     */
+    destroy(): void;
+    getAttribute(attr: string): ITemplate;
+    getAttribute(attrs: ITemplate): ITemplate;
+    setAttribute(attrs: string, value: any): any;
+    setAttribute(attrs: ITemplate): any;
+    protected get(name: string): any;
+    protected set(name: string, value: any): void;
+    class: ObjectClass;
+    toType<T extends SessionObject>(): T;
+}
+
+declare class SessionObjectCollection extends Collection<SessionObject> {
+    session: Session;
+    items(index: number): SessionObject;
+    constructor(items: Array<number>, session: Session, lib: Pkcs11, classType?: any);
+}
+
+/**
+ * Private key objects (object class `CKO_PRIVATE_KEY`) hold private keys
+ */
+declare class PrivateKey extends Key {
+    /**
+     * DER-encoding of the key subject name (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     */
+    subject: Buffer;
+    /**
+     * `CK_TRUE` if key is sensitive
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Attribute cannot be changed once set to CK_TRUE. It becomes a read only attribute.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    sensitive: boolean;
+    /**
+     * `CK_TRUE` if key supports decryption
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    decrypt: boolean;
+    /**
+     * `CK_TRUE` if key supports signatures where the signature is an appendix to the data
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    sign: boolean;
+    /**
+     * `CK_TRUE` if key supports signatures where the data can be recovered from the signature
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    signRecover: boolean;
+    /**
+     * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    unwrap: boolean;
+    /**
+     * `CK_TRUE` if key is extractable and can be wrapped
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    extractable: boolean;
+    /**
+     * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    alwaysSensitive: boolean;
+    /**
+     * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    neverExtractable: boolean;
+    /**
+     * `CK_TRUE` if the key can only be wrapped with a wrapping key
+     * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
+     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
+     */
+    wrapTrusted: boolean;
+    /**
+     * For wrapping keys. The attribute template to apply to any keys unwrapped
+     * using this wrapping key. Any user supplied template is applied after this template
+     * as if the object has already been created.
+     */
+    template: void;
+    alwaysAuthenticate: boolean;
+}
+
+/**
+ * Public key objects (object class CKO_PUBLIC_KEY) hold public keys
+ */
+declare class PublicKey extends Key {
+    /**
+     * DER-encoding of the key subject name (default empty)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     */
+    subject: Buffer;
+    /**
+     * `CK_TRUE` if key supports encryption
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    encrypt: boolean;
+    /**
+     * `CK_TRUE` if key supports verification where the signature is an appendix to the data
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    verify: boolean;
+    /**
+     * `CK_TRUE` if key supports verification where the data is recovered from the signature
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    verifyRecover: boolean;
+    /**
+     * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    wrap: boolean;
+    /**
+     * The key can be trusted for the application that it was created.
+     * - The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
+     * - Can only be set to CK_TRUE by the SO user.
+     */
+    trusted: boolean;
+    /**
+     * For wrapping keys. The attribute template to match against any keys wrapped using this wrapping key.
+     * Keys that do not match cannot be wrapped.
+     */
+    template: void;
+}
+
+/**
+ * Secret key objects (object class `CKO_SECRET_KEY`) hold secret keys.
+ */
+declare class SecretKey extends Key {
+    /**
+     * `CK_TRUE` if key is sensitive
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
+     */
+    sensitive: boolean;
+    /**
+     * `CK_TRUE` if key supports encryption
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    encrypt: boolean;
+    /**
+     * `CK_TRUE` if key supports decryption
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    decrypt: boolean;
+    /**
+     * `CK_TRUE` if key supports verification (i.e., of authentication codes) where the signature is an appendix to the data
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    verify: boolean;
+    /**
+     * 	`CK_TRUE` if key supports signatures (i.e., authentication codes) where the signature is an appendix to the data
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    sign: boolean;
+    /**
+     * `CK_TRUE` if key supports wrapping (i.e., can be used to wrap other keys)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    wrap: boolean;
+    /**
+     * `CK_TRUE` if key supports unwrapping (i.e., can be used to unwrap other keys)
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    unwrap: boolean;
+    /**
+     * `CK_TRUE` if key is extractable and can be wrapped
+     * - May be modified after object is created with a `C_SetAttributeValue` call,
+     * or in the process of copying object with a `C_CopyObject` call.
+     * However, it is possible that a particular token may not permit modification of the attribute
+     * during the course of a `C_CopyObject` call.
+     * - Attribute cannot be changed once set to `CK_FALSE`. It becomes a read only attribute.
+     * - Default value is token-specific, and may depend on the values of other attributes.
+     */
+    extractable: boolean;
+    /**
+     * `CK_TRUE` if key has always had the `CKA_SENSITIVE` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    alwaysSensitive: boolean;
+    /**
+     * `CK_TRUE` if key has never had the `CKA_EXTRACTABLE` attribute set to `CK_TRUE`
+     * - Must not be specified when object is created with `C_CreateObject`.
+     * - Must not be specified when object is generated with `C_GenerateKey` or `C_GenerateKeyPair`.
+     * - Must not be specified when object is unwrapped with `C_UnwrapKey`.
+     */
+    neverExtractable: boolean;
+    /**
+     * Key checksum
+     */
+    checkValue: Buffer;
+    /**
+     * `CK_TRUE` if the key can only be wrapped with a wrapping key
+     * that has `CKA_TRUSTED` set to `CK_TRUE`. Default is `CK_FALSE`.
+     * - Attribute cannot be changed once set to `CK_TRUE`. It becomes a read only attribute.
+     */
+    wrapTrusted: boolean;
+    /**
+     * The wrapping key can be used to wrap keys with `CKA_WRAP_WITH_TRUSTED` set to `CK_TRUE`.
+     * - Can only be set to CK_TRUE by the SO user.
+     */
+    trusted: boolean;
+    /**
+     * For wrapping keys.
+     * The attribute template to match against any keys wrapped using this wrapping key.
+     * Keys that do not match cannot be wrapped.
+     */
+    wrapTemplate: void;
+    /**
+     * For wrapping keys.
+     * The attribute template to apply to any keys unwrapped using this wrapping key.
+     * Any user supplied template is applied after this template as if the object has already been created.
+     */
+    unwrapTemplate: void;
+}
+
+
+interface ISlotInfo {
+    slotDescription: string;
+    manufacturerID: string;
+    flags: number;
+    hardwareVersion: IVersion;
+    firmwareVersion: IVersion;
+}
+
+declare enum SlotFlag {
+    /**
+     * `True` if a token is present in the slot (e.g., a device is in the reader)
+     */
+    TOKEN_PRESENT,
+    /**
+     * `True` if the reader supports removable devices
+     */
+    REMOVABLE_DEVICE,
+    /**
+     * True if the slot is a hardware slot, as opposed to a software slot implementing a "soft token"
+     */
+    HW_SLOT,
+}
+
+interface IVersion {
+    major: number;
+    minor: number;
+}
+interface IModuleInfo {
+    cryptokiVersion: IVersion;
+    manufacturerID: string;
+    flags: number;
+    libraryDescription: string;
+    libraryVersion: IVersion;
+}
+
+declare class Collection<T extends HandleObject> {
+    protected items_: Array<number>;
+    protected classType: any;
+    protected lib: Pkcs11;
+    constructor(items: Array<number>, lib: Pkcs11, classType: any);
+    /**
+     * returns length of collection
+     */
+    length: number;
+    /**
+     * returns item from collection by index
+     * @param {number} index of element in collection `[0..n]`
+     */
+    items(index: number): T;
+}
+
+declare enum SessionOpenFlag {
+    /**
+     * session is r/w
+     */
+    RW_SESSION,
+    /**
+     * no parallel
+     */
+    SERIAL_SESSION,
+}
+declare enum SessionFlag {
+    /**
+     * `True` if the session is read/write; `false` if the session is read-only
+     */
+    RW_SESSION,
+    /**
+     * This flag is provided for backward compatibility, and should always be set to `true`
+     */
+    SERIAL_SESSION,
+}
+declare enum UserType {
+    /**
+     * Security Officer
+     */
+    SO,
+    /**
+     * User
+     */
+    USER,
+    /**
+     * Context specific
+     */
+    CONTEXT_SPECIFIC,
+}
+interface IKeyPair {
+    privateKey: PrivateKey;
+    publicKey: PublicKey;
+}
+/**
+ * provides information about a session
+ */
+declare class Session extends HandleObject {
+    constructor(handle: number, slot: Slot, lib: Pkcs11);
+    slot: Slot;
+    /**
+     * the state of the session
+     */
+    state: number;
+    /**
+     * bit flags that define the type of session
+     */
+    flags: number;
+    /**
+     * an error code defined by the cryptographic device. Used for errors not covered by Cryptoki
+     */
+    deviceError: number;
+    protected getInfo(): void;
+    /**
+     * closes a session between an application and a token
+     */
+    close(): void;
+    /**
+     * initializes the normal user's PIN
+     * @param {string} pin the normal user's PIN
+     */
+    initPin(pin: string): void;
+    /**
+     * modifies the PIN of the user who is logged in
+     * @param {string} oldPin
+     * @param {string} newPin
+     */
+    setPin(oldPin: string, newPin: string): void;
+    /**
+     * obtains a copy of the cryptographic operations state of a session, encoded as a string of bytes
+     */
+    getOperationState(): Buffer;
+    /**
+     * restores the cryptographic operations state of a session
+     * from a string of bytes obtained with getOperationState
+     * @param {Buffer} state the saved state
+     * @param {number} encryptionKey holds key which will be used for an ongoing encryption
+     * or decryption operation in the restored session
+     * (or 0 if no encryption or decryption key is needed,
+     * either because no such operation is ongoing in the stored session
+     * or because all the necessary key information is present in the saved state)
+     * @param {number} authenticationKey holds a handle to the key which will be used for an ongoing signature,
+     * MACing, or verification operation in the restored session
+     * (or 0 if no such key is needed, either because no such operation is ongoing in the stored session
+     * or because all the necessary key information is present in the saved state)
+     */
+    setOperationState(state: Buffer, encryptionKey?: number, authenticationKey?: number): void;
+    /**
+     * logs a user into a token
+     * @param {string} pin the user's PIN.
+     * - This standard allows PIN values to contain any valid `UTF8` character,
+     * but the token may impose subset restrictions
+     * @param {} userType the user type. Default is `USER`
+     */
+    login(pin: string, userType?: UserType): void;
+    /**
+     * logs a user out from a token
+     */
+    logout(): void;
+    /**
+     * creates a new object
+     * - Only session objects can be created during a read-only session.
+     * - Only public objects can be created unless the normal user is logged in.
+     * @param {ITemplate} template the object's template
+     */
+    create(template: ITemplate): SessionObject;
+    /**
+     * removes all session objects matched to template
+     * - if template is null, removes all session objects
+     * - returns a number of destroied session objects
+     * @param {ITemplate} template template
+     */
+    destroy(template: ITemplate): number;
+    /**
+     * @param {SessionObject} object
+     */
+    destroy(object: SessionObject): number;
+    destroy(): number;
+    /**
+     * removes all session objects
+     * - returns a number of destroied session objects
+     */
+    clear(): number;
+    /**
+     * returns a collection of session objects mached to template
+     * @param template template
+     * @param callback optional callback function wich is called for each founded object
+     * - if callback function returns false, it breaks find function.
+     */
+    find(callback?: (obj: SessionObject) => void): SessionObjectCollection;
+    find(template: ITemplate, callback?: (obj: SessionObject) => void): SessionObjectCollection;
+    /**
+     * Returns object from session by handle
+     * @param  {number} handle handle of object
+     * @returns T
+     */
+    getObject<T extends SessionObject>(handle: number): T;
+    /**
+     * generates a secret key or set of domain parameters, creating a new object.
+     * @param mechanism generation mechanism
+     * @param template template for the new key or set of domain parameters
+     */
+    generateKey(mechanism: MechanismType, template?: ITemplate): SecretKey;
+    generateKey(mechanism: MechanismType, template: ITemplate, callback: (err: Error, key: SecretKey) => void): void;
+    generateKeyPair(mechanism: MechanismType, publicTemplate: ITemplate, privateTemplate: ITemplate): IKeyPair;
+    createSign(alg: MechanismType, key: Key): Sign;
+    createVerify(alg: MechanismType, key: Key): Verify;
+    createCipher(alg: MechanismType, key: Key): Cipher;
+    createDecipher(alg: MechanismType, key: Key): Decipher;
+    createDigest(alg: MechanismType): Digest;
+    wrapKey(alg: MechanismType, wrappingKey: Key, key: Key): Buffer;
+    unwrapKey(alg: MechanismType, unwrappingKey: Key, wrappedKey: Buffer, template: ITemplate): Key;
+    /**
+     * derives a key from a base key, creating a new key object
+     * @param {MechanismType} alg key deriv. mech
+     * @param {Key} baseKey base key
+     * @param {ITemplate} template new key template
+     */
+    deriveKey(alg: MechanismType, baseKey: Key, template: ITemplate): SecretKey;
+    /**
+     * generates random data
+     * @param {number} size \# of bytes to generate
+     */
+    generateRandom(size: number): Buffer;
+}
+
+declare enum TokenFlag {
+    RNG,
+    WRITE_PROTECTED,
+    LOGIN_REQUIRED,
+    USER_PIN_INITIALIZED,
+    RESTORE_KEY_NOT_NEEDED,
+    CLOCK_ON_TOKEN,
+    PROTECTED_AUTHENTICATION_PATH,
+    DUAL_CRYPTO_OPERATIONS,
+    TOKEN_INITIALIZED,
+    SECONDARY_AUTHENTICATION,
+    USER_PIN_COUNT_LOW,
+    USER_PIN_FINAL_TRY,
+    USER_PIN_LOCKED,
+    USER_PIN_TO_BE_CHANGED,
+    SO_PIN_COUNT_LOW,
+    SO_PIN_FINAL_TRY,
+    SO_PIN_LOCKED,
+    SO_PIN_TO_BE_CHANGED,
+}
+declare class Token extends HandleObject {
+    /**
+     * application-defined label, assigned during token initialization.
+     * - Must be padded with the blank character (' ').
+     * - Should __not__ be null-terminated.
+     */
+    label: string;
+    /**
+     * ID of the device manufacturer.
+     * - Must be padded with the blank character (' ').
+     * - Should __not__ be null-terminated.
+     */
+    manufacturerID: string;
+    /**
+     * model of the device.
+     * - Must be padded with the blank character (' ').
+     * - Should __not__ be null-terminated.
+     */
+    model: string;
+    /**
+     * character-string serial number of the device.
+     * - Must be padded with the blank character (' ').
+     * - Should __not__ be null-terminated.
+     */
+    serialNumber: string;
+    /**
+     * bit flags indicating capabilities and status of the device
+     */
+    flags: number;
+    /**
+     * maximum number of sessions that can be opened with the token at one time by a single application
+     */
+    maxSessionCount: number;
+    /**
+     * number of sessions that this application currently has open with the token
+     */
+    sessionCount: number;
+    /**
+     * maximum number of read/write sessions that can be opened
+     * with the token at one time by a single application
+     */
+    maxRwSessionCount: number;
+    /**
+     * number of read/write sessions that this application currently has open with the token
+     */
+    rwSessionCount: number;
+    /**
+     * maximum length in bytes of the PIN
+     */
+    maxPinLen: number;
+    /**
+     * minimum length in bytes of the PIN
+     */
+    minPinLen: number;
+    /**
+     * the total amount of memory on the token in bytes in which public objects may be stored
+     */
+    totalPublicMemory: number;
+    /**
+     * the amount of free (unused) memory on the token in bytes for public objects
+     */
+    freePublicMemory: number;
+    /**
+     * the total amount of memory on the token in bytes in which private objects may be stored
+     */
+    totalPrivateMemory: number;
+    /**
+     * the amount of free (unused) memory on the token in bytes for private objects
+     */
+    freePrivateMemory: number;
+    /**
+     * version number of hardware
+     */
+    hardwareVersion: IVersion;
+    /**
+     * version number of firmware
+     */
+    firmwareVersion: IVersion;
+    /**
+     * current time as a character-string of length 16,
+     * represented in the format YYYYMMDDhhmmssxx
+     */
+    utcTime: Date;
+    constructor(handle: number, lib: Pkcs11);
+    protected getInfo(): void;
+}
+
+declare class Slot extends HandleObject implements ISlotInfo {
+    slotDescription: string;
+    manufacturerID: string;
+    flags: number;
+    hardwareVersion: IVersion;
+    firmwareVersion: IVersion;
+    module: Module;
+    constructor(handle: number, module: Module, lib: Pkcs11);
+    protected getInfo(): void;
+    getToken(): Token;
+    /**
+     * returns list of `MechanismInfo`
+     */
+    getMechanisms(): MechanismCollection;
+    /**
+     * initializes a token
+     * @param {string} pin the SO's initial PIN
+     * @param {string} label label of the token
+     */
+    initToken(pin: string, label: string): void;
+    /**
+     * opens a session between an application and a token in a particular slot
+     * @parsm flags indicates the type of session
+     */
+    open(flags?: number): Session;
+    /**
+     * closes all sessions an application has with a token
+     */
+    closeAll(): void;
+}
+
+declare class SlotCollection extends Collection<Slot> {
+    module: Module;
+    items(index: number): Slot;
+    constructor(items: Array<number>, module: Module, lib: Pkcs11, classType?: any);
+}
+
+declare class Module extends BaseObject implements IModuleInfo {
+    libFile: string;
+    libName: string;
+    /**
+     * Cryptoki interface version
+     */
+    cryptokiVersion: IVersion;
+    /**
+     * blank padded manufacturer ID
+     */
+    manufacturerID: string;
+    /**
+     * must be zero
+     */
+    flags: number;
+    /**
+     * blank padded library description
+     */
+    libraryDescription: string;
+    /**
+     * version of library
+     */
+    libraryVersion: IVersion;
+    constructor(lib: Pkcs11);
+    protected getInfo(): void;
+    /**
+     * initializes the Cryptoki library
+     */
+    initialize(): void;
+    /**
+     * indicates that an application is done with the Cryptoki library
+     */
+    finalize(): void;
+    /**
+     * obtains a list of slots in the system
+     * @param {number} index index of an element in collection
+     * @param {number} tokenPresent only slots with tokens. Default `True`
+     */
+    getSlots(index: number, tokenPresent?: boolean): Slot;
+    /**
+     * @param {number} tokenPresent only slots with tokens. Default `True`
+     */
+    getSlots(tokenPresent?: boolean): SlotCollection;
+    /**
+     * loads pkcs11 lib
+     */
+    static load(libFile: string, libName?: string): Module;
+}
+
+declare class Cipher {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
+    protected init(alg: MechanismType, key: Key): void;
+    update(text: string): Buffer;
+    update(data: Buffer): Buffer;
+    final(): Buffer;
+}
+
+declare class Decipher {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
+    protected init(alg: MechanismType, key: Key): void;
+    update(text: string): Buffer;
+    update(data: Buffer): Buffer;
+    final(): Buffer;
+}
+
+declare class Digest {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, lib: Pkcs11);
+    protected init(alg: MechanismType): void;
+    update(text: string): void;
+    update(data: Buffer): void;
+    final(): Buffer;
+}
+
+declare class Sign {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
+    protected init(alg: MechanismType, key: Key): void;
+    update(text: string): void;
+    update(data: Buffer): void;
+    final(): Buffer;
+}
+
+declare class Verify {
+    session: Session;
+    lib: Pkcs11;
+    constructor(session: Session, alg: MechanismType, key: Key, lib: Pkcs11);
+    protected init(alg: MechanismType, key: Key): void;
+    update(text: string): void;
+    update(data: Buffer): void;
+    final(signature: Buffer): boolean;
+}
+
+/**
+ * 
+ * EC
+ * 
+ */
+
+/**
+ * EcKdf is used to indicate the Key Derivation Function (KDF)
+ * applied to derive keying data from a shared secret.
+ * The key derivation function will be used by the EC key agreement schemes.
+ */
+declare enum EcKdf {
+    NULL,
+    SHA1,
+    SHA224,
+    SHA256,
+    SHA384,
+    SHA512,
+}
+
+declare class EcdhParams implements IParams {
+    /**
+     * key derivation function used on the shared secret value
+     */
+    kdf: EcKdf;
+    /**
+     * some data shared between the two parties
+     */
+    sharedData: Buffer;
+    /**
+     * other party's EC public key value
+     */
+    publicData: Buffer;
+    /**
+     * @param  {EcKdf} kdf key derivation function used on the shared secret value
+     * @param  {Buffer=null} sharedData some data shared between the two parties
+     * @param  {Buffer=null} publicData other party's EC public key value
+     */
+    constructor(kdf: EcKdf, sharedData?: Buffer, publicData?: Buffer);
+    toCKI(): Buffer;
+}
+
+export interface INamedCurve {
+    name: string;
+    oid: string;
+    value: Buffer;
+    size: number;
+}
+
+declare class NamedCurve {
+    static getByName(name: string): INamedCurve;
+    static getByOid(oid: string): INamedCurve;
+}
+
+/**
+ * 
+ * AES
+ * 
+ */
+
+declare class AesCbcParams implements IParams {
+    /**
+     * initialization vector
+     * - must have a fixed size of 16 bytes
+     */
+    iv: Buffer;
+    /**
+     * the data
+     */
+    data: Buffer;
+    constructor(iv: Buffer, data: Buffer);
+    toCKI(): Buffer;
+}
+
+declare class AesCcmParams implements IParams {
+    /**
+     * length of the data where 0 <= dataLength < 2^8L
+     */
+    dataLength: number;
+    /**
+     * the nonce
+     */
+    nonce: Buffer;
+    /**
+     * the additional authentication data
+     * - This data is authenticated but not encrypted
+     */
+    aad: Buffer;
+    /**
+     * length of authentication tag (output following cipher text) in bits.
+     * - Can be any value between 0 and 128
+     */
+    macLength: number;
+    constructor(dataLength: number, nonce: Buffer, aad?: Buffer, macLength?: number);
+    toCKI(): Buffer;
+}
+
+declare class AesGcmParams implements IParams {
+    /**
+     * initialization vector
+     * - The length of the initialization vector can be any number between 1 and 256.
+     * 96-bit (12 byte) IV values can be processed more efficiently,
+     * so that length is recommended for situations in which efficiency is critical.
+     */
+    iv: Buffer;
+    /**
+     * pointer to additional authentication data.
+     * This data is authenticated but not encrypted.
+     */
+    aad: Buffer;
+    /**
+     * length of authentication tag (output following cipher text) in bits.
+     * Can be any value between 0 and 128. Default 128
+     */
+    tagBits: number;
+    constructor(iv: Buffer, aad?: Buffer, tagBits?: number);
+    toCKI(): Buffer;
+}
+
+/**
+ * 
+ * RSA
+ * 
+ */
+
+declare enum RsaMgf {
+    MGF1_SHA1,
+    MGF1_SHA224,
+    MGF1_SHA256,
+    MGF1_SHA384,
+    MGF1_SHA512,
+}
+
+declare class RsaOaepParams implements IParams {
+    hashAlgorithm: MechanismEnum;
+    mgf: RsaMgf;
+    source: number;
+    sourceData: Buffer;
+    constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, sourceData?: Buffer);
+    toCKI(): Buffer;
+}
+
+declare class RsaPssParams implements IParams {
+    /**
+     * hash algorithm used in the PSS encoding;
+     * - if the signature mechanism does not include message hashing,
+     * then this value must be the mechanism used by the application to generate
+     * the message hash;
+     * - if the signature mechanism includes hashing,
+     * then this value must match the hash algorithm indicated
+     * by the signature mechanism
+     */
+    hashAlgorithm: MechanismEnum;
+    /**
+     * mask generation function to use on the encoded block
+     */
+    mgf: RsaMgf;
+    /**
+     * length, in bytes, of the salt value used in the PSS encoding;
+     * - typical values are the length of the message hash and zero
+     */
+    saltLength: number;
+    constructor(hashAlg?: MechanismEnum, mgf?: RsaMgf, saltLen?: number);
+    toCKI(): Buffer;
+}
diff --git a/graphviz/graphviz.d.ts b/graphviz/graphviz.d.ts
index cdc6ba0141..f9d5178dcb 100644
--- a/graphviz/graphviz.d.ts
+++ b/graphviz/graphviz.d.ts
@@ -5,37 +5,37 @@
 
 // graphviz.d.ts
 
-declare module 'graphviz' {
 
-  export interface HasAttributes {
+
+export interface HasAttributes {
     set(name: string, value: any): void;
     get(name: string): any;
-  }
+}
 
-  export interface Node extends HasAttributes {
-  }
+export interface Node extends HasAttributes {
+}
 
-  export interface Edge extends HasAttributes {
-  }
+export interface Edge extends HasAttributes {
+}
 
-  export interface OutputCallback {
+export interface OutputCallback {
     (data: string): void;
-  }
+}
 
-  export interface ErrorCallback {
+export interface ErrorCallback {
     (code: number, stdout: string, stderr: string): void;
-  }
+}
 
-  export interface RenderOptions {
+export interface RenderOptions {
     type: string;  // output file type (png, jpeg, ps, ...)
     use: string;  // Graphviz command to use (dot, neato, ...)
     path: string;  // GraphViz path
     G: any;  // graph options
     N: any;  // node options
     E: any;  // edge options
-  }
+}
 
-  export interface Graph extends HasAttributes {
+export interface Graph extends HasAttributes {
 
     addNode(id: string, attrs?: any): Node;
     nodeCount(): number;
@@ -78,16 +78,14 @@ declare module 'graphviz' {
     output(options: RenderOptions, filename: string, errback?: ErrorCallback): void;
     output(type: string, callback: OutputCallback, errback?: ErrorCallback): void;
     output(options: RenderOptions, callback: OutputCallback, errback?: ErrorCallback): void;
-  }
-
-  export function graph(id: string): Graph;
-
-  export function digraph(id: string): Graph;
-
-  interface ParseCallback {
-    (graph: Graph): void;
-  }
-
-  export function parse(path: string, callback: ParseCallback, errback?: ErrorCallback): void;
-
 }
+
+declare export function graph(id: string): Graph;
+
+declare export function digraph(id: string): Graph;
+
+interface ParseCallback {
+    (graph: Graph): void;
+}
+
+declare export function parse(path: string, callback: ParseCallback, errback?: ErrorCallback): void;
diff --git a/gulp-autoprefixer/gulp-autoprefixer.d.ts b/gulp-autoprefixer/gulp-autoprefixer.d.ts
index a3b96bdb4a..2e6b53bd74 100644
--- a/gulp-autoprefixer/gulp-autoprefixer.d.ts
+++ b/gulp-autoprefixer/gulp-autoprefixer.d.ts
@@ -5,16 +5,15 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-autoprefixer" {
-    namespace autoPrefixer {
-        interface Options {
-            browsers?: string[];
-            cascade?: boolean;
-            remove?: boolean;
-        }
+
+declare namespace autoPrefixer {
+    interface Options {
+        browsers?: string[];
+        cascade?: boolean;
+        remove?: boolean;
     }
-
-    function autoPrefixer(opts?: autoPrefixer.Options): NodeJS.ReadWriteStream;
-
-    export = autoPrefixer;
 }
+
+declare function autoPrefixer(opts?: autoPrefixer.Options): NodeJS.ReadWriteStream;
+
+export = autoPrefixer;
diff --git a/gulp-babel/gulp-babel.d.ts b/gulp-babel/gulp-babel.d.ts
index 954ddae69d..353243e285 100644
--- a/gulp-babel/gulp-babel.d.ts
+++ b/gulp-babel/gulp-babel.d.ts
@@ -5,38 +5,37 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-babel' {
-	function babel(options?: {
-		filename?: string,
-		filenameRelative?: string,
-		presets?: string[],
-		plugins?: string[],
-		highlightCode?: boolean,
-		only?: string | string[],
-		ignore?: string | string[],
-		auxiliaryCommentBefore?: any,
-		auxiliaryCommentAfter?: any,
-		sourceMaps?: any,
-		inputSourceMap?: any,
-		sourceMapTarget?: any,
-		sourceFileName?: any,
-		sourceRoot?: any,
-		moduleRoot?: any,
-		moduleIds?: any,
-		moduleId?: any,
-		getModuleId?: any,
-		resolveModuleSource?: any,
-		keepModuleIdExtesions?: boolean,
-		code?: boolean,
-		ast?: boolean,
-		compact?: any,
-		comments?: boolean,
-		shouldPrintComment?: any,
-		env?: any,
-		retainLines?: boolean
-	}): NodeJS.ReadWriteStream;
 
-	namespace babel { }
+declare function babel(options?: {
+    filename?: string,
+    filenameRelative?: string,
+    presets?: string[],
+    plugins?: string[],
+    highlightCode?: boolean,
+    only?: string | string[],
+    ignore?: string | string[],
+    auxiliaryCommentBefore?: any,
+    auxiliaryCommentAfter?: any,
+    sourceMaps?: any,
+    inputSourceMap?: any,
+    sourceMapTarget?: any,
+    sourceFileName?: any,
+    sourceRoot?: any,
+    moduleRoot?: any,
+    moduleIds?: any,
+    moduleId?: any,
+    getModuleId?: any,
+    resolveModuleSource?: any,
+    keepModuleIdExtesions?: boolean,
+    code?: boolean,
+    ast?: boolean,
+    compact?: any,
+    comments?: boolean,
+    shouldPrintComment?: any,
+    env?: any,
+    retainLines?: boolean
+}): NodeJS.ReadWriteStream;
 
-	export = babel;
-}
+declare namespace babel { }
+
+export = babel;
diff --git a/gulp-cached/gulp-cached.d.ts b/gulp-cached/gulp-cached.d.ts
index c82876ca78..ba373457bc 100644
--- a/gulp-cached/gulp-cached.d.ts
+++ b/gulp-cached/gulp-cached.d.ts
@@ -5,35 +5,30 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-cached"
-{
-    interface ICacheStore
-    {
-        [name: string]: {};
-    }
 
-    interface IOptions
-    {
-        /**
-         * Uses md5 instead of storing the whole file contents.
-         * @default false
-         */
-        optimizeMemory?: boolean;
-    }
-
-    interface IGulpCached
-    {
-        /**
-         * Creates a new cache hash or uses an existing one.
-         */
-        (name: string, options?: IOptions): NodeJS.ReadWriteStream;
-
-        /**
-         * Cache store.
-         */
-        caches: ICacheStore;
-    }
-
-    const cached: IGulpCached;
-    export = cached;
+interface ICacheStore {
+    [name: string]: {};
 }
+
+interface IOptions {
+    /**
+     * Uses md5 instead of storing the whole file contents.
+     * @default false
+     */
+    optimizeMemory?: boolean;
+}
+
+interface IGulpCached {
+    /**
+     * Creates a new cache hash or uses an existing one.
+     */
+    (name: string, options?: IOptions): NodeJS.ReadWriteStream;
+
+    /**
+     * Cache store.
+     */
+    caches: ICacheStore;
+}
+
+declare const cached: IGulpCached;
+export = cached;
diff --git a/gulp-changed/gulp-changed.d.ts b/gulp-changed/gulp-changed.d.ts
index bbe1a26450..b1295faf92 100644
--- a/gulp-changed/gulp-changed.d.ts
+++ b/gulp-changed/gulp-changed.d.ts
@@ -6,55 +6,49 @@
 /// <reference path="../node/node.d.ts"/>
 /// <reference path="../vinyl/vinyl.d.ts"/>
 
-declare module "gulp-changed"
-{
-    import { Transform } from "stream";
-    import File = require("vinyl");
 
-    interface IComparator
-    {
-        /**
-         * @param stream Should be used to queue sourceFile if it passes some comparison
-         * @param callback Should be called when done
-         * @param sourceFile File to operate on
-         * @param destPath Destination for sourceFile as an absolute path
-         */
-        (stream: Transform, callback: Function, sourceFile: File, destPath: string): void;
-    }
+import { Transform } from "stream";
+import File = require("vinyl");
 
-    interface IDestination
-    {
-        (file: string|Buffer): string;
-    }
-
-    interface IOptions
-    {
-        /**
-         * The working directory the folder is relative to.
-         * @default process.cwd()
-         */
-        cwd?: string;
-
-        /**
-         * Extension of the destination files.
-         */
-        extension?: string;
-
-        /**
-         * Function that determines whether the source file is different from the destination file.
-         * @default changed.compareLastModifiedTime
-         */
-        hasChanged?: IComparator;
-    }
-
-    interface IGulpChanged
-    {
-        (destination: string|IDestination, options?: IOptions): NodeJS.ReadWriteStream;
-
-        compareLastModifiedTime: IComparator;
-        compareSha1Digest: IComparator;
-    }
-
-    const changed: IGulpChanged;
-    export = changed;
+interface IComparator {
+    /**
+     * @param stream Should be used to queue sourceFile if it passes some comparison
+     * @param callback Should be called when done
+     * @param sourceFile File to operate on
+     * @param destPath Destination for sourceFile as an absolute path
+     */
+    (stream: Transform, callback: Function, sourceFile: File, destPath: string): void;
 }
+
+interface IDestination {
+    (file: string | Buffer): string;
+}
+
+interface IOptions {
+    /**
+     * The working directory the folder is relative to.
+     * @default process.cwd()
+     */
+    cwd?: string;
+
+    /**
+     * Extension of the destination files.
+     */
+    extension?: string;
+
+    /**
+     * Function that determines whether the source file is different from the destination file.
+     * @default changed.compareLastModifiedTime
+     */
+    hasChanged?: IComparator;
+}
+
+interface IGulpChanged {
+    (destination: string | IDestination, options?: IOptions): NodeJS.ReadWriteStream;
+
+    compareLastModifiedTime: IComparator;
+    compareSha1Digest: IComparator;
+}
+
+declare const changed: IGulpChanged;
+export = changed;
diff --git a/gulp-cheerio/gulp-cheerio.d.ts b/gulp-cheerio/gulp-cheerio.d.ts
index 2aec1d07da..3871ef12de 100644
--- a/gulp-cheerio/gulp-cheerio.d.ts
+++ b/gulp-cheerio/gulp-cheerio.d.ts
@@ -7,28 +7,26 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../vinyl/vinyl.d.ts"/>
 
-declare module "gulp-cheerio" {
-    import Vinyl = require('vinyl');
 
-    namespace cheerio {
-        interface Cheerio {
-            (callback: Callback): NodeJS.ReadWriteStream;
-            (option: Option): NodeJS.ReadWriteStream;
-        }
+import Vinyl = require('vinyl');
 
-        interface Callback {
-            ($: CheerioStatic, file: Vinyl, done?: Function): any;
-        }
-
-        interface Option {
-            run?: Callback;
-            parserOptions?: CheerioOptionsInterface;
-            cheerio?: CheerioStatic;
-        }
+declare namespace cheerio {
+    interface Cheerio {
+        (callback: Callback): NodeJS.ReadWriteStream;
+        (option: Option): NodeJS.ReadWriteStream;
     }
 
-    var cheerio: cheerio.Cheerio;
+    interface Callback {
+        ($: CheerioStatic, file: Vinyl, done?: Function): any;
+    }
 
-    export = cheerio;
+    interface Option {
+        run?: Callback;
+        parserOptions?: CheerioOptionsInterface;
+        cheerio?: CheerioStatic;
+    }
 }
 
+declare var cheerio: cheerio.Cheerio;
+
+export = cheerio;
diff --git a/gulp-coffeeify/gulp-coffeeify.d.ts b/gulp-coffeeify/gulp-coffeeify.d.ts
index 6f49453d62..b420cb9f3c 100644
--- a/gulp-coffeeify/gulp-coffeeify.d.ts
+++ b/gulp-coffeeify/gulp-coffeeify.d.ts
@@ -5,40 +5,38 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-coffeeify" {
-	namespace coffeeify {
-		interface Coffeeify {
-			(option?: Option): NodeJS.ReadWriteStream;
-		}
 
-		interface Option {
-			options?: {
-				debug?: boolean;
-				paths?: string[];
-			},
-			/**
-			 * [DEPRECATED]: You should use a 'paths' options of browserify.
-			 */
-			aliases?: Aliases;
-			/**
-			 * [DEPRECATED]
-			 */
-			transforms?: Transforms;
-		}
+declare namespace coffeeify {
+    interface Coffeeify {
+        (option?: Option): NodeJS.ReadWriteStream;
+    }
 
-		interface Aliases {
-			cwd?: string;
-			base?: string;
-		}
+    interface Option {
+        options?: {
+            debug?: boolean;
+            paths?: string[];
+        },
+        /**
+         * [DEPRECATED]: You should use a 'paths' options of browserify.
+         */
+        aliases?: Aliases;
+        /**
+         * [DEPRECATED]
+         */
+        transforms?: Transforms;
+    }
 
-		interface Transforms {
-			ext?: string;
-			transform?(data: string): string;
-		}
-	}
+    interface Aliases {
+        cwd?: string;
+        base?: string;
+    }
 
-	var coffeeify: coffeeify.Coffeeify;
-
-	export = coffeeify;
+    interface Transforms {
+        ext?: string;
+        transform?(data: string): string;
+    }
 }
 
+declare var coffeeify: coffeeify.Coffeeify;
+
+export = coffeeify;
diff --git a/gulp-coffeelint/gulp-coffeelint.d.ts b/gulp-coffeelint/gulp-coffeelint.d.ts
index f4e8c1ef77..edc7950ed3 100644
--- a/gulp-coffeelint/gulp-coffeelint.d.ts
+++ b/gulp-coffeelint/gulp-coffeelint.d.ts
@@ -5,22 +5,20 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-coffeelint" {
-    namespace coffeelint {
-        interface Coffeelint {
-            /**
-             * @param optFile Absolute path of a json file containing options for coffeelint.
-             * @param opt Options you wish to send to coffeelint. If optFile is given, this will be ignored.
-             * @param literate Are we dealing with Literate CoffeeScript?
-             * @param rules Add custom rules to coffeelint.
-             */
-            (optFile?: string, opt?: any, literate?: boolean, rules?: Function[]): NodeJS.ReadWriteStream;
-            reporter(reporter?: string|Function): NodeJS.ReadWriteStream;
-        }
+
+declare namespace coffeelint {
+    interface Coffeelint {
+        /**
+         * @param optFile Absolute path of a json file containing options for coffeelint.
+         * @param opt Options you wish to send to coffeelint. If optFile is given, this will be ignored.
+         * @param literate Are we dealing with Literate CoffeeScript?
+         * @param rules Add custom rules to coffeelint.
+         */
+        (optFile?: string, opt?: any, literate?: boolean, rules?: Function[]): NodeJS.ReadWriteStream;
+        reporter(reporter?: string | Function): NodeJS.ReadWriteStream;
     }
-
-    var coffeelint: coffeelint.Coffeelint;
-
-    export = coffeelint;
 }
 
+declare var coffeelint: coffeelint.Coffeelint;
+
+export = coffeelint;
diff --git a/gulp-concat/gulp-concat.d.ts b/gulp-concat/gulp-concat.d.ts
index 8965a80a73..f3c7d55ef7 100644
--- a/gulp-concat/gulp-concat.d.ts
+++ b/gulp-concat/gulp-concat.d.ts
@@ -5,41 +5,40 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-concat" {
 
-    interface IOptions {
-        newLine: string;
-    }
 
-    interface IFsStats {
-        dev?: number;
-        ino?: number;
-        mode?: number;
-        nlink?: number;
-        uid?: number;
-        gid?: number;
-        rdev?: number;
-        size?: number;
-        blksize?: number;
-        blocks?: number;
-        atime?: Date;
-        mtime?: Date;
-        ctime?: Date;
-    }
-
-    interface IVinylOptions {
-        cwd?: string;
-        base?: string;
-        path?: string;
-        stat?: IFsStats;
-        contents?: NodeJS.ReadableStream | Buffer;
-    }
-
-    interface IConcat {
-        (filename: string, options?: IOptions): NodeJS.ReadWriteStream;
-        (options: IVinylOptions): NodeJS.ReadWriteStream;
-    }
-
-    var _tmp: IConcat;
-    export = _tmp;
+interface IOptions {
+    newLine: string;
 }
+
+interface IFsStats {
+    dev?: number;
+    ino?: number;
+    mode?: number;
+    nlink?: number;
+    uid?: number;
+    gid?: number;
+    rdev?: number;
+    size?: number;
+    blksize?: number;
+    blocks?: number;
+    atime?: Date;
+    mtime?: Date;
+    ctime?: Date;
+}
+
+interface IVinylOptions {
+    cwd?: string;
+    base?: string;
+    path?: string;
+    stat?: IFsStats;
+    contents?: NodeJS.ReadableStream | Buffer;
+}
+
+interface IConcat {
+    (filename: string, options?: IOptions): NodeJS.ReadWriteStream;
+    (options: IVinylOptions): NodeJS.ReadWriteStream;
+}
+
+declare var _tmp: IConcat;
+export = _tmp;
diff --git a/gulp-csso/gulp-csso.d.ts b/gulp-csso/gulp-csso.d.ts
index 299cf4f989..0d021141ae 100644
--- a/gulp-csso/gulp-csso.d.ts
+++ b/gulp-csso/gulp-csso.d.ts
@@ -5,8 +5,7 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-csso' {
-    function csso(structureMinimization?: boolean): NodeJS.ReadWriteStream;
-    namespace csso {}
-    export = csso;
-}
+
+declare function csso(structureMinimization?: boolean): NodeJS.ReadWriteStream;
+declare namespace csso { }
+export = csso;
diff --git a/gulp-debug/gulp-debug.d.ts b/gulp-debug/gulp-debug.d.ts
index 11641d7b62..a7706cbf85 100644
--- a/gulp-debug/gulp-debug.d.ts
+++ b/gulp-debug/gulp-debug.d.ts
@@ -5,15 +5,14 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-debug' {
-    interface IOptions {
-        title?: string;
-        minimal?: boolean;
-    }
 
-    function debug(options?: IOptions): NodeJS.ReadWriteStream;
-
-    namespace debug {}
-
-    export = debug;
+interface IOptions {
+    title?: string;
+    minimal?: boolean;
 }
+
+declare function debug(options?: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace debug { }
+
+export = debug;
diff --git a/gulp-dtsm/gulp-dtsm.d.ts b/gulp-dtsm/gulp-dtsm.d.ts
index 63da544062..dae683dbcc 100644
--- a/gulp-dtsm/gulp-dtsm.d.ts
+++ b/gulp-dtsm/gulp-dtsm.d.ts
@@ -5,10 +5,9 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-dtsm" {
-  function dtsm(): NodeJS.WritableStream;
 
-  namespace dtsm {}
+declare function dtsm(): NodeJS.WritableStream;
 
-  export = dtsm;
-}
+declare namespace dtsm { }
+
+export = dtsm;
diff --git a/gulp-espower/gulp-espower.d.ts b/gulp-espower/gulp-espower.d.ts
index 7f2176ead1..99fee75d54 100644
--- a/gulp-espower/gulp-espower.d.ts
+++ b/gulp-espower/gulp-espower.d.ts
@@ -5,23 +5,21 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-espower" {
 
-    namespace espower {
-        interface Espower {
-            /**
-             * @param options Target patterns for power assert feature instrumentation.
-             */
-            (options?: Options): NodeJS.ReadWriteStream;
-        }
 
-        interface Options {
-            patterns: string[];
-        }
+declare namespace espower {
+    interface Espower {
+        /**
+         * @param options Target patterns for power assert feature instrumentation.
+         */
+        (options?: Options): NodeJS.ReadWriteStream;
     }
 
-    var espower: espower.Espower;
-
-    export = espower;
+    interface Options {
+        patterns: string[];
+    }
 }
 
+declare var espower: espower.Espower;
+
+export = espower;
diff --git a/gulp-filter/gulp-filter.d.ts b/gulp-filter/gulp-filter.d.ts
index c841315563..542cf737b5 100644
--- a/gulp-filter/gulp-filter.d.ts
+++ b/gulp-filter/gulp-filter.d.ts
@@ -7,27 +7,26 @@
 /// <reference path="../vinyl/vinyl.d.ts"/>
 /// <reference path="../minimatch/minimatch.d.ts"/>
 
-declare module 'gulp-filter' {
-  import File = require('vinyl');
-  import * as Minimatch from 'minimatch';
 
-  namespace filter {
+import File = require('vinyl');
+import * as Minimatch from 'minimatch';
+
+declare namespace filter {
     interface FileFunction {
-      (file: File): boolean;
+        (file: File): boolean;
     }
 
     interface Options extends Minimatch.IOptions {
-      restore?: boolean;
-      passthrough?: boolean;
+        restore?: boolean;
+        passthrough?: boolean;
     }
 
     // A transform stream with a .restore object
     interface Filter extends NodeJS.ReadWriteStream {
-      restore: NodeJS.ReadWriteStream
+        restore: NodeJS.ReadWriteStream
     }
-  }
-
-  function filter(pattern: string | string[] | filter.FileFunction, options?: filter.Options): filter.Filter;
-
-  export = filter;
 }
+
+declare function filter(pattern: string | string[] | filter.FileFunction, options?: filter.Options): filter.Filter;
+
+export = filter;
diff --git a/gulp-flatten/gulp-flatten.d.ts b/gulp-flatten/gulp-flatten.d.ts
index 512a86a706..893dca905d 100644
--- a/gulp-flatten/gulp-flatten.d.ts
+++ b/gulp-flatten/gulp-flatten.d.ts
@@ -5,15 +5,14 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-flatten" {
 
-    interface IOptions {
-        newPath: string;
-    }
 
-    function flatten(options?: IOptions): NodeJS.ReadWriteStream;
-
-    namespace flatten {}
-
-    export = flatten;
+interface IOptions {
+    newPath: string;
 }
+
+declare function flatten(options?: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace flatten { }
+
+export = flatten;
diff --git a/gulp-gh-pages/gulp-gh-pages.d.ts b/gulp-gh-pages/gulp-gh-pages.d.ts
index fd39388a46..9391d120de 100644
--- a/gulp-gh-pages/gulp-gh-pages.d.ts
+++ b/gulp-gh-pages/gulp-gh-pages.d.ts
@@ -5,19 +5,18 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-gh-pages" {
-    interface Options {
-        remoteUrl?: string;
-        origin?: string;
-        branch?: string;
-        cacheDir?: string;
-        push?: boolean;
-        message?: string;
-    }
 
-    function ghPages(opts?: Options): NodeJS.ReadWriteStream;
-
-    namespace ghPages {}
-
-    export = ghPages;
+interface Options {
+    remoteUrl?: string;
+    origin?: string;
+    branch?: string;
+    cacheDir?: string;
+    push?: boolean;
+    message?: string;
 }
+
+declare function ghPages(opts?: Options): NodeJS.ReadWriteStream;
+
+declare namespace ghPages { }
+
+export = ghPages;
diff --git a/gulp-gzip/gulp-gzip.d.ts b/gulp-gzip/gulp-gzip.d.ts
index f7efe124d1..01839a6de4 100644
--- a/gulp-gzip/gulp-gzip.d.ts
+++ b/gulp-gzip/gulp-gzip.d.ts
@@ -5,43 +5,41 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-gzip" {
-    import zlib = require('zlib');
 
-    namespace gzip {
-        interface Gzip {
-            (options?: Options): NodeJS.ReadWriteStream;
-        }
+import zlib = require('zlib');
 
-        interface Options {
-            /**
-             * Appends .gz file extension if true.
-             * @default true
-             */
-            append?: boolean;
-            /**
-             * Appends an arbitrary extension to the filename. Disables append and preExtension options.
-             */
-            extension?: string;
-            /**
-             * Appends an arbitrary pre-extension to the filename. Disables append and extension options.
-             */
-            preExtension?: string;
-            /**
-             * Minimum size required to compress a file.
-             * @default false
-             */
-            threshold?: number|string|boolean;
-            /**
-             * Options object to pass through to zlib.Gzip.
-             * See <a href='https://nodejs.org/api/zlib.html#zlib_options'>zlib</a> documentation for more information.
-             */
-            gzipOptions?: zlib.ZlibOptions;
-        }
+declare namespace gzip {
+    interface Gzip {
+        (options?: Options): NodeJS.ReadWriteStream;
     }
 
-    var gzip: gzip.Gzip;
-
-    export = gzip;
+    interface Options {
+        /**
+         * Appends .gz file extension if true.
+         * @default true
+         */
+        append?: boolean;
+        /**
+         * Appends an arbitrary extension to the filename. Disables append and preExtension options.
+         */
+        extension?: string;
+        /**
+         * Appends an arbitrary pre-extension to the filename. Disables append and extension options.
+         */
+        preExtension?: string;
+        /**
+         * Minimum size required to compress a file.
+         * @default false
+         */
+        threshold?: number | string | boolean;
+        /**
+         * Options object to pass through to zlib.Gzip.
+         * See <a href='https://nodejs.org/api/zlib.html#zlib_options'>zlib</a> documentation for more information.
+         */
+        gzipOptions?: zlib.ZlibOptions;
+    }
 }
 
+declare var gzip: gzip.Gzip;
+
+export = gzip;
diff --git a/gulp-help/gulp-help.d.ts b/gulp-help/gulp-help.d.ts
index 183d25312e..7c8f48c34d 100644
--- a/gulp-help/gulp-help.d.ts
+++ b/gulp-help/gulp-help.d.ts
@@ -7,110 +7,109 @@
 /// <reference path="../gulp/gulp.d.ts" />
 /// <reference path="../orchestrator/orchestrator.d.ts" />
 
-declare module "gulp-help" {
-    import Orchestrator = require('orchestrator');
-    import gulp = require('gulp');
-    type HelpOption = string|boolean;
 
-    namespace gulpHelp {
-        interface TaskMethod {
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
-             * @param deps an array of tasks to be executed and completed before your task will run.
-             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-             * @param option task options
-             */
-            (name: string, help: HelpOption, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
-             * @param deps an array of tasks to be executed and completed before your task will run.
-             */
-            (name: string, help: HelpOption, deps: string[]): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
-             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-             * @param option task options
-             */
-            (name: string, help: HelpOption, fn?: gulp.TaskCallback, option?: TaskOptions): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
-             */
-            (name: string, help: HelpOption): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param deps an array of tasks to be executed and completed before your task will run.
-             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-             * @param option task options
-             */
-            (name: string, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
-            /**
-             * Define a task.
-             *
-             * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
-             * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
-             * @param option task options
-             */
-            (name: string, fn?: gulp.TaskCallback, option?: TaskOptions): any;
-        }
-
-        interface GulpHelp extends Orchestrator {
-            task: TaskMethod;
-            src: gulp.SrcMethod;
-            dest: gulp.DestMethod;
-            watch: gulp.WatchMethod;
-        }
-
-        interface TaskOptions {
-            /**
-             * List of aliases for this task
-             */
-            aliases?: string[];
-            /**
-             * Object documenting options which can be passed to your task
-             */
-            options?: { [key: string]: string };
-        }
-
-        interface GulpHelpOptions {
-            /**
-             * Modifies the default help message
-             */
-            description?: string;
-            /**
-             * Adds aliases to the default help task
-             */
-            aliases?: string[];
-            /**
-             * Hide all tasks with no help message defined. Useful when including 3rd party tasks
-             */
-            hideEmpty?: boolean;
-            /**
-             * Hide all task dependencies
-             */
-            hideDepsMessage?: boolean;
-            /**
-             * A function to run after the default help task runs
-             */
-            afterPrintCallback?: Function;
-        }
+import Orchestrator = require('orchestrator');
+import gulp = require('gulp');
+type HelpOption = string | boolean;
 
+declare namespace gulpHelp {
+    interface TaskMethod {
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+         * @param deps an array of tasks to be executed and completed before your task will run.
+         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+         * @param option task options
+         */
+        (name: string, help: HelpOption, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+         * @param deps an array of tasks to be executed and completed before your task will run.
+         */
+        (name: string, help: HelpOption, deps: string[]): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+         * @param option task options
+         */
+        (name: string, help: HelpOption, fn?: gulp.TaskCallback, option?: TaskOptions): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param help Custom help message as a string. If you want to hide the task from the help menu, supply false
+         */
+        (name: string, help: HelpOption): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param deps an array of tasks to be executed and completed before your task will run.
+         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+         * @param option task options
+         */
+        (name: string, deps: string[], fn?: gulp.TaskCallback, option?: TaskOptions): any;
+        /**
+         * Define a task.
+         *
+         * @param name the name of the task. Tasks that you want to run from the command line should not have spaces in them.
+         * @param fn the function that performs the task's operations. Generally this takes the form of gulp.src().pipe(someplugin()).
+         * @param option task options
+         */
+        (name: string, fn?: gulp.TaskCallback, option?: TaskOptions): any;
     }
 
-    function gulpHelp(gulp: gulp.Gulp, options?: gulpHelp.GulpHelpOptions): gulpHelp.GulpHelp;
+    interface GulpHelp extends Orchestrator {
+        task: TaskMethod;
+        src: gulp.SrcMethod;
+        dest: gulp.DestMethod;
+        watch: gulp.WatchMethod;
+    }
+
+    interface TaskOptions {
+        /**
+         * List of aliases for this task
+         */
+        aliases?: string[];
+        /**
+         * Object documenting options which can be passed to your task
+         */
+        options?: { [key: string]: string };
+    }
+
+    interface GulpHelpOptions {
+        /**
+         * Modifies the default help message
+         */
+        description?: string;
+        /**
+         * Adds aliases to the default help task
+         */
+        aliases?: string[];
+        /**
+         * Hide all tasks with no help message defined. Useful when including 3rd party tasks
+         */
+        hideEmpty?: boolean;
+        /**
+         * Hide all task dependencies
+         */
+        hideDepsMessage?: boolean;
+        /**
+         * A function to run after the default help task runs
+         */
+        afterPrintCallback?: Function;
+    }
 
-    export = gulpHelp;
 }
+
+declare function gulpHelp(gulp: gulp.Gulp, options?: gulpHelp.GulpHelpOptions): gulpHelp.GulpHelp;
+
+export = gulpHelp;
diff --git a/gulp-html-replace/gulp-html-replace.d.ts b/gulp-html-replace/gulp-html-replace.d.ts
index 19762294dd..a352ea77d5 100644
--- a/gulp-html-replace/gulp-html-replace.d.ts
+++ b/gulp-html-replace/gulp-html-replace.d.ts
@@ -4,26 +4,25 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-html-replace" {
-  interface AdvancedTask {
+
+interface AdvancedTask {
     src: string | string[];
     tpl: string;
-  }
+}
 
-  interface Tasks {
-    [taskId: string] : string | string[] | AdvancedTask;
-  }
+interface Tasks {
+    [taskId: string]: string | string[] | AdvancedTask;
+}
 
-  interface Options {
+interface Options {
     keepUnassigned?: boolean;
     keepBlockTags?: boolean;
     resolvePaths?: boolean;
-  }
-
-  interface HtmlReplace {
-    (tasks: Tasks, options?: Options) : NodeJS.ReadWriteStream;
-  }
-
-  const htmlReplace : HtmlReplace;
-  export = htmlReplace;
 }
+
+interface HtmlReplace {
+    (tasks: Tasks, options?: Options): NodeJS.ReadWriteStream;
+}
+
+declare const htmlReplace: HtmlReplace;
+export = htmlReplace;
diff --git a/gulp-htmlmin/gulp-htmlmin.d.ts b/gulp-htmlmin/gulp-htmlmin.d.ts
index 0dc0c0d1ef..c445984e2a 100644
--- a/gulp-htmlmin/gulp-htmlmin.d.ts
+++ b/gulp-htmlmin/gulp-htmlmin.d.ts
@@ -6,13 +6,12 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../html-minifier/html-minifier.d.ts" />
 
-declare module 'gulp-htmlmin' {
-    import * as HTMLMinifier from 'html-minifier';
 
-    namespace htmlmin {
-    }
+import * as HTMLMinifier from 'html-minifier';
 
-    function htmlmin(options?: HTMLMinifier.Options): NodeJS.ReadWriteStream;
-
-    export = htmlmin;
+declare namespace htmlmin {
 }
+
+declare function htmlmin(options?: HTMLMinifier.Options): NodeJS.ReadWriteStream;
+
+export = htmlmin;
diff --git a/gulp-if/gulp-if.d.ts b/gulp-if/gulp-if.d.ts
index f1f36ba63b..50c71803ef 100644
--- a/gulp-if/gulp-if.d.ts
+++ b/gulp-if/gulp-if.d.ts
@@ -6,59 +6,58 @@
 /// <reference path="../node/node.d.ts"/>
 /// <reference path="../vinyl/vinyl.d.ts"/>
 
-declare module 'gulp-if' {
-    import fs = require('fs');
-    import vinyl = require('vinyl');
-    
-    interface GulpIf {
-        /** 
-         * gulp-if will pipe data to stream whenever condition is truthy.
-         * If condition is falsey and elseStream is passed, data will pipe to elseStream
-         * After data is piped to stream or elseStream or neither, data is piped down-stream.
-         * 
-         * @param condition whether input should be piped to stream
-         * @param stream the stream to pipe to if condition is true
-         * @param elseStream (optional) the stream to pipe to if condition is false 
-         */
-        (condition: boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
-        /** 
-         * gulp-if will pipe data to stream whenever condition is truthy.
-         * If condition is falsey and elseStream is passed, data will pipe to elseStream
-         * After data is piped to stream or elseStream or neither, data is piped down-stream.
-         * 
-         * @param condition a Node Stat filter condition to be executed on the vinyl file's Stats object
-         * @param stream the stream to pipe to if condition is true
-         * @param elseStream (optional) the stream to pipe to if condition is false 
-         */
-        (condition: StatFilterCondition, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
-        /** 
-         * gulp-if will pipe data to stream whenever condition is truthy.
-         * If condition is falsey and elseStream is passed, data will pipe to elseStream
-         * After data is piped to stream or elseStream or neither, data is piped down-stream.
-         * 
-         * @param condition a function taking a vinyl file and returning a boolean
-         * @param stream the stream to pipe to if condition is true
-         * @param elseStream (optional) the stream to pipe to if condition is false 
-         */
-        (condition: (fs: vinyl) => boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
-        /** 
-         * gulp-if will pipe data to stream whenever condition is truthy.
-         * If condition is falsey and elseStream is passed, data will pipe to elseStream
-         * After data is piped to stream or elseStream or neither, data is piped down-stream.
-         * 
-         * @param condition a RegularExpression that works on the file.path
-         * @param stream the stream to pipe to if condition is true
-         * @param elseStream (optional) the stream to pipe to if condition is false 
-         */
-        (condition: RegExp, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
-    }
-    
-    interface StatFilterCondition {
-        isDirectory?: boolean; 
-        isFile?: boolean;
-    }
-    
-    var gulpIf: GulpIf; 
-    
-    export = gulpIf;
-}
\ No newline at end of file
+
+import fs = require('fs');
+import vinyl = require('vinyl');
+
+interface GulpIf {
+    /** 
+     * gulp-if will pipe data to stream whenever condition is truthy.
+     * If condition is falsey and elseStream is passed, data will pipe to elseStream
+     * After data is piped to stream or elseStream or neither, data is piped down-stream.
+     * 
+     * @param condition whether input should be piped to stream
+     * @param stream the stream to pipe to if condition is true
+     * @param elseStream (optional) the stream to pipe to if condition is false 
+     */
+    (condition: boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+    /** 
+     * gulp-if will pipe data to stream whenever condition is truthy.
+     * If condition is falsey and elseStream is passed, data will pipe to elseStream
+     * After data is piped to stream or elseStream or neither, data is piped down-stream.
+     * 
+     * @param condition a Node Stat filter condition to be executed on the vinyl file's Stats object
+     * @param stream the stream to pipe to if condition is true
+     * @param elseStream (optional) the stream to pipe to if condition is false 
+     */
+    (condition: StatFilterCondition, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+    /** 
+     * gulp-if will pipe data to stream whenever condition is truthy.
+     * If condition is falsey and elseStream is passed, data will pipe to elseStream
+     * After data is piped to stream or elseStream or neither, data is piped down-stream.
+     * 
+     * @param condition a function taking a vinyl file and returning a boolean
+     * @param stream the stream to pipe to if condition is true
+     * @param elseStream (optional) the stream to pipe to if condition is false 
+     */
+    (condition: (fs: vinyl) => boolean, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+    /** 
+     * gulp-if will pipe data to stream whenever condition is truthy.
+     * If condition is falsey and elseStream is passed, data will pipe to elseStream
+     * After data is piped to stream or elseStream or neither, data is piped down-stream.
+     * 
+     * @param condition a RegularExpression that works on the file.path
+     * @param stream the stream to pipe to if condition is true
+     * @param elseStream (optional) the stream to pipe to if condition is false 
+     */
+    (condition: RegExp, stream: NodeJS.ReadWriteStream, elseStream?: NodeJS.ReadWriteStream): NodeJS.ReadWriteStream;
+}
+
+interface StatFilterCondition {
+    isDirectory?: boolean;
+    isFile?: boolean;
+}
+
+declare var gulpIf: GulpIf;
+
+export = gulpIf;
diff --git a/gulp-inject/gulp-inject.d.ts b/gulp-inject/gulp-inject.d.ts
index 7749ce4d45..8794caf123 100644
--- a/gulp-inject/gulp-inject.d.ts
+++ b/gulp-inject/gulp-inject.d.ts
@@ -6,36 +6,35 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../vinyl/vinyl.d.ts" />
 
-declare module "gulp-inject" {
 
-    import File = require("vinyl");
 
-    interface ITagFunction {
-        (targetExt: string, sourceExt: string): string;
-    }
+import File = require("vinyl");
 
-    interface ITransformFunction {
-        (filepath: string, file?: File, index?: number, length?: number, targetFile?: File): string;
-    }
-
-    interface IOptions {
-        ignorePath?: string | string[];
-        relative?: boolean;
-        addPrefix?: string;
-        addSuffix?: string;
-        addRootSlash?: boolean;
-        name?: string;
-        removeTags?: boolean;
-        empty?: boolean;
-        starttag?: string | ITagFunction;
-        endtag?: string | ITagFunction;
-        transform?: ITransformFunction;
-        selfClosingTag?: boolean;
-    }
-
-    function inject(sources: NodeJS.ReadableStream, options?: IOptions): NodeJS.ReadWriteStream;
-
-    namespace inject {}
-
-    export = inject;
+interface ITagFunction {
+    (targetExt: string, sourceExt: string): string;
 }
+
+interface ITransformFunction {
+    (filepath: string, file?: File, index?: number, length?: number, targetFile?: File): string;
+}
+
+interface IOptions {
+    ignorePath?: string | string[];
+    relative?: boolean;
+    addPrefix?: string;
+    addSuffix?: string;
+    addRootSlash?: boolean;
+    name?: string;
+    removeTags?: boolean;
+    empty?: boolean;
+    starttag?: string | ITagFunction;
+    endtag?: string | ITagFunction;
+    transform?: ITransformFunction;
+    selfClosingTag?: boolean;
+}
+
+declare function inject(sources: NodeJS.ReadableStream, options?: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace inject { }
+
+export = inject;
diff --git a/gulp-install/gulp-install.d.ts b/gulp-install/gulp-install.d.ts
index 3d332548ca..16cef43e37 100644
--- a/gulp-install/gulp-install.d.ts
+++ b/gulp-install/gulp-install.d.ts
@@ -4,19 +4,18 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-install" {
-  interface Options {
+
+interface Options {
     production?: boolean;
     ignoreScripts?: boolean;
     noOptional?: boolean;
     allowRoot?: boolean;
     args?: string | string[];
-  }
-
-  interface Install {
-    (options?: Options) : NodeJS.ReadWriteStream;
-  }
-
-  const install : Install;
-  export = install;
 }
+
+interface Install {
+    (options?: Options): NodeJS.ReadWriteStream;
+}
+
+declare const install: Install;
+export = install;
diff --git a/gulp-istanbul/gulp-istanbul-0.8.1.d.ts b/gulp-istanbul/gulp-istanbul-0.8.1.d.ts
index 2f87073322..42ce4ec8cf 100644
--- a/gulp-istanbul/gulp-istanbul-0.8.1.d.ts
+++ b/gulp-istanbul/gulp-istanbul-0.8.1.d.ts
@@ -5,47 +5,46 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-istanbul" {
-    function GulpIstanbul(opts?: GulpIstanbul.Options): NodeJS.ReadWriteStream;
 
-    namespace GulpIstanbul {
-        export function hookRequire(): NodeJS.ReadWriteStream;
-        export function summarizeCoverage(opts?: {coverageVariable?: string}): Coverage;
-        export function writeReports(opts?: ReportOptions): NodeJS.ReadWriteStream;
+declare function GulpIstanbul(opts?: GulpIstanbul.Options): NodeJS.ReadWriteStream;
 
-        interface Options {
-            coverageVariable?: string;
-            includeUntested?: boolean;
-            embedSource?: boolean;
-            preserveComments?: boolean;
-            noCompact?: boolean;
-            noAutoWrap?: boolean;
-            codeGenerationOptions?: Object;
-            debug?: boolean;
-            walkDebug?: boolean;
-        }
+declare namespace GulpIstanbul {
+    export function hookRequire(): NodeJS.ReadWriteStream;
+    export function summarizeCoverage(opts?: { coverageVariable?: string }): Coverage;
+    export function writeReports(opts?: ReportOptions): NodeJS.ReadWriteStream;
 
-        interface Coverage {
-            lines: CoverageStats;
-            statements: CoverageStats;
-            functions: CoverageStats;
-            branches: CoverageStats;
-        }
-
-        interface CoverageStats {
-            total: number;
-            covered: number;
-            skipped: number;
-            pct: number;
-        }
-
-        interface ReportOptions {
-            dir?: string;
-            reporters?: string[];
-            reportOpts?: {dir?: string};
-            coverageVariable?: string;
-        }
+    interface Options {
+        coverageVariable?: string;
+        includeUntested?: boolean;
+        embedSource?: boolean;
+        preserveComments?: boolean;
+        noCompact?: boolean;
+        noAutoWrap?: boolean;
+        codeGenerationOptions?: Object;
+        debug?: boolean;
+        walkDebug?: boolean;
     }
 
-    export = GulpIstanbul;
+    interface Coverage {
+        lines: CoverageStats;
+        statements: CoverageStats;
+        functions: CoverageStats;
+        branches: CoverageStats;
+    }
+
+    interface CoverageStats {
+        total: number;
+        covered: number;
+        skipped: number;
+        pct: number;
+    }
+
+    interface ReportOptions {
+        dir?: string;
+        reporters?: string[];
+        reportOpts?: { dir?: string };
+        coverageVariable?: string;
+    }
 }
+
+export = GulpIstanbul;
diff --git a/gulp-istanbul/gulp-istanbul.d.ts b/gulp-istanbul/gulp-istanbul.d.ts
index 593860417b..17abd58309 100644
--- a/gulp-istanbul/gulp-istanbul.d.ts
+++ b/gulp-istanbul/gulp-istanbul.d.ts
@@ -5,60 +5,59 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-istanbul" {
-    function GulpIstanbul(opts?: GulpIstanbul.Options): NodeJS.ReadWriteStream;
 
-    namespace GulpIstanbul {
-        export function hookRequire(): NodeJS.ReadWriteStream;
-        export function summarizeCoverage(opts?: {coverageVariable?: string}): Coverage;
-        export function writeReports(opts?: ReportOptions): NodeJS.ReadWriteStream;
-        export function enforceThresholds(opts?: ThresholdOptions): NodeJS.ReadWriteStream;
+declare function GulpIstanbul(opts?: GulpIstanbul.Options): NodeJS.ReadWriteStream;
 
-        interface Options {
-            coverageVariable?: string;
-            includeUntested?: boolean;
-            embedSource?: boolean;
-            preserveComments?: boolean;
-            noCompact?: boolean;
-            noAutoWrap?: boolean;
-            codeGenerationOptions?: Object;
-            debug?: boolean;
-            walkDebug?: boolean;
-        }
+declare namespace GulpIstanbul {
+    export function hookRequire(): NodeJS.ReadWriteStream;
+    export function summarizeCoverage(opts?: { coverageVariable?: string }): Coverage;
+    export function writeReports(opts?: ReportOptions): NodeJS.ReadWriteStream;
+    export function enforceThresholds(opts?: ThresholdOptions): NodeJS.ReadWriteStream;
 
-        interface Coverage {
-            lines: CoverageStats;
-            statements: CoverageStats;
-            functions: CoverageStats;
-            branches: CoverageStats;
-        }
-
-        interface CoverageStats {
-            total: number;
-            covered: number;
-            skipped: number;
-            pct: number;
-        }
-
-        interface ReportOptions {
-            dir?: string;
-            reporters?: string[];
-            reportOpts?: {dir?: string};
-            coverageVariable?: string;
-        }
-
-        interface ThresholdOptions {
-            coverageVariable?: string;
-            thresholds?: { global?: CoverageOptions|number; each?: CoverageOptions|number };
-        }
-
-        interface CoverageOptions {
-            lines?: number;
-            statements?: number;
-            functions?: number;
-            branches?: number;
-        }
+    interface Options {
+        coverageVariable?: string;
+        includeUntested?: boolean;
+        embedSource?: boolean;
+        preserveComments?: boolean;
+        noCompact?: boolean;
+        noAutoWrap?: boolean;
+        codeGenerationOptions?: Object;
+        debug?: boolean;
+        walkDebug?: boolean;
     }
 
-    export = GulpIstanbul;
+    interface Coverage {
+        lines: CoverageStats;
+        statements: CoverageStats;
+        functions: CoverageStats;
+        branches: CoverageStats;
+    }
+
+    interface CoverageStats {
+        total: number;
+        covered: number;
+        skipped: number;
+        pct: number;
+    }
+
+    interface ReportOptions {
+        dir?: string;
+        reporters?: string[];
+        reportOpts?: { dir?: string };
+        coverageVariable?: string;
+    }
+
+    interface ThresholdOptions {
+        coverageVariable?: string;
+        thresholds?: { global?: CoverageOptions | number; each?: CoverageOptions | number };
+    }
+
+    interface CoverageOptions {
+        lines?: number;
+        statements?: number;
+        functions?: number;
+        branches?: number;
+    }
 }
+
+export = GulpIstanbul;
diff --git a/gulp-jade/gulp-jade.d.ts b/gulp-jade/gulp-jade.d.ts
index 16f7a04016..8a5b5bc1de 100644
--- a/gulp-jade/gulp-jade.d.ts
+++ b/gulp-jade/gulp-jade.d.ts
@@ -3,11 +3,11 @@
 // Definitions by: berwyn <https://github.com/berwyn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "gulp-jade" {
 
-  function GulpJade(params?: GulpJade.Params): any;
 
-  namespace GulpJade {
+declare function GulpJade(params?: GulpJade.Params): any;
+
+declare namespace GulpJade {
     interface Params {
         /*******
         * JADE API OPTIONS
@@ -27,7 +27,7 @@ declare module "gulp-jade" {
         * If a string is specified, that will be used as
         * indentation instead (e.g. '\t').
         */
-        pretty?: boolean|string;
+        pretty?: boolean | string;
 
         /**
         * Use a self namespace to hold the locals (false by default)
@@ -46,13 +46,13 @@ declare module "gulp-jade" {
         * in development). It is enabled by default unless used with
         * express in production mode.
         */
-        compileDebug?:boolean;
+        compileDebug?: boolean;
 
         /**
         * If set to true, compiled functions are cached. filename
         * must be set as the cache key.
         */
-        cache?:boolean;
+        cache?: boolean;
 
         /*******
         * GULP-JADE OPTIONS
@@ -81,7 +81,6 @@ declare module "gulp-jade" {
         */
         data?: any;
     }
-  }
-
-  export = GulpJade;
 }
+
+export = GulpJade;
diff --git a/gulp-jasmine-browser/gulp-jasmine-browser.d.ts b/gulp-jasmine-browser/gulp-jasmine-browser.d.ts
index a335bc413f..501c5e3ada 100644
--- a/gulp-jasmine-browser/gulp-jasmine-browser.d.ts
+++ b/gulp-jasmine-browser/gulp-jasmine-browser.d.ts
@@ -5,13 +5,12 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-jasmine-browser' {
-    interface IJasmineBrowser {
-        specRunner(options?: any): NodeJS.ReadWriteStream;
-        server(options?: any): NodeJS.ReadWriteStream;
-        headless(options?: any): NodeJS.ReadWriteStream;
-    }
 
-    var jasmineBrowser: IJasmineBrowser;
-    export = jasmineBrowser;
+interface IJasmineBrowser {
+    specRunner(options?: any): NodeJS.ReadWriteStream;
+    server(options?: any): NodeJS.ReadWriteStream;
+    headless(options?: any): NodeJS.ReadWriteStream;
 }
+
+declare var jasmineBrowser: IJasmineBrowser;
+export = jasmineBrowser;
diff --git a/gulp-json-editor/gulp-json-editor.d.ts b/gulp-json-editor/gulp-json-editor.d.ts
index 55a49f5b2a..045478e72b 100644
--- a/gulp-json-editor/gulp-json-editor.d.ts
+++ b/gulp-json-editor/gulp-json-editor.d.ts
@@ -5,13 +5,12 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../js-beautify/js-beautify.d.ts" />
 
-declare module "gulp-json-editor" {
 
-  interface JEditor {
-    (mergeWith: any | ((json : any) => any ),
-    jsBeautifyOptions? : JsBeautifyOptions ) : NodeJS.ReadWriteStream;
-  }
 
-  const jeditor : JEditor;
-  export = jeditor;
+interface JEditor {
+    (mergeWith: any | ((json: any) => any),
+        jsBeautifyOptions?: JsBeautifyOptions): NodeJS.ReadWriteStream;
 }
+
+declare const jeditor: JEditor;
+export = jeditor;
diff --git a/gulp-jspm/gulp-jspm.d.ts b/gulp-jspm/gulp-jspm.d.ts
index 632e317418..80e47a202f 100644
--- a/gulp-jspm/gulp-jspm.d.ts
+++ b/gulp-jspm/gulp-jspm.d.ts
@@ -4,19 +4,18 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-jspm" {
-  interface Options {
+
+interface Options {
     arithmetic?: string;
     selfExecutingBundle?: boolean;
     plugin?: boolean | string;
     inject?: boolean;
     minify?: boolean;
-  }
-
-  interface GulpJspm {
-    (options?: Options) : NodeJS.ReadWriteStream;
-  }
-
-  const gulpJspm : GulpJspm;
-  export = gulpJspm;
 }
+
+interface GulpJspm {
+    (options?: Options): NodeJS.ReadWriteStream;
+}
+
+declare const gulpJspm: GulpJspm;
+export = gulpJspm;
diff --git a/gulp-less/gulp-less.d.ts b/gulp-less/gulp-less.d.ts
index 4e01553b2b..4f8eb8c34c 100644
--- a/gulp-less/gulp-less.d.ts
+++ b/gulp-less/gulp-less.d.ts
@@ -5,18 +5,17 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-less" {
 
-    interface IOptions {
-        modifyVars?: {};
-        paths?: string[];
-        plugins?: any[];
-        relativeUrls?: boolean;
-    }
 
-    function less(options?: IOptions): NodeJS.ReadWriteStream;
-
-    namespace less {}
-
-    export = less;
+interface IOptions {
+    modifyVars?: {};
+    paths?: string[];
+    plugins?: any[];
+    relativeUrls?: boolean;
 }
+
+declare function less(options?: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace less { }
+
+export = less;
diff --git a/gulp-minify-css/gulp-minify-css.d.ts b/gulp-minify-css/gulp-minify-css.d.ts
index 55e192e911..e415c24092 100644
--- a/gulp-minify-css/gulp-minify-css.d.ts
+++ b/gulp-minify-css/gulp-minify-css.d.ts
@@ -6,12 +6,11 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../clean-css/clean-css.d.ts" />
 
-declare module "gulp-minify-css" {
-    import * as CleanCSS from 'clean-css';
 
-    function minifyCSS(options?: CleanCSS.Options): NodeJS.ReadWriteStream;
+import * as CleanCSS from 'clean-css';
 
-    namespace minifyCSS {}
+declare function minifyCSS(options?: CleanCSS.Options): NodeJS.ReadWriteStream;
 
-    export = minifyCSS;
-}
+declare namespace minifyCSS { }
+
+export = minifyCSS;
diff --git a/gulp-minify-html/gulp-minify-html.d.ts b/gulp-minify-html/gulp-minify-html.d.ts
index 412a1f2cb8..6dd6de4096 100644
--- a/gulp-minify-html/gulp-minify-html.d.ts
+++ b/gulp-minify-html/gulp-minify-html.d.ts
@@ -7,34 +7,33 @@
 
 // This package has been deprecated in favor of gulp-htmlmin, which should be faster and more comprehensive.
 
-declare module 'gulp-minify-html' {
-    namespace minifyHtml {
-        // Options from https://github.com/Swaagie/minimize#options
-        interface Options {
-            // Do not remove empty attributes
-            empty?: boolean;
 
-            // Do not strip CDATA from scripts
-            cdata?: boolean;
+declare namespace minifyHtml {
+    // Options from https://github.com/Swaagie/minimize#options
+    interface Options {
+        // Do not remove empty attributes
+        empty?: boolean;
 
-            // Do not remove comments
-            comments?: boolean;
+        // Do not strip CDATA from scripts
+        cdata?: boolean;
 
-            // Do not remove conditional internet explorer comments
-            conditionals?: boolean;
+        // Do not remove comments
+        comments?: boolean;
 
-            // Do not remove redundant attributes
-            spare?: boolean;
+        // Do not remove conditional internet explorer comments
+        conditionals?: boolean;
 
-            // Do not remove arbitrary quotes
-            quotes?: boolean;
+        // Do not remove redundant attributes
+        spare?: boolean;
 
-            // Preserve one whitespace
-            loose?: boolean;
-        }
+        // Do not remove arbitrary quotes
+        quotes?: boolean;
+
+        // Preserve one whitespace
+        loose?: boolean;
     }
-
-    function minifyHtml(options?: minifyHtml.Options): NodeJS.ReadWriteStream;
-
-    export = minifyHtml;
 }
+
+declare function minifyHtml(options?: minifyHtml.Options): NodeJS.ReadWriteStream;
+
+export = minifyHtml;
diff --git a/gulp-mocha/gulp-mocha.d.ts b/gulp-mocha/gulp-mocha.d.ts
index 521ef91555..b011d8305a 100644
--- a/gulp-mocha/gulp-mocha.d.ts
+++ b/gulp-mocha/gulp-mocha.d.ts
@@ -6,8 +6,7 @@
 /// <reference path="../mocha/mocha.d.ts"/>
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-mocha" {
-    function mocha(setupOptions?: MochaSetupOptions): NodeJS.ReadWriteStream;
-    namespace mocha {}
-    export = mocha;
-}
+
+declare function mocha(setupOptions?: MochaSetupOptions): NodeJS.ReadWriteStream;
+declare namespace mocha { }
+export = mocha;
diff --git a/gulp-newer/gulp-newer.d.ts b/gulp-newer/gulp-newer.d.ts
index 9a3e6decde..ca1321ee15 100644
--- a/gulp-newer/gulp-newer.d.ts
+++ b/gulp-newer/gulp-newer.d.ts
@@ -5,42 +5,38 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-newer"
-{
-    interface IOptions
-    {
-        /**
-         * Path to destination directory or file.
-         */
-        dest: string;
 
-        /**
-         * Source files will be matched to destination files with the provided extension.
-         */
-        ext?: string;
+interface IOptions {
+    /**
+     * Path to destination directory or file.
+     */
+    dest: string;
 
-        /**
-         * Map relative source paths to relative destination paths.
-         */
-        map?: (relativePath: string) => string;
-    }
+    /**
+     * Source files will be matched to destination files with the provided extension.
+     */
+    ext?: string;
 
-    interface IGulpNewer
-    {
-        /**
-         * Create a transform stream that passes through files whose modification time
-         * is more recent than the corresponding destination file's modification time.
-         * @param dest Path to destination directory or file.
-         */
-        (dest: string): NodeJS.ReadWriteStream;
-
-        /**
-         * Create a transform stream that passes through files whose modification time
-         * is more recent than the corresponding destination file's modification time.
-         */
-        (options: IOptions): NodeJS.ReadWriteStream;
-    }
-
-    const newer: IGulpNewer;
-    export = newer;
+    /**
+     * Map relative source paths to relative destination paths.
+     */
+    map?: (relativePath: string) => string;
 }
+
+interface IGulpNewer {
+    /**
+     * Create a transform stream that passes through files whose modification time
+     * is more recent than the corresponding destination file's modification time.
+     * @param dest Path to destination directory or file.
+     */
+    (dest: string): NodeJS.ReadWriteStream;
+
+    /**
+     * Create a transform stream that passes through files whose modification time
+     * is more recent than the corresponding destination file's modification time.
+     */
+    (options: IOptions): NodeJS.ReadWriteStream;
+}
+
+declare const newer: IGulpNewer;
+export = newer;
diff --git a/gulp-ng-annotate/gulp-ng-annotate.d.ts b/gulp-ng-annotate/gulp-ng-annotate.d.ts
index 12bfc9d539..0de5f9733c 100644
--- a/gulp-ng-annotate/gulp-ng-annotate.d.ts
+++ b/gulp-ng-annotate/gulp-ng-annotate.d.ts
@@ -5,57 +5,55 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-ng-annotate" {
 
-    namespace ngAnnotate {
-        interface NgAnnotate {
-            (option?: Option): NodeJS.ReadWriteStream;
-        }
 
-        //TODO: Should be on ng-annotate module
-        interface Option {
-            /**
-             * Add annotations where non-existing
-             */
-            add?: boolean;
-            /**
-             * Remove all existing annotations
-             */
-            remove?: boolean;
-            /**
-             * List optional matchers
-             */
-            list?: boolean;
-            /**
-             * Restrict matching further or to expand matching
-             */
-            regexp?: string;
-            /**
-             * Enable optional matcher
-             */
-            enable?: boolean;
-            /**
-             * Output '$scope' instead of "$scope".
-             */
-            single_quotes?: boolean;
-            /**
-             * Rename providers (services, factories, controllers, etc.) with a new name when declared and referenced through annotation
-             */
-            rename?: RenameOption[];
-            /**
-             * Load a user plugin with the provided path
-             */
-            plugin?: any[];
-        }
-
-        interface RenameOption {
-            from: string;
-            to: string;
-        }
+declare namespace ngAnnotate {
+    interface NgAnnotate {
+        (option?: Option): NodeJS.ReadWriteStream;
     }
 
-    var ngAnnotate: ngAnnotate.NgAnnotate;
+    //TODO: Should be on ng-annotate module
+    interface Option {
+        /**
+         * Add annotations where non-existing
+         */
+        add?: boolean;
+        /**
+         * Remove all existing annotations
+         */
+        remove?: boolean;
+        /**
+         * List optional matchers
+         */
+        list?: boolean;
+        /**
+         * Restrict matching further or to expand matching
+         */
+        regexp?: string;
+        /**
+         * Enable optional matcher
+         */
+        enable?: boolean;
+        /**
+         * Output '$scope' instead of "$scope".
+         */
+        single_quotes?: boolean;
+        /**
+         * Rename providers (services, factories, controllers, etc.) with a new name when declared and referenced through annotation
+         */
+        rename?: RenameOption[];
+        /**
+         * Load a user plugin with the provided path
+         */
+        plugin?: any[];
+    }
 
-    export = ngAnnotate;
+    interface RenameOption {
+        from: string;
+        to: string;
+    }
 }
 
+declare var ngAnnotate: ngAnnotate.NgAnnotate;
+
+export = ngAnnotate;
diff --git a/gulp-nodemon/gulp-nodemon.d.ts b/gulp-nodemon/gulp-nodemon.d.ts
index 5ee7cb4a72..79f19cb32b 100644
--- a/gulp-nodemon/gulp-nodemon.d.ts
+++ b/gulp-nodemon/gulp-nodemon.d.ts
@@ -5,83 +5,82 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-nodemon" {
-    namespace nodemon {
 
-        interface Nodemon {
-            (option?: Option): EventEmitter;
-        }
+declare namespace nodemon {
 
-        interface Option extends _Option {
-            tasks?: string[]|((changedFiles: string[]) => string[]);
-        }
-
-        // TODO: Properties may be insufficient
-        // TODO: In future this interface should be moved to nodemon.d.ts
-        interface _Option {
-            env?:  { [key: string]: string|boolean|number; };
-            script?: string;
-            /**
-             * Extensions to look for, ie. js,jade,hbs.
-             */
-            ext?: string;
-            /**
-             * Execute script with "app", ie. -x "python -v".
-             */
-            exec?: string;
-            /**
-             * Watch directory "dir" or files. use once for each directory or file to watch.
-             */
-            watch?: string[];
-            /**
-             * Ignore specific files or directories.
-             */
-            ignore?: string[];
-            /**
-             * Minimise nodemon messages to start/stop only.
-             */
-            quiet?: boolean;
-            /**
-             * Show detail on what is causing restarts.
-             */
-            verbose?: boolean;
-            /**
-             * Try to read from stdin.
-             */
-            stdin?: boolean;
-            stdout?: boolean;
-            /**
-             * Execute script on change only, not startup
-             */
-            runOnChangeOnly?: boolean;
-            /**
-             * Debounce restart in seconds.
-             */
-            delay?: number;
-            /**
-             * Forces node to use the most compatible version for watching file changes.
-             */
-            legacyWatch?: boolean;
-            /**
-             * Exit on crash, allows use of nodemon with daemon tools like forever.js.
-             */
-            exitcrash?: boolean;
-            execMap?: { [key: string]: string|boolean|number; };
-            events?:  { [key: string]: string; };
-            restartable?: string;
-        }
-
-        interface EventEmitter extends NodeJS.EventEmitter {
-            addListener(event: string, listener: Function): this;
-            addListener(event: string, tasks: string[]): this;
-            on(event: string, listener: Function): this;
-            on(event: string, tasks: string[]): this;
-            once(event: string, listener: Function): this;
-            once(event: string, tasks: string[]): this;
-        }
+    interface Nodemon {
+        (option?: Option): EventEmitter;
     }
 
-    var nodemon: nodemon.Nodemon;
+    interface Option extends _Option {
+        tasks?: string[] | ((changedFiles: string[]) => string[]);
+    }
 
-    export = nodemon;
+    // TODO: Properties may be insufficient
+    // TODO: In future this interface should be moved to nodemon.d.ts
+    interface _Option {
+        env?: { [key: string]: string | boolean | number; };
+        script?: string;
+        /**
+         * Extensions to look for, ie. js,jade,hbs.
+         */
+        ext?: string;
+        /**
+         * Execute script with "app", ie. -x "python -v".
+         */
+        exec?: string;
+        /**
+         * Watch directory "dir" or files. use once for each directory or file to watch.
+         */
+        watch?: string[];
+        /**
+         * Ignore specific files or directories.
+         */
+        ignore?: string[];
+        /**
+         * Minimise nodemon messages to start/stop only.
+         */
+        quiet?: boolean;
+        /**
+         * Show detail on what is causing restarts.
+         */
+        verbose?: boolean;
+        /**
+         * Try to read from stdin.
+         */
+        stdin?: boolean;
+        stdout?: boolean;
+        /**
+         * Execute script on change only, not startup
+         */
+        runOnChangeOnly?: boolean;
+        /**
+         * Debounce restart in seconds.
+         */
+        delay?: number;
+        /**
+         * Forces node to use the most compatible version for watching file changes.
+         */
+        legacyWatch?: boolean;
+        /**
+         * Exit on crash, allows use of nodemon with daemon tools like forever.js.
+         */
+        exitcrash?: boolean;
+        execMap?: { [key: string]: string | boolean | number; };
+        events?: { [key: string]: string; };
+        restartable?: string;
+    }
+
+    interface EventEmitter extends NodeJS.EventEmitter {
+        addListener(event: string, listener: Function): this;
+        addListener(event: string, tasks: string[]): this;
+        on(event: string, listener: Function): this;
+        on(event: string, tasks: string[]): this;
+        once(event: string, listener: Function): this;
+        once(event: string, tasks: string[]): this;
+    }
 }
+
+declare var nodemon: nodemon.Nodemon;
+
+export = nodemon;
diff --git a/gulp-plumber/gulp-plumber.d.ts b/gulp-plumber/gulp-plumber.d.ts
index 1d57e050a5..e6e96ba618 100644
--- a/gulp-plumber/gulp-plumber.d.ts
+++ b/gulp-plumber/gulp-plumber.d.ts
@@ -6,46 +6,45 @@
 /// <reference path="../node/node.d.ts" />
 
 /** Prevent pipe breaking caused by errors from gulp plugins */
-declare module 'gulp-plumber' {
-	
-	/** Prevent pipe breaking caused by errors from gulp plugins */
-	interface GulpPlumber {
-		/**
-		 * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
-		 * 
-		 * @param options Sets options as described in the Options interface
-		 */
-		(options?: Options): NodeJS.ReadWriteStream;
-		/**
-		 * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
-		 * 
-		 * @param errorHandler the function to be attached to the stream on('error')
-		 */
-		(errorHandler: ErrorHandlerFunction): NodeJS.ReadWriteStream;
-		/** returns default behaviour for pipeline after it was piped */
-		stop(): NodeJS.ReadWriteStream;
-	}
-	
-	interface Options {
-		/** 
-		 * Handle errors in underlying streams and output them to console. Default true.
-		 * If function passed, it will be attached to stream on('error')
-		 * If false passed, error handler will not be attached
-		 * If undefined passed, default error handler will be attached
-		 */
-		errorHandler?: ErrorHandlerFunction | boolean;
-		/** Monkeypatch pipe functions in underlying streams in pipeline. Default true. */
-		inherit?: boolean;
-	}
-	
-	/** an error handler function to be attached to the stream on('error') */
-	interface ErrorHandlerFunction {
-		/** an error handler function to be attached to the stream on('error') */
-		(error: any): void;
-	}
-	
-	/** Prevent pipe breaking caused by errors from gulp plugins */
-	var gulpPlumber: GulpPlumber;
-	
-	export = gulpPlumber;
+
+
+/** Prevent pipe breaking caused by errors from gulp plugins */
+interface GulpPlumber {
+    /**
+     * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
+     * 
+     * @param options Sets options as described in the Options interface
+     */
+    (options?: Options): NodeJS.ReadWriteStream;
+    /**
+     * Returns Stream, that fixes pipe methods on Streams that are next in pipeline.
+     * 
+     * @param errorHandler the function to be attached to the stream on('error')
+     */
+    (errorHandler: ErrorHandlerFunction): NodeJS.ReadWriteStream;
+    /** returns default behaviour for pipeline after it was piped */
+    stop(): NodeJS.ReadWriteStream;
 }
+
+interface Options {
+    /** 
+     * Handle errors in underlying streams and output them to console. Default true.
+     * If function passed, it will be attached to stream on('error')
+     * If false passed, error handler will not be attached
+     * If undefined passed, default error handler will be attached
+     */
+    errorHandler?: ErrorHandlerFunction | boolean;
+    /** Monkeypatch pipe functions in underlying streams in pipeline. Default true. */
+    inherit?: boolean;
+}
+
+/** an error handler function to be attached to the stream on('error') */
+interface ErrorHandlerFunction {
+    /** an error handler function to be attached to the stream on('error') */
+    (error: any): void;
+}
+
+/** Prevent pipe breaking caused by errors from gulp plugins */
+declare var gulpPlumber: GulpPlumber;
+
+export = gulpPlumber;
diff --git a/gulp-protractor/gulp-protractor.d.ts b/gulp-protractor/gulp-protractor.d.ts
index 73f39fb227..3e72899ec9 100644
--- a/gulp-protractor/gulp-protractor.d.ts
+++ b/gulp-protractor/gulp-protractor.d.ts
@@ -6,22 +6,21 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../gulp/gulp.d.ts" />
 
-declare module 'gulp-protractor' {
-    import gulp = require('gulp');
 
-    interface IOptions {
-        configFile?: string;
-        args?: Array<string>;
-        debug?: boolean;
-    }
+import gulp = require('gulp');
 
-    interface IGulpProtractor {
-        getProtractorDir(): string;
-        protractor(options?: IOptions): NodeJS.ReadWriteStream;
-        webdriver_standalone: gulp.TaskCallback;
-        webdriver_update: gulp.TaskCallback;
-    }
-
-    var protractor: IGulpProtractor;
-    export = protractor;
+interface IOptions {
+    configFile?: string;
+    args?: Array<string>;
+    debug?: boolean;
 }
+
+interface IGulpProtractor {
+    getProtractorDir(): string;
+    protractor(options?: IOptions): NodeJS.ReadWriteStream;
+    webdriver_standalone: gulp.TaskCallback;
+    webdriver_update: gulp.TaskCallback;
+}
+
+declare var protractor: IGulpProtractor;
+export = protractor;
diff --git a/gulp-remember/gulp-remember.d.ts b/gulp-remember/gulp-remember.d.ts
index 9a3b4052fd..3b04c1adfb 100644
--- a/gulp-remember/gulp-remember.d.ts
+++ b/gulp-remember/gulp-remember.d.ts
@@ -5,55 +5,51 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-remember"
-{
-    interface ICache
-    {
-        [path: string]: NodeJS.ReadWriteStream;
-    }
 
-    interface IGulpRemember
-    {
-        /**
-         * Return a through stream that will:
-         *   1. Remember all files that ever pass through it.
-         *   2. Add all remembered files back into the stream when not present.
-         * @param cacheName Name to give your cache
-         */
-        (cacheName?: string): NodeJS.ReadWriteStream;
-
-        /**
-         * Forget about a file.
-         * A warning is logged if either the named cache or file do not exist.
-         * @param path Path of the file to forget
-         */
-        forget(path: string): void;
-
-        /**
-         * Forget about a file.
-         * A warning is logged if either the named cache or file do not exist.
-         * @param cacheName Name of the cache from which to drop the file
-         * @param path Path of the file to forget
-         */
-        forget(cacheName: string, path: string): void;
-
-        /**
-         * Forget all files in one cache.
-         * A warning is logged if the cache does not exist.
-         *
-         * @param cacheName Name of the cache to wipe
-         */
-        forgetAll(cacheName?: string): void;
-
-        /**
-         * Return a raw cache by name.
-         * Useful for checking state. Manually adding or removing files is NOT recommended.
-         *
-         * @param cacheName Name of the cache to retrieve
-         */
-        cacheFor(cacheName?: string): ICache;
-    }
-
-    const remember: IGulpRemember;
-    export = remember;
+interface ICache {
+    [path: string]: NodeJS.ReadWriteStream;
 }
+
+interface IGulpRemember {
+    /**
+     * Return a through stream that will:
+     *   1. Remember all files that ever pass through it.
+     *   2. Add all remembered files back into the stream when not present.
+     * @param cacheName Name to give your cache
+     */
+    (cacheName?: string): NodeJS.ReadWriteStream;
+
+    /**
+     * Forget about a file.
+     * A warning is logged if either the named cache or file do not exist.
+     * @param path Path of the file to forget
+     */
+    forget(path: string): void;
+
+    /**
+     * Forget about a file.
+     * A warning is logged if either the named cache or file do not exist.
+     * @param cacheName Name of the cache from which to drop the file
+     * @param path Path of the file to forget
+     */
+    forget(cacheName: string, path: string): void;
+
+    /**
+     * Forget all files in one cache.
+     * A warning is logged if the cache does not exist.
+     *
+     * @param cacheName Name of the cache to wipe
+     */
+    forgetAll(cacheName?: string): void;
+
+    /**
+     * Return a raw cache by name.
+     * Useful for checking state. Manually adding or removing files is NOT recommended.
+     *
+     * @param cacheName Name of the cache to retrieve
+     */
+    cacheFor(cacheName?: string): ICache;
+}
+
+declare const remember: IGulpRemember;
+export = remember;
diff --git a/gulp-rename/gulp-rename.d.ts b/gulp-rename/gulp-rename.d.ts
index 11368e9698..9474927f30 100644
--- a/gulp-rename/gulp-rename.d.ts
+++ b/gulp-rename/gulp-rename.d.ts
@@ -5,20 +5,19 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-rename" {
-    interface ParsedPath {
-        dirname?: string;
-        basename?: string;
-        extname?: string;
-    }
 
-    interface Options extends ParsedPath {
-        prefix?: string;
-        suffix?: string;
-    }
+interface ParsedPath {
+    dirname?: string;
+    basename?: string;
+    extname?: string;
+}
 
-    function rename(name: string): NodeJS.ReadWriteStream;
-    function rename(callback: (path: ParsedPath) => any): NodeJS.ReadWriteStream;
-    function rename(opts: Options): NodeJS.ReadWriteStream;
-    export = rename;
-}
\ No newline at end of file
+interface Options extends ParsedPath {
+    prefix?: string;
+    suffix?: string;
+}
+
+declare function rename(name: string): NodeJS.ReadWriteStream;
+declare function rename(callback: (path: ParsedPath) => any): NodeJS.ReadWriteStream;
+declare function rename(opts: Options): NodeJS.ReadWriteStream;
+export = rename;
diff --git a/gulp-replace/gulp-replace.d.ts b/gulp-replace/gulp-replace.d.ts
index 90ecb13535..33ab5f7343 100644
--- a/gulp-replace/gulp-replace.d.ts
+++ b/gulp-replace/gulp-replace.d.ts
@@ -5,19 +5,18 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-replace" {
-    interface Options {
-        skipBinary?: boolean;
-    }
 
-    interface Replacer {
-      (match: string): string
-    }
-
-    function replace(pattern: string, replacement: string | Replacer, opts?: Options): NodeJS.ReadWriteStream;
-    function replace(pattern: RegExp, replacement: string | Replacer, opts?: Options): NodeJS.ReadWriteStream;
-
-    namespace replace {}
-
-    export = replace;
+interface Options {
+    skipBinary?: boolean;
 }
+
+interface Replacer {
+    (match: string): string
+}
+
+declare function replace(pattern: string, replacement: string | Replacer, opts?: Options): NodeJS.ReadWriteStream;
+declare function replace(pattern: RegExp, replacement: string | Replacer, opts?: Options): NodeJS.ReadWriteStream;
+
+declare namespace replace { }
+
+export = replace;
diff --git a/gulp-rev-replace/gulp-rev-replace.d.ts b/gulp-rev-replace/gulp-rev-replace.d.ts
index 520db3c493..3ec8f5e5ea 100644
--- a/gulp-rev-replace/gulp-rev-replace.d.ts
+++ b/gulp-rev-replace/gulp-rev-replace.d.ts
@@ -5,19 +5,18 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-rev-replace' {
-  namespace revReplace {
+
+declare namespace revReplace {
     interface Options {
-      canonicalUris?: boolean;
-      replaceInExtensions?: Array<string>;
-      prefix?: string;
-      manifest?: NodeJS.ReadWriteStream;
-      modifyUnreved?: Function;
-      modifyReved?: Function;
+        canonicalUris?: boolean;
+        replaceInExtensions?: Array<string>;
+        prefix?: string;
+        manifest?: NodeJS.ReadWriteStream;
+        modifyUnreved?: Function;
+        modifyReved?: Function;
     }
-  }
-
-  function revReplace(options?: revReplace.Options): NodeJS.ReadWriteStream;
-
-  export = revReplace;
 }
+
+declare function revReplace(options?: revReplace.Options): NodeJS.ReadWriteStream;
+
+export = revReplace;
diff --git a/gulp-rev/gulp-rev.d.ts b/gulp-rev/gulp-rev.d.ts
index f02950d797..514e7625e8 100644
--- a/gulp-rev/gulp-rev.d.ts
+++ b/gulp-rev/gulp-rev.d.ts
@@ -5,22 +5,21 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-rev' {
-    interface IOptions {
-        base?: string;
-        cwd?: string;
-        merge?: boolean;
-    }
 
-    interface IRev {
-        (): NodeJS.ReadWriteStream;
-
-        manifest(): NodeJS.ReadWriteStream;
-        manifest(path?: string): NodeJS.ReadWriteStream;
-        manifest(options?: IOptions): NodeJS.ReadWriteStream;
-        manifest(path?: string, options?: IOptions): NodeJS.ReadWriteStream;
-    }
-
-    var rev: IRev;
-    export = rev;
+interface IOptions {
+    base?: string;
+    cwd?: string;
+    merge?: boolean;
 }
+
+interface IRev {
+    (): NodeJS.ReadWriteStream;
+
+    manifest(): NodeJS.ReadWriteStream;
+    manifest(path?: string): NodeJS.ReadWriteStream;
+    manifest(options?: IOptions): NodeJS.ReadWriteStream;
+    manifest(path?: string, options?: IOptions): NodeJS.ReadWriteStream;
+}
+
+declare var rev: IRev;
+export = rev;
diff --git a/gulp-ruby-sass/gulp-ruby-sass.d.ts b/gulp-ruby-sass/gulp-ruby-sass.d.ts
index 3cb8238664..272135e66f 100644
--- a/gulp-ruby-sass/gulp-ruby-sass.d.ts
+++ b/gulp-ruby-sass/gulp-ruby-sass.d.ts
@@ -5,66 +5,65 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-ruby-sass" {
-    /**
-     * The interface includes all options that available for sass executable.
-     * Options are converted from dashed to camelCase
-     * @interface SassOptions
-     */
-    interface SassOptions {
-        loadPath?: string | string[];
-        require?: string;
-        compass?: boolean;
-        style?: string;
-        force?: boolean;
-        stopOnError?: boolean;
-        scss?: boolean;
-        defaultEncoding?: string;
-        unixNewlines?: boolean;
-        debugInfo?: boolean;
-        lineNumbers?: boolean;
-        lineComments?: boolean;
-        check?: boolean;
-        precision?: number;
-        cacheLocation?: string;
-        noCache?: boolean;
-        trace?: boolean;
-        quiet?: boolean;
 
-        // Actually, there should be a string. However due to ts spec, overriding member should be the same type or a subtype.
-        // http://stackoverflow.com/questions/19605557/incompatible-static-properties-in-three-d-ts-with-latest-typescript
-        // We need Options.soucemap to be boolean, so here 'any' is used instead of string.
-        sourcemap?: any;
+/**
+ * The interface includes all options that available for sass executable.
+ * Options are converted from dashed to camelCase
+ * @interface SassOptions
+ */
+interface SassOptions {
+    loadPath?: string | string[];
+    require?: string;
+    compass?: boolean;
+    style?: string;
+    force?: boolean;
+    stopOnError?: boolean;
+    scss?: boolean;
+    defaultEncoding?: string;
+    unixNewlines?: boolean;
+    debugInfo?: boolean;
+    lineNumbers?: boolean;
+    lineComments?: boolean;
+    check?: boolean;
+    precision?: number;
+    cacheLocation?: string;
+    noCache?: boolean;
+    trace?: boolean;
+    quiet?: boolean;
 
-        // All listed below options are acceptable by the sass executable and potentially may be used from js.
-        // However I doubt are there cases when it's meaningful
-        watch?: string;
-        update?: string;
-        stdin?: boolean;
-        interactive?: boolean;
-    }
+    // Actually, there should be a string. However due to ts spec, overriding member should be the same type or a subtype.
+    // http://stackoverflow.com/questions/19605557/incompatible-static-properties-in-three-d-ts-with-latest-typescript
+    // We need Options.soucemap to be boolean, so here 'any' is used instead of string.
+    sourcemap?: any;
 
-    /**
-     * The interface includes the node-ruby-sass only options.
-     * Attention: sourcemap option type differs from the same SassOption's type.
-     * @interface Options
-     * @extends SassOptions
-     */
-    interface Options extends SassOptions {
-        verbose?: boolean;
-        bundleExec?: boolean;
-        sourcemap?: boolean;
-        container?: string;
-    }
-
-    /**
-     * Object to be exported
-     * @param {string} source - Filename or directory
-     * @param {Options} options - Additional processing rules/options
-     */
-    function sass(source: string, options?: Options): NodeJS.ReadableStream;
-
-    namespace sass {}
-
-    export = sass;
+    // All listed below options are acceptable by the sass executable and potentially may be used from js.
+    // However I doubt are there cases when it's meaningful
+    watch?: string;
+    update?: string;
+    stdin?: boolean;
+    interactive?: boolean;
 }
+
+/**
+ * The interface includes the node-ruby-sass only options.
+ * Attention: sourcemap option type differs from the same SassOption's type.
+ * @interface Options
+ * @extends SassOptions
+ */
+interface Options extends SassOptions {
+    verbose?: boolean;
+    bundleExec?: boolean;
+    sourcemap?: boolean;
+    container?: string;
+}
+
+/**
+ * Object to be exported
+ * @param {string} source - Filename or directory
+ * @param {Options} options - Additional processing rules/options
+ */
+declare function sass(source: string, options?: Options): NodeJS.ReadableStream;
+
+declare namespace sass { }
+
+export = sass;
diff --git a/gulp-sass/gulp-sass.d.ts b/gulp-sass/gulp-sass.d.ts
index d54c53b3da..5021933c8e 100644
--- a/gulp-sass/gulp-sass.d.ts
+++ b/gulp-sass/gulp-sass.d.ts
@@ -5,50 +5,49 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-sass" {
-    interface SassResults {
-        css: string;
-        map: string;
-        stats: {
-            entry: string;
-            start: Date;
-            end: Date;
-            duration: number;
-            includedFiles: string[];
-        }
-    }
 
-    interface SassOptions {
-        file?: string;
-        data?: string;
-        success?: (results: SassResults) => any;
-        error?: (err: Error) => any;
-        includePaths?: string[];
-        imagePaths?: string[];
-        indentedSyntax?: boolean;
-        omitSourceMapUrl?: boolean;
-        outFile?: string;
-        outputStyle?: string;
-        precision?: number;
-        sourceComments?: boolean;
-        sourceMap?: boolean | string;
-        sourceMapEmbed?: boolean;
-        sourceMapContents?: boolean;
+interface SassResults {
+    css: string;
+    map: string;
+    stats: {
+        entry: string;
+        start: Date;
+        end: Date;
+        duration: number;
+        includedFiles: string[];
     }
+}
 
-    interface Options extends SassOptions {
-        errLogToConsole?: boolean;
-        onSuccess?: (css: string) => any;
-        onError?: (err: Error) => any;
-        sync?: boolean;
-    }
+interface SassOptions {
+    file?: string;
+    data?: string;
+    success?: (results: SassResults) => any;
+    error?: (err: Error) => any;
+    includePaths?: string[];
+    imagePaths?: string[];
+    indentedSyntax?: boolean;
+    omitSourceMapUrl?: boolean;
+    outFile?: string;
+    outputStyle?: string;
+    precision?: number;
+    sourceComments?: boolean;
+    sourceMap?: boolean | string;
+    sourceMapEmbed?: boolean;
+    sourceMapContents?: boolean;
+}
 
-    interface Sass {
-        (opts?: Options): NodeJS.ReadWriteStream;
-        logError(error?: string): void;
-        sync(options?: Options): NodeJS.ReadWriteStream;
-    }
+interface Options extends SassOptions {
+    errLogToConsole?: boolean;
+    onSuccess?: (css: string) => any;
+    onError?: (err: Error) => any;
+    sync?: boolean;
+}
 
-    var _tmp: Sass;
-    export = _tmp;
-}
\ No newline at end of file
+interface Sass {
+    (opts?: Options): NodeJS.ReadWriteStream;
+    logError(error?: string): void;
+    sync(options?: Options): NodeJS.ReadWriteStream;
+}
+
+declare var _tmp: Sass;
+export = _tmp;
diff --git a/gulp-shell/gulp-shell.d.ts b/gulp-shell/gulp-shell.d.ts
index 5235b101f4..2b3c9f72fd 100644
--- a/gulp-shell/gulp-shell.d.ts
+++ b/gulp-shell/gulp-shell.d.ts
@@ -5,64 +5,62 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-shell" {
 
-    namespace shell {
-        interface Shell {
-            (commands: string|string[], options?: Option): NodeJS.ReadWriteStream;
-            task(commands: string|string[], options?: Option): (done: Function) => NodeJS.ReadWriteStream;
-        }
 
-        interface Option {
-            /**
-             * You can add a custom error message for when the command fails. This can be a template which can be
-             * interpolated with the current command, some file info (e.g. file.path) and some error info
-             * (e.g. error.code).
-             * @default 'Command `<%= command %>` failed with exit code <%= error.code %>'
-             */
-            errorMessage?: string;
-            /**
-             * By default, it will emit an error event when the command finishes unsuccessfully.
-             * @default false
-             */
-            ignoreErrors?: boolean;
-            /**
-             * By default, it will print the command output.
-             * @default false
-             */
-            quiet?: boolean;
-            /**
-             * Sets the current working directory for the command.
-             * @default process.cwd()
-             */
-            cwd?: string;
-            /**
-             * The data that can be accessed in template.
-             */
-            templateData?: any;
-            /**
-             * You won't need to set this option unless you encounter a "stdout maxBuffer exceeded" error.
-             * @default 16MB(16 * 1024 * 1024)
-             */
-            maxBuffer?: number;
-            /**
-             * The maximum amount of time in milliseconds the process is allowed to run.
-             * @default
-             */
-            timeout?: number;
-            /**
-             * By default, all the commands will be executed in an environment with all the variables in process.env
-             * and PATH prepended by ./node_modules/.bin (allowing you to run executables in your Node's dependencies).
-             * You can override any environment variables with this option.
-             * For example, setting it to {PATH: process.env.PATH} will reset the PATH
-             * if the default one brings your some troubles.
-             */
-            env?: any;
-        }
+declare namespace shell {
+    interface Shell {
+        (commands: string | string[], options?: Option): NodeJS.ReadWriteStream;
+        task(commands: string | string[], options?: Option): (done: Function) => NodeJS.ReadWriteStream;
     }
 
-    var shell: shell.Shell;
-
-    export = shell;
+    interface Option {
+        /**
+         * You can add a custom error message for when the command fails. This can be a template which can be
+         * interpolated with the current command, some file info (e.g. file.path) and some error info
+         * (e.g. error.code).
+         * @default 'Command `<%= command %>` failed with exit code <%= error.code %>'
+         */
+        errorMessage?: string;
+        /**
+         * By default, it will emit an error event when the command finishes unsuccessfully.
+         * @default false
+         */
+        ignoreErrors?: boolean;
+        /**
+         * By default, it will print the command output.
+         * @default false
+         */
+        quiet?: boolean;
+        /**
+         * Sets the current working directory for the command.
+         * @default process.cwd()
+         */
+        cwd?: string;
+        /**
+         * The data that can be accessed in template.
+         */
+        templateData?: any;
+        /**
+         * You won't need to set this option unless you encounter a "stdout maxBuffer exceeded" error.
+         * @default 16MB(16 * 1024 * 1024)
+         */
+        maxBuffer?: number;
+        /**
+         * The maximum amount of time in milliseconds the process is allowed to run.
+         * @default
+         */
+        timeout?: number;
+        /**
+         * By default, all the commands will be executed in an environment with all the variables in process.env
+         * and PATH prepended by ./node_modules/.bin (allowing you to run executables in your Node's dependencies).
+         * You can override any environment variables with this option.
+         * For example, setting it to {PATH: process.env.PATH} will reset the PATH
+         * if the default one brings your some troubles.
+         */
+        env?: any;
+    }
 }
 
+declare var shell: shell.Shell;
+
+export = shell;
diff --git a/gulp-size/gulp-size.d.ts b/gulp-size/gulp-size.d.ts
index ec33f14890..557a0393c5 100644
--- a/gulp-size/gulp-size.d.ts
+++ b/gulp-size/gulp-size.d.ts
@@ -5,21 +5,20 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-size' {
-    namespace size {
-        interface Options {
-            showFiles?: boolean;
-            gzip?: boolean;
-            title?: string;
-        }
 
-        interface SizeStream extends NodeJS.ReadWriteStream {
-            size: number;
-            prettySize: string;
-        }
+declare namespace size {
+    interface Options {
+        showFiles?: boolean;
+        gzip?: boolean;
+        title?: string;
     }
 
-    function size(options?: size.Options): size.SizeStream;
-
-    export = size;
+    interface SizeStream extends NodeJS.ReadWriteStream {
+        size: number;
+        prettySize: string;
+    }
 }
+
+declare function size(options?: size.Options): size.SizeStream;
+
+export = size;
diff --git a/gulp-sort/gulp-sort.d.ts b/gulp-sort/gulp-sort.d.ts
index 5290f1ed46..3271e32bd9 100644
--- a/gulp-sort/gulp-sort.d.ts
+++ b/gulp-sort/gulp-sort.d.ts
@@ -7,40 +7,39 @@
 /// <reference path="../gulp-util/gulp-util.d.ts" />
 
 /** Sort files in stream by path or any custom sort comparator */
-declare module 'gulp-sort' {
 
-	import gulpUtil = require('gulp-util');
 
-	interface IOptions {
-		/**
-		 * A function to compare two files.
-		 * Returns:
-		 * -1 if file1 should be before file2,
-		 * 0 if file1 is equivalent to file2, and
-		 * 1 if file1 should be after file2
-		 */
-		comparator?: IComparatorFunction;
-		/** Whether to sort in ascending order, default is true */
-		asc?: boolean;
-	}
+import gulpUtil = require('gulp-util');
 
-	interface IComparatorFunction {
-		/**
-		 * A function to compare two files.
-		 * Returns:
-		 * -1 if file1 should be before file2,
-		 * 0 if file1 is equivalent to file2, and
-		 * 1 if file1 should be after file2
-		 */
-		(file1: gulpUtil.File, file2: gulpUtil.File): number;
-	}
-
-	/** Sort files in stream by path or any custom sort comparator */
-	function gulpSort(): NodeJS.ReadWriteStream;
-	function gulpSort(comparator: IComparatorFunction): NodeJS.ReadWriteStream;
-	function gulpSort(options: IOptions): NodeJS.ReadWriteStream;
-
-	namespace gulpSort {}
-
-	export = gulpSort;
+interface IOptions {
+    /**
+     * A function to compare two files.
+     * Returns:
+     * -1 if file1 should be before file2,
+     * 0 if file1 is equivalent to file2, and
+     * 1 if file1 should be after file2
+     */
+    comparator?: IComparatorFunction;
+    /** Whether to sort in ascending order, default is true */
+    asc?: boolean;
 }
+
+interface IComparatorFunction {
+    /**
+     * A function to compare two files.
+     * Returns:
+     * -1 if file1 should be before file2,
+     * 0 if file1 is equivalent to file2, and
+     * 1 if file1 should be after file2
+     */
+    (file1: gulpUtil.File, file2: gulpUtil.File): number;
+}
+
+/** Sort files in stream by path or any custom sort comparator */
+declare function gulpSort(): NodeJS.ReadWriteStream;
+declare function gulpSort(comparator: IComparatorFunction): NodeJS.ReadWriteStream;
+declare function gulpSort(options: IOptions): NodeJS.ReadWriteStream;
+
+declare namespace gulpSort { }
+
+export = gulpSort;
diff --git a/gulp-sourcemaps/gulp-sourcemaps.d.ts b/gulp-sourcemaps/gulp-sourcemaps.d.ts
index 51f222ed3e..e0f7893076 100644
--- a/gulp-sourcemaps/gulp-sourcemaps.d.ts
+++ b/gulp-sourcemaps/gulp-sourcemaps.d.ts
@@ -5,24 +5,23 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-sourcemaps" {
-    interface InitOptions {
-        loadMaps?: boolean;
-        debug?: boolean;
-    }
 
-    interface WriteMapper {
-        (file: string): string;
-    }
+interface InitOptions {
+    loadMaps?: boolean;
+    debug?: boolean;
+}
 
-    interface WriteOptions {
-        addComment?: boolean;
-        includeContent?: boolean;
-        sourceRoot?: string | WriteMapper;
-        sourceMappingURLPrefix?: string | WriteMapper;
-    }
+interface WriteMapper {
+    (file: string): string;
+}
 
-    export function init(opts?: InitOptions): NodeJS.ReadWriteStream;
-    export function write(path?: string, opts?: WriteOptions): NodeJS.ReadWriteStream;
-    export function write(opts?: WriteOptions): NodeJS.ReadWriteStream;
-}
\ No newline at end of file
+interface WriteOptions {
+    addComment?: boolean;
+    includeContent?: boolean;
+    sourceRoot?: string | WriteMapper;
+    sourceMappingURLPrefix?: string | WriteMapper;
+}
+
+declare export function init(opts?: InitOptions): NodeJS.ReadWriteStream;
+declare export function write(path?: string, opts?: WriteOptions): NodeJS.ReadWriteStream;
+declare export function write(opts?: WriteOptions): NodeJS.ReadWriteStream;
diff --git a/gulp-strip-debug/gulp-strip-debug.d.ts b/gulp-strip-debug/gulp-strip-debug.d.ts
index 782dea37be..d7baaa3a2c 100644
--- a/gulp-strip-debug/gulp-strip-debug.d.ts
+++ b/gulp-strip-debug/gulp-strip-debug.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference path="../node/node.d.ts" />
 
-declare module "gulp-strip-debug" {
-  const gulpStripDebug : () => NodeJS.ReadWriteStream;
-  export = gulpStripDebug;
-}
+
+declare const gulpStripDebug: () => NodeJS.ReadWriteStream;
+export = gulpStripDebug;
diff --git a/gulp-svg-sprite/gulp-svg-sprite.d.ts b/gulp-svg-sprite/gulp-svg-sprite.d.ts
index 036c9bb2ab..fb8d5bec76 100644
--- a/gulp-svg-sprite/gulp-svg-sprite.d.ts
+++ b/gulp-svg-sprite/gulp-svg-sprite.d.ts
@@ -6,17 +6,15 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../svg-sprite/svg-sprite.d.ts" />
 
-declare module "gulp-svg-sprite" {
-    import spriter = require('svg-sprite');
 
-    namespace svgSprite {
-        interface SvgSprite {
-            (options?: spriter.Config): NodeJS.ReadWriteStream;
-        }
+import spriter = require('svg-sprite');
+
+declare namespace svgSprite {
+    interface SvgSprite {
+        (options?: spriter.Config): NodeJS.ReadWriteStream;
     }
-
-    var svgSprite: svgSprite.SvgSprite;
-
-    export = svgSprite;
 }
 
+declare var svgSprite: svgSprite.SvgSprite;
+
+export = svgSprite;
diff --git a/gulp-task-listing/gulp-task-listing.d.ts b/gulp-task-listing/gulp-task-listing.d.ts
index e78c598e3b..113c6acaf2 100644
--- a/gulp-task-listing/gulp-task-listing.d.ts
+++ b/gulp-task-listing/gulp-task-listing.d.ts
@@ -11,30 +11,29 @@
  * You can optionally override the Regexp used to determine whether a task is a primary or 
  * subtask, as well as filter out tasks you don't want to see in the output.
  */
-declare module 'gulp-task-listing' {
-	
-	/** 
-	 * Provides an easy way to get a listing of your tasks from your gulpfile. By default, the 
-	 * output groups tasks based on whether or not they contain a hyphen (-), underscore (_), 
-	 * or colon (:) in their name.
-	 * 
-	 * You can optionally override the Regexp used to determine whether a task is a primary or 
-	 * subtask, as well as filter out tasks you don't want to see in the output.
-	 */
-	interface GulpTaskListing {
-		(cb: Function): void;
-		/**
-		 * Allows for custom filtering of Gulp tasks in the listing
-		 * 
-		 * @param subTaskFilter a RegExp or Function returning whether the given task is a subtask
-		 * @param excludeFilter a RegExp or Function returning whether the given task should be excluded from the listing
-		 */
-		withFilters(subTaskFilter: RegExp | FilterFunction, excludeFilter?: RegExp | FilterFunction): (cb: Function) => void;
-	}
-	
-	type FilterFunction = (task: string) => boolean;
-	
-	var gulpTaskListing: GulpTaskListing;
-	
-	export = gulpTaskListing;
+
+
+/** 
+ * Provides an easy way to get a listing of your tasks from your gulpfile. By default, the 
+ * output groups tasks based on whether or not they contain a hyphen (-), underscore (_), 
+ * or colon (:) in their name.
+ * 
+ * You can optionally override the Regexp used to determine whether a task is a primary or 
+ * subtask, as well as filter out tasks you don't want to see in the output.
+ */
+interface GulpTaskListing {
+    (cb: Function): void;
+    /**
+     * Allows for custom filtering of Gulp tasks in the listing
+     * 
+     * @param subTaskFilter a RegExp or Function returning whether the given task is a subtask
+     * @param excludeFilter a RegExp or Function returning whether the given task should be excluded from the listing
+     */
+    withFilters(subTaskFilter: RegExp | FilterFunction, excludeFilter?: RegExp | FilterFunction): (cb: Function) => void;
 }
+
+type FilterFunction = (task: string) => boolean;
+
+declare var gulpTaskListing: GulpTaskListing;
+
+export = gulpTaskListing;
diff --git a/gulp-tsd/gulp-tsd.d.ts b/gulp-tsd/gulp-tsd.d.ts
index 9077228fec..30f2fc8212 100644
--- a/gulp-tsd/gulp-tsd.d.ts
+++ b/gulp-tsd/gulp-tsd.d.ts
@@ -6,19 +6,18 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../gulp/gulp.d.ts" />
 
-declare module "gulp-tsd" {
-    import gulp = require('gulp');
 
-    interface IOptions {
-        command?: string;
-        latest?: boolean;
-        config?: string;
-        opts?: Object;
-    }
+import gulp = require('gulp');
 
-    function tsd(opts?: IOptions, callback?: gulp.TaskCallback): NodeJS.ReadWriteStream;
-
-    namespace tsd {}
-
-    export = tsd;
+interface IOptions {
+    command?: string;
+    latest?: boolean;
+    config?: string;
+    opts?: Object;
 }
+
+declare function tsd(opts?: IOptions, callback?: gulp.TaskCallback): NodeJS.ReadWriteStream;
+
+declare namespace tsd { }
+
+export = tsd;
diff --git a/gulp-tslint/gulp-tslint.d.ts b/gulp-tslint/gulp-tslint.d.ts
index 6ce984d275..34420daa7b 100644
--- a/gulp-tslint/gulp-tslint.d.ts
+++ b/gulp-tslint/gulp-tslint.d.ts
@@ -6,45 +6,44 @@
 /// <reference path="../node/node.d.ts"/>
 /// <reference path="../vinyl/vinyl.d.ts"/>
 
-declare module "gulp-tslint" {
-    import vinyl = require("vinyl");
 
-    namespace gulpTsLint {
-        interface GulpTsLint {
-            (options?: Options): NodeJS.ReadWriteStream;
-            report(reporter?: Reporter, options?: ReportOptions): NodeJS.ReadWriteStream;
-            report(options?: ReportOptions): NodeJS.ReadWriteStream;
-        }
+import vinyl = require("vinyl");
 
-        interface Options {
-            configuration?: {},
-            rulesDirectory?: string,
-            tslint?: GulpTsLint
-        }
-
-        interface ReportOptions {
-            emitError?: boolean,
-            reportLimit?: number,
-            summarizeFailureOutput?: boolean
-        }
-
-        interface Position {
-            position: number;
-            line: number;
-            character: number;
-        }
-
-        interface Output {
-            name: string;
-            failure: string;
-            startPosition: Position;
-            endPosition: Position;
-            ruleName: string;
-        }
-
-        type Reporter = string|((output: Output[], file: vinyl, options: ReportOptions) => any);
+declare namespace gulpTsLint {
+    interface GulpTsLint {
+        (options?: Options): NodeJS.ReadWriteStream;
+        report(reporter?: Reporter, options?: ReportOptions): NodeJS.ReadWriteStream;
+        report(options?: ReportOptions): NodeJS.ReadWriteStream;
     }
 
-    var gulpTsLint: gulpTsLint.GulpTsLint;
-    export = gulpTsLint;
+    interface Options {
+        configuration?: {},
+        rulesDirectory?: string,
+        tslint?: GulpTsLint
+    }
+
+    interface ReportOptions {
+        emitError?: boolean,
+        reportLimit?: number,
+        summarizeFailureOutput?: boolean
+    }
+
+    interface Position {
+        position: number;
+        line: number;
+        character: number;
+    }
+
+    interface Output {
+        name: string;
+        failure: string;
+        startPosition: Position;
+        endPosition: Position;
+        ruleName: string;
+    }
+
+    type Reporter = string | ((output: Output[], file: vinyl, options: ReportOptions) => any);
 }
+
+declare var gulpTsLint: gulpTsLint.GulpTsLint;
+export = gulpTsLint;
diff --git a/gulp-typedoc/gulp-typedoc.d.ts b/gulp-typedoc/gulp-typedoc.d.ts
index 865fac2b8d..cd83313ed0 100644
--- a/gulp-typedoc/gulp-typedoc.d.ts
+++ b/gulp-typedoc/gulp-typedoc.d.ts
@@ -5,26 +5,25 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-typedoc" {
-    interface Options {
-        out: string;
-        mode?: string;
-        json?: string;
-        exclude?: string;
-        includeDeclarations?: boolean;
-        externalPattern?: string;
-        excludeExternals?: boolean;
-        module?: string;
-        target?: string;
-        theme?: string;
-        name?: string;
-        readme?: string;
-        hideGenerator?: boolean;
-        gaID?: string;
-        gaSite?: string;
-        verbose?: boolean;
-    }
 
-    function typedoc(opts: Options): NodeJS.ReadWriteStream;
-    export = typedoc;
-}
\ No newline at end of file
+interface Options {
+    out: string;
+    mode?: string;
+    json?: string;
+    exclude?: string;
+    includeDeclarations?: boolean;
+    externalPattern?: string;
+    excludeExternals?: boolean;
+    module?: string;
+    target?: string;
+    theme?: string;
+    name?: string;
+    readme?: string;
+    hideGenerator?: boolean;
+    gaID?: string;
+    gaSite?: string;
+    verbose?: boolean;
+}
+
+declare function typedoc(opts: Options): NodeJS.ReadWriteStream;
+export = typedoc;
diff --git a/gulp-typescript/gulp-typescript.d.ts b/gulp-typescript/gulp-typescript.d.ts
index a73c13773b..8f9158b606 100644
--- a/gulp-typescript/gulp-typescript.d.ts
+++ b/gulp-typescript/gulp-typescript.d.ts
@@ -5,69 +5,68 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "gulp-typescript" {
-    function GulpTypescript(params?: GulpTypescript.Params, filters?: GulpTypescript.FilterSettings, reporter?: GulpTypescript.Reporter): GulpTypescript.CompilationStream;
 
-    namespace GulpTypescript {
-        export function createProject(params?: Params): Project;
-        export function createProject(file: string, params?: Params): Project;
-        export function filter(filters: FilterSettings): CompilationStream;
-        interface Params {
-            declarationFiles?: boolean;
-            module?: string;
-            noEmitOnError?: boolean;
-            noExternalResolve?: boolean;
-            noImplicitAny?: boolean;
-            noLib?: boolean;
-            removeComments?: boolean;
-            sourceRoot?: string; // use gulp-sourcemaps instead
-            sortOutput?: boolean;
-            target?: string;
-            typescript?: any;
-            outFile?: string;
-            outDir?: string;
-            suppressImplicitAnyIndexErrors?: boolean;
-            jsx?: string;
-            declaration?: boolean;
-            emitDecoratorMetadata?: boolean;
-            experimentalDecorators?: boolean;
-            experimentalAsyncFunctions?: boolean;
-            moduleResolution?: string;
-            noEmitHelpers?: boolean;
-            preserveConstEnums?: boolean;
-            isolatedModules?: boolean;
-        }
+declare function GulpTypescript(params?: GulpTypescript.Params, filters?: GulpTypescript.FilterSettings, reporter?: GulpTypescript.Reporter): GulpTypescript.CompilationStream;
 
-        interface TsConfig {
-            files?: string[];
-            exclude?: string[];
-            compilerOptions?: any;
-        }
-
-        interface Project {
-            config: TsConfig;
-            src(): NodeJS.ReadWriteStream;
-        }
-
-        interface FilterSettings {
-            referencedFrom?: string[];
-        }
-
-        interface Reporter {
-            error(error: any): void;
-        }
-
-        interface CompilationStream extends NodeJS.ReadWriteStream {
-            dts: NodeJS.ReadWriteStream;
-            js: NodeJS.ReadWriteStream;
-        }
-
-        namespace reporter {
-            function nullReporter(): Reporter;
-            function defaultReporter(): Reporter;
-            function fullReporter(showFullFilename?: boolean): Reporter;
-        }
+declare namespace GulpTypescript {
+    export function createProject(params?: Params): Project;
+    export function createProject(file: string, params?: Params): Project;
+    export function filter(filters: FilterSettings): CompilationStream;
+    interface Params {
+        declarationFiles?: boolean;
+        module?: string;
+        noEmitOnError?: boolean;
+        noExternalResolve?: boolean;
+        noImplicitAny?: boolean;
+        noLib?: boolean;
+        removeComments?: boolean;
+        sourceRoot?: string; // use gulp-sourcemaps instead
+        sortOutput?: boolean;
+        target?: string;
+        typescript?: any;
+        outFile?: string;
+        outDir?: string;
+        suppressImplicitAnyIndexErrors?: boolean;
+        jsx?: string;
+        declaration?: boolean;
+        emitDecoratorMetadata?: boolean;
+        experimentalDecorators?: boolean;
+        experimentalAsyncFunctions?: boolean;
+        moduleResolution?: string;
+        noEmitHelpers?: boolean;
+        preserveConstEnums?: boolean;
+        isolatedModules?: boolean;
     }
 
-    export = GulpTypescript;
+    interface TsConfig {
+        files?: string[];
+        exclude?: string[];
+        compilerOptions?: any;
+    }
+
+    interface Project {
+        config: TsConfig;
+        src(): NodeJS.ReadWriteStream;
+    }
+
+    interface FilterSettings {
+        referencedFrom?: string[];
+    }
+
+    interface Reporter {
+        error(error: any): void;
+    }
+
+    interface CompilationStream extends NodeJS.ReadWriteStream {
+        dts: NodeJS.ReadWriteStream;
+        js: NodeJS.ReadWriteStream;
+    }
+
+    namespace reporter {
+        function nullReporter(): Reporter;
+        function defaultReporter(): Reporter;
+        function fullReporter(showFullFilename?: boolean): Reporter;
+    }
 }
+
+export = GulpTypescript;
diff --git a/gulp-uglify/gulp-uglify.d.ts b/gulp-uglify/gulp-uglify.d.ts
index 13eda63706..fb7b04db9c 100644
--- a/gulp-uglify/gulp-uglify.d.ts
+++ b/gulp-uglify/gulp-uglify.d.ts
@@ -6,37 +6,36 @@
 /// <reference path="../node/node.d.ts"/>
 /// <reference path="../uglify-js/uglify-js.d.ts"/>
 
-declare module "gulp-uglify" {
-    import * as UglifyJS from 'uglify-js';
 
-    namespace GulpUglify {
-        interface Options {
-            /**
-             * Pass false to skip mangling names.
-             */
-            mangle?: boolean;
+import * as UglifyJS from 'uglify-js';
 
-            /**
-             * Pass if you wish to specify additional output options. The defaults are optimized for best compression.
-             */
-            output?: UglifyJS.BeautifierOptions;
+declare namespace GulpUglify {
+    interface Options {
+        /**
+         * Pass false to skip mangling names.
+         */
+        mangle?: boolean;
 
-            /**
-             * Pass an object to specify custom compressor options. Pass false to skip compression completely.
-             */
-            compress?: UglifyJS.CompressorOptions | boolean;
+        /**
+         * Pass if you wish to specify additional output options. The defaults are optimized for best compression.
+         */
+        output?: UglifyJS.BeautifierOptions;
 
-            /**
-             * A convenience option for options.output.comments. Defaults to preserving no comments.
-             * all - Preserve all comments in code blocks
-             * some - Preserve comments that start with a bang (!) or include a Closure Compiler directive (@preserve, @license, @cc_on)
-             * function - Specify your own comment preservation function. You will be passed the current node and the current comment and are expected to return either true or false.
-             */
-            preserverComments?: string|((node: any, comment: UglifyJS.Tokenizer) => boolean);
-        }
+        /**
+         * Pass an object to specify custom compressor options. Pass false to skip compression completely.
+         */
+        compress?: UglifyJS.CompressorOptions | boolean;
+
+        /**
+         * A convenience option for options.output.comments. Defaults to preserving no comments.
+         * all - Preserve all comments in code blocks
+         * some - Preserve comments that start with a bang (!) or include a Closure Compiler directive (@preserve, @license, @cc_on)
+         * function - Specify your own comment preservation function. You will be passed the current node and the current comment and are expected to return either true or false.
+         */
+        preserverComments?: string | ((node: any, comment: UglifyJS.Tokenizer) => boolean);
     }
-
-    function GulpUglify(options?: GulpUglify.Options): NodeJS.ReadWriteStream;
-
-    export = GulpUglify;
 }
+
+declare function GulpUglify(options?: GulpUglify.Options): NodeJS.ReadWriteStream;
+
+export = GulpUglify;
diff --git a/gulp-useref/gulp-useref.d.ts b/gulp-useref/gulp-useref.d.ts
index 96c214532b..bc490e5327 100644
--- a/gulp-useref/gulp-useref.d.ts
+++ b/gulp-useref/gulp-useref.d.ts
@@ -5,20 +5,19 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-useref' {
-    interface Options {
-        searchPath?: string | string[];
-        base?: string;
-        noAssets?: boolean;
-        noconcat?: boolean;
-        additionalStreams?: Array<NodeJS.ReadWriteStream>;
-        transformPath?: (filePath: string) => void;
-    }
 
-    interface Useref {
-        (options?: Options, ...transformStreams: NodeJS.ReadWriteStream[]): NodeJS.ReadWriteStream;
-    }
-
-    var useref: Useref;
-    export = useref;
+interface Options {
+    searchPath?: string | string[];
+    base?: string;
+    noAssets?: boolean;
+    noconcat?: boolean;
+    additionalStreams?: Array<NodeJS.ReadWriteStream>;
+    transformPath?: (filePath: string) => void;
 }
+
+interface Useref {
+    (options?: Options, ...transformStreams: NodeJS.ReadWriteStream[]): NodeJS.ReadWriteStream;
+}
+
+declare var useref: Useref;
+export = useref;
diff --git a/gulp-watch/gulp-watch.d.ts b/gulp-watch/gulp-watch.d.ts
index 7b2f8a1a30..a1e55f3063 100644
--- a/gulp-watch/gulp-watch.d.ts
+++ b/gulp-watch/gulp-watch.d.ts
@@ -5,23 +5,22 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'gulp-watch' {
-    interface IOptions {
-        ignoreInitial?: boolean;
-        events?: Array<string>;
-        base?: string;
-        name?: string;
-        verbose?: boolean;
-        readDelay?: number;
-    }
 
-    interface IWatchStream extends NodeJS.ReadWriteStream {
-        add(path: string | Array<string>): NodeJS.ReadWriteStream;
-        unwatch(path: string | Array<string>): NodeJS.ReadWriteStream;
-        close(): NodeJS.ReadWriteStream;
-    }
-
-    function watch(glob: string | Array<string>, options?: IOptions, callback?: Function): IWatchStream;
-    namespace watch {}
-    export = watch;
+interface IOptions {
+    ignoreInitial?: boolean;
+    events?: Array<string>;
+    base?: string;
+    name?: string;
+    verbose?: boolean;
+    readDelay?: number;
 }
+
+interface IWatchStream extends NodeJS.ReadWriteStream {
+    add(path: string | Array<string>): NodeJS.ReadWriteStream;
+    unwatch(path: string | Array<string>): NodeJS.ReadWriteStream;
+    close(): NodeJS.ReadWriteStream;
+}
+
+declare function watch(glob: string | Array<string>, options?: IOptions, callback?: Function): IWatchStream;
+declare namespace watch { }
+export = watch;
diff --git a/gulp/gulp.d.ts b/gulp/gulp.d.ts
index 43bb5aa597..3716ec8e8f 100644
--- a/gulp/gulp.d.ts
+++ b/gulp/gulp.d.ts
@@ -6,285 +6,284 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../orchestrator/orchestrator.d.ts" />
 
-declare module "gulp" {
-    import Orchestrator = require("orchestrator");
 
-    namespace gulp {
-        interface Gulp extends Orchestrator {
-            /**
-             * Define a task
-             * @param name The name of the task.
-             * @param deps An array of task names to be executed and completed before your task will run.
-             * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
-             * <ul>
-             *     <li>Take in a callback</li>
-             *     <li>Return a stream or a promise</li>
-             * </ul>
-             */
-            task: Orchestrator.AddMethod;
-            /**
-             * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
-             * @param glob Glob or array of globs to read.
-             * @param opt Options to pass to node-glob through glob-stream.
-             */
-            src: SrcMethod;
-            /**
-             * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
-             * Folders that don't exist will be created.
-             *
-             * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
-             * @param opt
-             */
-            dest: DestMethod;
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param opt options, that are passed to the gaze library.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            watch: WatchMethod;
-        }
-
-        interface GulpPlugin {
-            (...args: any[]): NodeJS.ReadWriteStream;
-        }
-
-        interface WatchMethod {
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            (glob: string|string[], fn: (WatchCallback|string)): NodeJS.EventEmitter;
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            (glob: string|string[], fn: (WatchCallback|string)[]): NodeJS.EventEmitter;
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param opt options, that are passed to the gaze library.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)): NodeJS.EventEmitter;
-            /**
-             * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
-             *
-             * @param glob a single glob or array of globs that indicate which files to watch for changes.
-             * @param opt options, that are passed to the gaze library.
-             * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
-             */
-            (glob: string|string[], opt: WatchOptions, fn: (WatchCallback|string)[]): NodeJS.EventEmitter;
-
-        }
-
-        interface DestMethod {
-            /**
-             * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
-             * Folders that don't exist will be created.
-             *
-             * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
-             * @param opt
-             */
-            (outFolder: string|((file: string) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
-        }
-
-        interface SrcMethod {
-            /**
-             * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
-             * @param glob Glob or array of globs to read.
-             * @param opt Options to pass to node-glob through glob-stream.
-             */
-            (glob: string|string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
-        }
+import Orchestrator = require("orchestrator");
 
+declare namespace gulp {
+    interface Gulp extends Orchestrator {
         /**
-         * Options to pass to node-glob through glob-stream.
-         * Specifies two options in addition to those used by node-glob:
-         * https://github.com/isaacs/node-glob#options
+         * Define a task
+         * @param name The name of the task.
+         * @param deps An array of task names to be executed and completed before your task will run.
+         * @param fn The function that performs the task's operations. For asynchronous tasks, you need to provide a hint when the task is complete:
+         * <ul>
+         *     <li>Take in a callback</li>
+         *     <li>Return a stream or a promise</li>
+         * </ul>
          */
-        interface SrcOptions {
-            /**
-             * Setting this to <code>false</code> will return <code>file.contents</code> as <code>null</code>
-             * and not read the file at all.
-             * Default: <code>true</code>.
-             */
-            read?: boolean;
-
-            /**
-             * Setting this to false will return <code>file.contents</code> as a stream and not buffer files.
-             * This is useful when working with large files.
-             * Note: Plugins might not implement support for streams.
-             * Default: <code>true</code>.
-             */
-            buffer?: boolean;
-
-            /**
-             * The base path of a glob.
-             *
-             * Default is everything before a glob starts.
-             */
-            base?: string;
-
-            /**
-             * The current working directory in which to search.
-             * Defaults to process.cwd().
-             */
-            cwd?: string;
-
-            /**
-             * The place where patterns starting with / will be mounted onto.
-             * Defaults to path.resolve(options.cwd, "/") (/ on Unix systems, and C:\ or some such on Windows.)
-             */
-            root?: string;
-
-            /**
-             * Include .dot files in normal matches and globstar matches.
-             * Note that an explicit dot in a portion of the pattern will always match dot files.
-             */
-            dot?: boolean;
-
-            /**
-             * By default, a pattern starting with a forward-slash will be "mounted" onto the root setting, so that a valid
-             * filesystem path is returned. Set this flag to disable that behavior.
-             */
-            nomount?: boolean;
-
-            /**
-             * Add a / character to directory matches. Note that this requires additional stat calls.
-             */
-            mark?: boolean;
-
-            /**
-             * Don't sort the results.
-             */
-            nosort?: boolean;
-
-            /**
-             * Set to true to stat all results. This reduces performance somewhat, and is completely unnecessary, unless
-             * readdir is presumed to be an untrustworthy indicator of file existence. It will cause ELOOP to be triggered one
-             * level sooner in the case of cyclical symbolic links.
-             */
-            stat?: boolean;
-
-            /**
-             * When an unusual error is encountered when attempting to read a directory, a warning will be printed to stderr.
-             * Set the silent option to true to suppress these warnings.
-             */
-            silent?: boolean;
-
-            /**
-             * When an unusual error is encountered when attempting to read a directory, the process will just continue on in
-             * search of other matches. Set the strict option to raise an error in these cases.
-             */
-            strict?: boolean;
-
-            /**
-             * See cache property above. Pass in a previously generated cache object to save some fs calls.
-             */
-            cache?: boolean;
-
-            /**
-             * A cache of results of filesystem information, to prevent unnecessary stat calls.
-             * While it should not normally be necessary to set this, you may pass the statCache from one glob() call to the
-             * options object of another, if you know that the filesystem will not change between calls.
-             */
-            statCache?: boolean;
-
-            /**
-             * Perform a synchronous glob search.
-             */
-            sync?: boolean;
-
-            /**
-             * In some cases, brace-expanded patterns can result in the same file showing up multiple times in the result set.
-             * By default, this implementation prevents duplicates in the result set. Set this flag to disable that behavior.
-             */
-            nounique?: boolean;
-
-            /**
-             * Set to never return an empty set, instead returning a set containing the pattern itself.
-             * This is the default in glob(3).
-             */
-            nonull?: boolean;
-
-            /**
-             * Perform a case-insensitive match. Note that case-insensitive filesystems will sometimes result in glob returning
-             * results that are case-insensitively matched anyway, since readdir and stat will not raise an error.
-             */
-            nocase?: boolean;
-
-            /**
-             * Set to enable debug logging in minimatch and glob.
-             */
-            debug?: boolean;
-
-            /**
-             * Set to enable debug logging in glob, but not minimatch.
-             */
-            globDebug?: boolean;
-        }
-
-        interface DestOptions {
-            /**
-             * The output folder. Only has an effect if provided output folder is relative.
-             * Default: process.cwd()
-             */
-            cwd?: string;
-
-            /**
-             * Octal permission string specifying mode for any folders that need to be created for output folder.
-             * Default: 0777.
-             */
-            mode?: string;
-        }
-
+        task: Orchestrator.AddMethod;
         /**
-         * Options that are passed to <code>gaze</code>.
-         * https://github.com/shama/gaze
+         * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+         * @param glob Glob or array of globs to read.
+         * @param opt Options to pass to node-glob through glob-stream.
          */
-        interface WatchOptions {
-            /** Interval to pass to fs.watchFile. */
-            interval?: number;
-            /** Delay for events called in succession for the same file/event. */
-            debounceDelay?: number;
-            /** Force the watch mode. Either 'auto' (default), 'watch' (force native events), or 'poll' (force stat polling). */
-            mode?: string;
-            /** The current working directory to base file patterns from. Default is process.cwd().. */
-            cwd?: string;
-        }
-
-        interface WatchEvent {
-            /** The type of change that occurred, either added, changed or deleted. */
-            type: string;
-            /** The path to the file that triggered the event. */
-            path: string;
-        }
-
+        src: SrcMethod;
         /**
-         * Callback to be called on each watched file change.
+         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
+         * Folders that don't exist will be created.
+         *
+         * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+         * @param opt
          */
-        interface WatchCallback {
-            (event: WatchEvent): void;
-        }
-
-        interface TaskCallback {
-            /**
-             * Defines a task.
-             * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream.
-             * @param cb callback used to signal asynchronous completion. Caller includes <code>err</code> in case of error.
-             */
-            (cb?: (err?: any) => void): any;
-        }
+        dest: DestMethod;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        watch: WatchMethod;
     }
 
-    var gulp: gulp.Gulp;
+    interface GulpPlugin {
+        (...args: any[]): NodeJS.ReadWriteStream;
+    }
 
-    export = gulp;
+    interface WatchMethod {
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], fn: (WatchCallback | string)): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], fn: (WatchCallback | string)[]): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], opt: WatchOptions, fn: (WatchCallback | string)): NodeJS.EventEmitter;
+        /**
+         * Watch files and do something when a file changes. This always returns an EventEmitter that emits change events.
+         *
+         * @param glob a single glob or array of globs that indicate which files to watch for changes.
+         * @param opt options, that are passed to the gaze library.
+         * @param fn a callback or array of callbacks to be called on each change, or names of task(s) to run when a file changes, added with task().
+         */
+        (glob: string | string[], opt: WatchOptions, fn: (WatchCallback | string)[]): NodeJS.EventEmitter;
+
+    }
+
+    interface DestMethod {
+        /**
+         * Can be piped to and it will write files. Re-emits all data passed to it so you can pipe to multiple folders.
+         * Folders that don't exist will be created.
+         *
+         * @param outFolder The path (output folder) to write files to. Or a function that returns it, the function will be provided a vinyl File instance.
+         * @param opt
+         */
+        (outFolder: string | ((file: string) => string), opt?: DestOptions): NodeJS.ReadWriteStream;
+    }
+
+    interface SrcMethod {
+        /**
+         * Emits files matching provided glob or an array of globs. Returns a stream of Vinyl files that can be piped to plugins.
+         * @param glob Glob or array of globs to read.
+         * @param opt Options to pass to node-glob through glob-stream.
+         */
+        (glob: string | string[], opt?: SrcOptions): NodeJS.ReadWriteStream;
+    }
+
+    /**
+     * Options to pass to node-glob through glob-stream.
+     * Specifies two options in addition to those used by node-glob:
+     * https://github.com/isaacs/node-glob#options
+     */
+    interface SrcOptions {
+        /**
+         * Setting this to <code>false</code> will return <code>file.contents</code> as <code>null</code>
+         * and not read the file at all.
+         * Default: <code>true</code>.
+         */
+        read?: boolean;
+
+        /**
+         * Setting this to false will return <code>file.contents</code> as a stream and not buffer files.
+         * This is useful when working with large files.
+         * Note: Plugins might not implement support for streams.
+         * Default: <code>true</code>.
+         */
+        buffer?: boolean;
+
+        /**
+         * The base path of a glob.
+         *
+         * Default is everything before a glob starts.
+         */
+        base?: string;
+
+        /**
+         * The current working directory in which to search.
+         * Defaults to process.cwd().
+         */
+        cwd?: string;
+
+        /**
+         * The place where patterns starting with / will be mounted onto.
+         * Defaults to path.resolve(options.cwd, "/") (/ on Unix systems, and C:\ or some such on Windows.)
+         */
+        root?: string;
+
+        /**
+         * Include .dot files in normal matches and globstar matches.
+         * Note that an explicit dot in a portion of the pattern will always match dot files.
+         */
+        dot?: boolean;
+
+        /**
+         * By default, a pattern starting with a forward-slash will be "mounted" onto the root setting, so that a valid
+         * filesystem path is returned. Set this flag to disable that behavior.
+         */
+        nomount?: boolean;
+
+        /**
+         * Add a / character to directory matches. Note that this requires additional stat calls.
+         */
+        mark?: boolean;
+
+        /**
+         * Don't sort the results.
+         */
+        nosort?: boolean;
+
+        /**
+         * Set to true to stat all results. This reduces performance somewhat, and is completely unnecessary, unless
+         * readdir is presumed to be an untrustworthy indicator of file existence. It will cause ELOOP to be triggered one
+         * level sooner in the case of cyclical symbolic links.
+         */
+        stat?: boolean;
+
+        /**
+         * When an unusual error is encountered when attempting to read a directory, a warning will be printed to stderr.
+         * Set the silent option to true to suppress these warnings.
+         */
+        silent?: boolean;
+
+        /**
+         * When an unusual error is encountered when attempting to read a directory, the process will just continue on in
+         * search of other matches. Set the strict option to raise an error in these cases.
+         */
+        strict?: boolean;
+
+        /**
+         * See cache property above. Pass in a previously generated cache object to save some fs calls.
+         */
+        cache?: boolean;
+
+        /**
+         * A cache of results of filesystem information, to prevent unnecessary stat calls.
+         * While it should not normally be necessary to set this, you may pass the statCache from one glob() call to the
+         * options object of another, if you know that the filesystem will not change between calls.
+         */
+        statCache?: boolean;
+
+        /**
+         * Perform a synchronous glob search.
+         */
+        sync?: boolean;
+
+        /**
+         * In some cases, brace-expanded patterns can result in the same file showing up multiple times in the result set.
+         * By default, this implementation prevents duplicates in the result set. Set this flag to disable that behavior.
+         */
+        nounique?: boolean;
+
+        /**
+         * Set to never return an empty set, instead returning a set containing the pattern itself.
+         * This is the default in glob(3).
+         */
+        nonull?: boolean;
+
+        /**
+         * Perform a case-insensitive match. Note that case-insensitive filesystems will sometimes result in glob returning
+         * results that are case-insensitively matched anyway, since readdir and stat will not raise an error.
+         */
+        nocase?: boolean;
+
+        /**
+         * Set to enable debug logging in minimatch and glob.
+         */
+        debug?: boolean;
+
+        /**
+         * Set to enable debug logging in glob, but not minimatch.
+         */
+        globDebug?: boolean;
+    }
+
+    interface DestOptions {
+        /**
+         * The output folder. Only has an effect if provided output folder is relative.
+         * Default: process.cwd()
+         */
+        cwd?: string;
+
+        /**
+         * Octal permission string specifying mode for any folders that need to be created for output folder.
+         * Default: 0777.
+         */
+        mode?: string;
+    }
+
+    /**
+     * Options that are passed to <code>gaze</code>.
+     * https://github.com/shama/gaze
+     */
+    interface WatchOptions {
+        /** Interval to pass to fs.watchFile. */
+        interval?: number;
+        /** Delay for events called in succession for the same file/event. */
+        debounceDelay?: number;
+        /** Force the watch mode. Either 'auto' (default), 'watch' (force native events), or 'poll' (force stat polling). */
+        mode?: string;
+        /** The current working directory to base file patterns from. Default is process.cwd().. */
+        cwd?: string;
+    }
+
+    interface WatchEvent {
+        /** The type of change that occurred, either added, changed or deleted. */
+        type: string;
+        /** The path to the file that triggered the event. */
+        path: string;
+    }
+
+    /**
+     * Callback to be called on each watched file change.
+     */
+    interface WatchCallback {
+        (event: WatchEvent): void;
+    }
+
+    interface TaskCallback {
+        /**
+         * Defines a task.
+         * Tasks may be made asynchronous if they are passing a callback or return a promise or a stream.
+         * @param cb callback used to signal asynchronous completion. Caller includes <code>err</code> in case of error.
+         */
+        (cb?: (err?: any) => void): any;
+    }
 }
+
+declare var gulp: gulp.Gulp;
+
+export = gulp;
diff --git a/hapi/hapi-8.2.0.d.ts b/hapi/hapi-8.2.0.d.ts
index d205ade2bc..072e3a7a20 100644
--- a/hapi/hapi-8.2.0.d.ts
+++ b/hapi/hapi-8.2.0.d.ts
@@ -7,665 +7,665 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "hapi" {
-	import http = require("http");
-	import stream = require("stream");
-	import Events = require("events");
 
-	interface IDictionary<T> {
-		[key: string]: T;
-	}
+import http = require("http");
+import stream = require("stream");
+import Events = require("events");
 
-	/** Boom Module for errors. https://github.com/hapijs/boom
-	*  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
-	export interface IBoom extends Error {
-		/**  if true, indicates this is a Boom object instance.  */
-		isBoom: boolean;
-		/** convenience bool indicating status code >= 500.  */
-		isServer: boolean;
-		/**  the error message.  */
-		message: string;
-		/**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
-		output: {
-			/** the HTTP status code (typically 4xx or 5xx).  */
-			statusCode: number;
-			/** an object containing any HTTP headers where each key is a header name and value is the header content.  */
-			headers: IDictionary<string>;
-			/** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
-			payload: {
-				/** the HTTP status code, derived from error.output.statusCode.  */
-				statusCode: number;
-				/** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
-				error: string;
-				/** the error message derived from error.message. */
-				message: string;
-			};
-		};
-		/**  reformat()rebuilds error.output using the other object properties.  */
-		reformat(): void;
+interface IDictionary<T> {
+    [key: string]: T;
+}
 
-	}
+/** Boom Module for errors. https://github.com/hapijs/boom
+*  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
+export interface IBoom extends Error {
+    /**  if true, indicates this is a Boom object instance.  */
+    isBoom: boolean;
+    /** convenience bool indicating status code >= 500.  */
+    isServer: boolean;
+    /**  the error message.  */
+    message: string;
+    /**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
+    output: {
+        /** the HTTP status code (typically 4xx or 5xx).  */
+        statusCode: number;
+        /** an object containing any HTTP headers where each key is a header name and value is the header content.  */
+        headers: IDictionary<string>;
+        /** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
+        payload: {
+            /** the HTTP status code, derived from error.output.statusCode.  */
+            statusCode: number;
+            /** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
+            error: string;
+            /** the error message derived from error.message. */
+            message: string;
+        };
+    };
+    /**  reformat()rebuilds error.output using the other object properties.  */
+    reformat(): void;
 
-	/** cache functionality via the "CatBox" module. */
-	export interface ICatBoxCacheOptions {
-		/**  a prototype function or catbox engine object.  */
-		engine: any;
-		/**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
-		name?: string;
-		/**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
-		shared?: boolean;
-	}
+}
 
-	/** Any connections configuration server defaults can be included to override and customize the individual connection. */
-	export interface ISeverConnectionOptions extends IConnectionConfigurationServerDefaults {
-		/**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
-		host?: string;
-		/** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
-		address?: string;
-		/** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
-		port?: string|number;
-		/** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
-		uri?: string;
-		/**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
-		listener?: any;
-		/**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
-		autoListen?: boolean;
-		/**  caching headers configuration: */
-		cache?: {
-			/** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
-			statuses: number[];
-		};
-		/** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
-		labels?: string|string[];
-		/**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
-		tls?: boolean;
+/** cache functionality via the "CatBox" module. */
+export interface ICatBoxCacheOptions {
+    /**  a prototype function or catbox engine object.  */
+    engine: any;
+    /**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
+    name?: string;
+    /**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
+    shared?: boolean;
+}
 
-	}
+/** Any connections configuration server defaults can be included to override and customize the individual connection. */
+export interface ISeverConnectionOptions extends IConnectionConfigurationServerDefaults {
+    /**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
+    host?: string;
+    /** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
+    address?: string;
+    /** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
+    port?: string | number;
+    /** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
+    uri?: string;
+    /**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
+    listener?: any;
+    /**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
+    autoListen?: boolean;
+    /**  caching headers configuration: */
+    cache?: {
+        /** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
+        statuses: number[];
+    };
+    /** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
+    labels?: string | string[];
+    /**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
+    tls?: boolean;
 
-	export interface IConnectionConfigurationServerDefaults {
-		/**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
-		app?: any;
-		/**  connection load limits configuration where:  */
-		load?: {
-			/**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxHeapUsedBytes: number;
-			/**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxRssBytes: number;
-			/**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxEventLoopDelay: number;
-		};
-		/**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
-		plugins?: any;
-		/**  controls how incoming request URIs are matched against the routing table: */
-		router?: {
-			/**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
-			isCaseSensitive: boolean;
-			/**  removes trailing slashes on incoming paths. Defaults to false.  */
-			stripTrailingSlash: boolean;
-		};
-		/** a route options object used to set the default configuration for every route. */
-		routes?: IRouteAdditionalConfigurationOptions;
-		state?: IServerState;
-	}
+}
 
-	/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
-	export interface IServerOptions {
-		/**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
-		app?: any;
-		/**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
-		a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
-		a configuration object with the following options:
-		enginea prototype function or catbox engine object.
-		namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
-		sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
-		other options passed to the catbox strategy used.
-		an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
-		cache?: string|ICatBoxCacheOptions|Array<ICatBoxCacheOptions>|any;
-		/**  sets the default connections configuration which can be overridden by each connection where:  */
-		connections?: IConnectionConfigurationServerDefaults;
-		/** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
-		debug?: boolean|{
-			/** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
-			log: string[];
-			/**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
-			request: string[];
-		};
-		/** file system related settings*/
-		files?: {
-			/**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
-			etagsCacheMaxSize?: number;
-		};
-		/**  process load monitoring*/
-		load?: {
-			/**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
-			sampleInterval?: number;
-		};
+export interface IConnectionConfigurationServerDefaults {
+    /**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
+    app?: any;
+    /**  connection load limits configuration where:  */
+    load?: {
+        /**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxHeapUsedBytes: number;
+        /**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxRssBytes: number;
+        /**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxEventLoopDelay: number;
+    };
+    /**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
+    plugins?: any;
+    /**  controls how incoming request URIs are matched against the routing table: */
+    router?: {
+        /**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
+        isCaseSensitive: boolean;
+        /**  removes trailing slashes on incoming paths. Defaults to false.  */
+        stripTrailingSlash: boolean;
+    };
+    /** a route options object used to set the default configuration for every route. */
+    routes?: IRouteAdditionalConfigurationOptions;
+    state?: IServerState;
+}
 
-		/** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
-		mime?: any;
-		/**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
-		minimal?: boolean;
-		/** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
-		plugins?: IDictionary<any>;
+/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
+export interface IServerOptions {
+    /**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
+    app?: any;
+    /**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
+    a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
+    a configuration object with the following options:
+    enginea prototype function or catbox engine object.
+    namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
+    sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
+    other options passed to the catbox strategy used.
+    an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
+    cache?: string | ICatBoxCacheOptions | Array<ICatBoxCacheOptions> | any;
+    /**  sets the default connections configuration which can be overridden by each connection where:  */
+    connections?: IConnectionConfigurationServerDefaults;
+    /** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
+    debug?: boolean | {
+        /** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
+        log: string[];
+        /**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
+        request: string[];
+    };
+    /** file system related settings*/
+    files?: {
+        /**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
+        etagsCacheMaxSize?: number;
+    };
+    /**  process load monitoring*/
+    load?: {
+        /**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
+        sampleInterval?: number;
+    };
 
-	}
+    /** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
+    mime?: any;
+    /**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
+    minimal?: boolean;
+    /** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
+    plugins?: IDictionary<any>;
 
-	export interface IServerViewCompile {
-		(template: string, options: any): void;
-		(template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
-	}
+}
 
-	export interface IServerViewsAdditionalOptions {
-		/**	path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
-		path?: string;
-		/**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
-		*/
-		partialsPath?: string;
-		/**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
-		helpersPath?: string;
-		/**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
-		relativeTo?: string;
+export interface IServerViewCompile {
+    (template: string, options: any): void;
+    (template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
+}
 
-		/**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
-		layout?: boolean;
-		/**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
-		layoutPath?: string;
-		/**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
-		layoutKeywork?: string;
-		/**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
-		encoding?: string;
-		/**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
-		isCached?: boolean;
-		/**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
-		allowAbsolutePaths?: boolean;
-		/**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
-		allowInsecureAccess?: boolean;
-		/**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
-		compileOptions?: any;
-		/**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
-		runtimeOptions?: any;
-		/**contentType - the content type of the engine results.Defaults to 'text/html'.*/
-		contentType?: string;
-		/**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
-		compileMode?: string;
-		/**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
-		context?: any;
-	}
+export interface IServerViewsAdditionalOptions {
+    /**	path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
+    path?: string;
+    /**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
+    */
+    partialsPath?: string;
+    /**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
+    helpersPath?: string;
+    /**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
+    relativeTo?: string;
 
-	export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
-		/**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
-		* If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
-		module: {
-			compile? (template: any, options: any): (context: any, options: any) => void;
-			compile? (template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
-		};
-	}
+    /**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
+    layout?: boolean;
+    /**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
+    layoutPath?: string;
+    /**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
+    layoutKeywork?: string;
+    /**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
+    encoding?: string;
+    /**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
+    isCached?: boolean;
+    /**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
+    allowAbsolutePaths?: boolean;
+    /**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
+    allowInsecureAccess?: boolean;
+    /**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
+    compileOptions?: any;
+    /**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
+    runtimeOptions?: any;
+    /**contentType - the content type of the engine results.Defaults to 'text/html'.*/
+    contentType?: string;
+    /**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
+    compileMode?: string;
+    /**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
+    context?: any;
+}
 
-	/**Initializes the server views manager
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
+export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
+    /**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
+    * If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
+    module: {
+        compile?(template: any, options: any): (context: any, options: any) => void;
+        compile?(template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
+    };
+}
 
-	server.views({
-	engines: {
-	html: require('handlebars'),
-	jade: require('jade')
-	},
-	path: '/static/templates'
-	});
-	When server.views() is called within a plugin, the views manager is only available to plugins methods.
-	*/
-	export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
-		/** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
-		engines: IDictionary<any>|IServerViewsEnginesOptions;
-		/**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
-		defaultExtension?: string;
-	}
+/**Initializes the server views manager
+var Hapi = require('hapi');
+var server = new Hapi.Server();
 
-	/**  Concludes the handler activity by setting a response and returning control over to the framework where:
-	erran optional error response.
-	resultan optional response payload.
-	Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
-	FLOW CONTROL:
-	When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
-	export interface IReply {
-		<T>(err: Error,
-		result?: string|number|boolean|Buffer|stream.Stream | Promise<T> | T,
-		/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-		credentialData?: any
-		): IBoom;
-		/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-		<T>(result?: string|number|boolean|Buffer|stream.Stream | Promise<T> | T): Response;
+server.views({
+engines: {
+html: require('handlebars'),
+jade: require('jade')
+},
+path: '/static/templates'
+});
+When server.views() is called within a plugin, the views manager is only available to plugins methods.
+*/
+export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
+    /** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
+    engines: IDictionary<any> | IServerViewsEnginesOptions;
+    /**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
+    defaultExtension?: string;
+}
 
-		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
-		  * The data argument is only used for passing back authentication data and is ignored elsewhere. */
-		continue(credentialData?: any): void;
+/**  Concludes the handler activity by setting a response and returning control over to the framework where:
+erran optional error response.
+resultan optional response payload.
+Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
+FLOW CONTROL:
+When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
+export interface IReply {
+    <T>(err: Error,
+        result?: string | number | boolean | Buffer | stream.Stream | Promise<T> | T,
+        /**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+        credentialData?: any
+    ): IBoom;
+    /**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+    <T>(result?: string | number | boolean | Buffer | stream.Stream | Promise<T> | T): Response;
 
-		/** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
-		file(
-			/**   the file path. */
-			path: string,
-			/**  optional settings:  */
-			options?: {
-				/** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-				filename?: string;
-				/** specifies whether to include the 'Content-Disposition' header with the response. Available values:
-				false - header is not included. This is the default value.
-				'attachment'
-				'inline'*/
-				mode?: boolean|string;
-				/**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
-				lookupCompressed: boolean;
-			}): void;
-		/**  Concludes the handler activity by returning control over to the router with a templatized view response.
-		the response flow control rules apply. */
+    /** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
+      * The data argument is only used for passing back authentication data and is ignored elsewhere. */
+    continue(credentialData?: any): void;
 
-		view(
-			/**  the template filename and path, relative to the templates path configured via the server views manager. */
-			template: string,
-			/**  optional object used by the template to render context-specific result. Defaults to no context {}. */
-			context?: {},
-			/**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
-			options?: any): Response;
-		/** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
-		The response flow control rules do not apply. */
-		close(options?: {
-			/**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
-			end?: boolean;
-		}): void;
-		/** Proxies the request to an upstream endpoint.
-		the response flow control rules do not apply. */
+    /** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
+    file(
+        /**   the file path. */
+        path: string,
+        /**  optional settings:  */
+        options?: {
+            /** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+            filename?: string;
+            /** specifies whether to include the 'Content-Disposition' header with the response. Available values:
+            false - header is not included. This is the default value.
+            'attachment'
+            'inline'*/
+            mode?: boolean | string;
+            /**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
+            lookupCompressed: boolean;
+        }): void;
+    /**  Concludes the handler activity by returning control over to the router with a templatized view response.
+    the response flow control rules apply. */
 
-		proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
-			options: IProxyHandlerConfig): void;
-		/** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
-		he response flow control rules apply. */
-		redirect(uri: string): Response;
-	}
+    view(
+        /**  the template filename and path, relative to the templates path configured via the server views manager. */
+        template: string,
+        /**  optional object used by the template to render context-specific result. Defaults to no context {}. */
+        context?: {},
+        /**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
+        options?: any): Response;
+    /** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
+    The response flow control rules do not apply. */
+    close(options?: {
+        /**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
+        end?: boolean;
+    }): void;
+    /** Proxies the request to an upstream endpoint.
+    the response flow control rules do not apply. */
 
-	export interface ISessionHandler {
-		(request: Request, reply: IReply): void;
-	}
-	export interface IRequestHandler<T> {
-		(request: Request): T;
-	}
+    proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
+        options: IProxyHandlerConfig): void;
+    /** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
+    he response flow control rules apply. */
+    redirect(uri: string): Response;
+}
+
+export interface ISessionHandler {
+    (request: Request, reply: IReply): void;
+}
+export interface IRequestHandler<T> {
+    (request: Request): T;
+}
 
 
-	export interface IFailAction {
-		(source: string, error: any, next: () => void): void
-	}
-	/**  generates a reverse proxy handler */
-	export interface IProxyHandlerConfig {
-		/** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
-		host?: string;
-		/** the upstream service port. */
-		port?: number;
-		/**  The protocol to use when making a request to the proxied host:
-		'http'
-		'https'*/
-		protocol?: string;
-		/**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
-		uri?: string;
-		/**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
-		passThrough?: boolean;
-		/** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
-		localStatePassThrough?: boolean;
-		/**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
-		acceptEncoding?: boolean;
-		/** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
-		rejectUnauthorized?: boolean;
-		/**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
-		xforward?: boolean;
-		/** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
-		redirects?: boolean|number;
-		/**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
-		timeout?: number;
-		/** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
-		request - is the incoming request object.
-		callback - is function(err, uri, headers) where:
-		err - internal error condition.
-		uri - the absolute proxy URI.
-		headers - optional object where each key is an HTTP request header and the value is the header content.*/
-		mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
-		/**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
-		onResponse?: (
-		err: any,
-		res: http.ServerResponse,
-		req: Request,
-		reply: () => void,
-		settings: IProxyHandlerConfig,
-		ttl: number
-		) => void;
-		/** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
-		ttl?: number;
-		/** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
-		agent?: http.Agent;
-		/** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
-		maxSockets?: boolean|number;
-	}
-	/**  TODO: fill in joi definition  */
-	export interface IJoi {
+export interface IFailAction {
+    (source: string, error: any, next: () => void): void
+}
+/**  generates a reverse proxy handler */
+export interface IProxyHandlerConfig {
+    /** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
+    host?: string;
+    /** the upstream service port. */
+    port?: number;
+    /**  The protocol to use when making a request to the proxied host:
+    'http'
+    'https'*/
+    protocol?: string;
+    /**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
+    uri?: string;
+    /**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
+    passThrough?: boolean;
+    /** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
+    localStatePassThrough?: boolean;
+    /**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
+    acceptEncoding?: boolean;
+    /** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
+    rejectUnauthorized?: boolean;
+    /**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
+    xforward?: boolean;
+    /** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
+    redirects?: boolean | number;
+    /**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
+    timeout?: number;
+    /** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
+    request - is the incoming request object.
+    callback - is function(err, uri, headers) where:
+    err - internal error condition.
+    uri - the absolute proxy URI.
+    headers - optional object where each key is an HTTP request header and the value is the header content.*/
+    mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
+    /**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
+    onResponse?: (
+        err: any,
+        res: http.ServerResponse,
+        req: Request,
+        reply: () => void,
+        settings: IProxyHandlerConfig,
+        ttl: number
+    ) => void;
+    /** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
+    ttl?: number;
+    /** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
+    agent?: http.Agent;
+    /** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
+    maxSockets?: boolean | number;
+}
+/**  TODO: fill in joi definition  */
+export interface IJoi {
 
-	}
-	/**  a validation function using the signature function(value, options, next) */
-	export interface IValidationFunction {
+}
+/**  a validation function using the signature function(value, options, next) */
+export interface IValidationFunction {
 
-		(/**   the object containing the path parameters. */
-		value: any,
-		/**  the server validation options. */
-		options: any,
-		/**   the callback function called when validation is completed.  */
-		next: (err: any, value: any) => void): void;
-	}
-	/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-	export interface IRouteFailFunction {
-		/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-		(
-		/** - the [request object]. */
-		request: Request,
-		/**   the continuation reply interface. */
-		reply: IReply,
-		/**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
-		source: string,
-		/**  the error object prepared for the client response (including the validation function error under error.data). */
-		error: any): void;
-	}
+    (/**   the object containing the path parameters. */
+        value: any,
+        /**  the server validation options. */
+        options: any,
+        /**   the callback function called when validation is completed.  */
+        next: (err: any, value: any) => void): void;
+}
+/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+export interface IRouteFailFunction {
+    /**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+    (
+        /** - the [request object]. */
+        request: Request,
+        /**   the continuation reply interface. */
+        reply: IReply,
+        /**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
+        source: string,
+        /**  the error object prepared for the client response (including the validation function error under error.data). */
+        error: any): void;
+}
 
-	/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
-	export interface IRouteAdditionalConfigurationOptions {
-		/**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
-		app?: any;
-		/** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
-		a string with the name of an authentication strategy registered with server.auth.strategy().
-		an object  */
-		auth?: boolean|string|
-		{
-			/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
-			'required'authentication is required.
-			'optional'authentication is optional (must be valid if present).
-			'try'same as 'optional' but allows for invalid authentication. */
-			mode: string;
-			/**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
-			strategies?: string | Array<string>;
-			strategy?: string;
-			/**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
-			falseno payload authentication.This is the default value.
-			'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
-			'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
-			payload?: string;
-			/**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
-			scope?: string|Array<string>|boolean;
-			/** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
-			anythe authentication can be on behalf of a user or application.This is the default value.
-			userthe authentication must be on behalf of a user.
-			appthe authentication must be on behalf of an application. */
-			entity?: string;
-		};
-		/** an object passed back to the provided handler (via this) when called. */
-		bind?: any;
-		/** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
-		cache?: {
-			/**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
-			fault'no privacy flag.This is the default setting.
-			'public'mark the response as suitable for public caching.
-			'private'mark the response as suitable only for private caching.  */
-			privacy: string;
-			/**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
-			expiresIn: number;
-			/**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
-			expiresAt: string;
-		};
-		/** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
-		cors?: {
-			/** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
-			origin?: Array<string>;
-			/** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
-			matchOrigin?: boolean;
-			/** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
-			isOriginExposed?: boolean;
-			/**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
-			maxAge?: number;
-			/**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
-			headers?: string[];
-			/**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
-			additionalHeaders?: string[];
-			/**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
-			methods?: string[];
-			/**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
-			additionalMethods?: string[];
-			/**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
-			exposedHeaders?: string[];
-			/**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
-			additionalExposedHeaders?: string[];
-			/**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
-			credentials?: boolean;
-			/** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
-			override?: boolean;
-		};
-		/**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
-		files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
-			relativeTo: string;
-		};
+/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
+export interface IRouteAdditionalConfigurationOptions {
+    /**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
+    app?: any;
+    /** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
+    a string with the name of an authentication strategy registered with server.auth.strategy().
+    an object  */
+    auth?: boolean | string |
+    {
+        /**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
+        'required'authentication is required.
+        'optional'authentication is optional (must be valid if present).
+        'try'same as 'optional' but allows for invalid authentication. */
+        mode: string;
+        /**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
+        strategies?: string | Array<string>;
+        strategy?: string;
+        /**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
+        falseno payload authentication.This is the default value.
+        'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
+        'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
+        payload?: string;
+        /**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
+        scope?: string | Array<string> | boolean;
+        /** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
+        anythe authentication can be on behalf of a user or application.This is the default value.
+        userthe authentication must be on behalf of a user.
+        appthe authentication must be on behalf of an application. */
+        entity?: string;
+    };
+    /** an object passed back to the provided handler (via this) when called. */
+    bind?: any;
+    /** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
+    cache?: {
+        /**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
+        fault'no privacy flag.This is the default setting.
+        'public'mark the response as suitable for public caching.
+        'private'mark the response as suitable only for private caching.  */
+        privacy: string;
+        /**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
+        expiresIn: number;
+        /**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
+        expiresAt: string;
+    };
+    /** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
+    cors?: {
+        /** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
+        origin?: Array<string>;
+        /** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
+        matchOrigin?: boolean;
+        /** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
+        isOriginExposed?: boolean;
+        /**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
+        maxAge?: number;
+        /**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
+        headers?: string[];
+        /**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
+        additionalHeaders?: string[];
+        /**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
+        methods?: string[];
+        /**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
+        additionalMethods?: string[];
+        /**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
+        exposedHeaders?: string[];
+        /**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
+        additionalExposedHeaders?: string[];
+        /**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
+        credentials?: boolean;
+        /** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
+        override?: boolean;
+    };
+    /**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
+    files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
+        relativeTo: string;
+    };
 
-		/**  an alternative location for the route handler option. */
-		handler?: ISessionHandler | string | IRouteHandlerConfig;
-		/** an optional unique identifier used to look up the route using server.lookup(). */
-		id?: number;
-		/** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
-		json?: {
-			/** the replacer function or array.Defaults to no action. */
-			replacer?: Function | string[];
-			/**  number of spaces to indent nested object keys.Defaults to no indentation. */
-			space?: number|string;
-			/** string suffix added after conversion to JSON string.Defaults to no suffix. */
-			suffix?: string;
-		};
-		/** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
-		jsonp?: string;
-		/** determines how the request payload is processed: */
-		payload?: {
-			/**  the type of payload representation requested. The value must be one of:
-			'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
-			'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
-			'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
-			output?: string;
-			/**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
-			'application/json'
-			'application/x-www-form-urlencoded'
-			'application/octet-stream'
-			'text/ *'
-			'multipart/form-data' */
-			parse?: string | boolean;
-			/** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
-			allow?: string | string[];
-			/** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
-			override?: string;
-			/**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
-			maxBytes?: number;
-			/** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
-			timeout?: number;
-			/**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
-			uploads?: string;
-			/**  determines how to handle payload parsing errors. Allowed values are:
-			'error'return a Bad Request (400) error response. This is the default value.
-			'log'report the error but continue processing the request.
-			'ignore'take no action and continue processing the request. */
-			failAction?: string;
-		};
-		/** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
-		plugins?: IDictionary<any>;
-		/** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
-		pre?: any[];
-		/** validation rules for the outgoing response payload (response body).Can only validate object response: */
-		response?: {
-			/**   the default response object validation rules (for all non-error responses) expressed as one of:
-			trueany payload allowed (no validation performed). This is the default.
-			falseno payload allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the response object.
-			optionsthe server validation options.
-			next(err)the callback function called when validation is completed.  */
-			schema: boolean|any;
-			/** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
-			status: number;
-			/** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
-			sample: number;
-			/**  defines what to do when a response fails validation.Options are:
-			errorreturn an Internal Server Error (500) error response.This is the default value.
-			loglog the error but send the response.  */
-			failAction: string;
-			/** if true, applies the validation rule changes to the response.Defaults to false. */
-			modify: boolean;
-			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
-			options: any;
-		};
-		/** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
-		security?: boolean| {
-			/** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
-			hsts: boolean|number|{
-				/** the max- age portion of the header, as a number.Default is 15768000. */
-				maxAge?: number;
-				/**  a boolean specifying whether to add the includeSubdomains flag to the header. */
-				includeSubdomains?: boolean;
-			};
-			/** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
-			xframe: {
-				/** either 'deny', 'sameorigin', or 'allow-from' */
-				rule: string;
-				/** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
-				source: string;
-			};
-			/** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
-			xss: boolean;
-			/**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
-			noOpen: boolean;
-			/** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
-			noSniff: boolean;
-		};
-		/** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
-		state?: {
-			/** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
-			parse: boolean;
-			/** determines how to handle cookie parsing errors.Allowed values are:
-			'error'return a Bad Request (400) error response.This is the default value.
-			'log'report the error but continue processing the request.
-			'ignore'take no action. */
-			failAction: string;
-		};
-		/**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
-		validate?: {
-			/** validation rules for incoming request headers.Values allowed:
-			* trueany headers allowed (no validation performed).This is the default.
-			falseno headers allowed (this will cause all valid HTTP requests to fail).
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the request headers.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed.
-			*/
-			headers?: boolean | IJoi | IValidationFunction;
+    /**  an alternative location for the route handler option. */
+    handler?: ISessionHandler | string | IRouteHandlerConfig;
+    /** an optional unique identifier used to look up the route using server.lookup(). */
+    id?: number;
+    /** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
+    json?: {
+        /** the replacer function or array.Defaults to no action. */
+        replacer?: Function | string[];
+        /**  number of spaces to indent nested object keys.Defaults to no indentation. */
+        space?: number | string;
+        /** string suffix added after conversion to JSON string.Defaults to no suffix. */
+        suffix?: string;
+    };
+    /** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
+    jsonp?: string;
+    /** determines how the request payload is processed: */
+    payload?: {
+        /**  the type of payload representation requested. The value must be one of:
+        'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
+        'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
+        'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
+        output?: string;
+        /**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
+        'application/json'
+        'application/x-www-form-urlencoded'
+        'application/octet-stream'
+        'text/ *'
+        'multipart/form-data' */
+        parse?: string | boolean;
+        /** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
+        allow?: string | string[];
+        /** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
+        override?: string;
+        /**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
+        maxBytes?: number;
+        /** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
+        timeout?: number;
+        /**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
+        uploads?: string;
+        /**  determines how to handle payload parsing errors. Allowed values are:
+        'error'return a Bad Request (400) error response. This is the default value.
+        'log'report the error but continue processing the request.
+        'ignore'take no action and continue processing the request. */
+        failAction?: string;
+    };
+    /** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
+    plugins?: IDictionary<any>;
+    /** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
+    pre?: any[];
+    /** validation rules for the outgoing response payload (response body).Can only validate object response: */
+    response?: {
+        /**   the default response object validation rules (for all non-error responses) expressed as one of:
+        trueany payload allowed (no validation performed). This is the default.
+        falseno payload allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the response object.
+        optionsthe server validation options.
+        next(err)the callback function called when validation is completed.  */
+        schema: boolean | any;
+        /** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
+        status: number;
+        /** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
+        sample: number;
+        /**  defines what to do when a response fails validation.Options are:
+        errorreturn an Internal Server Error (500) error response.This is the default value.
+        loglog the error but send the response.  */
+        failAction: string;
+        /** if true, applies the validation rule changes to the response.Defaults to false. */
+        modify: boolean;
+        /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
+        options: any;
+    };
+    /** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
+    security?: boolean | {
+        /** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
+        hsts: boolean | number | {
+            /** the max- age portion of the header, as a number.Default is 15768000. */
+            maxAge?: number;
+            /**  a boolean specifying whether to add the includeSubdomains flag to the header. */
+            includeSubdomains?: boolean;
+        };
+        /** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
+        xframe: {
+            /** either 'deny', 'sameorigin', or 'allow-from' */
+            rule: string;
+            /** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
+            source: string;
+        };
+        /** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
+        xss: boolean;
+        /**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
+        noOpen: boolean;
+        /** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
+        noSniff: boolean;
+    };
+    /** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
+    state?: {
+        /** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
+        parse: boolean;
+        /** determines how to handle cookie parsing errors.Allowed values are:
+        'error'return a Bad Request (400) error response.This is the default value.
+        'log'report the error but continue processing the request.
+        'ignore'take no action. */
+        failAction: string;
+    };
+    /**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
+    validate?: {
+        /** validation rules for incoming request headers.Values allowed:
+        * trueany headers allowed (no validation performed).This is the default.
+        falseno headers allowed (this will cause all valid HTTP requests to fail).
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the request headers.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed.
+        */
+        headers?: boolean | IJoi | IValidationFunction;
 
 
-			/** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
-			trueany path parameters allowed (no validation performed).This is the default.
-			falseno path variables allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the path parameters.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed. */
-			params?: boolean | IJoi | IValidationFunction;
-			/** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
-			trueany query parameters allowed (no validation performed).This is the default.
-			falseno query parameters allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the query parameters.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed. */
-			query?: boolean | IJoi | IValidationFunction;
-			/**  validation rules for an incoming request payload (request body).Values allowed:
-			trueany payload allowed (no validation performed).This is the default.
-			falseno payload allowed.
-			a Joi validation object.
-			a validation function using the signature function(value, options, next) where:
-			valuethe object containing the payload object.
-			optionsthe server validation options.
-			next(err, value)the callback function called when validation is completed.  */
-			payload?: boolean | IJoi | IValidationFunction;
-			/** an optional object with error fields copied into every validation error response. */
-			errorFields?: any;
-			/** determines how to handle invalid requests.Allowed values are:
-			'error'return a Bad Request (400) error response.This is the default value.
-			'log'log the error but continue processing the request.
-			'ignore'take no action.
-			OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
-			requestthe request object.
-			replythe continuation reply interface.
-			sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
-			errorthe error object prepared for the client response (including the validation function error under error.data). */
-			failAction?: string | IRouteFailFunction;
-			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
-			options?: any;
-		};
-		/** define timeouts for processing durations: */
-		timeout?: {
-			/** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
-			server: boolean|number;
-			/** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
-			socket: boolean|number;
-		};
+        /** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
+        trueany path parameters allowed (no validation performed).This is the default.
+        falseno path variables allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the path parameters.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed. */
+        params?: boolean | IJoi | IValidationFunction;
+        /** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
+        trueany query parameters allowed (no validation performed).This is the default.
+        falseno query parameters allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the query parameters.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed. */
+        query?: boolean | IJoi | IValidationFunction;
+        /**  validation rules for an incoming request payload (request body).Values allowed:
+        trueany payload allowed (no validation performed).This is the default.
+        falseno payload allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the payload object.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed.  */
+        payload?: boolean | IJoi | IValidationFunction;
+        /** an optional object with error fields copied into every validation error response. */
+        errorFields?: any;
+        /** determines how to handle invalid requests.Allowed values are:
+        'error'return a Bad Request (400) error response.This is the default value.
+        'log'log the error but continue processing the request.
+        'ignore'take no action.
+        OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
+        requestthe request object.
+        replythe continuation reply interface.
+        sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
+        errorthe error object prepared for the client response (including the validation function error under error.data). */
+        failAction?: string | IRouteFailFunction;
+        /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
+        options?: any;
+    };
+    /** define timeouts for processing durations: */
+    timeout?: {
+        /** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
+        server: boolean | number;
+        /** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
+        socket: boolean | number;
+    };
 
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route description used for generating documentation (string).
-		*/
-		description?: string;
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route notes used for generating documentation (string or array of strings).
-		*/
-		notes?: string|string[];
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		*route tags used for generating documentation (array of strings).
-		*/
-		tags?: string[]
-	}
-	/** server.realm http://hapijs.com/api#serverrealm
-	The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
-	the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
-	Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-	The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-	exports.register = function (server, options, next) {
-	console.log(server.realm.modifiers.route.prefix);
-	return next();
-	};
-	*/
-	export interface IServerRealm {
-		/** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
-		modifiers: {
-			/** routes preferences: */
-			route: {
-				/** - the route path prefix used by any calls to server.route() from the server. */
-				prefix: string;
-				/**  the route virtual host settings used by any calls to server.route() from the server. */
-				vhost: string;
-			};
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+    *route description used for generating documentation (string).
+    */
+    description?: string;
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+    *route notes used for generating documentation (string or array of strings).
+    */
+    notes?: string | string[];
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+    *route tags used for generating documentation (array of strings).
+    */
+    tags?: string[]
+}
+/** server.realm http://hapijs.com/api#serverrealm
+The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
+the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
+Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+exports.register = function (server, options, next) {
+console.log(server.realm.modifiers.route.prefix);
+return next();
+};
+*/
+export interface IServerRealm {
+    /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
+    modifiers: {
+        /** routes preferences: */
+        route: {
+            /** - the route path prefix used by any calls to server.route() from the server. */
+            prefix: string;
+            /**  the route virtual host settings used by any calls to server.route() from the server. */
+            vhost: string;
+        };
 
-		};
-		/** the active plugin name (empty string if at the server root). */
-		plugin: string;
-		/** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
-		plugins: IDictionary<any>;
-		/**  settings overrides */
-		settings: {
-			files: {
-				relativeTo: any;
-			};
-			bind: any;
-		}
-	}
-	/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
-	HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
-	export interface IServerState {
+    };
+    /** the active plugin name (empty string if at the server root). */
+    plugin: string;
+    /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
+    plugins: IDictionary<any>;
+    /**  settings overrides */
+    settings: {
+        files: {
+            relativeTo: any;
+        };
+        bind: any;
+    }
+}
+/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
+HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
+export interface IServerState {
 /**  - the cookie name string. */name: string;
 
 /** - are the optional cookie settings: */options: {
@@ -674,1539 +674,1538 @@ declare module "hapi" {
 /**  - sets the 'HttpOnly' flag.Defaults to false.*/isHttpOnly: boolean
 /**  - the path scope.Defaults to null (no path).*/path: any;
 /**  - the domain scope.Defaults to null (no domain). */domain: any;
-			/**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
-			request - the request object.
-			next - the continuation function using the function(err, value) signature.*/
-			autoValue: (request: Request, next: (err: any, value: any) => void) => void;
-			/**  - encoding performs on the provided value before serialization. Options are:
-			'none' - no encoding. When used, the cookie value must be a string. This is the default value.
-			'base64' - string value is encoded using Base64.
-			'base64json' - object value is JSON-stringified than encoded using Base64.
-			'form' - object value is encoded using the x-www-form-urlencoded method.
-			'iron' - Encrypts and sign the value using iron.*/
-			encoding: string;
+        /**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
+        request - the request object.
+        next - the continuation function using the function(err, value) signature.*/
+        autoValue: (request: Request, next: (err: any, value: any) => void) => void;
+        /**  - encoding performs on the provided value before serialization. Options are:
+        'none' - no encoding. When used, the cookie value must be a string. This is the default value.
+        'base64' - string value is encoded using Base64.
+        'base64json' - object value is JSON-stringified than encoded using Base64.
+        'form' - object value is encoded using the x-www-form-urlencoded method.
+        'iron' - Encrypts and sign the value using iron.*/
+        encoding: string;
 /**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:*/sign: {
 /** - algorithm options.Defaults to require('iron').defaults.integrity.*/integrity: any;
 /** - password used for HMAC key generation.*/password: string;
-			};
+        };
 /**  - password used for 'iron' encoding.*/password: string;
 /** - options for 'iron' encoding.Defaults to require('iron').defaults.*/iron: any;
 /** - if false, errors are ignored and treated as missing cookies.*/ignoreErrors: boolean;
 /**  - if true, automatically instruct the client to remove invalid cookies.Defaults to false.*/clearInvalid: boolean;
 /**  - if false, allows any cookie value including values in violation of RFC 6265. Defaults to true.*/strictHeader: boolean;
 /**  - overrides the default proxy localStatePassThrough setting.*/passThrough: any;
-		};
-	}
-
-	export interface IFileHandlerConfig {
-		/**  a path string or function as described above.*/
-		path: string;
-		/** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-		filename?: string;
-		/**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
-		false - header is not included. This is the default value.
-		'attachment'
-		'inline'*/
-		mode?: boolean| string;
-		/** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
-		lookupCompressed: boolean;
-	}
-
-	/**http://hapijs.com/api#route-handler
-	Built-in handlers
-
-	The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
-	export interface IRouteHandlerConfig {
-		/** generates a static file endpoint for serving a single file. file can be set to:
-					a relative or absolute file path string (relative paths are resolved based on the route files configuration).
-		a function with the signature function(request) which returns the relative or absolute file path.
-		an object with the following options */
-		file?: string | IRequestHandler<void> |IFileHandlerConfig;
-		/** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
-					path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
-		a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
-		an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
-		a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
-		index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
-		listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
-		showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
-		redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
-		lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
-		defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
-		directory?: {
-			path: string |Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
-			index?: boolean;
-			listing?: boolean;
-			showHidden?: boolean;
-			redirectToSlash?: boolean;
-			lookupCompressed?: boolean;
-			defaultExtension?: string;
-		};
-		proxy?: IProxyHandlerConfig;
-		view?: string | {
-			template: string;
-			context: {
-				payload: any;
-				params: any;
-				query: any;
-				pre: any;
-			}
-		};
-		config?: {
-			handler: any;
-			bind: any;
-			app: any;
-			plugins: {
-				[name: string]: any;
-			};
-			pre: Array<() => void>;
-			validate: {
-				headers: any;
-				params: any;
-				query: any;
-				payload: any;
-				errorFields?: any;
-				failAction?: string | IFailAction;
-			};
-			payload: {
-				output: {
-					data: any;
-					stream: any;
-					file: any;
-				};
-				parse?: any;
-				allow?: string|Array<string>;
-				override?: string;
-				maxBytes?: number;
-				uploads?: number;
-				failAction?: string;
-			};
-			response: {
-				schema: any;
-				sample: number;
-				failAction: string;
-			};
-			cache: {
-				privacy: string;
-				expiresIn: number;
-				expiresAt: number;
-			};
-			auth: string|boolean|{
-				mode: string;
-				strategies: Array<string>;
-				payload?: boolean|string;
-				tos?: boolean|string;
-				scope?: string|Array<string>;
-				entity: string;
-			};
-			cors?: boolean;
-			jsonp?: string;
-			description?: string;
-			notes?: string|Array<string>;
-			tags?: Array<string>;
-		};
-	}
-	/** Route configuration
-	The route configuration object*/
-	export interface IRouteConfiguration {
-		/**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
-		path: string;
-		/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
-		* Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
-		method: string|string[];
-		/**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
-		vhost?: string;
-		/**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
-		handler: ISessionHandler | string | IRouteHandlerConfig;
-		/** - additional route options.*/
-		config?: IRouteAdditionalConfigurationOptions;
-	}
-	/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
-	export interface IRoute {
-
-
-		/** the route HTTP method. */
-		method: string;
-		/** the route path. */
-		path: string;
-		/** the route vhost option if configured. */
-		vhost?: string|Array<string>;
-		/** the [active realm] associated with the route.*/
-		realm: IServerRealm;
-		/** the [route options]  object with all defaults applied. */
-		settings: IRouteAdditionalConfigurationOptions;
-	}
-
-	export interface IServerAuthScheme {
-		/** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
-		request - the request object.
-		reply - the reply interface the authentication method must call when done authenticating the request where:
-		reply(err, response, result) - is called if authentication failed where:
-		err - any authentication error.
-		response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		result - an object containing:
-		credentials - the authenticated credentials.
-		artifacts - optional authentication artifacts.
-		reply.continue(result) - is called if authentication succeeded where:
-		result - same object as result above.
-		When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
-		.If the err returned by the reply() method includes a message, no additional strategies will be attempted.
-		If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var scheme = function (server, options) {
-		return {
-		authenticate: function (request, reply) {
-		var req = request.raw.req;
-		var authorization = req.headers.authorization;
-		if (!authorization) {
-		return reply(Boom.unauthorized(null, 'Custom'));
-		}
-		return reply(null, { credentials: { user: 'john' } });
-		}
-		};
-		};
-		server.auth.scheme('custom', scheme);*/
-		authenticate(request: Request, reply: IReply): void;
-		/** payload(request, reply) - optional function called to authenticate the request payload where:
-		request - the request object.
-		reply(err, response) - is called if authentication failed where:
-		err - any authentication error.
-		response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		reply.continue() - is called if payload authentication succeeded.
-		When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
-		payload? (request: Request, reply: IReply): void;
-		/** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
-		request - the request object.
-		reply(err, response) - is called if an error occurred where:
-		err - any authentication error.
-		response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
-		reply.continue() - is called if the operation succeeded.*/
-		response? (request: Request, reply: IReply): void;
-		/** an optional object  */
-		options?: {
-			/**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
-			payload: boolean;
-		}
-	}
-
-
-
-	export interface IServerInject {
-		(options: {
-			/**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
-			method: string;
-			/** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
-			url: string;
-			/** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
-			headers: IDictionary<string>;
-			/**- an optional string or buffer containing the request payload (object must be manually converted to a string first). Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
-			payload: string|Buffer;
-			/**an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
-			credentials: any;
-			/**object with options used to simulate client request stream conditions for testing:
-			error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
-			close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
-			end - if false, does not end the stream. Defaults to true.*/
-			simulate: {
-				error: boolean;
-				close: boolean;
-				end: boolean;
-			};
-		},
-		callback: (
-		/**the response object where:
-		statusCode - the HTTP status code.
-		headers - an object containing the headers set.
-		payload - the response payload string.
-		rawPayload - the raw response payload buffer.
-		raw - an object with the injection request and response objects:
-		req - the simulated node request object.
-		res - the simulated node response object.
-		result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
-		request - the request object.*/
-		res: { statusCode: number; headers: IDictionary<string>; payload: string; rawPayload: Buffer; raw: { req: http.ClientRequest; res: http.ServerResponse }; result: string; request: Request }) => void
-		):void;
-
-	}
-
-
-	/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-	The return value is an array where each item is an object containing:
-	info - the connection.info the connection the table was generated for.
-	labels - the connection labels.
-	table - an array of routes where each route contains:
-	settings - the route config with defaults applied.
-	method - the HTTP method in lower case.
-	path - the route path.*/
-	export interface IConnectionTable {
-		info: any;
-		labels: any;
-		table: IRoute[];
-	}
-
-	export interface ICookieSettings {
-		/** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
-		ttl?: number;
-		/** - sets the 'Secure' flag.Defaults to false.*/
-		isSecure?: boolean;
-		/** - sets the 'HttpOnly' flag.Defaults to false.*/
-		isHttpOnly?: boolean;
-		/** - the path scope.Defaults to null (no path).*/
-		path?: string;
-		/** - the domain scope.Defaults to null (no domain).*/
-		domain?: any;
-		/** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
-		request - the request object.
-		next - the continuation function using the function(err, value) signature.*/
-		autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
-		/** - encoding performs on the provided value before serialization.Options are:
-		'none' - no encoding.When used, the cookie value must be a string.This is the default value.
-		'base64' - string value is encoded using Base64.
-		'base64json' - object value is JSON- stringified than encoded using Base64.
-		'form' - object value is encoded using the x- www - form - urlencoded method. */
-		encoding?: string;
-		/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
-		integrity - algorithm options.Defaults to require('iron').defaults.integrity.
-		password - password used for HMAC key generation. */
-		sign?: { integrity: any; password: string; }
-		password?: string;
-		iron?: any;
-		ignoreErrors?: boolean;
-		clearInvalid?: boolean;
-		strictHeader?: boolean;
-		passThrough?: any;
-	}
-
-	/** method - the method function with the signature is one of:
-	function(arg1, arg2, ..., argn, next) where:
-	arg1, arg2, etc. - the method function arguments.
-	next - the function called when the method is done with the signature function(err, result, ttl) where:
-	err - error response if the method failed.
-	result - the return value.
-	ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
-	function(arg1, arg2, ..., argn) where:
-	arg1, arg2, etc. - the method function arguments.
-	the callback option is set to false.
-	the method must returns a value (result, Error, or a promise) or throw an Error.*/
-	export interface IServerMethod {
-		//(): void;
-		//(next: (err: any, result: any, ttl: number) => void): void;
-		//(arg1: any): void;
-		//(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
-		//(arg1: any, arg2: any): void;
-		(...args: any[]): void;
-
-	}
-	/** options - optional configuration:
-	bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
-	cache - the same cache configuration used in server.cache().
-	callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
-	generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
-	export interface IServerMethodOptions {
-		bind?: any;
-		cache?: ICatBoxCacheOptions;
-		callback?: boolean;
-		generateKey?(args: any[]): string;
-	}
-	/** Request object
-
-	The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
-	Request events
-
-	The request object supports the following events:
-
-	'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
-	'finish' - emitted when the request payload finished reading. The event method signature is function ().
-	'disconnect' - emitted when a request errors or aborts unexpectedly.
-	var Crypto = require('crypto');
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
-	server.connection({ port: 80 });
-
-	server.ext('onRequest', function (request, reply) {
-
-	var hash = Crypto.createHash('sha1');
-	request.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	request.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	request.once('disconnect', function () {
-
-	console.error('request aborted');
-	});
-
-	return reply.continue();
-	});*/
-	export class Request extends Events.EventEmitter {
-		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-		app: any;
-		/**  authentication information*/
-		auth: {
-			/** true is the request has been successfully authenticated, otherwise false.*/
-			isAuthenticated: boolean;
-			/**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.*/
-			credentials: any;
-			/**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
-			artifacts: any;
-			/**  the route authentication mode.*/
-			mode: any;
-			/** the authentication error is failed and mode set to 'try'.*/
-			error: any;
-			/** an object used by the ['cookie' authentication scheme]  https://github.com/hapijs/hapi-auth-cookie */
-			session: any
-		};
-		/**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
-		domain: any;
-		/** the raw request headers (references request.raw.headers).*/
-		headers: IDictionary<string>;
-		/** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
-		id: number;
-		/**  request information */
-		info: {
-			/**  request reception timestamp. */
-			received: number;
-			/**  request response timestamp (0 is not responded yet). */
-			responded: number;
-			/** remote client IP address. */
-
-			remoteAddress: string;
-			/**  remote client port. */
-			remotePort: number;
-			/**  content of the HTTP 'Referrer' (or 'Referer') header. */
-			referrer: string;
-			/**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
-			host: string;
-			/**  the hostname part of the 'Host' header (e.g. 'example.com').*/
-			hostname: string;
-		};
-		/**  the request method in lower case (e.g. 'get', 'post'). */
-		method: string;
-		/**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
-		mime: string;
-		/**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
-		orig: {
-			params: any;
-			query: any;
-			payload: any;
-		};
-		/**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
-		params: IDictionary<string>;
-		/** an array containing all the path params values in the order they appeared in the path.*/
-		paramsArray: string[];
-		/**  the request URI's path component. */
-		path: string;
-		/** the request payload based on the route payload.output and payload.parse settings.*/
-		payload: any;
-		/**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
-		plugins: any;
-		/** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
-		pre: IDictionary<any>;
-		/** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
-		response: Response;
-		/**preResponses - same as pre but represented as the response object created by the pre method.*/
-		preResponses: any;
-		/**an object containing the query parameters.*/
-		query: any;
-		/**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
-		raw: {
-			req: http.ClientRequest;
-			res: http.ServerResponse;
-		};
-		/** the route public interface.*/
-		route: IRoute;
-		/** the server object. */
-		server: Server;
-		/** Special key reserved for plugins implementing session support. Plugins utilizing this key must check for null value to ensure there is no conflict with another similar server. */
-		session: any;
-		/** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
-		state: any;
-		/** complex object contining details on the url */
-		url: {
-			/** null when i tested */
-			auth: any;
-			/** null when i tested */
-			hash: any;
-			/** null when i tested */
-			host: any;
-			/** null when i tested */
-			hostname: any;
-			href: string;
-			path: string;
-			/** path without search*/
-			pathname: string;
-			/** null when i tested */
-			port: any;
-			/** null when i tested */
-			protocol: any;
-			/** querystring parameters*/
-			query: IDictionary<string>;
-			/** querystring parameters as a string*/
-			search: string;
-			/** null when i tested */
-			slashes: any;
-		};
-		/** request.setUrl(url)
-
-		Available only in 'onRequest' extension methods.
-
-		Changes the request URI before the router begins processing the request where:
-
-		url - the new request path value.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});*/
-		setUrl(url: string): void;
-		/** request.setMethod(method)
-
-		Available only in 'onRequest' extension methods.
-
-		Changes the request method before the router begins processing the request where:
-
-		method - is the request HTTP method (e.g. 'GET').
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to 'GET'
-		request.setMethod('GET');
-		return reply.continue();
-		});*/
-		setMethod(method: string): void;
-		/** request.log(tags, [data, [timestamp]])
-
-		Always available.
-
-		Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
-
-		data - an optional message string or object with the application data being logged.
-		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
-
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		server.on('request', function (request, event, tags) {
-
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-
-		var handler = function (request, reply) {
-
-		request.log(['test', 'error'], 'Test event');
-		return reply();
-		};
-		*/
-		log(
-			/** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
-			tags: string|string[],
-			/** an optional message string or object with the application data being logged.*/
-			data?: string,
-			/**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
-			timestamp?: number): void;
-		/** request.getLog([tags], [internal])
-
-		Always available.
-
-		Returns an array containing the events matching any of the tags specified (logical OR)
-		request.getLog();
-		request.getLog('error');
-		request.getLog(['error', 'auth']);
-		request.getLog(['error'], true);
-		request.getLog(false);*/
-
-		getLog(
-			/** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
-			tags?: string,
-			/**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
-			internal?: boolean): string[];
-
-		/** request.tail([name])
-
-		Available until immediately after the 'response' event is emitted.
-
-		Adds a request tail which has to complete before the request lifecycle is complete where:
-
-		name - an optional tail name used for logging purposes.
-		Returns a tail function which must be called when the tail activity is completed.
-
-		Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
-
-		When all tails completed, the server emits a 'tail' event.
-
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-
-		var get = function (request, reply) {
-
-		var dbTail = request.tail('write to database');
-
-		db.save('key', 'value', function () {
-
-		dbTail();
-		});
-
-		return reply('Success!');
-		};
-
-		server.route({ method: 'GET', path: '/', handler: get });
-
-		server.on('tail', function (request) {
-
-		console.log('Request completed including db activity');
-		});*/
-		tail(
-			/** an optional tail name used for logging purposes.*/
-			name?: string): Function;
-	}
-	/** Response events
-
-	The response object supports the following events:
-
-	'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
-	'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
-	var Crypto = require('crypto');
-	var Hapi = require('hapi');
-	var server = new Hapi.Server();
-	server.connection({ port: 80 });
-
-	server.ext('onPreResponse', function (request, reply) {
-
-	var response = request.response;
-	if (response.isBoom) {
-	return reply();
-	}
-
-	var hash = Crypto.createHash('sha1');
-	response.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	response.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	return reply.continue();
-	});*/
-	export class Response extends Events.EventEmitter {
-		/**  the HTTP response status code. Defaults to 200 (except for errors).*/
-		statusCode: number;
-		/** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
-		headers: IDictionary<string>;
-		/** the value provided using the reply interface.*/
-		source: any;
-		/** a string indicating the type of source with available values:
-		'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
-		'buffer' - a Buffer.
-		'view' - a view generated with reply.view().
-		'file' - a file generated with reply.file() of via the directory handler.
-		'stream' - a Stream.
-		'promise' - a Promise object. */
-		variety: string;
-		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-		app: any;
-		/** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
-		plugins: any;
-		/** settings - response handling flags:
-		charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
-		encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
-		passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
-		stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
-		ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
-		varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
-		settings: {
-			charset: string;
-			encoding: string;
-			passThrough: boolean;
-			stringify: any;
-			ttl: number;
-			varyEtag: boolean;
-		}
-
-		/**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
-		length - the header value. Must match the actual payload size.*/
-		bytes(length: number): void;
-		/**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
-		charset(charset: string): void;
-
-		/**  sets the HTTP status code where:
-		statusCode - the HTTP status code.*/
-		code(statusCode: number): void;
-		/** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
-		created(uri: string): void;
-
-
-		/** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
-		encoding(encoding: string): void;
-
-		/** etag(tag, options) - sets the representation entity tag where:
-		tag - the entity tag string without the double-quote.
-		options - optional settings where:
-		weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
-		vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
-		etag(tag: string, options: {
-			weak: boolean; vary: boolean;
-		}): void;
-
-		/**header(name, value, options) - sets an HTTP header where:
-		name - the header name.
-		value - the header value.
-		options - optional settings where:
-		append - if true, the value is appended to any existing header value using separator. Defaults to false.
-		separator - string used as separator when appending to an exiting value. Defaults to ','.
-		override - if false, the header value is not set if an existing value present. Defaults to true.*/
-		header(name: string, value: string, options?: {
-			append: boolean;
-			separator: string;
-			override: boolean;
-		}): void;
-
-		/** location(uri) - sets the HTTP 'Location' header where:
-		uri - an absolute or relative URI used as the 'Location' header value.*/
-		location(uri: string): void;
-
-		/** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
-		uri - an absolute or relative URI used to redirect the client to another resource. */
-		redirect(uri: string): void;
-
-		/** replacer(method) - sets the JSON.stringify() replacer argument where:
-		method - the replacer function or array. Defaults to none.*/
-		replacer(method: Function| Array<Function>): void;
-
-		/** spaces(count) - sets the JSON.stringify() space argument where:
-		count - the number of spaces to indent nested object keys. Defaults to no indentation. */
-		spaces(count: number): void;
-		/**state(name, value, [options]) - sets an HTTP cookie where:
-		name - the cookie name.
-		value - the cookie value. If no encoding is defined, must be a string.
-		options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
-		state(name: string, value: string, options?: any): void;
-
-	}
-
-
-
-	/** Server http://hapijs.com/api#server
-	rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
-	Server events
-	The server object inherits from Events.EventEmitter and emits the following events:
-	'log' - events logged with server.log() and server events generated internally by the framework.
-	'start' - emitted when the server is started using server.start().
-	'stop' - emitted when the server is stopped using server.stop().
-	'request' - events generated by request.log(). Does not include any internally generated events.
-	'request-internal' - request events generated internally by the framework (multiple events per request).
-	'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
-	'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
-	'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
-	Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
-	MORE EVENTS HERE: http://hapijs.com/api#server-events*/
-	export class Server extends Events.EventEmitter {
-
-		constructor(options?: IServerOptions);
-		/** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
-		var Hapi = require('hapi');
-		server = new Hapi.Server();
-		server.app.key = 'value';
-		var handler = function (request, reply) {
-		return reply(request.server.app.key);
-		}; */
-		app: any;
-		/** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
-		var server = new Hapi.Server();
-		server.connection({ port: 80, labels: 'a' });
-		server.connection({ port: 8080, labels: 'b' });
-		// server.connections.length === 2
-		var a = server.select('a');
-		// a.connections.length === 1*/
-		connections: Array<ISeverConnectionOptions>;
-		/** When the server contains exactly one connection, info is an object containing information about the sole connection.
-		* When the server contains more than one connection, each server.connections array member provides its own connection.info.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// server.info.port === 80
-		server.connection({ port: 8080 });
-		// server.info === null
-		// server.connections[1].info.port === 8080
-		*/
-		info: {
-			/**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
-			id: string;
-			/**  - the connection creation timestamp.*/
-			created: number;
-			/**  - the connection start timestamp (0 when stopped).*/
-			started: number;
-			/**  the connection port based on the following rules:
-			the configured port value before the server has been started.
-			the actual port assigned when no port is configured or set to 0 after the server has been started.*/
-			port: number;
-
-			/** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
-			host: string;
-			/** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
-			address: string;
-			/**  - the protocol used:
-			'http' - HTTP.
-			'https' - HTTPS.
-			'socket' - UNIX domain socket or Windows named pipe.*/
-			protocol: string;
-			/** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
-			uri: string;
-		};
-		/** An object containing the process load metrics (when load.sampleInterval is enabled):
-		rss - RSS memory usage.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
-		console.log(server.load.rss);*/
-		load: {
-			/** - event loop delay milliseconds.*/
-			eventLoopDelay: number;
-			/**  - V8 heap usage.*/
-			heapUsed: number;
-		};
-		/** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
-		When the server contains more than one connection, each server.connections array member provides its own connection.listener.
-		var Hapi = require('hapi');
-		var SocketIO = require('socket.io');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var io = SocketIO.listen(server.listener);
-		io.sockets.on('connection', function(socket) {
-		socket.emit({ msg: 'welcome' });
-		});*/
-		listener: http.Server;
-
-		/** server.methods
-		An object providing access to the server methods where each server method name is an object property.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.method('add', function (a, b, next) {
-		return next(null, a + b);
-		});
-		server.methods.add(1, 2, function (err, result) {
-		// result === 3
-		});*/
-		methods: IDictionary<Function>;
-
-		/** server.mime
-		Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
-		var Hapi = require('hapi');
-		var options = {
-		mime: {
-		override: {
-		'node/module': {
-		source: 'steve',
-		compressible: false,
-		extensions: ['node', 'module', 'npm'],
-		type: 'node/module'
-		}
-		}
-		}
-		};
-		var server = new Hapi.Server(options);
-		// server.mime.path('code.js').type === 'application/javascript'
-		// server.mime.path('file.npm').type === 'node/module'*/
-		mime: any;
-		/**server.plugins
-		An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
-		exports.register = function (server, options, next) {
-		server.expose('key', 'value');
-		// server.plugins.example.key === 'value'
-		return next();
-		};
-		exports.register.attributes = {
-		name: 'example'
-		};*/
-		plugins: IDictionary<any>;
-		/** server.realm
-		The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-		modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
-		route - routes preferences:
-		prefix - the route path prefix used by any calls to server.route() from the server.
-		vhost - the route virtual host settings used by any calls to server.route() from the server.
-		plugin - the active plugin name (empty string if at the server root).
-		plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
-		settings - settings overrides:
-		files.relativeTo
-		bind
-		The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-		exports.register = function (server, options, next) {
-		console.log(server.realm.modifiers.route.prefix);
-		return next();
-		};*/
-		realm: IServerRealm;
-
-		/** server.root
-		The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
-		root: Server;
-		/** server.settings
-		The server configuration object after defaults applied.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server({
-		app: {
-		key: 'value'
-		}
-		});
-		// server.settings.app === { key: 'value' }*/
-		settings: IServerOptions;
-
-		/** server.version
-		The hapi module version number.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		// server.version === '8.0.0'*/
-		version: string;
-
-		/** server.after(method, [dependencies])
-		Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
-		after - the method with signature function(plugin, next) where:
-		server - server object the after() method was called on.
-		next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		err - internal error which is returned back via the server.start() callback.
-		dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.after(function () {
-		// Perform some pre-start logic
-		});
-		server.start(function (err) {
-		// After method already executed
-		});
-		server.auth.default(options)*/
-		after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string|string[]): void;
-
-		auth: {
-			/** server.auth.default(options)
-			Sets a default strategy which is applied to every route where:
-			options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
-			The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
-			The default auth strategy configuration can be accessed via connection.auth.settings.default.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.auth.default('default');
-			server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			});*/
-			default(options: string):void;
-			default(options: { strategy: string }): void;
-			default(options: { strategies: string[] }): void;
-			/** server.auth.scheme(name, scheme)
-			Registers an authentication scheme where:
-			name - the scheme name.
-			scheme - the method implementing the scheme with signature function(server, options) where:
-			server - a reference to the server object the scheme is added to.
-			options - optional scheme settings used to instantiate a strategy.*/
-			scheme(name: string,
-				/** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-				n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
-				server = new Hapi.Server();
-				server.connection({ port: 80 });
-				scheme = function (server, options) {
-				urn {
-				authenticate: function (request, reply) {
-				req = request.raw.req;
-				var authorization = req.headers.authorization;
-				if (!authorization) {
-				return reply(Boom.unauthorized(null, 'Custom'));
-				}
-				urn reply(null, { credentials: { user: 'john' } });
-				}
-				};
-				};
-				*/
-				scheme: (server: Server, options: any) => IServerAuthScheme): void;
-
-			/** server.auth.strategy(name, scheme, [mode], [options])
-			Registers an authentication strategy where:
-			name - the strategy name.
-			scheme - the scheme name (must be previously registered using server.auth.scheme()).
-			mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
-			options - scheme options based on the scheme requirements.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.route({
-			method: 'GET',
-			path: '/',
-			config: {
-			auth: 'default',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			}
-			});*/
-			strategy(name: string, scheme: any, mode?: boolean, options?: any):void;
-
-			/** server.auth.test(strategy, request, next)
-			Tests a request against an authentication strategy where:
-			strategy - the strategy name registered with server.auth.strategy().
-			request - the request object.
-			next - the callback function with signature function(err, credentials) where:
-			err - the error if authentication failed.
-			credentials - the authentication credentials object if authentication was successful.
-			Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
-			var server = new Hapi.Server();
-			server.connection({ port: 80 });
-			server.auth.scheme('custom', scheme);
-			server.auth.strategy('default', 'custom');
-			server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			request.server.auth.test('default', request, function (err, credentials) {
-			if (err) {
-			return reply({ status: false });
-			}
-			return reply({ status: true, user: credentials.name });
-			});
-			}
-			});*/
-			test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
-		};
-		/** server.bind(context)
-		Sets a global context used as the default bind object when adding a route or an extension where:
-		context - the object used to bind this in handler and extension methods.
-		When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
-		var handler = function (request, reply) {
-		return reply(this.message);
-		};
-		exports.register = function (server, options, next) {
-		var bind = {
-		message: 'hello'
-		};
-		server.bind(bind);
-		server.route({ method: 'GET', path: '/', handler: handler });
-		return next();
-		};*/
-		bind(context: any): void;
-
-
-		/** server.cache(options)
-		Provisions a cache segment within the server cache facility where:
-		options - catbox policy configuration where:
-		expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
-		expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
-		generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
-		staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
-		staleTimeout - number of milliseconds to wait before checking if an item is stale.
-		generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
-		cache - the cache name configured in 'server.cache`. Defaults to the default cache.
-		segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
-		shared - if true, allows multiple cache provisions to share the same segment. Default to false.
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
-		cache.set('norway', { capital: 'oslo' }, null, function (err) {
-		cache.get('norway', function (err, value, cached, log) {
-		// value === { capital: 'oslo' };
-		});
-		});*/
-		cache(options: ICatBoxCacheOptions): void;
-
-		/** server.connection([options])
-		Adds an incoming server connection
-		Returns a server object with the new connection selected.
-		Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
-		Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
-		var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
-		// server.connections.length === 2
-		// web.connections.length === 1
-		// admin.connections.length === 1 */
-		connection(options: ISeverConnectionOptions): Server;
-		/** server.decorate(type, property, method)
-		Extends various framework interfaces with custom methods where:
-		type - the interface being decorated. Supported types:
-		'reply' - adds methods to the reply interface.
-		'server' - adds methods to the Server object.
-		property - the object decoration key name.
-		method - the extension function.
-		Note that decorations apply to the entire server and all its connections regardless of current selection.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.decorate('reply', 'success', function () {
-		return this.response({ status: 'ok' });
-		});
-		server.route({
-		method: 'GET',
-		path: '/',
-		handler: function (request, reply) {
-		return reply.success();
-		}
-		});*/
-		decorate(type: string, property: string, method: Function):void;
-
-		/** server.dependency(dependencies, [after])
-		Used within a plugin to declares a required dependency on other plugins where:
-		dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
-		after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
-		server - the server the dependency() method was called on.
-		next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		err - internal error condition, which is returned back via the server.start() callback.
-		exports.register = function (server, options, next) {
-		server.dependency('yar', after);
-		return next();
-		};
-		var after = function (server, next) {
-		// Additional plugin registration logic
-		return next();
-		};*/
-		dependency(dependencies: string|string[], after?: (server: Server, next: (err: any) => void) => void): void;
-
-
-		/** server.expose(key, value)
-		Used within a plugin to expose a property via server.plugins[name] where:
-		key - the key assigned (server.plugins[name][key]).
-		value - the value assigned.
-		exports.register = function (server, options, next) {
-		server.expose('util', function () { console.log('something'); });
-		return next();
-		};*/
-		expose(key: string, value: any): void;
-
-		/** server.expose(obj)
-		Merges a deep copy of an object into to the existing content of server.plugins[name] where:
-		obj - the object merged into the exposed properties container.
-		exports.register = function (server, options, next) {
-		server.expose({ util: function () { console.log('something'); } });
-		return next();
-		};*/
-		expose(obj: any): void;
-
-		/** server.ext(event, method, [options])
-		Registers an extension function in one of the available extension points where:
-		event - the event name.
-		method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
-		request - the request object.
-		reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
-		this - the object provided via options.bind or the current active context set with server.bind().
-		options - an optional object with the following:
-		before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
-		after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
-		bind - a context object passed back to the provided method (via this) when called.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.ext('onRequest', function (request, reply) {
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});
-		var handler = function (request, reply) {
-		return reply({ status: 'ok' });
-		};
-		server.route({ method: 'GET', path: '/test', handler: handler });
-		server.start();
-		// All requests will get routed to '/test'*/
-		ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string|string[]; after: string|string[]; bind?: any }): void;
-
-		/** server.handler(name, method)
-		Registers a new handler type to be used in routes where:
-		name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
-		method - the function used to generate the route handler using the signature function(route, options) where:
-		route - the route public interface object.
-		options - the configuration object provided in the handler config.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ host: 'localhost', port: 8000 });
-		// Defines new handler for routes on this server
-		server.handler('test', function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		});
-		server.route({
-		method: 'GET',
-		path: '/',
-		handler: { test: { msg: 'test' } }
-		});
-		server.start();
-		The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ host: 'localhost', port: 8000 });
-		var handler = function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		};
-		// Change the default payload processing for this handler
-		handler.defaults = {
-		payload: {
-		output: 'stream',
-		parse: false
-		}
-		};
-		server.handler('test', handler);*/
-		handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
-		/** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
-		Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
-		Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
-		* When the server contains more than one connection, each server.connections array member provides its own connection.inject().
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		var handler = function (request, reply) {
-		return reply('Success!');
-		};
-		server.route({ method: 'GET', path: '/', handler: handler });
-		server.inject('/', function (res) {
-		console.log(res.result);
-		});
-		*/
-		inject: IServerInject;
-
-		/** server.log(tags, [data, [timestamp]])
-		Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
-		tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
-		data - an optional message string or object with the application data being logged.
-		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.on('log', function (event, tags) {
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-		server.log(['test', 'error'], 'Test event');*/
-		log(tags: string|string[], data?: string|any, timestamp?: number): void;
-		/**server.lookup(id)
-		When the server contains exactly one connection, looks up a route configuration where:
-		id - the route identifier as set in the route options.
-		returns the route public interface object if found, otherwise null.
-		var server = new Hapi.Server();
-		server.connection();
-		server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		var route = server.lookup('root');
-		When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
-		lookup(id: string): IRoute;
-		/** server.match(method, path, [host])
-		When the server contains exactly one connection, looks up a route configuration where:
-		method - the HTTP method (e.g. 'GET', 'POST').
-		path - the requested path (must begin with '/').
-		host - optional hostname (to match against routes with vhost).
-		returns the route public interface object if found, otherwise null.
-		var server = new Hapi.Server();
-		server.connection();
-		server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		var route = server.match('get', '/');
-		When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
-		match(method: string, path: string, host?: string): IRoute;
-
-
-
-
-		/** server.method(name, method, [options])
-		Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
-		Methods are registered via server.method(name, method, [options])
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// Simple arguments
-		var add = function (a, b, next) {
-		return next(null, a + b);
-		};
-		server.method('sum', add, { cache: { expiresIn: 2000 } });
-		server.methods.sum(4, 5, function (err, result) {
-		console.log(result);
-		});
-		// Object argument
-		var addArray = function (array, next) {
-		var sum = 0;
-		array.forEach(function (item) {
-		sum += item;
-		});
-		return next(null, sum);
-		};
-		server.method('sumObj', addArray, {
-		cache: { expiresIn: 2000 },
-		generateKey: function (array) {
-		return array.join(',');
-		}
-		});
-		server.methods.sumObj([5, 6], function (err, result) {
-		console.log(result);
-		});
-		// Synchronous method with cache
-		var addSync = function (a, b) {
-		return a + b;
-		};
-		server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
-		server.methods.sumSync(4, 5, function (err, result) {
-		console.log(result);
-		}); */
-		method(
-			/**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
-			name: string,
-			method: IServerMethod,
-			options?: IServerMethodOptions):void;
-
-
-		/**server.method(methods)
-		Registers a server method function as described in server.method() using a configuration object where:
-		methods - an object or an array of objects where each one contains:
-		name - the method name.
-		method - the method function.
-		options - optional settings.
-		var add = function (a, b, next) {
-		next(null, a + b);
-		};
-		server.method({
-		name: 'sum',
-		method: add,
-		options: {
-		cache: {
-		expiresIn: 2000
-		}
-		}
-		});*/
-		method(methods: {
-			name: string; method: IServerMethod; options?: IServerMethodOptions
-		}| Array<{
-				name: string; method: IServerMethod; options?: IServerMethodOptions
-			}>):void;
-		/**server.path(relativeTo)
-		Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
-		relativeTo - the path prefix added to any relative file path starting with '.'.
-		Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
-		exports.register = function (server, options, next) {
-		server.path(__dirname + '../static');
-		server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
-		next();
-		};*/
-		path(relativeTo: string): void;
-		/**server.register(plugins, [options], callback)
-		Registers a plugin where:
-		plugins - an object or array of objects where each one is either:
-		a plugin registration function.
-		an object with the following:
-		register - the plugin registration function.
-		options - optional options passed to the registration function when called.
-		options - optional registration options (different from the options passed to the registration function):
-		select - a string or array of string labels used to pre-select connections for plugin registration.
-		routes - modifiers applied to each route added by the plugin:
-		prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
-		vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
-		callback - the callback function with signature function(err) where:
-		err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
-		server.register({
-		register: require('plugin_name'),
-		options: {
-		message: 'hello'
-		}
-		}, function (err) {
-		if (err) {
-		console.log('Failed loading plugin');
-		}
-		});*/
-		register(plugins: any|any[], options: {
-			select: string|string[];
-			routes: {
-				prefix: string; vhost?: string|string[]
-			};
-		}
-			, callback: (err: any) => void):void;
-
-		register(plugins: any|any[], callback: (err: any) => void):void;
-
-		/**server.render(template, context, [options], callback)
-		Utilizes the server views manager to render a template where:
-		template - the template filename and path, relative to the views manager templates path (path or relativeTo).
-		context - optional object used by the template to render context-specific result. Defaults to no context ({}).
-		options - optional object used to override the views manager configuration.
-		callback - the callback function with signature function (err, rendered, config) where:
-		err - the rendering error if any.
-		rendered - the result view string.
-		config - the configuration used to render the template.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.views({
-		engines: { html: require('handlebars') },
-		path: __dirname + '/templates'
-		});
-		var context = {
-		title: 'Views Example',
-		message: 'Hello, World'
-		};
-		server.render('hello', context, function (err, rendered, config) {
-		console.log(rendered);
-		});*/
-		render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void):void;
-		/** server.route(options)
-		Adds a connection route where:
-		options - a route configuration object or an array of configuration objects.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
-		server.route([
-		{ method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
-		{ method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
-		]);*/
-		route(options: IRouteConfiguration):void;
-		route(options: IRouteConfiguration[]):void;
-		/**server.select(labels)
-		Selects a subset of the server's connections where:
-		labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
-		Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, labels: ['a'] });
-		server.connection({ port: 8080, labels: ['b'] });
-		server.connection({ port: 8081, labels: ['c'] });
-		server.connection({ port: 8082, labels: ['c','d'] });
-		var a = server.select('a');          // The server with port 80
-		var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
-		var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
-		select(labels: string|string[]): Server|Server[];
-		/** server.start([callback])
-		Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
-		callback - optional callback when server startup is completed or failed with the signature function(err) where:
-		err - any startup error condition.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.start(function (err) {
-		console.log('Server started at: ' + server.info.uri);
-		});*/
-		start(callback?: (err: any) => void): void;
-		/** server.state(name, [options])
-		HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
-		State defaults can be modified via the server connections.routes.state configuration option.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		// Set cookie definition
-		server.state('session', {
-		ttl: 24 * 60 * 60 * 1000,     // One day
-		isSecure: true,
-		path: '/',
-		encoding: 'base64json'
-		});
-		// Set state in route handler
-		var handler = function (request, reply) {
-		var session = request.state.session;
-		if (!session) {
-		session = { user: 'joe' };
-		}
-		session.last = Date.now();
-		return reply('Success').state('session', session);
-		};
-		Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.on('request-internal', function (request, event, tags) {
-		if (tags.error && tags.state) {
-		console.error(event);
-		}
-		});	*/
-		state(name: string, options?: ICookieSettings): void;
-
-		/** server.stop([options], [callback])
-		Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
-		options - optional object with:
-		timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
-		callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80 });
-		server.stop({ timeout: 60 * 1000 }, function () {
-		console.log('Server stopped');
-		});*/
-		stop(options?: { timeout: number }, callback?: () => void): void;
-		/**server.table([host])
-		Returns a copy of the routing table where:
-		host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-		The return value is an array where each item is an object containing:
-		info - the connection.info the connection the table was generated for.
-		labels - the connection labels.
-		table - an array of routes where each route contains:
-		settings - the route config with defaults applied.
-		method - the HTTP method in lower case.
-		path - the route path.
-		Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, host: 'example.com' });
-		server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		var table = server.table();
-		When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.connection({ port: 80, host: 'example.com' });
-		server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		var table = server.connections[0].table();
-		//[
-		//    {
-		//        method: 'get',
-		//        path: '/example',
-		//        settings: { ... }
-		//    }
-		//]
-		*/
-		table(host?: any): IConnectionTable;
-
-		/**server.views(options)
-		Initializes the server views manager
-		var Hapi = require('hapi');
-		var server = new Hapi.Server();
-		server.views({
-		engines: {
-		html: require('handlebars'),
-		jade: require('jade')
-		},
-		path: '/static/templates'
-		});
-		When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
-		views(options: IServerViewsConfiguration): void;
-
-	}
+    };
+}
+
+export interface IFileHandlerConfig {
+    /**  a path string or function as described above.*/
+    path: string;
+    /** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+    filename?: string;
+    /**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
+    false - header is not included. This is the default value.
+    'attachment'
+    'inline'*/
+    mode?: boolean | string;
+    /** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
+    lookupCompressed: boolean;
+}
+
+/**http://hapijs.com/api#route-handler
+Built-in handlers
+
+The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
+export interface IRouteHandlerConfig {
+    /** generates a static file endpoint for serving a single file. file can be set to:
+                a relative or absolute file path string (relative paths are resolved based on the route files configuration).
+    a function with the signature function(request) which returns the relative or absolute file path.
+    an object with the following options */
+    file?: string | IRequestHandler<void> | IFileHandlerConfig;
+    /** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
+                path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
+    a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
+    an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
+    a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
+    index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
+    listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
+    showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
+    redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
+    lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
+    defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
+    directory?: {
+        path: string | Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
+        index?: boolean;
+        listing?: boolean;
+        showHidden?: boolean;
+        redirectToSlash?: boolean;
+        lookupCompressed?: boolean;
+        defaultExtension?: string;
+    };
+    proxy?: IProxyHandlerConfig;
+    view?: string | {
+        template: string;
+        context: {
+            payload: any;
+            params: any;
+            query: any;
+            pre: any;
+        }
+    };
+    config?: {
+        handler: any;
+        bind: any;
+        app: any;
+        plugins: {
+            [name: string]: any;
+        };
+        pre: Array<() => void>;
+        validate: {
+            headers: any;
+            params: any;
+            query: any;
+            payload: any;
+            errorFields?: any;
+            failAction?: string | IFailAction;
+        };
+        payload: {
+            output: {
+                data: any;
+                stream: any;
+                file: any;
+            };
+            parse?: any;
+            allow?: string | Array<string>;
+            override?: string;
+            maxBytes?: number;
+            uploads?: number;
+            failAction?: string;
+        };
+        response: {
+            schema: any;
+            sample: number;
+            failAction: string;
+        };
+        cache: {
+            privacy: string;
+            expiresIn: number;
+            expiresAt: number;
+        };
+        auth: string | boolean | {
+            mode: string;
+            strategies: Array<string>;
+            payload?: boolean | string;
+            tos?: boolean | string;
+            scope?: string | Array<string>;
+            entity: string;
+        };
+        cors?: boolean;
+        jsonp?: string;
+        description?: string;
+        notes?: string | Array<string>;
+        tags?: Array<string>;
+    };
+}
+/** Route configuration
+The route configuration object*/
+export interface IRouteConfiguration {
+    /**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
+    path: string;
+    /** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
+    * Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
+    method: string | string[];
+    /**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
+    vhost?: string;
+    /**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
+    handler: ISessionHandler | string | IRouteHandlerConfig;
+    /** - additional route options.*/
+    config?: IRouteAdditionalConfigurationOptions;
+}
+/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
+export interface IRoute {
+
+
+    /** the route HTTP method. */
+    method: string;
+    /** the route path. */
+    path: string;
+    /** the route vhost option if configured. */
+    vhost?: string | Array<string>;
+    /** the [active realm] associated with the route.*/
+    realm: IServerRealm;
+    /** the [route options]  object with all defaults applied. */
+    settings: IRouteAdditionalConfigurationOptions;
+}
+
+export interface IServerAuthScheme {
+    /** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
+    request - the request object.
+    reply - the reply interface the authentication method must call when done authenticating the request where:
+    reply(err, response, result) - is called if authentication failed where:
+    err - any authentication error.
+    response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+    result - an object containing:
+    credentials - the authenticated credentials.
+    artifacts - optional authentication artifacts.
+    reply.continue(result) - is called if authentication succeeded where:
+    result - same object as result above.
+    When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
+    .If the err returned by the reply() method includes a message, no additional strategies will be attempted.
+    If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    var scheme = function (server, options) {
+    return {
+    authenticate: function (request, reply) {
+    var req = request.raw.req;
+    var authorization = req.headers.authorization;
+    if (!authorization) {
+    return reply(Boom.unauthorized(null, 'Custom'));
+    }
+    return reply(null, { credentials: { user: 'john' } });
+    }
+    };
+    };
+    server.auth.scheme('custom', scheme);*/
+    authenticate(request: Request, reply: IReply): void;
+    /** payload(request, reply) - optional function called to authenticate the request payload where:
+    request - the request object.
+    reply(err, response) - is called if authentication failed where:
+    err - any authentication error.
+    response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+    reply.continue() - is called if payload authentication succeeded.
+    When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
+    payload?(request: Request, reply: IReply): void;
+    /** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
+    request - the request object.
+    reply(err, response) - is called if an error occurred where:
+    err - any authentication error.
+    response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
+    reply.continue() - is called if the operation succeeded.*/
+    response?(request: Request, reply: IReply): void;
+    /** an optional object  */
+    options?: {
+        /**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
+        payload: boolean;
+    }
+}
+
+
+
+export interface IServerInject {
+    (options: {
+        /**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
+        method: string;
+        /** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
+        url: string;
+        /** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
+        headers: IDictionary<string>;
+        /**- an optional string or buffer containing the request payload (object must be manually converted to a string first). Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
+        payload: string | Buffer;
+        /**an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
+        credentials: any;
+        /**object with options used to simulate client request stream conditions for testing:
+        error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+        close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+        end - if false, does not end the stream. Defaults to true.*/
+        simulate: {
+            error: boolean;
+            close: boolean;
+            end: boolean;
+        };
+    },
+        callback: (
+            /**the response object where:
+            statusCode - the HTTP status code.
+            headers - an object containing the headers set.
+            payload - the response payload string.
+            rawPayload - the raw response payload buffer.
+            raw - an object with the injection request and response objects:
+            req - the simulated node request object.
+            res - the simulated node response object.
+            result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
+            request - the request object.*/
+            res: { statusCode: number; headers: IDictionary<string>; payload: string; rawPayload: Buffer; raw: { req: http.ClientRequest; res: http.ServerResponse }; result: string; request: Request }) => void
+    ): void;
+
+}
+
+
+/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+The return value is an array where each item is an object containing:
+info - the connection.info the connection the table was generated for.
+labels - the connection labels.
+table - an array of routes where each route contains:
+settings - the route config with defaults applied.
+method - the HTTP method in lower case.
+path - the route path.*/
+export interface IConnectionTable {
+    info: any;
+    labels: any;
+    table: IRoute[];
+}
+
+export interface ICookieSettings {
+    /** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
+    ttl?: number;
+    /** - sets the 'Secure' flag.Defaults to false.*/
+    isSecure?: boolean;
+    /** - sets the 'HttpOnly' flag.Defaults to false.*/
+    isHttpOnly?: boolean;
+    /** - the path scope.Defaults to null (no path).*/
+    path?: string;
+    /** - the domain scope.Defaults to null (no domain).*/
+    domain?: any;
+    /** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
+    request - the request object.
+    next - the continuation function using the function(err, value) signature.*/
+    autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
+    /** - encoding performs on the provided value before serialization.Options are:
+    'none' - no encoding.When used, the cookie value must be a string.This is the default value.
+    'base64' - string value is encoded using Base64.
+    'base64json' - object value is JSON- stringified than encoded using Base64.
+    'form' - object value is encoded using the x- www - form - urlencoded method. */
+    encoding?: string;
+    /**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
+    integrity - algorithm options.Defaults to require('iron').defaults.integrity.
+    password - password used for HMAC key generation. */
+    sign?: { integrity: any; password: string; }
+    password?: string;
+    iron?: any;
+    ignoreErrors?: boolean;
+    clearInvalid?: boolean;
+    strictHeader?: boolean;
+    passThrough?: any;
+}
+
+/** method - the method function with the signature is one of:
+function(arg1, arg2, ..., argn, next) where:
+arg1, arg2, etc. - the method function arguments.
+next - the function called when the method is done with the signature function(err, result, ttl) where:
+err - error response if the method failed.
+result - the return value.
+ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+function(arg1, arg2, ..., argn) where:
+arg1, arg2, etc. - the method function arguments.
+the callback option is set to false.
+the method must returns a value (result, Error, or a promise) or throw an Error.*/
+export interface IServerMethod {
+    //(): void;
+    //(next: (err: any, result: any, ttl: number) => void): void;
+    //(arg1: any): void;
+    //(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
+    //(arg1: any, arg2: any): void;
+    (...args: any[]): void;
+
+}
+/** options - optional configuration:
+bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
+cache - the same cache configuration used in server.cache().
+callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
+generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
+export interface IServerMethodOptions {
+    bind?: any;
+    cache?: ICatBoxCacheOptions;
+    callback?: boolean;
+    generateKey?(args: any[]): string;
+}
+/** Request object
+
+The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
+Request events
+
+The request object supports the following events:
+
+'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+'finish' - emitted when the request payload finished reading. The event method signature is function ().
+'disconnect' - emitted when a request errors or aborts unexpectedly.
+var Crypto = require('crypto');
+var Hapi = require('hapi');
+var server = new Hapi.Server();
+server.connection({ port: 80 });
+
+server.ext('onRequest', function (request, reply) {
+
+var hash = Crypto.createHash('sha1');
+request.on('peek', function (chunk) {
+
+hash.update(chunk);
+});
+
+request.once('finish', function () {
+
+console.log(hash.digest('hex'));
+});
+
+request.once('disconnect', function () {
+
+console.error('request aborted');
+});
+
+return reply.continue();
+});*/
+declare export class Request extends Events.EventEmitter {
+    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+    app: any;
+    /**  authentication information*/
+    auth: {
+        /** true is the request has been successfully authenticated, otherwise false.*/
+        isAuthenticated: boolean;
+        /**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.*/
+        credentials: any;
+        /**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
+        artifacts: any;
+        /**  the route authentication mode.*/
+        mode: any;
+        /** the authentication error is failed and mode set to 'try'.*/
+        error: any;
+        /** an object used by the ['cookie' authentication scheme]  https://github.com/hapijs/hapi-auth-cookie */
+        session: any
+    };
+    /**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
+    domain: any;
+    /** the raw request headers (references request.raw.headers).*/
+    headers: IDictionary<string>;
+    /** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
+    id: number;
+    /**  request information */
+    info: {
+        /**  request reception timestamp. */
+        received: number;
+        /**  request response timestamp (0 is not responded yet). */
+        responded: number;
+        /** remote client IP address. */
+
+        remoteAddress: string;
+        /**  remote client port. */
+        remotePort: number;
+        /**  content of the HTTP 'Referrer' (or 'Referer') header. */
+        referrer: string;
+        /**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
+        host: string;
+        /**  the hostname part of the 'Host' header (e.g. 'example.com').*/
+        hostname: string;
+    };
+    /**  the request method in lower case (e.g. 'get', 'post'). */
+    method: string;
+    /**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
+    mime: string;
+    /**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
+    orig: {
+        params: any;
+        query: any;
+        payload: any;
+    };
+    /**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
+    params: IDictionary<string>;
+    /** an array containing all the path params values in the order they appeared in the path.*/
+    paramsArray: string[];
+    /**  the request URI's path component. */
+    path: string;
+    /** the request payload based on the route payload.output and payload.parse settings.*/
+    payload: any;
+    /**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
+    plugins: any;
+    /** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
+    pre: IDictionary<any>;
+    /** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
+    response: Response;
+    /**preResponses - same as pre but represented as the response object created by the pre method.*/
+    preResponses: any;
+    /**an object containing the query parameters.*/
+    query: any;
+    /**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
+    raw: {
+        req: http.ClientRequest;
+        res: http.ServerResponse;
+    };
+    /** the route public interface.*/
+    route: IRoute;
+    /** the server object. */
+    server: Server;
+    /** Special key reserved for plugins implementing session support. Plugins utilizing this key must check for null value to ensure there is no conflict with another similar server. */
+    session: any;
+    /** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
+    state: any;
+    /** complex object contining details on the url */
+    url: {
+        /** null when i tested */
+        auth: any;
+        /** null when i tested */
+        hash: any;
+        /** null when i tested */
+        host: any;
+        /** null when i tested */
+        hostname: any;
+        href: string;
+        path: string;
+        /** path without search*/
+        pathname: string;
+        /** null when i tested */
+        port: any;
+        /** null when i tested */
+        protocol: any;
+        /** querystring parameters*/
+        query: IDictionary<string>;
+        /** querystring parameters as a string*/
+        search: string;
+        /** null when i tested */
+        slashes: any;
+    };
+    /** request.setUrl(url)
+
+    Available only in 'onRequest' extension methods.
+
+    Changes the request URI before the router begins processing the request where:
+
+    url - the new request path value.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+
+    server.ext('onRequest', function (request, reply) {
+
+    // Change all requests to '/test'
+    request.setUrl('/test');
+    return reply.continue();
+    });*/
+    setUrl(url: string): void;
+    /** request.setMethod(method)
+
+    Available only in 'onRequest' extension methods.
+
+    Changes the request method before the router begins processing the request where:
+
+    method - is the request HTTP method (e.g. 'GET').
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+
+    server.ext('onRequest', function (request, reply) {
+
+    // Change all requests to 'GET'
+    request.setMethod('GET');
+    return reply.continue();
+    });*/
+    setMethod(method: string): void;
+    /** request.log(tags, [data, [timestamp]])
+
+    Always available.
+
+    Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
+
+    data - an optional message string or object with the application data being logged.
+    timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+    Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
+
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+
+    server.on('request', function (request, event, tags) {
+
+    if (tags.error) {
+    console.log(event);
+    }
+    });
+
+    var handler = function (request, reply) {
+
+    request.log(['test', 'error'], 'Test event');
+    return reply();
+    };
+    */
+    log(
+        /** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
+        tags: string | string[],
+        /** an optional message string or object with the application data being logged.*/
+        data?: string,
+        /**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
+        timestamp?: number): void;
+    /** request.getLog([tags], [internal])
+
+    Always available.
+
+    Returns an array containing the events matching any of the tags specified (logical OR)
+    request.getLog();
+    request.getLog('error');
+    request.getLog(['error', 'auth']);
+    request.getLog(['error'], true);
+    request.getLog(false);*/
+
+    getLog(
+        /** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
+        tags?: string,
+        /**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
+        internal?: boolean): string[];
+
+    /** request.tail([name])
+
+    Available until immediately after the 'response' event is emitted.
+
+    Adds a request tail which has to complete before the request lifecycle is complete where:
+
+    name - an optional tail name used for logging purposes.
+    Returns a tail function which must be called when the tail activity is completed.
+
+    Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
+
+    When all tails completed, the server emits a 'tail' event.
+
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+
+    var get = function (request, reply) {
+
+    var dbTail = request.tail('write to database');
+
+    db.save('key', 'value', function () {
+
+    dbTail();
+    });
+
+    return reply('Success!');
+    };
+
+    server.route({ method: 'GET', path: '/', handler: get });
+
+    server.on('tail', function (request) {
+
+    console.log('Request completed including db activity');
+    });*/
+    tail(
+        /** an optional tail name used for logging purposes.*/
+        name?: string): Function;
+}
+/** Response events
+
+The response object supports the following events:
+
+'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+var Crypto = require('crypto');
+var Hapi = require('hapi');
+var server = new Hapi.Server();
+server.connection({ port: 80 });
+
+server.ext('onPreResponse', function (request, reply) {
+
+var response = request.response;
+if (response.isBoom) {
+return reply();
+}
+
+var hash = Crypto.createHash('sha1');
+response.on('peek', function (chunk) {
+
+hash.update(chunk);
+});
+
+response.once('finish', function () {
+
+console.log(hash.digest('hex'));
+});
+
+return reply.continue();
+});*/
+declare export class Response extends Events.EventEmitter {
+    /**  the HTTP response status code. Defaults to 200 (except for errors).*/
+    statusCode: number;
+    /** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
+    headers: IDictionary<string>;
+    /** the value provided using the reply interface.*/
+    source: any;
+    /** a string indicating the type of source with available values:
+    'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
+    'buffer' - a Buffer.
+    'view' - a view generated with reply.view().
+    'file' - a file generated with reply.file() of via the directory handler.
+    'stream' - a Stream.
+    'promise' - a Promise object. */
+    variety: string;
+    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+    app: any;
+    /** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
+    plugins: any;
+    /** settings - response handling flags:
+    charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
+    encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
+    passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
+    stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
+    ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
+    varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
+    settings: {
+        charset: string;
+        encoding: string;
+        passThrough: boolean;
+        stringify: any;
+        ttl: number;
+        varyEtag: boolean;
+    }
+
+    /**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
+    length - the header value. Must match the actual payload size.*/
+    bytes(length: number): void;
+    /**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
+    charset(charset: string): void;
+
+    /**  sets the HTTP status code where:
+    statusCode - the HTTP status code.*/
+    code(statusCode: number): void;
+    /** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
+    created(uri: string): void;
+
+
+    /** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
+    encoding(encoding: string): void;
+
+    /** etag(tag, options) - sets the representation entity tag where:
+    tag - the entity tag string without the double-quote.
+    options - optional settings where:
+    weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
+    vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
+    etag(tag: string, options: {
+        weak: boolean; vary: boolean;
+    }): void;
+
+    /**header(name, value, options) - sets an HTTP header where:
+    name - the header name.
+    value - the header value.
+    options - optional settings where:
+    append - if true, the value is appended to any existing header value using separator. Defaults to false.
+    separator - string used as separator when appending to an exiting value. Defaults to ','.
+    override - if false, the header value is not set if an existing value present. Defaults to true.*/
+    header(name: string, value: string, options?: {
+        append: boolean;
+        separator: string;
+        override: boolean;
+    }): void;
+
+    /** location(uri) - sets the HTTP 'Location' header where:
+    uri - an absolute or relative URI used as the 'Location' header value.*/
+    location(uri: string): void;
+
+    /** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
+    uri - an absolute or relative URI used to redirect the client to another resource. */
+    redirect(uri: string): void;
+
+    /** replacer(method) - sets the JSON.stringify() replacer argument where:
+    method - the replacer function or array. Defaults to none.*/
+    replacer(method: Function | Array<Function>): void;
+
+    /** spaces(count) - sets the JSON.stringify() space argument where:
+    count - the number of spaces to indent nested object keys. Defaults to no indentation. */
+    spaces(count: number): void;
+    /**state(name, value, [options]) - sets an HTTP cookie where:
+    name - the cookie name.
+    value - the cookie value. If no encoding is defined, must be a string.
+    options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
+    state(name: string, value: string, options?: any): void;
+
+}
+
+
+
+/** Server http://hapijs.com/api#server
+rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
+Server events
+The server object inherits from Events.EventEmitter and emits the following events:
+'log' - events logged with server.log() and server events generated internally by the framework.
+'start' - emitted when the server is started using server.start().
+'stop' - emitted when the server is stopped using server.stop().
+'request' - events generated by request.log(). Does not include any internally generated events.
+'request-internal' - request events generated internally by the framework (multiple events per request).
+'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
+'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
+'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
+Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
+MORE EVENTS HERE: http://hapijs.com/api#server-events*/
+declare export class Server extends Events.EventEmitter {
+
+    constructor(options?: IServerOptions);
+    /** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
+    var Hapi = require('hapi');
+    server = new Hapi.Server();
+    server.app.key = 'value';
+    var handler = function (request, reply) {
+    return reply(request.server.app.key);
+    }; */
+    app: any;
+    /** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
+    var server = new Hapi.Server();
+    server.connection({ port: 80, labels: 'a' });
+    server.connection({ port: 8080, labels: 'b' });
+    // server.connections.length === 2
+    var a = server.select('a');
+    // a.connections.length === 1*/
+    connections: Array<ISeverConnectionOptions>;
+    /** When the server contains exactly one connection, info is an object containing information about the sole connection.
+    * When the server contains more than one connection, each server.connections array member provides its own connection.info.
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    // server.info.port === 80
+    server.connection({ port: 8080 });
+    // server.info === null
+    // server.connections[1].info.port === 8080
+    */
+    info: {
+        /**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
+        id: string;
+        /**  - the connection creation timestamp.*/
+        created: number;
+        /**  - the connection start timestamp (0 when stopped).*/
+        started: number;
+        /**  the connection port based on the following rules:
+        the configured port value before the server has been started.
+        the actual port assigned when no port is configured or set to 0 after the server has been started.*/
+        port: number;
+
+        /** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
+        host: string;
+        /** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
+        address: string;
+        /**  - the protocol used:
+        'http' - HTTP.
+        'https' - HTTPS.
+        'socket' - UNIX domain socket or Windows named pipe.*/
+        protocol: string;
+        /** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
+        uri: string;
+    };
+    /** An object containing the process load metrics (when load.sampleInterval is enabled):
+    rss - RSS memory usage.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
+    console.log(server.load.rss);*/
+    load: {
+        /** - event loop delay milliseconds.*/
+        eventLoopDelay: number;
+        /**  - V8 heap usage.*/
+        heapUsed: number;
+    };
+    /** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
+    When the server contains more than one connection, each server.connections array member provides its own connection.listener.
+    var Hapi = require('hapi');
+    var SocketIO = require('socket.io');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    var io = SocketIO.listen(server.listener);
+    io.sockets.on('connection', function(socket) {
+    socket.emit({ msg: 'welcome' });
+    });*/
+    listener: http.Server;
+
+    /** server.methods
+    An object providing access to the server methods where each server method name is an object property.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.method('add', function (a, b, next) {
+    return next(null, a + b);
+    });
+    server.methods.add(1, 2, function (err, result) {
+    // result === 3
+    });*/
+    methods: IDictionary<Function>;
+
+    /** server.mime
+    Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
+    var Hapi = require('hapi');
+    var options = {
+    mime: {
+    override: {
+    'node/module': {
+    source: 'steve',
+    compressible: false,
+    extensions: ['node', 'module', 'npm'],
+    type: 'node/module'
+    }
+    }
+    }
+    };
+    var server = new Hapi.Server(options);
+    // server.mime.path('code.js').type === 'application/javascript'
+    // server.mime.path('file.npm').type === 'node/module'*/
+    mime: any;
+    /**server.plugins
+    An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
+    exports.register = function (server, options, next) {
+    server.expose('key', 'value');
+    // server.plugins.example.key === 'value'
+    return next();
+    };
+    exports.register.attributes = {
+    name: 'example'
+    };*/
+    plugins: IDictionary<any>;
+    /** server.realm
+    The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+    modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
+    route - routes preferences:
+    prefix - the route path prefix used by any calls to server.route() from the server.
+    vhost - the route virtual host settings used by any calls to server.route() from the server.
+    plugin - the active plugin name (empty string if at the server root).
+    plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
+    settings - settings overrides:
+    files.relativeTo
+    bind
+    The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+    exports.register = function (server, options, next) {
+    console.log(server.realm.modifiers.route.prefix);
+    return next();
+    };*/
+    realm: IServerRealm;
+
+    /** server.root
+    The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
+    root: Server;
+    /** server.settings
+    The server configuration object after defaults applied.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server({
+    app: {
+    key: 'value'
+    }
+    });
+    // server.settings.app === { key: 'value' }*/
+    settings: IServerOptions;
+
+    /** server.version
+    The hapi module version number.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    // server.version === '8.0.0'*/
+    version: string;
+
+    /** server.after(method, [dependencies])
+    Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
+    after - the method with signature function(plugin, next) where:
+    server - server object the after() method was called on.
+    next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+    err - internal error which is returned back via the server.start() callback.
+    dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.after(function () {
+    // Perform some pre-start logic
+    });
+    server.start(function (err) {
+    // After method already executed
+    });
+    server.auth.default(options)*/
+    after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string | string[]): void;
+
+    auth: {
+        /** server.auth.default(options)
+        Sets a default strategy which is applied to every route where:
+        options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
+        The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
+        The default auth strategy configuration can be accessed via connection.auth.settings.default.
+        var server = new Hapi.Server();
+        server.connection({ port: 80 });
+        server.auth.scheme('custom', scheme);
+        server.auth.strategy('default', 'custom');
+        server.auth.default('default');
+        server.route({
+        method: 'GET',
+        path: '/',
+        handler: function (request, reply) {
+        return reply(request.auth.credentials.user);
+        }
+        });*/
+        default(options: string): void;
+        default(options: { strategy: string }): void;
+        default(options: { strategies: string[] }): void;
+        /** server.auth.scheme(name, scheme)
+        Registers an authentication scheme where:
+        name - the scheme name.
+        scheme - the method implementing the scheme with signature function(server, options) where:
+        server - a reference to the server object the scheme is added to.
+        options - optional scheme settings used to instantiate a strategy.*/
+        scheme(name: string,
+            /** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+            n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
+            server = new Hapi.Server();
+            server.connection({ port: 80 });
+            scheme = function (server, options) {
+            urn {
+            authenticate: function (request, reply) {
+            req = request.raw.req;
+            var authorization = req.headers.authorization;
+            if (!authorization) {
+            return reply(Boom.unauthorized(null, 'Custom'));
+            }
+            urn reply(null, { credentials: { user: 'john' } });
+            }
+            };
+            };
+            */
+            scheme: (server: Server, options: any) => IServerAuthScheme): void;
+
+        /** server.auth.strategy(name, scheme, [mode], [options])
+        Registers an authentication strategy where:
+        name - the strategy name.
+        scheme - the scheme name (must be previously registered using server.auth.scheme()).
+        mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
+        options - scheme options based on the scheme requirements.
+        var server = new Hapi.Server();
+        server.connection({ port: 80 });
+        server.auth.scheme('custom', scheme);
+        server.auth.strategy('default', 'custom');
+        server.route({
+        method: 'GET',
+        path: '/',
+        config: {
+        auth: 'default',
+        handler: function (request, reply) {
+        return reply(request.auth.credentials.user);
+        }
+        }
+        });*/
+        strategy(name: string, scheme: any, mode?: boolean, options?: any): void;
+
+        /** server.auth.test(strategy, request, next)
+        Tests a request against an authentication strategy where:
+        strategy - the strategy name registered with server.auth.strategy().
+        request - the request object.
+        next - the callback function with signature function(err, credentials) where:
+        err - the error if authentication failed.
+        credentials - the authentication credentials object if authentication was successful.
+        Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
+        var server = new Hapi.Server();
+        server.connection({ port: 80 });
+        server.auth.scheme('custom', scheme);
+        server.auth.strategy('default', 'custom');
+        server.route({
+        method: 'GET',
+        path: '/',
+        handler: function (request, reply) {
+        request.server.auth.test('default', request, function (err, credentials) {
+        if (err) {
+        return reply({ status: false });
+        }
+        return reply({ status: true, user: credentials.name });
+        });
+        }
+        });*/
+        test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
+    };
+    /** server.bind(context)
+    Sets a global context used as the default bind object when adding a route or an extension where:
+    context - the object used to bind this in handler and extension methods.
+    When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
+    var handler = function (request, reply) {
+    return reply(this.message);
+    };
+    exports.register = function (server, options, next) {
+    var bind = {
+    message: 'hello'
+    };
+    server.bind(bind);
+    server.route({ method: 'GET', path: '/', handler: handler });
+    return next();
+    };*/
+    bind(context: any): void;
+
+
+    /** server.cache(options)
+    Provisions a cache segment within the server cache facility where:
+    options - catbox policy configuration where:
+    expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+    expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
+    generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
+    staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
+    staleTimeout - number of milliseconds to wait before checking if an item is stale.
+    generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
+    cache - the cache name configured in 'server.cache`. Defaults to the default cache.
+    segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
+    shared - if true, allows multiple cache provisions to share the same segment. Default to false.
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
+    cache.set('norway', { capital: 'oslo' }, null, function (err) {
+    cache.get('norway', function (err, value, cached, log) {
+    // value === { capital: 'oslo' };
+    });
+    });*/
+    cache(options: ICatBoxCacheOptions): void;
+
+    /** server.connection([options])
+    Adds an incoming server connection
+    Returns a server object with the new connection selected.
+    Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
+    Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
+    var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
+    // server.connections.length === 2
+    // web.connections.length === 1
+    // admin.connections.length === 1 */
+    connection(options: ISeverConnectionOptions): Server;
+    /** server.decorate(type, property, method)
+    Extends various framework interfaces with custom methods where:
+    type - the interface being decorated. Supported types:
+    'reply' - adds methods to the reply interface.
+    'server' - adds methods to the Server object.
+    property - the object decoration key name.
+    method - the extension function.
+    Note that decorations apply to the entire server and all its connections regardless of current selection.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.decorate('reply', 'success', function () {
+    return this.response({ status: 'ok' });
+    });
+    server.route({
+    method: 'GET',
+    path: '/',
+    handler: function (request, reply) {
+    return reply.success();
+    }
+    });*/
+    decorate(type: string, property: string, method: Function): void;
+
+    /** server.dependency(dependencies, [after])
+    Used within a plugin to declares a required dependency on other plugins where:
+    dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
+    after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
+    server - the server the dependency() method was called on.
+    next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+    err - internal error condition, which is returned back via the server.start() callback.
+    exports.register = function (server, options, next) {
+    server.dependency('yar', after);
+    return next();
+    };
+    var after = function (server, next) {
+    // Additional plugin registration logic
+    return next();
+    };*/
+    dependency(dependencies: string | string[], after?: (server: Server, next: (err: any) => void) => void): void;
+
+
+    /** server.expose(key, value)
+    Used within a plugin to expose a property via server.plugins[name] where:
+    key - the key assigned (server.plugins[name][key]).
+    value - the value assigned.
+    exports.register = function (server, options, next) {
+    server.expose('util', function () { console.log('something'); });
+    return next();
+    };*/
+    expose(key: string, value: any): void;
+
+    /** server.expose(obj)
+    Merges a deep copy of an object into to the existing content of server.plugins[name] where:
+    obj - the object merged into the exposed properties container.
+    exports.register = function (server, options, next) {
+    server.expose({ util: function () { console.log('something'); } });
+    return next();
+    };*/
+    expose(obj: any): void;
+
+    /** server.ext(event, method, [options])
+    Registers an extension function in one of the available extension points where:
+    event - the event name.
+    method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
+    request - the request object.
+    reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
+    this - the object provided via options.bind or the current active context set with server.bind().
+    options - an optional object with the following:
+    before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+    after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+    bind - a context object passed back to the provided method (via this) when called.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.ext('onRequest', function (request, reply) {
+    // Change all requests to '/test'
+    request.setUrl('/test');
+    return reply.continue();
+    });
+    var handler = function (request, reply) {
+    return reply({ status: 'ok' });
+    };
+    server.route({ method: 'GET', path: '/test', handler: handler });
+    server.start();
+    // All requests will get routed to '/test'*/
+    ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
+
+    /** server.handler(name, method)
+    Registers a new handler type to be used in routes where:
+    name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
+    method - the function used to generate the route handler using the signature function(route, options) where:
+    route - the route public interface object.
+    options - the configuration object provided in the handler config.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ host: 'localhost', port: 8000 });
+    // Defines new handler for routes on this server
+    server.handler('test', function (route, options) {
+    return function (request, reply) {
+    return reply('new handler: ' + options.msg);
+    }
+    });
+    server.route({
+    method: 'GET',
+    path: '/',
+    handler: { test: { msg: 'test' } }
+    });
+    server.start();
+    The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ host: 'localhost', port: 8000 });
+    var handler = function (route, options) {
+    return function (request, reply) {
+    return reply('new handler: ' + options.msg);
+    }
+    };
+    // Change the default payload processing for this handler
+    handler.defaults = {
+    payload: {
+    output: 'stream',
+    parse: false
+    }
+    };
+    server.handler('test', handler);*/
+    handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
+    /** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
+    Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
+    Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
+    * When the server contains more than one connection, each server.connections array member provides its own connection.inject().
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    var handler = function (request, reply) {
+    return reply('Success!');
+    };
+    server.route({ method: 'GET', path: '/', handler: handler });
+    server.inject('/', function (res) {
+    console.log(res.result);
+    });
+    */
+    inject: IServerInject;
+
+    /** server.log(tags, [data, [timestamp]])
+    Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
+    tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
+    data - an optional message string or object with the application data being logged.
+    timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.on('log', function (event, tags) {
+    if (tags.error) {
+    console.log(event);
+    }
+    });
+    server.log(['test', 'error'], 'Test event');*/
+    log(tags: string | string[], data?: string | any, timestamp?: number): void;
+    /**server.lookup(id)
+    When the server contains exactly one connection, looks up a route configuration where:
+    id - the route identifier as set in the route options.
+    returns the route public interface object if found, otherwise null.
+    var server = new Hapi.Server();
+    server.connection();
+    server.route({
+    method: 'GET',
+    path: '/',
+    config: {
+    handler: function (request, reply) { return reply(); },
+    id: 'root'
+    }
+    });
+    var route = server.lookup('root');
+    When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
+    lookup(id: string): IRoute;
+    /** server.match(method, path, [host])
+    When the server contains exactly one connection, looks up a route configuration where:
+    method - the HTTP method (e.g. 'GET', 'POST').
+    path - the requested path (must begin with '/').
+    host - optional hostname (to match against routes with vhost).
+    returns the route public interface object if found, otherwise null.
+    var server = new Hapi.Server();
+    server.connection();
+    server.route({
+    method: 'GET',
+    path: '/',
+    config: {
+    handler: function (request, reply) { return reply(); },
+    id: 'root'
+    }
+    });
+    var route = server.match('get', '/');
+    When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
+    match(method: string, path: string, host?: string): IRoute;
+
+
+
+
+    /** server.method(name, method, [options])
+    Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
+    Methods are registered via server.method(name, method, [options])
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    // Simple arguments
+    var add = function (a, b, next) {
+    return next(null, a + b);
+    };
+    server.method('sum', add, { cache: { expiresIn: 2000 } });
+    server.methods.sum(4, 5, function (err, result) {
+    console.log(result);
+    });
+    // Object argument
+    var addArray = function (array, next) {
+    var sum = 0;
+    array.forEach(function (item) {
+    sum += item;
+    });
+    return next(null, sum);
+    };
+    server.method('sumObj', addArray, {
+    cache: { expiresIn: 2000 },
+    generateKey: function (array) {
+    return array.join(',');
+    }
+    });
+    server.methods.sumObj([5, 6], function (err, result) {
+    console.log(result);
+    });
+    // Synchronous method with cache
+    var addSync = function (a, b) {
+    return a + b;
+    };
+    server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
+    server.methods.sumSync(4, 5, function (err, result) {
+    console.log(result);
+    }); */
+    method(
+        /**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
+        name: string,
+        method: IServerMethod,
+        options?: IServerMethodOptions): void;
+
+
+    /**server.method(methods)
+    Registers a server method function as described in server.method() using a configuration object where:
+    methods - an object or an array of objects where each one contains:
+    name - the method name.
+    method - the method function.
+    options - optional settings.
+    var add = function (a, b, next) {
+    next(null, a + b);
+    };
+    server.method({
+    name: 'sum',
+    method: add,
+    options: {
+    cache: {
+    expiresIn: 2000
+    }
+    }
+    });*/
+    method(methods: {
+        name: string; method: IServerMethod; options?: IServerMethodOptions
+    } | Array<{
+        name: string; method: IServerMethod; options?: IServerMethodOptions
+    }>): void;
+    /**server.path(relativeTo)
+    Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
+    relativeTo - the path prefix added to any relative file path starting with '.'.
+    Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
+    exports.register = function (server, options, next) {
+    server.path(__dirname + '../static');
+    server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
+    next();
+    };*/
+    path(relativeTo: string): void;
+    /**server.register(plugins, [options], callback)
+    Registers a plugin where:
+    plugins - an object or array of objects where each one is either:
+    a plugin registration function.
+    an object with the following:
+    register - the plugin registration function.
+    options - optional options passed to the registration function when called.
+    options - optional registration options (different from the options passed to the registration function):
+    select - a string or array of string labels used to pre-select connections for plugin registration.
+    routes - modifiers applied to each route added by the plugin:
+    prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+    vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+    callback - the callback function with signature function(err) where:
+    err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
+    server.register({
+    register: require('plugin_name'),
+    options: {
+    message: 'hello'
+    }
+    }, function (err) {
+    if (err) {
+    console.log('Failed loading plugin');
+    }
+    });*/
+    register(plugins: any | any[], options: {
+        select: string | string[];
+        routes: {
+            prefix: string; vhost?: string | string[]
+        };
+    }
+        , callback: (err: any) => void): void;
+
+    register(plugins: any | any[], callback: (err: any) => void): void;
+
+    /**server.render(template, context, [options], callback)
+    Utilizes the server views manager to render a template where:
+    template - the template filename and path, relative to the views manager templates path (path or relativeTo).
+    context - optional object used by the template to render context-specific result. Defaults to no context ({}).
+    options - optional object used to override the views manager configuration.
+    callback - the callback function with signature function (err, rendered, config) where:
+    err - the rendering error if any.
+    rendered - the result view string.
+    config - the configuration used to render the template.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.views({
+    engines: { html: require('handlebars') },
+    path: __dirname + '/templates'
+    });
+    var context = {
+    title: 'Views Example',
+    message: 'Hello, World'
+    };
+    server.render('hello', context, function (err, rendered, config) {
+    console.log(rendered);
+    });*/
+    render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void): void;
+    /** server.route(options)
+    Adds a connection route where:
+    options - a route configuration object or an array of configuration objects.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
+    server.route([
+    { method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
+    { method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
+    ]);*/
+    route(options: IRouteConfiguration): void;
+    route(options: IRouteConfiguration[]): void;
+    /**server.select(labels)
+    Selects a subset of the server's connections where:
+    labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
+    Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80, labels: ['a'] });
+    server.connection({ port: 8080, labels: ['b'] });
+    server.connection({ port: 8081, labels: ['c'] });
+    server.connection({ port: 8082, labels: ['c','d'] });
+    var a = server.select('a');          // The server with port 80
+    var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
+    var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
+    select(labels: string | string[]): Server | Server[];
+    /** server.start([callback])
+    Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
+    callback - optional callback when server startup is completed or failed with the signature function(err) where:
+    err - any startup error condition.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.start(function (err) {
+    console.log('Server started at: ' + server.info.uri);
+    });*/
+    start(callback?: (err: any) => void): void;
+    /** server.state(name, [options])
+    HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
+    State defaults can be modified via the server connections.routes.state configuration option.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    // Set cookie definition
+    server.state('session', {
+    ttl: 24 * 60 * 60 * 1000,     // One day
+    isSecure: true,
+    path: '/',
+    encoding: 'base64json'
+    });
+    // Set state in route handler
+    var handler = function (request, reply) {
+    var session = request.state.session;
+    if (!session) {
+    session = { user: 'joe' };
+    }
+    session.last = Date.now();
+    return reply('Success').state('session', session);
+    };
+    Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.on('request-internal', function (request, event, tags) {
+    if (tags.error && tags.state) {
+    console.error(event);
+    }
+    });	*/
+    state(name: string, options?: ICookieSettings): void;
+
+    /** server.stop([options], [callback])
+    Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
+    options - optional object with:
+    timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
+    callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80 });
+    server.stop({ timeout: 60 * 1000 }, function () {
+    console.log('Server stopped');
+    });*/
+    stop(options?: { timeout: number }, callback?: () => void): void;
+    /**server.table([host])
+    Returns a copy of the routing table where:
+    host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+    The return value is an array where each item is an object containing:
+    info - the connection.info the connection the table was generated for.
+    labels - the connection labels.
+    table - an array of routes where each route contains:
+    settings - the route config with defaults applied.
+    method - the HTTP method in lower case.
+    path - the route path.
+    Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80, host: 'example.com' });
+    server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+    var table = server.table();
+    When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.connection({ port: 80, host: 'example.com' });
+    server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+    var table = server.connections[0].table();
+    //[
+    //    {
+    //        method: 'get',
+    //        path: '/example',
+    //        settings: { ... }
+    //    }
+    //]
+    */
+    table(host?: any): IConnectionTable;
+
+    /**server.views(options)
+    Initializes the server views manager
+    var Hapi = require('hapi');
+    var server = new Hapi.Server();
+    server.views({
+    engines: {
+    html: require('handlebars'),
+    jade: require('jade')
+    },
+    path: '/static/templates'
+    });
+    When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
+    views(options: IServerViewsConfiguration): void;
+
 }
diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
index 874a73a6c3..07b5f83658 100644
--- a/hapi/hapi.d.ts
+++ b/hapi/hapi.d.ts
@@ -8,721 +8,721 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "hapi" {
-	import http = require("http");
-	import stream = require("stream");
-	import Events = require("events");
 
-	interface IDictionary<T> {
-		[key: string]: T;
-	}
+import http = require("http");
+import stream = require("stream");
+import Events = require("events");
 
-	interface IThenable<R> {
-		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IThenable<U>;
-		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IThenable<U>;
-	}
+interface IDictionary<T> {
+    [key: string]: T;
+}
 
-	interface IPromise<R> extends IThenable<R> {
-		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
-		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IPromise<U>;
-		catch<U>(onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
-	}
+interface IThenable<R> {
+    then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IThenable<U>;
+    then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IThenable<U>;
+}
 
-	export interface IHeaderOptions {
-		append?: boolean;
-		separator?: string;
-		override?: boolean;
-		duplicate?: boolean;
-	}
+interface IPromise<R> extends IThenable<R> {
+    then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
+    then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IPromise<U>;
+    catch<U>(onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
+}
 
-	/** Boom Module for errors. https://github.com/hapijs/boom
-	 *  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
-	export interface IBoom extends Error {
-		/**  if true, indicates this is a Boom object instance.  */
-		isBoom: boolean;
-		/** convenience bool indicating status code >= 500.  */
-		isServer: boolean;
-		/**  the error message.  */
-		message: string;
-		/**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
-		output: {
-			/** the HTTP status code (typically 4xx or 5xx).  */
-			statusCode: number;
-			/** an object containing any HTTP headers where each key is a header name and value is the header content.  */
-			headers: IDictionary<string>;
-			/** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
-			payload: {
-				/** the HTTP status code, derived from error.output.statusCode.  */
-				statusCode: number;
-				/** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
-				error: string;
-				/** the error message derived from error.message. */
-				message: string;
-			};
-		};
-		/**  reformat()rebuilds error.output using the other object properties.  */
-		reformat(): void;
+export interface IHeaderOptions {
+    append?: boolean;
+    separator?: string;
+    override?: boolean;
+    duplicate?: boolean;
+}
 
-	}
+/** Boom Module for errors. https://github.com/hapijs/boom
+ *  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
+export interface IBoom extends Error {
+    /**  if true, indicates this is a Boom object instance.  */
+    isBoom: boolean;
+    /** convenience bool indicating status code >= 500.  */
+    isServer: boolean;
+    /**  the error message.  */
+    message: string;
+    /**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
+    output: {
+        /** the HTTP status code (typically 4xx or 5xx).  */
+        statusCode: number;
+        /** an object containing any HTTP headers where each key is a header name and value is the header content.  */
+        headers: IDictionary<string>;
+        /** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
+        payload: {
+            /** the HTTP status code, derived from error.output.statusCode.  */
+            statusCode: number;
+            /** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
+            error: string;
+            /** the error message derived from error.message. */
+            message: string;
+        };
+    };
+    /**  reformat()rebuilds error.output using the other object properties.  */
+    reformat(): void;
 
-	/** cache functionality via the "CatBox" module. */
-	export interface ICatBoxCacheOptions {
-		/**  a prototype function or catbox engine object.  */
-		engine: any;
-		/**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
-		name?: string;
-		/**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
-		shared?: boolean;
-	}
+}
 
-	/** Any connections configuration server defaults can be included to override and customize the individual connection. */
-	export interface IServerConnectionOptions extends IConnectionConfigurationServerDefaults {
-		/**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
-		host?: string;
-		/** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
-		address?: string;
-		/** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
-		port?: string | number;
-		/** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
-		uri?: string;
-		/**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
-		listener?: any;
-		/**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
-		autoListen?: boolean;
-		/**  caching headers configuration: */
-		cache?: {
-			/** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
-			statuses: number[];
-		};
-		/** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
-		labels?: string | string[];
-		/**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
-		tls?: boolean | { key?: string; cert?: string; pfx?: string; } | Object;
+/** cache functionality via the "CatBox" module. */
+export interface ICatBoxCacheOptions {
+    /**  a prototype function or catbox engine object.  */
+    engine: any;
+    /**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
+    name?: string;
+    /**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
+    shared?: boolean;
+}
 
-	}
+/** Any connections configuration server defaults can be included to override and customize the individual connection. */
+export interface IServerConnectionOptions extends IConnectionConfigurationServerDefaults {
+    /**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
+    host?: string;
+    /** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
+    address?: string;
+    /** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
+    port?: string | number;
+    /** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
+    uri?: string;
+    /**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
+    listener?: any;
+    /**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
+    autoListen?: boolean;
+    /**  caching headers configuration: */
+    cache?: {
+        /** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
+        statuses: number[];
+    };
+    /** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
+    labels?: string | string[];
+    /**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
+    tls?: boolean | { key?: string; cert?: string; pfx?: string; } | Object;
 
-	export interface IConnectionConfigurationServerDefaults {
-		/**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
-		app?: any;
-		/**  connection load limits configuration where:  */
-		load?: {
-			/**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxHeapUsedBytes: number;
-			/**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxRssBytes: number;
-			/**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxEventLoopDelay: number;
-		};
-		/**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
-		plugins?: any;
-		/**  controls how incoming request URIs are matched against the routing table: */
-		router?: {
-			/**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
-			isCaseSensitive: boolean;
-			/**  removes trailing slashes on incoming paths. Defaults to false.  */
-			stripTrailingSlash: boolean;
-		};
-		/** a route options object used to set the default configuration for every route. */
-		routes?: IRouteAdditionalConfigurationOptions;
-		state?: IServerState;
-	}
+}
 
-	/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
-	export interface IServerOptions {
-		/**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
-		app?: any;
-		/**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
-		 a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
-		 a configuration object with the following options:
-		 enginea prototype function or catbox engine object.
-		 namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
-		 sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
-		 other options passed to the catbox strategy used.
-		 an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
-		cache?: string | ICatBoxCacheOptions | Array<ICatBoxCacheOptions> | any;
-		/**  sets the default connections configuration which can be overridden by each connection where:  */
-		connections?: IConnectionConfigurationServerDefaults;
-		/** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
-		debug?: boolean | {
-			/** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
-			log: string[];
-			/**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
-			request: string[];
-		};
-		/** file system related settings*/
-		files?: {
-			/**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
-			etagsCacheMaxSize?: number;
-		};
-		/**  process load monitoring*/
-		load?: {
-			/**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
-			sampleInterval?: number;
-		};
+export interface IConnectionConfigurationServerDefaults {
+    /**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
+    app?: any;
+    /**  connection load limits configuration where:  */
+    load?: {
+        /**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxHeapUsedBytes: number;
+        /**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxRssBytes: number;
+        /**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+        maxEventLoopDelay: number;
+    };
+    /**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
+    plugins?: any;
+    /**  controls how incoming request URIs are matched against the routing table: */
+    router?: {
+        /**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
+        isCaseSensitive: boolean;
+        /**  removes trailing slashes on incoming paths. Defaults to false.  */
+        stripTrailingSlash: boolean;
+    };
+    /** a route options object used to set the default configuration for every route. */
+    routes?: IRouteAdditionalConfigurationOptions;
+    state?: IServerState;
+}
 
-		/** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
-		mime?: any;
-		/**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
-		minimal?: boolean;
-		/** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
-		plugins?: IDictionary<any>;
+/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
+export interface IServerOptions {
+    /**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
+    app?: any;
+    /**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
+     a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
+     a configuration object with the following options:
+     enginea prototype function or catbox engine object.
+     namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
+     sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
+     other options passed to the catbox strategy used.
+     an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
+    cache?: string | ICatBoxCacheOptions | Array<ICatBoxCacheOptions> | any;
+    /**  sets the default connections configuration which can be overridden by each connection where:  */
+    connections?: IConnectionConfigurationServerDefaults;
+    /** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
+    debug?: boolean | {
+        /** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
+        log: string[];
+        /**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
+        request: string[];
+    };
+    /** file system related settings*/
+    files?: {
+        /**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
+        etagsCacheMaxSize?: number;
+    };
+    /**  process load monitoring*/
+    load?: {
+        /**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
+        sampleInterval?: number;
+    };
 
-	}
+    /** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
+    mime?: any;
+    /**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
+    minimal?: boolean;
+    /** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
+    plugins?: IDictionary<any>;
 
-	export interface IServerViewCompile {
-		(template: string, options: any): void;
-		(template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
-	}
+}
 
-	export interface IServerViewsAdditionalOptions {
-		/**    path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
-		path?: string;
-		/**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
-		 */
-		partialsPath?: string;
-		/**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
-		helpersPath?: string;
-		/**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
-		relativeTo?: string;
+export interface IServerViewCompile {
+    (template: string, options: any): void;
+    (template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
+}
 
-		/**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
-		layout?: boolean | string;
-		/**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
-		layoutPath?: string;
-		/**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
-		layoutKeywork?: string;
-		/**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
-		encoding?: string;
-		/**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
-		isCached?: boolean;
-		/**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
-		allowAbsolutePaths?: boolean;
-		/**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
-		allowInsecureAccess?: boolean;
-		/**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
-		compileOptions?: any;
-		/**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
-		runtimeOptions?: any;
-		/**contentType - the content type of the engine results.Defaults to 'text/html'.*/
-		contentType?: string;
-		/**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
-		compileMode?: string;
-		/**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
-		context?: any;
-	}
+export interface IServerViewsAdditionalOptions {
+    /**    path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
+    path?: string;
+    /**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
+     */
+    partialsPath?: string;
+    /**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
+    helpersPath?: string;
+    /**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
+    relativeTo?: string;
 
-	export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
-		/**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
-		 * If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
-			module: {
-			compile?(template: any, options: any): (context: any, options: any) => void;
-			compile?(template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
-		};
-	}
+    /**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
+    layout?: boolean | string;
+    /**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
+    layoutPath?: string;
+    /**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
+    layoutKeywork?: string;
+    /**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
+    encoding?: string;
+    /**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
+    isCached?: boolean;
+    /**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
+    allowAbsolutePaths?: boolean;
+    /**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
+    allowInsecureAccess?: boolean;
+    /**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
+    compileOptions?: any;
+    /**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
+    runtimeOptions?: any;
+    /**contentType - the content type of the engine results.Defaults to 'text/html'.*/
+    contentType?: string;
+    /**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
+    compileMode?: string;
+    /**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
+    context?: any;
+}
 
-	/**Initializes the server views manager
-	 var Hapi = require('hapi');
-	 var server = new Hapi.Server();
+export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
+    /**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
+     * If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
+    module: {
+        compile?(template: any, options: any): (context: any, options: any) => void;
+        compile?(template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
+    };
+}
 
-	 server.views({
-	engines: {
-	html: require('handlebars'),
-	jade: require('jade')
-	},
-	path: '/static/templates'
-	});
-	 When server.views() is called within a plugin, the views manager is only available to plugins methods.
-	 */
-	export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
-		/** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
-		engines: IDictionary<any> | IServerViewsEnginesOptions;
-		/**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
-		defaultExtension?: string;
-	}
+/**Initializes the server views manager
+ var Hapi = require('hapi');
+ var server = new Hapi.Server();
 
-	/**  Concludes the handler activity by setting a response and returning control over to the framework where:
-	 erran optional error response.
-	 resultan optional response payload.
-	 Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
-	 FLOW CONTROL:
-	 When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
-	export interface IReply {
-		<T>(err: Error,
-			result?: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T,
-			/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-			credentialData?: any): IBoom;
-		/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-		<T>(result: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T): Response;
+ server.views({
+engines: {
+html: require('handlebars'),
+jade: require('jade')
+},
+path: '/static/templates'
+});
+ When server.views() is called within a plugin, the views manager is only available to plugins methods.
+ */
+export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
+    /** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
+    engines: IDictionary<any> | IServerViewsEnginesOptions;
+    /**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
+    defaultExtension?: string;
+}
 
-		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
-		 * The data argument is only used for passing back authentication data and is ignored elsewhere. */
-		continue(credentialData?: any): void;
+/**  Concludes the handler activity by setting a response and returning control over to the framework where:
+ erran optional error response.
+ resultan optional response payload.
+ Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
+ FLOW CONTROL:
+ When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
+export interface IReply {
+    <T>(err: Error,
+        result?: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T,
+        /**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+        credentialData?: any): IBoom;
+    /**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+    <T>(result: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T): Response;
 
-		/** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
-		file(/**   the file path. */
-			 path: string,
-			 /**  optional settings:  */
-			 options?: {
-				 /** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-				 filename?: string;
-				 /** specifies whether to include the 'Content-Disposition' header with the response. Available values:
-				  false - header is not included. This is the default value.
-				  'attachment'
-				  'inline'*/
-				 mode?: boolean | string;
-				 /**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
-				 lookupCompressed: boolean;
-			 }): void;
-		/**  Concludes the handler activity by returning control over to the router with a templatized view response.
-		 the response flow control rules apply. */
-		view(/**  the template filename and path, relative to the templates path configured via the server views manager. */
-			 template: string,
-			 /**  optional object used by the template to render context-specific result. Defaults to no context {}. */
-			 context?: {},
-			 /**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
-			 options?: any): Response;
-		/** Sets a header on the response */
-		header(name: string, value: string, options?: IHeaderOptions): Response;
+    /** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
+     * The data argument is only used for passing back authentication data and is ignored elsewhere. */
+    continue(credentialData?: any): void;
 
-		/** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
-		 The response flow control rules do not apply. */
-		close(options?: {
-			/**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
-			end?: boolean;
-		}): void;
-		/** Proxies the request to an upstream endpoint.
-		 the response flow control rules do not apply. */
+    /** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
+    file(/**   the file path. */
+        path: string,
+        /**  optional settings:  */
+        options?: {
+            /** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+            filename?: string;
+            /** specifies whether to include the 'Content-Disposition' header with the response. Available values:
+             false - header is not included. This is the default value.
+             'attachment'
+             'inline'*/
+            mode?: boolean | string;
+            /**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
+            lookupCompressed: boolean;
+        }): void;
+    /**  Concludes the handler activity by returning control over to the router with a templatized view response.
+     the response flow control rules apply. */
+    view(/**  the template filename and path, relative to the templates path configured via the server views manager. */
+        template: string,
+        /**  optional object used by the template to render context-specific result. Defaults to no context {}. */
+        context?: {},
+        /**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
+        options?: any): Response;
+    /** Sets a header on the response */
+    header(name: string, value: string, options?: IHeaderOptions): Response;
 
-		proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
-			  options: IProxyHandlerConfig): void;
-		/** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
-		 he response flow control rules apply. */
-		redirect(uri: string): ResponseRedirect;
+    /** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
+     The response flow control rules do not apply. */
+    close(options?: {
+        /**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
+        end?: boolean;
+    }): void;
+    /** Proxies the request to an upstream endpoint.
+     the response flow control rules do not apply. */
 
-		/** Replies with the specified response */
-		response(result: any): Response;
+    proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
+        options: IProxyHandlerConfig): void;
+    /** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
+     he response flow control rules apply. */
+    redirect(uri: string): ResponseRedirect;
 
-		/** Sets a cookie on the response */
-		state(name: string, value: string, options?: any): void;
+    /** Replies with the specified response */
+    response(result: any): Response;
 
-		/** Clears a cookie on the response */
-		unstate(name: string, options?: any): void;
-	}
+    /** Sets a cookie on the response */
+    state(name: string, value: string, options?: any): void;
 
-	export interface ISessionHandler {
-		(request: Request, reply: IReply): void;
-	}
-	export interface IRequestHandler<T> {
-		(request: Request): T;
-	}
+    /** Clears a cookie on the response */
+    unstate(name: string, options?: any): void;
+}
+
+export interface ISessionHandler {
+    (request: Request, reply: IReply): void;
+}
+export interface IRequestHandler<T> {
+    (request: Request): T;
+}
 
 
-	export interface IFailAction {
-		(source: string, error: any, next: () => void): void
-	}
-	/**  generates a reverse proxy handler */
-	export interface IProxyHandlerConfig {
-		/** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
-		host?: string;
-		/** the upstream service port. */
-		port?: number;
-		/**  The protocol to use when making a request to the proxied host:
-		 'http'
-		 'https'*/
-		protocol?: string;
-		/**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
-		uri?: string;
-		/**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
-		passThrough?: boolean;
-		/** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
-		localStatePassThrough?: boolean;
-		/**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
-		acceptEncoding?: boolean;
-		/** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
-		rejectUnauthorized?: boolean;
-		/**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
-		xforward?: boolean;
-		/** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
-		redirects?: boolean | number;
-		/**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
-		timeout?: number;
-		/** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
-		 request - is the incoming request object.
-		 callback - is function(err, uri, headers) where:
-		 err - internal error condition.
-		 uri - the absolute proxy URI.
-		 headers - optional object where each key is an HTTP request header and the value is the header content.*/
-		mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
-		/**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
-		onResponse?: (err: any,
-					  res: http.ServerResponse,
-					  req: Request,
-					  reply: IReply,
-					  settings: IProxyHandlerConfig,
-					  ttl: number) => void;
-		/** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
-		ttl?: number;
-		/** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
-		agent?: http.Agent;
-		/** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
-		maxSockets?: boolean | number;
-	}
-	/**  TODO: fill in joi definition  */
-	export interface IJoi {
+export interface IFailAction {
+    (source: string, error: any, next: () => void): void
+}
+/**  generates a reverse proxy handler */
+export interface IProxyHandlerConfig {
+    /** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
+    host?: string;
+    /** the upstream service port. */
+    port?: number;
+    /**  The protocol to use when making a request to the proxied host:
+     'http'
+     'https'*/
+    protocol?: string;
+    /**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
+    uri?: string;
+    /**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
+    passThrough?: boolean;
+    /** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
+    localStatePassThrough?: boolean;
+    /**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
+    acceptEncoding?: boolean;
+    /** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
+    rejectUnauthorized?: boolean;
+    /**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
+    xforward?: boolean;
+    /** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
+    redirects?: boolean | number;
+    /**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
+    timeout?: number;
+    /** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
+     request - is the incoming request object.
+     callback - is function(err, uri, headers) where:
+     err - internal error condition.
+     uri - the absolute proxy URI.
+     headers - optional object where each key is an HTTP request header and the value is the header content.*/
+    mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
+    /**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
+    onResponse?: (err: any,
+        res: http.ServerResponse,
+        req: Request,
+        reply: IReply,
+        settings: IProxyHandlerConfig,
+        ttl: number) => void;
+    /** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
+    ttl?: number;
+    /** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
+    agent?: http.Agent;
+    /** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
+    maxSockets?: boolean | number;
+}
+/**  TODO: fill in joi definition  */
+export interface IJoi {
 
-	}
-	/**  a validation function using the signature function(value, options, next) */
-	export interface IValidationFunction {
+}
+/**  a validation function using the signature function(value, options, next) */
+export interface IValidationFunction {
 
-		(/**   the object containing the path parameters. */
-		 value: any,
-		 /**  the server validation options. */
-		 options: any,
-		 /**   the callback function called when validation is completed.  */
-		 next: (err: any, value: any) => void): void;
-	}
-	/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-	export interface IRouteFailFunction {
-		/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-		(/** - the [request object]. */
-		 request: Request,
-		 /**   the continuation reply interface. */
-		 reply: IReply,
-		 /**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
-		 source: string,
-		 /**  the error object prepared for the client response (including the validation function error under error.data). */
-		 error: any): void;
-	}
+    (/**   the object containing the path parameters. */
+        value: any,
+        /**  the server validation options. */
+        options: any,
+        /**   the callback function called when validation is completed.  */
+        next: (err: any, value: any) => void): void;
+}
+/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+export interface IRouteFailFunction {
+    /**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+    (/** - the [request object]. */
+        request: Request,
+        /**   the continuation reply interface. */
+        reply: IReply,
+        /**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
+        source: string,
+        /**  the error object prepared for the client response (including the validation function error under error.data). */
+        error: any): void;
+}
 
-	/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
-	export interface IRouteAdditionalConfigurationOptions {
-		/**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
-		app?: any;
-		/** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
-		 a string with the name of an authentication strategy registered with server.auth.strategy().
-		 an object  */
-		auth?: boolean | string |
-			{
-				/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
-				 'required'authentication is required.
-				 'optional'authentication is optional (must be valid if present).
-				 'try'same as 'optional' but allows for invalid authentication. */
-				mode?: string;
-				/**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
-				strategies?: string | Array<string>;
-				/**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
-				 falseno payload authentication.This is the default value.
-				 'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
-				 'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
-				payload?: string;
-				/**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
-				scope?: string | Array<string> | boolean;
-				/** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
-				 anythe authentication can be on behalf of a user or application.This is the default value.
-				 userthe authentication must be on behalf of a user.
-				 appthe authentication must be on behalf of an application. */
-				entity?: string;
-				/**
-				 * an object or array of objects specifying the route access rules. Each rule is evaluated against an incoming
-				 * request and access is granted if at least one rule matches. Each rule object must include at least one of:
-				 */
-				access?: IRouteAdditionalConfigurationAuthAccess | IRouteAdditionalConfigurationAuthAccess[];
-			};
-		/** an object passed back to the provided handler (via this) when called. */
-		bind?: any;
-		/** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
-		cache?: {
-			/**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
-			 fault'no privacy flag.This is the default setting.
-			 'public'mark the response as suitable for public caching.
-			 'private'mark the response as suitable only for private caching.  */
-			privacy: string;
-			/**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
-			expiresIn: number;
-			/**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
-			expiresAt: string;
-		};
-		/** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
-		cors?: {
-			/** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
-			origin?: Array<string>;
-			/** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
-			matchOrigin?: boolean;
-			/** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
-			isOriginExposed?: boolean;
-			/**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
-			maxAge?: number;
-			/**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
-			headers?: string[];
-			/**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
-			additionalHeaders?: string[];
-			/**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
-			methods?: string[];
-			/**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
-			additionalMethods?: string[];
-			/**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
-			exposedHeaders?: string[];
-			/**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
-			additionalExposedHeaders?: string[];
-			/**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
-			credentials?: boolean;
-			/** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
-			override?: boolean;
-		};
-		/**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
-		files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
-		relativeTo: string;
-		};
+/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
+export interface IRouteAdditionalConfigurationOptions {
+    /**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
+    app?: any;
+    /** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
+     a string with the name of an authentication strategy registered with server.auth.strategy().
+     an object  */
+    auth?: boolean | string |
+    {
+        /**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
+         'required'authentication is required.
+         'optional'authentication is optional (must be valid if present).
+         'try'same as 'optional' but allows for invalid authentication. */
+        mode?: string;
+        /**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
+        strategies?: string | Array<string>;
+        /**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
+         falseno payload authentication.This is the default value.
+         'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
+         'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
+        payload?: string;
+        /**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
+        scope?: string | Array<string> | boolean;
+        /** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
+         anythe authentication can be on behalf of a user or application.This is the default value.
+         userthe authentication must be on behalf of a user.
+         appthe authentication must be on behalf of an application. */
+        entity?: string;
+        /**
+         * an object or array of objects specifying the route access rules. Each rule is evaluated against an incoming
+         * request and access is granted if at least one rule matches. Each rule object must include at least one of:
+         */
+        access?: IRouteAdditionalConfigurationAuthAccess | IRouteAdditionalConfigurationAuthAccess[];
+    };
+    /** an object passed back to the provided handler (via this) when called. */
+    bind?: any;
+    /** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
+    cache?: {
+        /**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
+         fault'no privacy flag.This is the default setting.
+         'public'mark the response as suitable for public caching.
+         'private'mark the response as suitable only for private caching.  */
+        privacy: string;
+        /**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
+        expiresIn: number;
+        /**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
+        expiresAt: string;
+    };
+    /** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
+    cors?: {
+        /** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
+        origin?: Array<string>;
+        /** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
+        matchOrigin?: boolean;
+        /** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
+        isOriginExposed?: boolean;
+        /**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
+        maxAge?: number;
+        /**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
+        headers?: string[];
+        /**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
+        additionalHeaders?: string[];
+        /**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
+        methods?: string[];
+        /**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
+        additionalMethods?: string[];
+        /**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
+        exposedHeaders?: string[];
+        /**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
+        additionalExposedHeaders?: string[];
+        /**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
+        credentials?: boolean;
+        /** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
+        override?: boolean;
+    };
+    /**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
+    files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
+        relativeTo: string;
+    };
 
-		/**  an alternative location for the route handler option. */
-		handler?: ISessionHandler | string | IRouteHandlerConfig;
-		/** an optional unique identifier used to look up the route using server.lookup(). */
-		id?: number;
-		/** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
-		json?: {
-			/** the replacer function or array.Defaults to no action. */
-			replacer?: Function | string[];
-			/**  number of spaces to indent nested object keys.Defaults to no indentation. */
-			space?: number | string;
-			/** string suffix added after conversion to JSON string.Defaults to no suffix. */
-			suffix?: string;
-		};
-		/** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
-		jsonp?: string;
-		/** determines how the request payload is processed: */
-		payload?: {
-			/**  the type of payload representation requested. The value must be one of:
-			 'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
-			 'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
-			 'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
-			output?: string;
-			/**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
-			 'application/json'
-			 'application/x-www-form-urlencoded'
-			 'application/octet-stream'
-			 'text/ *'
-			 'multipart/form-data' */
-			parse?: string | boolean;
-			/** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
-			allow?: string | string[];
-			/** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
-			override?: string;
-			/**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
-			maxBytes?: number;
-			/** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
-			timeout?: number;
-			/**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
-			uploads?: string;
-			/**  determines how to handle payload parsing errors. Allowed values are:
-			 'error'return a Bad Request (400) error response. This is the default value.
-			 'log'report the error but continue processing the request.
-			 'ignore'take no action and continue processing the request. */
-			failAction?: string;
-		};
-		/** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
-		plugins?: IDictionary<any>;
-		/** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
-		pre?: any[];
-		/** validation rules for the outgoing response payload (response body).Can only validate object response: */
-		response?: {
-			/** the default HTTP status code when the payload is empty. Value can be 200 or 204.
-			 Note that a 200 status code is converted to a 204 only at the time or response transmission
-			 (the response status code will remain 200 throughout the request lifecycle unless manually set). Defaults to 200. */
-			emptyStatusCode?: number;
-			/**   the default response object validation rules (for all non-error responses) expressed as one of:
-			 true - any payload allowed (no validation performed). This is the default.
-			 false - no payload allowed.
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 value - the object containing the response object.
-			 options - the server validation options.
-			 next(err) - the callback function called when validation is completed.  */
-			schema?: boolean | any;
-			/** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
-			status?: { [statusCode: number]: boolean | any };
-			/** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
-			sample?: number;
-			/**  defines what to do when a response fails validation.Options are:
-			 errorreturn an Internal Server Error (500) error response.This is the default value.
-			 loglog the error but send the response.  */
-			failAction?: string;
-			/** if true, applies the validation rule changes to the response.Defaults to false. */
-			modify?: boolean;
-			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
-			options?: any;
-		};
-		/** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
-		security?: boolean | {
-			/** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
-			hsts?: boolean | number | {
-				/** the max- age portion of the header, as a number.Default is 15768000. */
-				maxAge?: number;
-				/**  a boolean specifying whether to add the includeSubdomains flag to the header. */
-				includeSubdomains?: boolean;
-				/** a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header. */
-				preload?: boolean;
-			};
-			/** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
-			xframe?: {
-				/** either 'deny', 'sameorigin', or 'allow-from' */
-				rule: string;
-				/** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
-				source: string;
-			};
-			/** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
-			xss?: boolean;
-			/**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
-			noOpen?: boolean;
-			/** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
-			noSniff?: boolean;
-		};
-		/** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
-		state?: {
-			/** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
-			parse: boolean;
-			/** determines how to handle cookie parsing errors.Allowed values are:
-			 'error'return a Bad Request (400) error response.This is the default value.
-			 'log'report the error but continue processing the request.
-			 'ignore'take no action. */
-			failAction: string;
-		};
-		/**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
-		validate?: {
-			/** validation rules for incoming request headers.Values allowed:
-			 * trueany headers allowed (no validation performed).This is the default.
-			 falseno headers allowed (this will cause all valid HTTP requests to fail).
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 valuethe object containing the request headers.
-			 optionsthe server validation options.
-			 next(err, value)the callback function called when validation is completed.
-			 */
-			headers?: boolean | IJoi | IValidationFunction;
+    /**  an alternative location for the route handler option. */
+    handler?: ISessionHandler | string | IRouteHandlerConfig;
+    /** an optional unique identifier used to look up the route using server.lookup(). */
+    id?: number;
+    /** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
+    json?: {
+        /** the replacer function or array.Defaults to no action. */
+        replacer?: Function | string[];
+        /**  number of spaces to indent nested object keys.Defaults to no indentation. */
+        space?: number | string;
+        /** string suffix added after conversion to JSON string.Defaults to no suffix. */
+        suffix?: string;
+    };
+    /** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
+    jsonp?: string;
+    /** determines how the request payload is processed: */
+    payload?: {
+        /**  the type of payload representation requested. The value must be one of:
+         'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
+         'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
+         'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
+        output?: string;
+        /**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
+         'application/json'
+         'application/x-www-form-urlencoded'
+         'application/octet-stream'
+         'text/ *'
+         'multipart/form-data' */
+        parse?: string | boolean;
+        /** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
+        allow?: string | string[];
+        /** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
+        override?: string;
+        /**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
+        maxBytes?: number;
+        /** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
+        timeout?: number;
+        /**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
+        uploads?: string;
+        /**  determines how to handle payload parsing errors. Allowed values are:
+         'error'return a Bad Request (400) error response. This is the default value.
+         'log'report the error but continue processing the request.
+         'ignore'take no action and continue processing the request. */
+        failAction?: string;
+    };
+    /** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
+    plugins?: IDictionary<any>;
+    /** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
+    pre?: any[];
+    /** validation rules for the outgoing response payload (response body).Can only validate object response: */
+    response?: {
+        /** the default HTTP status code when the payload is empty. Value can be 200 or 204.
+         Note that a 200 status code is converted to a 204 only at the time or response transmission
+         (the response status code will remain 200 throughout the request lifecycle unless manually set). Defaults to 200. */
+        emptyStatusCode?: number;
+        /**   the default response object validation rules (for all non-error responses) expressed as one of:
+         true - any payload allowed (no validation performed). This is the default.
+         false - no payload allowed.
+         a Joi validation object.
+         a validation function using the signature function(value, options, next) where:
+         value - the object containing the response object.
+         options - the server validation options.
+         next(err) - the callback function called when validation is completed.  */
+        schema?: boolean | any;
+        /** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
+        status?: { [statusCode: number]: boolean | any };
+        /** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
+        sample?: number;
+        /**  defines what to do when a response fails validation.Options are:
+         errorreturn an Internal Server Error (500) error response.This is the default value.
+         loglog the error but send the response.  */
+        failAction?: string;
+        /** if true, applies the validation rule changes to the response.Defaults to false. */
+        modify?: boolean;
+        /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
+        options?: any;
+    };
+    /** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
+    security?: boolean | {
+        /** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
+        hsts?: boolean | number | {
+            /** the max- age portion of the header, as a number.Default is 15768000. */
+            maxAge?: number;
+            /**  a boolean specifying whether to add the includeSubdomains flag to the header. */
+            includeSubdomains?: boolean;
+            /** a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header. */
+            preload?: boolean;
+        };
+        /** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
+        xframe?: {
+            /** either 'deny', 'sameorigin', or 'allow-from' */
+            rule: string;
+            /** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
+            source: string;
+        };
+        /** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
+        xss?: boolean;
+        /**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
+        noOpen?: boolean;
+        /** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
+        noSniff?: boolean;
+    };
+    /** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
+    state?: {
+        /** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
+        parse: boolean;
+        /** determines how to handle cookie parsing errors.Allowed values are:
+         'error'return a Bad Request (400) error response.This is the default value.
+         'log'report the error but continue processing the request.
+         'ignore'take no action. */
+        failAction: string;
+    };
+    /**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
+    validate?: {
+        /** validation rules for incoming request headers.Values allowed:
+         * trueany headers allowed (no validation performed).This is the default.
+         falseno headers allowed (this will cause all valid HTTP requests to fail).
+         a Joi validation object.
+         a validation function using the signature function(value, options, next) where:
+         valuethe object containing the request headers.
+         optionsthe server validation options.
+         next(err, value)the callback function called when validation is completed.
+         */
+        headers?: boolean | IJoi | IValidationFunction;
 
 
-			/** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
-			 trueany path parameters allowed (no validation performed).This is the default.
-			 falseno path variables allowed.
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 valuethe object containing the path parameters.
-			 optionsthe server validation options.
-			 next(err, value)the callback function called when validation is completed. */
-			params?: boolean | IJoi | IValidationFunction;
-			/** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
-			 trueany query parameters allowed (no validation performed).This is the default.
-			 falseno query parameters allowed.
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 valuethe object containing the query parameters.
-			 optionsthe server validation options.
-			 next(err, value)the callback function called when validation is completed. */
-			query?: boolean | IJoi | IValidationFunction;
-			/**  validation rules for an incoming request payload (request body).Values allowed:
-			 trueany payload allowed (no validation performed).This is the default.
-			 falseno payload allowed.
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 valuethe object containing the payload object.
-			 optionsthe server validation options.
-			 next(err, value)the callback function called when validation is completed.  */
-			payload?: boolean | IJoi | IValidationFunction;
-			/** an optional object with error fields copied into every validation error response. */
-			errorFields?: any;
-			/** determines how to handle invalid requests.Allowed values are:
-			 'error'return a Bad Request (400) error response.This is the default value.
-			 'log'log the error but continue processing the request.
-			 'ignore'take no action.
-			 OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
-			 requestthe request object.
-			 replythe continuation reply interface.
-			 sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
-			 errorthe error object prepared for the client response (including the validation function error under error.data). */
-			failAction?: string | IRouteFailFunction;
-			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
-			options?: any;
-		};
-		/** define timeouts for processing durations: */
-		timeout?: {
-			/** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
-			server: boolean | number;
-			/** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
-			socket: boolean | number;
-		};
+        /** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
+         trueany path parameters allowed (no validation performed).This is the default.
+         falseno path variables allowed.
+         a Joi validation object.
+         a validation function using the signature function(value, options, next) where:
+         valuethe object containing the path parameters.
+         optionsthe server validation options.
+         next(err, value)the callback function called when validation is completed. */
+        params?: boolean | IJoi | IValidationFunction;
+        /** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
+         trueany query parameters allowed (no validation performed).This is the default.
+         falseno query parameters allowed.
+         a Joi validation object.
+         a validation function using the signature function(value, options, next) where:
+         valuethe object containing the query parameters.
+         optionsthe server validation options.
+         next(err, value)the callback function called when validation is completed. */
+        query?: boolean | IJoi | IValidationFunction;
+        /**  validation rules for an incoming request payload (request body).Values allowed:
+         trueany payload allowed (no validation performed).This is the default.
+         falseno payload allowed.
+         a Joi validation object.
+         a validation function using the signature function(value, options, next) where:
+         valuethe object containing the payload object.
+         optionsthe server validation options.
+         next(err, value)the callback function called when validation is completed.  */
+        payload?: boolean | IJoi | IValidationFunction;
+        /** an optional object with error fields copied into every validation error response. */
+        errorFields?: any;
+        /** determines how to handle invalid requests.Allowed values are:
+         'error'return a Bad Request (400) error response.This is the default value.
+         'log'log the error but continue processing the request.
+         'ignore'take no action.
+         OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
+         requestthe request object.
+         replythe continuation reply interface.
+         sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
+         errorthe error object prepared for the client response (including the validation function error under error.data). */
+        failAction?: string | IRouteFailFunction;
+        /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
+        options?: any;
+    };
+    /** define timeouts for processing durations: */
+    timeout?: {
+        /** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
+        server: boolean | number;
+        /** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
+        socket: boolean | number;
+    };
 
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		 *route description used for generating documentation (string).
-		 */
-		description?: string;
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		 *route notes used for generating documentation (string or array of strings).
-		 */
-		notes?: string | string[];
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		 *route tags used for generating documentation (array of strings).
-		 */
-		tags?: string[]
-	}
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+     *route description used for generating documentation (string).
+     */
+    description?: string;
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+     *route notes used for generating documentation (string or array of strings).
+     */
+    notes?: string | string[];
+    /**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+     *route tags used for generating documentation (array of strings).
+     */
+    tags?: string[]
+}
 
-	/**
-	 * specifying the route access rules. Each rule is evaluated against an incoming request and access is granted if at least one rule matches
-	 */
-	export interface IRouteAdditionalConfigurationAuthAccess {
-		/**
-		 * the application scope required to access the route. Value can be a scope string or an array of scope strings.
-		 * The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.
-		 * If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character,
-		 * that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials'
-		 * scope must not include 'a', must include 'b', and must include on of 'c' or 'd'. You may also access properties
-		 * on the request object (query and params} to populate a dynamic scope by using {} characters around the property name,
-		 * such as 'user-{params.id}'. Defaults to false (no scope requirements).
-		 */
-		scope?: string | Array<string> | boolean;
-		/** the required authenticated entity type. If set, must match the entity value of the authentication credentials. Available values:
-		 * any - the authentication can be on behalf of a user or application. This is the default value.
-		 * user - the authentication must be on behalf of a user which is identified by the presence of a user attribute in the credentials object returned by the authentication strategy.
-		 * app - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
-		 */
-		entity?: string;
-	}
+/**
+ * specifying the route access rules. Each rule is evaluated against an incoming request and access is granted if at least one rule matches
+ */
+export interface IRouteAdditionalConfigurationAuthAccess {
+    /**
+     * the application scope required to access the route. Value can be a scope string or an array of scope strings.
+     * The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.
+     * If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character,
+     * that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials'
+     * scope must not include 'a', must include 'b', and must include on of 'c' or 'd'. You may also access properties
+     * on the request object (query and params} to populate a dynamic scope by using {} characters around the property name,
+     * such as 'user-{params.id}'. Defaults to false (no scope requirements).
+     */
+    scope?: string | Array<string> | boolean;
+    /** the required authenticated entity type. If set, must match the entity value of the authentication credentials. Available values:
+     * any - the authentication can be on behalf of a user or application. This is the default value.
+     * user - the authentication must be on behalf of a user which is identified by the presence of a user attribute in the credentials object returned by the authentication strategy.
+     * app - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
+     */
+    entity?: string;
+}
 
-	/** server.realm http://hapijs.com/api#serverrealm
-	 The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
-	 the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
-	 Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-	 The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-	 exports.register = function (server, options, next) {
-	console.log(server.realm.modifiers.route.prefix);
-	return next();
-	};
-	 */
-	export interface IServerRealm {
-		/** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
-		modifiers: {
-			/** routes preferences: */
-			route: {
-				/** - the route path prefix used by any calls to server.route() from the server. */
-				prefix: string;
-				/**  the route virtual host settings used by any calls to server.route() from the server. */
-				vhost: string;
-			};
+/** server.realm http://hapijs.com/api#serverrealm
+ The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
+ the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
+ Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+ The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+ exports.register = function (server, options, next) {
+console.log(server.realm.modifiers.route.prefix);
+return next();
+};
+ */
+export interface IServerRealm {
+    /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
+    modifiers: {
+        /** routes preferences: */
+        route: {
+            /** - the route path prefix used by any calls to server.route() from the server. */
+            prefix: string;
+            /**  the route virtual host settings used by any calls to server.route() from the server. */
+            vhost: string;
+        };
 
-		};
-		/** the active plugin name (empty string if at the server root). */
-		plugin: string;
-		/** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
-		plugins: IDictionary<any>;
-		/**  settings overrides */
-		settings: {
-			files: {
-				relativeTo: any;
-			};
-			bind: any;
-		}
-	}
-	/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
-	 HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
-	export interface IServerState {
+    };
+    /** the active plugin name (empty string if at the server root). */
+    plugin: string;
+    /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
+    plugins: IDictionary<any>;
+    /**  settings overrides */
+    settings: {
+        files: {
+            relativeTo: any;
+        };
+        bind: any;
+    }
+}
+/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
+ HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
+export interface IServerState {
 		/**  - the cookie name string. */name: string;
 
 		/** - are the optional cookie settings: */options: {
@@ -731,1697 +731,1696 @@ declare module "hapi" {
 			/**  - sets the 'HttpOnly' flag.Defaults to false.*/isHttpOnly: boolean
 			/**  - the path scope.Defaults to null (no path).*/path: any;
 			/**  - the domain scope.Defaults to null (no domain). */domain: any;
-			/**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
-			 request - the request object.
-			 next - the continuation function using the function(err, value) signature.*/
-			autoValue: (request: Request, next: (err: any, value: any) => void) => void;
-			/**  - encoding performs on the provided value before serialization. Options are:
-			 'none' - no encoding. When used, the cookie value must be a string. This is the default value.
-			 'base64' - string value is encoded using Base64.
-			 'base64json' - object value is JSON-stringified than encoded using Base64.
-			 'form' - object value is encoded using the x-www-form-urlencoded method.
-			 'iron' - Encrypts and sign the value using iron.*/
-			encoding: string;
+        /**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
+         request - the request object.
+         next - the continuation function using the function(err, value) signature.*/
+        autoValue: (request: Request, next: (err: any, value: any) => void) => void;
+        /**  - encoding performs on the provided value before serialization. Options are:
+         'none' - no encoding. When used, the cookie value must be a string. This is the default value.
+         'base64' - string value is encoded using Base64.
+         'base64json' - object value is JSON-stringified than encoded using Base64.
+         'form' - object value is encoded using the x-www-form-urlencoded method.
+         'iron' - Encrypts and sign the value using iron.*/
+        encoding: string;
 			/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:*/sign: {
 				/** - algorithm options.Defaults to require('iron').defaults.integrity.*/integrity: any;
 				/** - password used for HMAC key generation.*/password: string;
-			};
+        };
 			/**  - password used for 'iron' encoding.*/password: string;
 			/** - options for 'iron' encoding.Defaults to require('iron').defaults.*/iron: any;
 			/** - if false, errors are ignored and treated as missing cookies.*/ignoreErrors: boolean;
 			/**  - if true, automatically instruct the client to remove invalid cookies.Defaults to false.*/clearInvalid: boolean;
 			/**  - if false, allows any cookie value including values in violation of RFC 6265. Defaults to true.*/strictHeader: boolean;
 			/**  - overrides the default proxy localStatePassThrough setting.*/passThrough: any;
-		};
-	}
-
-	export interface IFileHandlerConfig {
-		/**  a path string or function as described above.*/
-		path: string;
-		/** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-		filename?: string;
-		/**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
-		 false - header is not included. This is the default value.
-		 'attachment'
-		 'inline'*/
-		mode?: boolean | string;
-		/** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
-		lookupCompressed: boolean;
-	}
-
-	/**http://hapijs.com/api#route-handler
-	 Built-in handlers
-
-	 The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
-	export interface IRouteHandlerConfig {
-		/** generates a static file endpoint for serving a single file. file can be set to:
-		 a relative or absolute file path string (relative paths are resolved based on the route files configuration).
-		 a function with the signature function(request) which returns the relative or absolute file path.
-		 an object with the following options */
-		file?: string | IRequestHandler<void> | IFileHandlerConfig;
-		/** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
-		 path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
-		 a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
-		 an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
-		 a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
-		 index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
-		 listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
-		 showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
-		 redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
-		 lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
-		 defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
-		directory?: {
-			path: string | Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
-			index?: boolean | string | string[];
-			listing?: boolean;
-			showHidden?: boolean;
-			redirectToSlash?: boolean;
-			lookupCompressed?: boolean;
-			defaultExtension?: string;
-		};
-		proxy?: IProxyHandlerConfig;
-		view?: string | {
-			template: string;
-			context: {
-				payload: any;
-				params: any;
-				query: any;
-				pre: any;
-			}
-		};
-		config?: {
-			handler: any;
-			bind: any;
-			app: any;
-			plugins: {
-				[name: string]: any;
-			};
-			pre: Array<() => void>;
-			validate: {
-				headers: any;
-				params: any;
-				query: any;
-				payload: any;
-				errorFields?: any;
-				failAction?: string | IFailAction;
-			};
-			payload: {
-				output: {
-					data: any;
-					stream: any;
-					file: any;
-				};
-				parse?: any;
-				allow?: string | Array<string>;
-				override?: string;
-				maxBytes?: number;
-				uploads?: number;
-				failAction?: string;
-			};
-			response: {
-				schema: any;
-				sample: number;
-				failAction: string;
-			};
-			cache: {
-				privacy: string;
-				expiresIn: number;
-				expiresAt: number;
-			};
-			auth: string | boolean | {
-				mode: string;
-				strategies: Array<string>;
-				payload?: boolean | string;
-				tos?: boolean | string;
-				scope?: string | Array<string>;
-				entity: string;
-			};
-			cors?: boolean;
-			jsonp?: string;
-			description?: string;
-			notes?: string | Array<string>;
-			tags?: Array<string>;
-		};
-	}
-	/** Route configuration
-	 The route configuration object*/
-	export interface IRouteConfiguration {
-		/**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
-		path: string;
-		/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
-		 * Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
-		method: string | string[];
-		/**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
-		vhost?: string;
-		/**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
-		handler: ISessionHandler | string | IRouteHandlerConfig;
-		/** - additional route options.*/
-		config?: IRouteAdditionalConfigurationOptions;
-	}
-	/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
-	export interface IRoute {
-
-
-		/** the route HTTP method. */
-		method: string;
-		/** the route path. */
-		path: string;
-		/** the route vhost option if configured. */
-		vhost?: string | Array<string>;
-		/** the [active realm] associated with the route.*/
-		realm: IServerRealm;
-		/** the [route options]  object with all defaults applied. */
-		settings: IRouteAdditionalConfigurationOptions;
-	}
-
-	export interface IServerAuthScheme {
-		/** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
-		 request - the request object.
-		 reply - the reply interface the authentication method must call when done authenticating the request where:
-		 reply(err, response, result) - is called if authentication failed where:
-		 err - any authentication error.
-		 response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		 result - an object containing:
-		 credentials - the authenticated credentials.
-		 artifacts - optional authentication artifacts.
-		 reply.continue(result) - is called if authentication succeeded where:
-		 result - same object as result above.
-		 When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
-		 .If the err returned by the reply() method includes a message, no additional strategies will be attempted.
-		 If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 var scheme = function (server, options) {
-		return {
-		authenticate: function (request, reply) {
-		var req = request.raw.req;
-		var authorization = req.headers.authorization;
-		if (!authorization) {
-		return reply(Boom.unauthorized(null, 'Custom'));
-		}
-		return reply(null, { credentials: { user: 'john' } });
-		}
-		};
-		};
-		 server.auth.scheme('custom', scheme);*/
-		authenticate(request: Request, reply: IReply): void;
-		/** payload(request, reply) - optional function called to authenticate the request payload where:
-		 request - the request object.
-		 reply(err, response) - is called if authentication failed where:
-		 err - any authentication error.
-		 response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		 reply.continue() - is called if payload authentication succeeded.
-		 When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
-		payload?(request: Request, reply: IReply): void;
-		/** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
-		 request - the request object.
-		 reply(err, response) - is called if an error occurred where:
-		 err - any authentication error.
-		 response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
-		 reply.continue() - is called if the operation succeeded.*/
-		response?(request: Request, reply: IReply): void;
-		/** an optional object  */
-		options?: {
-			/**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
-			payload: boolean;
-		}
-	}
-
-	/**the response object where:
-	 statusCode - the HTTP status code.
-	 headers - an object containing the headers set.
-	 payload - the response payload string.
-	 rawPayload - the raw response payload buffer.
-	 raw - an object with the injection request and response objects:
-	 req - the simulated node request object.
-	 res - the simulated node response object.
-	 result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
-	 request - the request object.*/
-	export interface IServerInjectResponse {
-		statusCode: number;
-		headers: IDictionary<string>;
-		payload: string;
-		rawPayload: Buffer;
-		raw: {
-			req: http.ClientRequest;
-			res: http.ServerResponse
-		};
-		result: string;
-		request: Request;
-	}
-
-	export interface IServerInject {
-		(options: string | IServerInjectOptions, callback: (res: IServerInjectResponse) => void): void;
-		(options: string | IServerInjectOptions): IPromise<IServerInjectResponse>;
-	}
-
-	export interface IServerInjectOptions {
-		/**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
-		method: string;
-		/** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
-		url: string;
-		/** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
-		headers?: IDictionary<string>;
-		/** n optional string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
-		payload?: string | {} | Buffer;
-		/** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
-		credentials?: any;
-		/** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.*/
-		artifacts?: any;
-		/** sets the initial value of request.app*/
-		app?: any;
-		/** sets the initial value of request.plugins*/
-		plugins?: any;
-		/** allows access to routes with config.isInternal set to true. Defaults to false.*/
-		allowInternals?: boolean;
-		/** sets the remote address for the incoming connection.*/
-		remoteAddress?: boolean;
-		/**object with options used to simulate client request stream conditions for testing:
-		 error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
-		 close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
-		 end - if false, does not end the stream. Defaults to true.*/
-		simulate?: {
-			error: boolean;
-			close: boolean;
-			end: boolean;
-		};
-	}
-
-
-	/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-	 The return value is an array where each item is an object containing:
-	 info - the connection.info the connection the table was generated for.
-	 labels - the connection labels.
-	 table - an array of routes where each route contains:
-	 settings - the route config with defaults applied.
-	 method - the HTTP method in lower case.
-	 path - the route path.*/
-	export interface IConnectionTable {
-		info: any;
-		labels: any;
-		table: IRoute[];
-	}
-
-	export interface ICookieSettings {
-		/** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
-		ttl?: number;
-		/** - sets the 'Secure' flag.Defaults to false.*/
-		isSecure?: boolean;
-		/** - sets the 'HttpOnly' flag.Defaults to false.*/
-		isHttpOnly?: boolean;
-		/** - the path scope.Defaults to null (no path).*/
-		path?: string;
-		/** - the domain scope.Defaults to null (no domain).*/
-		domain?: any;
-		/** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
-		 request - the request object.
-		 next - the continuation function using the function(err, value) signature.*/
-		autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
-		/** - encoding performs on the provided value before serialization.Options are:
-		 'none' - no encoding.When used, the cookie value must be a string.This is the default value.
-		 'base64' - string value is encoded using Base64.
-		 'base64json' - object value is JSON- stringified than encoded using Base64.
-		 'form' - object value is encoded using the x- www - form - urlencoded method. */
-		encoding?: string;
-		/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
-		 integrity - algorithm options.Defaults to require('iron').defaults.integrity.
-		 password - password used for HMAC key generation. */
-		sign?: { integrity: any; password: string; }
-		password?: string;
-		iron?: any;
-		ignoreErrors?: boolean;
-		clearInvalid?: boolean;
-		strictHeader?: boolean;
-		passThrough?: any;
-	}
-
-	/** method - the method function with the signature is one of:
-	 function(arg1, arg2, ..., argn, next) where:
-	 arg1, arg2, etc. - the method function arguments.
-	 next - the function called when the method is done with the signature function(err, result, ttl) where:
-	 err - error response if the method failed.
-	 result - the return value.
-	 ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
-	 function(arg1, arg2, ..., argn) where:
-	 arg1, arg2, etc. - the method function arguments.
-	 the callback option is set to false.
-	 the method must returns a value (result, Error, or a promise) or throw an Error.*/
-	export interface IServerMethod {
-		//(): void;
-		//(next: (err: any, result: any, ttl: number) => void): void;
-		//(arg1: any): void;
-		//(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
-		//(arg1: any, arg2: any): void;
-		(...args: any[]): void;
-
-	}
-	/** options - optional configuration:
-	 bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
-	 cache - the same cache configuration used in server.cache().
-	 callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
-	 generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
-	export interface IServerMethodOptions {
-		bind?: any;
-		cache?: ICatBoxCacheOptions;
-		callback?: boolean;
-		generateKey?(args: any[]): string;
-	}
-	/** Request object
-
-	 The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
-	 Request events
-
-	 The request object supports the following events:
-
-	 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
-	 'finish' - emitted when the request payload finished reading. The event method signature is function ().
-	 'disconnect' - emitted when a request errors or aborts unexpectedly.
-	 var Crypto = require('crypto');
-	 var Hapi = require('hapi');
-	 var server = new Hapi.Server();
-	 server.connection({ port: 80 });
-
-	 server.ext('onRequest', function (request, reply) {
-
-	var hash = Crypto.createHash('sha1');
-	request.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	request.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	request.once('disconnect', function () {
-
-	console.error('request aborted');
-	});
-
-	return reply.continue();
-	});*/
-	export class Request extends Events.EventEmitter {
-		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-		app: any;
-		/**  authentication information*/
-		auth: {
-			/** true is the request has been successfully authenticated, otherwise false.*/
-			isAuthenticated: boolean;
-			/**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.  can be set in the validate function's callback.*/
-			credentials: any;
-			/**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
-			artifacts: any;
-			/**  the route authentication mode.*/
-			mode: any;
-			/** the authentication error is failed and mode set to 'try'.*/
-			error: any;
-		};
-		/** the connection used by this request*/
-		connection: ServerConnection;
-		/**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
-		domain: any;
-		/** the raw request headers (references request.raw.headers).*/
-		headers: IDictionary<string>;
-		/** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
-		id: number;
-		/**  request information */
-		info: {
-			/**  the request preferred encoding. */
-			acceptEncoding: string;
-			/**  if CORS is enabled for the route, contains the following: */
-			cors: {
-				isOriginMatch: boolean; /**  true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle. */
-			};
-			/**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
-			host: string;
-			/**  the hostname part of the 'Host' header (e.g. 'example.com').*/
-			hostname: string;
-			/**  request reception timestamp. */
-			received: number;
-			/**  content of the HTTP 'Referrer' (or 'Referer') header. */
-			referrer: string;
-			/** remote client IP address. */
-			remoteAddress: string;
-			/**  remote client port. */
-			remotePort: number;
-			/**  request response timestamp (0 is not responded yet). */
-			responded: number;
-		};
-		/**  the request method in lower case (e.g. 'get', 'post'). */
-		method: string;
-		/**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
-		mime: string;
-		/**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
-		orig: {
-			params: any;
-			query: any;
-			payload: any;
-		};
-		/**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
-		params: IDictionary<string>;
-		/** an array containing all the path params values in the order they appeared in the path.*/
-		paramsArray: string[];
-		/**  the request URI's path component. */
-		path: string;
-		/** the request payload based on the route payload.output and payload.parse settings.*/
-		payload: stream.Readable | Buffer | any;
-		/**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
-		plugins: any;
-		/** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
-		pre: IDictionary<any>;
-		/** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
-		response: Response;
-		/**preResponses - same as pre but represented as the response object created by the pre method.*/
-		preResponses: any;
-		/**an object containing the query parameters.*/
-		query: any;
-		/**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
-		raw: {
-			req: http.ClientRequest;
-			res: http.ServerResponse;
-		};
-		/** the route public interface.*/
-		route: IRoute;
-		/** the server object. */
-		server: Server;
-		/** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
-		state: any;
-		/** complex object contining details on the url */
-		url: {
-			/** null when i tested */
-			auth: any;
-			/** null when i tested */
-			hash: any;
-			/** null when i tested */
-			host: any;
-			/** null when i tested */
-			hostname: any;
-			href: string;
-			path: string;
-			/** path without search*/
-			pathname: string;
-			/** null when i tested */
-			port: any;
-			/** null when i tested */
-			protocol: any;
-			/** querystring parameters*/
-			query: IDictionary<string>;
-			/** querystring parameters as a string*/
-			search: string;
-			/** null when i tested */
-			slashes: any;
-		};
-
-		/** request.setUrl(url)
-
-		 Available only in 'onRequest' extension methods.
-
-		 Changes the request URI before the router begins processing the request where:
-
-		 url - the new request path value.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-
-		 server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});*/
-		setUrl(url: string): void;
-
-		/** request.setMethod(method)
-
-		 Available only in 'onRequest' extension methods.
-
-		 Changes the request method before the router begins processing the request where:
-
-		 method - is the request HTTP method (e.g. 'GET').
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-
-		 server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to 'GET'
-		request.setMethod('GET');
-		return reply.continue();
-		});*/
-		setMethod(method: string): void;
-
-		/** request.log(tags, [data, [timestamp]])
-
-		 Always available.
-
-		 Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
-
-		 data - an optional message string or object with the application data being logged.
-		 timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		 Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
-
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-
-		 server.on('request', function (request, event, tags) {
-
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-
-		 var handler = function (request, reply) {
-
-		request.log(['test', 'error'], 'Test event');
-		return reply();
-		};
-		 */
-		log(/** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
-			tags: string | string[],
-			/** an optional message string or object with the application data being logged.*/
-			data?: string,
-			/**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
-			timestamp?: number): void;
-
-		/** request.getLog([tags], [internal])
-
-		 Always available.
-
-		 Returns an array containing the events matching any of the tags specified (logical OR)
-		 request.getLog();
-		 request.getLog('error');
-		 request.getLog(['error', 'auth']);
-		 request.getLog(['error'], true);
-		 request.getLog(false);*/
-
-		getLog(/** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
-			   tags?: string,
-			   /**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
-			   internal?: boolean): string[];
-
-		/** request.tail([name])
-
-		 Available until immediately after the 'response' event is emitted.
-
-		 Adds a request tail which has to complete before the request lifecycle is complete where:
-
-		 name - an optional tail name used for logging purposes.
-		 Returns a tail function which must be called when the tail activity is completed.
-
-		 Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
-
-		 When all tails completed, the server emits a 'tail' event.
-
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-
-		 var get = function (request, reply) {
-
-		var dbTail = request.tail('write to database');
-
-		db.save('key', 'value', function () {
-
-		dbTail();
-		});
-
-		return reply('Success!');
-		};
-
-		 server.route({ method: 'GET', path: '/', handler: get });
-
-		 server.on('tail', function (request) {
-
-		console.log('Request completed including db activity');
-		});*/
-		tail(/** an optional tail name used for logging purposes.*/
-			 name?: string): Function;
-	}
-	/** Response events
-
-	 The response object supports the following events:
-
-	 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
-	 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
-	 var Crypto = require('crypto');
-	 var Hapi = require('hapi');
-	 var server = new Hapi.Server();
-	 server.connection({ port: 80 });
-
-	 server.ext('onPreResponse', function (request, reply) {
-
-	var response = request.response;
-	if (response.isBoom) {
-	return reply();
-	}
-
-	var hash = Crypto.createHash('sha1');
-	response.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	response.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	return reply.continue();
-	});*/
-	export class Response extends Events.EventEmitter {
-		isBoom: boolean;
-		/**  the HTTP response status code. Defaults to 200 (except for errors).*/
-		statusCode: number;
-		/** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
-		headers: IDictionary<string>;
-		/** the value provided using the reply interface.*/
-		source: any;
-		/** a string indicating the type of source with available values:
-		 'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
-		 'buffer' - a Buffer.
-		 'view' - a view generated with reply.view().
-		 'file' - a file generated with reply.file() of via the directory handler.
-		 'stream' - a Stream.
-		 'promise' - a Promise object. */
-		variety: string;
-		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-		app: any;
-		/** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
-		plugins: any;
-		/** settings - response handling flags:
-		 charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
-		 encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
-		 passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
-		 stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
-		 ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
-		 varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
-		settings: {
-			charset: string;
-			encoding: string;
-			passThrough: boolean;
-			stringify: any;
-			ttl: number;
-			varyEtag: boolean;
-		}
-
-		/**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
-		 length - the header value. Must match the actual payload size.*/
-		bytes(length: number): Response;
-
-		/**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
-		charset(charset: string): Response;
-
-		/**  sets the HTTP status code where:
-		 statusCode - the HTTP status code.*/
-		code(statusCode: number): Response;
-
-		/** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
-		created(uri: string): Response;
-
-
-		/** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
-		encoding(encoding: string): Response;
-
-		/** etag(tag, options) - sets the representation entity tag where:
-		 tag - the entity tag string without the double-quote.
-		 options - optional settings where:
-		 weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
-		 vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
-		etag(tag: string, options: {
-			weak: boolean; vary: boolean;
-		}): Response;
-
-		/**header(name, value, options) - sets an HTTP header where:
-		 name - the header name.
-		 value - the header value.
-		 options - optional settings where:
-		 append - if true, the value is appended to any existing header value using separator. Defaults to false.
-		 separator - string used as separator when appending to an exiting value. Defaults to ','.
-		 override - if false, the header value is not set if an existing value present. Defaults to true.*/
-		header(name: string, value: string, options?: IHeaderOptions): Response;
-
-		/** hold() - puts the response on hold until response.send() is called. Available only after reply() is called and until response.hold() is invoked once. */
-		hold(): Response;
-
-		/** location(uri) - sets the HTTP 'Location' header where:
-		 uri - an absolute or relative URI used as the 'Location' header value.*/
-		location(uri: string): Response;
-
-		/** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
-		 uri - an absolute or relative URI used to redirect the client to another resource. */
-		redirect(uri: string): Response;
-
-		/** replacer(method) - sets the JSON.stringify() replacer argument where:
-		 method - the replacer function or array. Defaults to none.*/
-		replacer(method: Function | Array<Function>): Response;
-
-		/** spaces(count) - sets the JSON.stringify() space argument where:
-		 count - the number of spaces to indent nested object keys. Defaults to no indentation. */
-		spaces(count: number): Response;
-
-		/**state(name, value, [options]) - sets an HTTP cookie where:
-		 name - the cookie name.
-		 value - the cookie value. If no encoding is defined, must be a string.
-		 options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
-		state(name: string, value: string, options?: any): Response;
-
-		/** send() - resume the response which will be transmitted in the next tick. Available only after response.hold() is called and until response.send() is invoked once. */
-		send(): void;
-
-		/** sets a string suffix when the response is process via JSON.stringify().*/
-		suffix(suffix: string): void;
-
-		/** overrides the default route cache expiration rule for this response instance where:
-		 msec - the time-to-live value in milliseconds.*/
-		ttl(msec: number): void;
-
-		/** type(mimeType) - sets the HTTP 'Content-Type' header where:
-		 mimeType - is the mime type. Should only be used to override the built-in default for each response type. */
-		type(mimeType: string): Response;
-
-		/** clears the HTTP cookie by setting an expired value where:
-		 name - the cookie name.
-		 options - optional configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
-		unstate(name: string, options?: { [key: string]: string }): Response;
-
-		/** adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header where:
-		 header - the HTTP request header name.*/
-		vary(header: string): void;
-	}
-	/** When using the redirect() method, the response object provides these additional methods */
-	export class ResponseRedirect extends Response {
-		/** sets the status code to 302 or 307 (based on the rewritable() setting) where:
-		 isTemporary - if false, sets status to permanent. Defaults to true.*/
-		temporary(isTemporary: boolean): void;
-
-		/** sets the status code to 301 or 308 (based on the rewritable() setting) where:
-		 isPermanent - if true, sets status to temporary. Defaults to false. */
-		permanent(isPermanent: boolean): void;
-
-		/** sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the temporary() or permanent() setting. Arguments:
-		 isRewritable - if false, sets to non-rewritable. Defaults to true.
-		 Permanent    Temporary
-		 Rewritable    301    302(1)
-		 Non-rewritable    308(2)    307
-		 Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
-		rewritable(isRewritable: boolean): void;
-	}
-	/** info about a server connection */
-	export interface IServerConnectionInfo {
-		/**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
-		id: string;
-		/**  - the connection creation timestamp.*/
-		created: number;
-		/**  - the connection start timestamp (0 when stopped).*/
-		started: number;
-		/**  the connection port based on the following rules:
-		 the configured port value before the server has been started.
-		 the actual port assigned when no port is configured or set to 0 after the server has been started.*/
-		port: number;
-
-		/** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
-		host: string;
-		/** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
-		address: string;
-		/**  - the protocol used:
-		 'http' - HTTP.
-		 'https' - HTTPS.
-		 'socket' - UNIX domain socket or Windows named pipe.*/
-		protocol: string;
-		/** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
-		uri: string;
-	}
-	/**
-	 *  undocumented.   The connection object constructed after calling server.connection();
-	 * can be accessed via server.connections; or request.connection;
-	 */
-	export class ServerConnection extends Events.EventEmitter {
-		domain: any;
-		_events: { route: Function, domain: Function, _events: Function, _eventsCount: Function, _maxListeners: Function };
-		_eventsCount: number;
-		settings: IServerConnectionOptions;
-		server: Server;
-		/** ex: "tcp" */
-		type: string;
-		_started: boolean;
-		/** dictionary of sockets */
-		_connections: { [ip_port: string]: any };
-		_onConnection: Function;
-		registrations: any;
-		_extensions: any;
-		_requestCounter: { value: number; min: number; max: number };
-		_load: any;
-		states: {
-			settings: any; cookies: any; names: any[]
-		};
-		auth: { connection: ServerConnection; _schemes: any; _strategies: any; settings: any; api: any; };
-		_router: any;
-		MSPluginsCollection: any;
-		applicationCache: any;
-		addEventListener: any;
-		info: IServerConnectionInfo;
-	}
-
-	/** Server http://hapijs.com/api#server
-	 rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
-	 Server events
-	 The server object inherits from Events.EventEmitter and emits the following events:
-	 'log' - events logged with server.log() and server events generated internally by the framework.
-	 'start' - emitted when the server is started using server.start().
-	 'stop' - emitted when the server is stopped using server.stop().
-	 'request' - events generated by request.log(). Does not include any internally generated events.
-	 'request-internal' - request events generated internally by the framework (multiple events per request).
-	 'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
-	 'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
-	 'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
-	 Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
-	 MORE EVENTS HERE: http://hapijs.com/api#server-events*/
-	export class Server extends Events.EventEmitter {
-
-		constructor(options?: IServerOptions);
-
-		/** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
-		 var Hapi = require('hapi');
-		 server = new Hapi.Server();
-		 server.app.key = 'value';
-		 var handler = function (request, reply) {
-		return reply(request.server.app.key);
-		}; */
-		app: any;
-		/** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80, labels: 'a' });
-		 server.connection({ port: 8080, labels: 'b' });
-		 // server.connections.length === 2
-		 var a = server.select('a');
-		 // a.connections.length === 1*/
-		connections: Array<ServerConnection>;
-		/** When the server contains exactly one connection, info is an object containing information about the sole connection.
-		 * When the server contains more than one connection, each server.connections array member provides its own connection.info.
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 // server.info.port === 80
-		 server.connection({ port: 8080 });
-		 // server.info === null
-		 // server.connections[1].info.port === 8080
-		 */
-		info: IServerConnectionInfo;
-		/** An object containing the process load metrics (when load.sampleInterval is enabled):
-		 rss - RSS memory usage.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
-		 console.log(server.load.rss);*/
-		load: {
-			/** - event loop delay milliseconds.*/
-			eventLoopDelay: number;
-			/**  - V8 heap usage.*/
-			heapUsed: number;
-		};
-		/** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
-		 When the server contains more than one connection, each server.connections array member provides its own connection.listener.
-		 var Hapi = require('hapi');
-		 var SocketIO = require('socket.io');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 var io = SocketIO.listen(server.listener);
-		 io.sockets.on('connection', function(socket) {
-		socket.emit({ msg: 'welcome' });
-		});*/
-		listener: http.Server;
-
-		/** server.methods
-		 An object providing access to the server methods where each server method name is an object property.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.method('add', function (a, b, next) {
-		return next(null, a + b);
-		});
-		 server.methods.add(1, 2, function (err, result) {
-		// result === 3
-		});*/
-		methods: IDictionary<Function>;
-
-		/** server.mime
-		 Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
-		 var Hapi = require('hapi');
-		 var options = {
-		mime: {
-		override: {
-		'node/module': {
-		source: 'steve',
-		compressible: false,
-		extensions: ['node', 'module', 'npm'],
-		type: 'node/module'
-		}
-		}
-		}
-		};
-		 var server = new Hapi.Server(options);
-		 // server.mime.path('code.js').type === 'application/javascript'
-		 // server.mime.path('file.npm').type === 'node/module'*/
-		mime: any;
-		/**server.plugins
-		 An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
-		 exports.register = function (server, options, next) {
-		server.expose('key', 'value');
-		// server.plugins.example.key === 'value'
-		return next();
-		};
-		 exports.register.attributes = {
-		name: 'example'
-		};*/
-		plugins: IDictionary<any>;
-		/** server.realm
-		 The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-		 modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
-		 route - routes preferences:
-		 prefix - the route path prefix used by any calls to server.route() from the server.
-		 vhost - the route virtual host settings used by any calls to server.route() from the server.
-		 plugin - the active plugin name (empty string if at the server root).
-		 plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
-		 settings - settings overrides:
-		 files.relativeTo
-		 bind
-		 The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-		 exports.register = function (server, options, next) {
-		console.log(server.realm.modifiers.route.prefix);
-		return next();
-		};*/
-		realm: IServerRealm;
-
-		/** server.root
-		 The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
-		root: Server;
-		/** server.settings
-		 The server configuration object after defaults applied.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server({
-		app: {
-		key: 'value'
-		}
-		});
-		 // server.settings.app === { key: 'value' }*/
-		settings: IServerOptions;
-
-		/** server.version
-		 The hapi module version number.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 // server.version === '8.0.0'*/
-		version: string;
-
-		/** server.after(method, [dependencies])
-		 Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
-		 after - the method with signature function(plugin, next) where:
-		 server - server object the after() method was called on.
-		 next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		 err - internal error which is returned back via the server.start() callback.
-		 dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.after(function () {
-		// Perform some pre-start logic
-		});
-		 server.start(function (err) {
-		// After method already executed
-		});
-		 server.auth.default(options)*/
-		after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string | string[]): void;
-
-		auth: {
-			/** server.auth.api
-			 An object where each key is a strategy name and the value is the exposed strategy API. Available on when the authentication scheme exposes an API by returning an api key in the object returned from its implementation function.
-			 When the server contains more than one connection, each server.connections array member provides its own connection.auth.api object.
-			 const server = new Hapi.Server();
-			 server.connection({ port: 80 });
-			 const scheme = function (server, options) {
-            return {
-            api: {
-            settings: {
-            x: 5
-            }
-            },
-            authenticate: function (request, reply) {
-            const req = request.raw.req;
-            const authorization = req.headers.authorization;
-            if (!authorization) {
-            return reply(Boom.unauthorized(null, 'Custom'));
-            }
-            return reply.continue({ credentials: { user: 'john' } });
-            }
-            };
-            };
-			 server.auth.scheme('custom', scheme);
-			 server.auth.strategy('default', 'custom');
-			 console.log(server.auth.api.default.settings.x);    // 5
-			 */
-			api: {
-				[index: string]: any;
-			}
-			/** server.auth.default(options)
-			 Sets a default strategy which is applied to every route where:
-			 options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
-			 The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
-			 The default auth strategy configuration can be accessed via connection.auth.settings.default.
-			 var server = new Hapi.Server();
-			 server.connection({ port: 80 });
-			 server.auth.scheme('custom', scheme);
-			 server.auth.strategy('default', 'custom');
-			 server.auth.default('default');
-			 server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			});*/
-			default(options: string): void;
-			default(options: { strategy: string }): void;
-			default(options: { strategies: string[] }): void;
-			/** server.auth.scheme(name, scheme)
-			 Registers an authentication scheme where:
-			 name - the scheme name.
-			 scheme - the method implementing the scheme with signature function(server, options) where:
-			 server - a reference to the server object the scheme is added to.
-			 options - optional scheme settings used to instantiate a strategy.*/
-			scheme(name: string,
-				   /** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-					n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
-					server = new Hapi.Server();
-					server.connection({ port: 80 });
-					scheme = function (server, options) {
-				urn {
-				authenticate: function (request, reply) {
-				req = request.raw.req;
-				var authorization = req.headers.authorization;
-				if (!authorization) {
-				return reply(Boom.unauthorized(null, 'Custom'));
-				}
-				urn reply(null, { credentials: { user: 'john' } });
-				}
-				};
-				};
-					*/
-				   scheme: (server: Server, options: any) => IServerAuthScheme): void;
-
-			/** server.auth.strategy(name, scheme, [mode], [options])
-			 Registers an authentication strategy where:
-			 name - the strategy name.
-			 scheme - the scheme name (must be previously registered using server.auth.scheme()).
-			 mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
-			 options - scheme options based on the scheme requirements.
-			 var server = new Hapi.Server();
-			 server.connection({ port: 80 });
-			 server.auth.scheme('custom', scheme);
-			 server.auth.strategy('default', 'custom');
-			 server.route({
-			method: 'GET',
-			path: '/',
-			config: {
-			auth: 'default',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			}
-			});*/
-			strategy(name: string, scheme: any, mode?: boolean | string, options?: any): void;
-
-			/** server.auth.test(strategy, request, next)
-			 Tests a request against an authentication strategy where:
-			 strategy - the strategy name registered with server.auth.strategy().
-			 request - the request object.
-			 next - the callback function with signature function(err, credentials) where:
-			 err - the error if authentication failed.
-			 credentials - the authentication credentials object if authentication was successful.
-			 Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
-			 var server = new Hapi.Server();
-			 server.connection({ port: 80 });
-			 server.auth.scheme('custom', scheme);
-			 server.auth.strategy('default', 'custom');
-			 server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			request.server.auth.test('default', request, function (err, credentials) {
-			if (err) {
-			return reply({ status: false });
-			}
-			return reply({ status: true, user: credentials.name });
-			});
-			}
-			});*/
-			test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
-		};
-
-		/** server.bind(context)
-		 Sets a global context used as the default bind object when adding a route or an extension where:
-		 context - the object used to bind this in handler and extension methods.
-		 When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
-		 var handler = function (request, reply) {
-		return reply(this.message);
-		};
-		 exports.register = function (server, options, next) {
-		var bind = {
-		message: 'hello'
-		};
-		server.bind(bind);
-		server.route({ method: 'GET', path: '/', handler: handler });
-		return next();
-		};*/
-		bind(context: any): void;
-
-
-		/** server.cache(options)
-		 Provisions a cache segment within the server cache facility where:
-		 options - catbox policy configuration where:
-		 expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
-		 expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
-		 generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
-		 staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
-		 staleTimeout - number of milliseconds to wait before checking if an item is stale.
-		 generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
-		 cache - the cache name configured in 'server.cache`. Defaults to the default cache.
-		 segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
-		 shared - if true, allows multiple cache provisions to share the same segment. Default to false.
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
-		 cache.set('norway', { capital: 'oslo' }, null, function (err) {
-		cache.get('norway', function (err, value, cached, log) {
-		// value === { capital: 'oslo' };
-		});
-		});*/
-		cache(options: ICatBoxCacheOptions): void;
-
-		/** server.connection([options])
-		 Adds an incoming server connection
-		 Returns a server object with the new connection selected.
-		 Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
-		 Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
-		 var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
-		 // server.connections.length === 2
-		 // web.connections.length === 1
-		 // admin.connections.length === 1 */
-		connection(options: IServerConnectionOptions): Server;
-
-		/** server.decorate(type, property, method, [options])
-		 Extends various framework interfaces with custom methods where:
-		 type - the interface being decorated. Supported types:
-		 'reply' - adds methods to the reply interface.
-		 'server' - adds methods to the Server object.
-		 property - the object decoration key name.
-		 method - the extension function.
-		 options - if the type is 'request', supports the following optional settings:
-		 'apply' - if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
-		 Note that decorations apply to the entire server and all its connections regardless of current selection.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.decorate('reply', 'success', function () {
-		return this.response({ status: 'ok' });
-		});
-		 server.route({
-		method: 'GET',
-		path: '/',
-		handler: function (request, reply) {
-		return reply.success();
-		}
-		});*/
-		decorate(type: string, property: string, method: Function, options?: { apply: boolean }): void;
-
-		/** server.dependency(dependencies, [after])
-		 Used within a plugin to declares a required dependency on other plugins where:
-		 dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
-		 after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
-		 server - the server the dependency() method was called on.
-		 next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		 err - internal error condition, which is returned back via the server.start() callback.
-		 exports.register = function (server, options, next) {
-		server.dependency('yar', after);
-		return next();
-		};
-		 var after = function (server, next) {
-		// Additional plugin registration logic
-		return next();
-		};*/
-		dependency(dependencies: string | string[], after?: (server: Server, next: (err: any) => void) => void): void;
-
-
-		/** server.expose(key, value)
-		 Used within a plugin to expose a property via server.plugins[name] where:
-		 key - the key assigned (server.plugins[name][key]).
-		 value - the value assigned.
-		 exports.register = function (server, options, next) {
-		server.expose('util', function () { console.log('something'); });
-		return next();
-		};*/
-		expose(key: string, value: any): void;
-
-		/** server.expose(obj)
-		 Merges a deep copy of an object into to the existing content of server.plugins[name] where:
-		 obj - the object merged into the exposed properties container.
-		 exports.register = function (server, options, next) {
-		server.expose({ util: function () { console.log('something'); } });
-		return next();
-		};*/
-		expose(obj: any): void;
-
-		/** server.ext(event, method, [options])
-		 Registers an extension function in one of the available extension points where:
-		 event - the event name.
-		 method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
-		 request - the request object. NOTE: Access the Response via request.response
-		 reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
-		 this - the object provided via options.bind or the current active context set with server.bind().
-		 options - an optional object with the following:
-		 before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
-		 after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
-		 bind - a context object passed back to the provided method (via this) when called.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.ext('onRequest', function (request, reply) {
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});
-		 var handler = function (request, reply) {
-		return reply({ status: 'ok' });
-		};
-		 server.route({ method: 'GET', path: '/test', handler: handler });
-		 server.start();
-		 // All requests will get routed to '/test'*/
-		ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
-
-		/** server.handler(name, method)
-		 Registers a new handler type to be used in routes where:
-		 name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
-		 method - the function used to generate the route handler using the signature function(route, options) where:
-		 route - the route public interface object.
-		 options - the configuration object provided in the handler config.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ host: 'localhost', port: 8000 });
-		 // Defines new handler for routes on this server
-		 server.handler('test', function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		});
-		 server.route({
-		method: 'GET',
-		path: '/',
-		handler: { test: { msg: 'test' } }
-		});
-		 server.start();
-		 The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ host: 'localhost', port: 8000 });
-		 var handler = function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		};
-		 // Change the default payload processing for this handler
-		 handler.defaults = {
-		payload: {
-		output: 'stream',
-		parse: false
-		}
-		};
-		 server.handler('test', handler);*/
-		handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
-
-		/** server.initialize([callback])
-		 Initializes the server (starts the caches, finalizes plugin registration) but does not start listening
-		 on the connection ports, where:
-		 - `callback` - the callback method when server initialization is completed or failed with the signature
-		 `function(err)` where:
-		 - `err` - any initialization error condition.
-
-		 If no `callback` is provided, a `Promise` object is returned.
-
-		 Note that if the method fails and the callback includes an error, the server is considered to be in
-		 an undefined state and should be shut down. In most cases it would be impossible to fully recover as
-		 the various plugins, caches, and other event listeners will get confused by repeated attempts to
-		 start the server or make assumptions about the healthy state of the environment. It is recommended
-		 to assert that no error has been returned after calling `initialize()` to abort the process when the
-		 server fails to start properly. If you must try to resume after an error, call `server.stop()`
-		 first to reset the server state.
-		 */
-		initialize(callback?: (error: any) => void): IPromise<void>;
-
-		/** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
-		 Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
-		 Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
-		 * When the server contains more than one connection, each server.connections array member provides its own connection.inject().
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 var handler = function (request, reply) {
-		return reply('Success!');
-		};
-		 server.route({ method: 'GET', path: '/', handler: handler });
-		 server.inject('/', function (res) {
-		console.log(res.result);
-		});
-		 */
-		inject: IServerInject;
-
-		/** server.log(tags, [data, [timestamp]])
-		 Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
-		 tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
-		 data - an optional message string or object with the application data being logged.
-		 timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.on('log', function (event, tags) {
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-		 server.log(['test', 'error'], 'Test event');*/
-		log(tags: string | string[], data?: string | any, timestamp?: number): void;
-
-		/**server.lookup(id)
-		 When the server contains exactly one connection, looks up a route configuration where:
-		 id - the route identifier as set in the route options.
-		 returns the route public interface object if found, otherwise null.
-		 var server = new Hapi.Server();
-		 server.connection();
-		 server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		 var route = server.lookup('root');
-		 When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
-		lookup(id: string): IRoute;
-
-		/** server.match(method, path, [host])
-		 When the server contains exactly one connection, looks up a route configuration where:
-		 method - the HTTP method (e.g. 'GET', 'POST').
-		 path - the requested path (must begin with '/').
-		 host - optional hostname (to match against routes with vhost).
-		 returns the route public interface object if found, otherwise null.
-		 var server = new Hapi.Server();
-		 server.connection();
-		 server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		 var route = server.match('get', '/');
-		 When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
-		match(method: string, path: string, host?: string): IRoute;
-
-
-		/** server.method(name, method, [options])
-		 Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
-		 Methods are registered via server.method(name, method, [options])
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 // Simple arguments
-		 var add = function (a, b, next) {
-		return next(null, a + b);
-		};
-		 server.method('sum', add, { cache: { expiresIn: 2000 } });
-		 server.methods.sum(4, 5, function (err, result) {
-		console.log(result);
-		});
-		 // Object argument
-		 var addArray = function (array, next) {
-		var sum = 0;
-		array.forEach(function (item) {
-		sum += item;
-		});
-		return next(null, sum);
-		};
-		 server.method('sumObj', addArray, {
-		cache: { expiresIn: 2000 },
-		generateKey: function (array) {
-		return array.join(',');
-		}
-		});
-		 server.methods.sumObj([5, 6], function (err, result) {
-		console.log(result);
-		});
-		 // Synchronous method with cache
-		 var addSync = function (a, b) {
-		return a + b;
-		};
-		 server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
-		 server.methods.sumSync(4, 5, function (err, result) {
-		console.log(result);
-		}); */
-		method(/**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
-			   name: string,
-			   method: IServerMethod,
-			   options?: IServerMethodOptions): void;
-
-
-		/**server.method(methods)
-		 Registers a server method function as described in server.method() using a configuration object where:
-		 methods - an object or an array of objects where each one contains:
-		 name - the method name.
-		 method - the method function.
-		 options - optional settings.
-		 var add = function (a, b, next) {
-		next(null, a + b);
-		};
-		 server.method({
-		name: 'sum',
-		method: add,
-		options: {
-		cache: {
-		expiresIn: 2000
-		}
-		}
-		});*/
-		method(methods: {
-			name: string; method: IServerMethod; options?: IServerMethodOptions
-		} | Array<{
-			name: string; method: IServerMethod; options?: IServerMethodOptions
-		}>): void;
-
-		/**server.path(relativeTo)
-		 Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
-		 relativeTo - the path prefix added to any relative file path starting with '.'.
-		 Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
-		 exports.register = function (server, options, next) {
-		server.path(__dirname + '../static');
-		server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
-		next();
-		};*/
-		path(relativeTo: string): void;
-
-
-		/**
-		 * server.register(plugins, [options], callback)
-		 * Registers a plugin where:
-		 * plugins - an object or array of objects where each one is either:
-		 * a plugin registration function.
-		 * an object with the following:
-		 * register - the plugin registration function.
-		 * options - optional options passed to the registration function when called.
-		 * options - optional registration options (different from the options passed to the registration function):
-		 * select - a string or array of string labels used to pre-select connections for plugin registration.
-		 * routes - modifiers applied to each route added by the plugin:
-		 * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
-		 * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
-		 * callback - the callback function with signature function(err) where:
-		 * err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
-		 *
-		 * If no callback is provided, a Promise object is returned.
-		 */
-		register(plugins: any | any[], options: {
-			select: string | string[];
-			routes: {
-				prefix: string; vhost?: string | string[]
-			};
-		}, callback: (err: any) => void): void;
-		register(plugins: any | any[], options: {
-			select: string | string[];
-			routes: {
-				prefix: string; vhost?: string | string[]
-			};
-		}): IPromise<any>;
-
-		register(plugins: any | any[], callback: (err: any) => void): void;
-		register(plugins: any | any[]): IPromise<any>;
-
-		/**server.render(template, context, [options], callback)
-		 Utilizes the server views manager to render a template where:
-		 template - the template filename and path, relative to the views manager templates path (path or relativeTo).
-		 context - optional object used by the template to render context-specific result. Defaults to no context ({}).
-		 options - optional object used to override the views manager configuration.
-		 callback - the callback function with signature function (err, rendered, config) where:
-		 err - the rendering error if any.
-		 rendered - the result view string.
-		 config - the configuration used to render the template.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.views({
-		engines: { html: require('handlebars') },
-		path: __dirname + '/templates'
-		});
-		 var context = {
-		title: 'Views Example',
-		message: 'Hello, World'
-		};
-		 server.render('hello', context, function (err, rendered, config) {
-		console.log(rendered);
-		});*/
-		render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void): void;
-
-		/** server.route(options)
-		 Adds a connection route where:
-		 options - a route configuration object or an array of configuration objects.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
-		 server.route([
-		 { method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
-		 { method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
-		 ]);*/
-		route(options: IRouteConfiguration): void;
-		route(options: IRouteConfiguration[]): void;
-
-		/**server.select(labels)
-		 Selects a subset of the server's connections where:
-		 labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
-		 Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80, labels: ['a'] });
-		 server.connection({ port: 8080, labels: ['b'] });
-		 server.connection({ port: 8081, labels: ['c'] });
-		 server.connection({ port: 8082, labels: ['c','d'] });
-		 var a = server.select('a');          // The server with port 80
-		 var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
-		 var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
-		select(labels: string | string[]): Server | Server[];
-
-		/** server.start([callback])
-		 Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
-		 callback - optional callback when server startup is completed or failed with the signature function(err) where:
-		 err - any startup error condition.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.start(function (err) {
-		console.log('Server started at: ' + server.info.uri);
-		});*/
-		start(callback?: (err: any) => void): IPromise<void>;
-
-		/** server.state(name, [options])
-		 HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
-		 State defaults can be modified via the server connections.routes.state configuration option.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 // Set cookie definition
-		 server.state('session', {
-		ttl: 24 * 60 * 60 * 1000,     // One day
-		isSecure: true,
-		path: '/',
-		encoding: 'base64json'
-		});
-		 // Set state in route handler
-		 var handler = function (request, reply) {
-		var session = request.state.session;
-		if (!session) {
-		session = { user: 'joe' };
-		}
-		session.last = Date.now();
-		return reply('Success').state('session', session);
-		};
-		 Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.on('request-internal', function (request, event, tags) {
-		if (tags.error && tags.state) {
-		console.error(event);
-		}
-		});    */
-		state(name: string, options?: ICookieSettings): void;
-
-		/** server.stop([options], [callback])
-		 Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
-		 options - optional object with:
-		 timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
-		 callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.stop({ timeout: 60 * 1000 }, function () {
-		console.log('Server stopped');
-		});*/
-		stop(options?: { timeout: number }, callback?: () => void): IPromise<void>;
-
-		/**server.table([host])
-		 Returns a copy of the routing table where:
-		 host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-		 The return value is an array where each item is an object containing:
-		 info - the connection.info the connection the table was generated for.
-		 labels - the connection labels.
-		 table - an array of routes where each route contains:
-		 settings - the route config with defaults applied.
-		 method - the HTTP method in lower case.
-		 path - the route path.
-		 Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80, host: 'example.com' });
-		 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		 var table = server.table();
-		 When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80, host: 'example.com' });
-		 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		 var table = server.connections[0].table();
-		 //[
-		 //    {
-		//        method: 'get',
-		//        path: '/example',
-		//        settings: { ... }
-		//    }
-		 //]
-		 */
-		table(host?: any): IConnectionTable;
-
-		/**server.views(options)
-		 Initializes the server views manager
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.views({
-		engines: {
-		html: require('handlebars'),
-		jade: require('jade')
-		},
-		path: '/static/templates'
-		});
-		 When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
-		views(options: IServerViewsConfiguration): void;
-
-	}
+    };
+}
+
+export interface IFileHandlerConfig {
+    /**  a path string or function as described above.*/
+    path: string;
+    /** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+    filename?: string;
+    /**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
+     false - header is not included. This is the default value.
+     'attachment'
+     'inline'*/
+    mode?: boolean | string;
+    /** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
+    lookupCompressed: boolean;
+}
+
+/**http://hapijs.com/api#route-handler
+ Built-in handlers
+
+ The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
+export interface IRouteHandlerConfig {
+    /** generates a static file endpoint for serving a single file. file can be set to:
+     a relative or absolute file path string (relative paths are resolved based on the route files configuration).
+     a function with the signature function(request) which returns the relative or absolute file path.
+     an object with the following options */
+    file?: string | IRequestHandler<void> | IFileHandlerConfig;
+    /** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
+     path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
+     a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
+     an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
+     a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
+     index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
+     listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
+     showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
+     redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
+     lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
+     defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
+    directory?: {
+        path: string | Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
+        index?: boolean | string | string[];
+        listing?: boolean;
+        showHidden?: boolean;
+        redirectToSlash?: boolean;
+        lookupCompressed?: boolean;
+        defaultExtension?: string;
+    };
+    proxy?: IProxyHandlerConfig;
+    view?: string | {
+        template: string;
+        context: {
+            payload: any;
+            params: any;
+            query: any;
+            pre: any;
+        }
+    };
+    config?: {
+        handler: any;
+        bind: any;
+        app: any;
+        plugins: {
+            [name: string]: any;
+        };
+        pre: Array<() => void>;
+        validate: {
+            headers: any;
+            params: any;
+            query: any;
+            payload: any;
+            errorFields?: any;
+            failAction?: string | IFailAction;
+        };
+        payload: {
+            output: {
+                data: any;
+                stream: any;
+                file: any;
+            };
+            parse?: any;
+            allow?: string | Array<string>;
+            override?: string;
+            maxBytes?: number;
+            uploads?: number;
+            failAction?: string;
+        };
+        response: {
+            schema: any;
+            sample: number;
+            failAction: string;
+        };
+        cache: {
+            privacy: string;
+            expiresIn: number;
+            expiresAt: number;
+        };
+        auth: string | boolean | {
+            mode: string;
+            strategies: Array<string>;
+            payload?: boolean | string;
+            tos?: boolean | string;
+            scope?: string | Array<string>;
+            entity: string;
+        };
+        cors?: boolean;
+        jsonp?: string;
+        description?: string;
+        notes?: string | Array<string>;
+        tags?: Array<string>;
+    };
+}
+/** Route configuration
+ The route configuration object*/
+export interface IRouteConfiguration {
+    /**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
+    path: string;
+    /** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
+     * Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
+    method: string | string[];
+    /**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
+    vhost?: string;
+    /**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
+    handler: ISessionHandler | string | IRouteHandlerConfig;
+    /** - additional route options.*/
+    config?: IRouteAdditionalConfigurationOptions;
+}
+/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
+export interface IRoute {
+
+
+    /** the route HTTP method. */
+    method: string;
+    /** the route path. */
+    path: string;
+    /** the route vhost option if configured. */
+    vhost?: string | Array<string>;
+    /** the [active realm] associated with the route.*/
+    realm: IServerRealm;
+    /** the [route options]  object with all defaults applied. */
+    settings: IRouteAdditionalConfigurationOptions;
+}
+
+export interface IServerAuthScheme {
+    /** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
+     request - the request object.
+     reply - the reply interface the authentication method must call when done authenticating the request where:
+     reply(err, response, result) - is called if authentication failed where:
+     err - any authentication error.
+     response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+     result - an object containing:
+     credentials - the authenticated credentials.
+     artifacts - optional authentication artifacts.
+     reply.continue(result) - is called if authentication succeeded where:
+     result - same object as result above.
+     When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
+     .If the err returned by the reply() method includes a message, no additional strategies will be attempted.
+     If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     var scheme = function (server, options) {
+    return {
+    authenticate: function (request, reply) {
+    var req = request.raw.req;
+    var authorization = req.headers.authorization;
+    if (!authorization) {
+    return reply(Boom.unauthorized(null, 'Custom'));
+    }
+    return reply(null, { credentials: { user: 'john' } });
+    }
+    };
+    };
+     server.auth.scheme('custom', scheme);*/
+    authenticate(request: Request, reply: IReply): void;
+    /** payload(request, reply) - optional function called to authenticate the request payload where:
+     request - the request object.
+     reply(err, response) - is called if authentication failed where:
+     err - any authentication error.
+     response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+     reply.continue() - is called if payload authentication succeeded.
+     When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
+    payload?(request: Request, reply: IReply): void;
+    /** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
+     request - the request object.
+     reply(err, response) - is called if an error occurred where:
+     err - any authentication error.
+     response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
+     reply.continue() - is called if the operation succeeded.*/
+    response?(request: Request, reply: IReply): void;
+    /** an optional object  */
+    options?: {
+        /**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
+        payload: boolean;
+    }
+}
+
+/**the response object where:
+ statusCode - the HTTP status code.
+ headers - an object containing the headers set.
+ payload - the response payload string.
+ rawPayload - the raw response payload buffer.
+ raw - an object with the injection request and response objects:
+ req - the simulated node request object.
+ res - the simulated node response object.
+ result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
+ request - the request object.*/
+export interface IServerInjectResponse {
+    statusCode: number;
+    headers: IDictionary<string>;
+    payload: string;
+    rawPayload: Buffer;
+    raw: {
+        req: http.ClientRequest;
+        res: http.ServerResponse
+    };
+    result: string;
+    request: Request;
+}
+
+export interface IServerInject {
+    (options: string | IServerInjectOptions, callback: (res: IServerInjectResponse) => void): void;
+    (options: string | IServerInjectOptions): IPromise<IServerInjectResponse>;
+}
+
+export interface IServerInjectOptions {
+    /**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
+    method: string;
+    /** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
+    url: string;
+    /** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
+    headers?: IDictionary<string>;
+    /** n optional string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
+    payload?: string | {} | Buffer;
+    /** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
+    credentials?: any;
+    /** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.*/
+    artifacts?: any;
+    /** sets the initial value of request.app*/
+    app?: any;
+    /** sets the initial value of request.plugins*/
+    plugins?: any;
+    /** allows access to routes with config.isInternal set to true. Defaults to false.*/
+    allowInternals?: boolean;
+    /** sets the remote address for the incoming connection.*/
+    remoteAddress?: boolean;
+    /**object with options used to simulate client request stream conditions for testing:
+     error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+     close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+     end - if false, does not end the stream. Defaults to true.*/
+    simulate?: {
+        error: boolean;
+        close: boolean;
+        end: boolean;
+    };
+}
+
+
+/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+ The return value is an array where each item is an object containing:
+ info - the connection.info the connection the table was generated for.
+ labels - the connection labels.
+ table - an array of routes where each route contains:
+ settings - the route config with defaults applied.
+ method - the HTTP method in lower case.
+ path - the route path.*/
+export interface IConnectionTable {
+    info: any;
+    labels: any;
+    table: IRoute[];
+}
+
+export interface ICookieSettings {
+    /** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
+    ttl?: number;
+    /** - sets the 'Secure' flag.Defaults to false.*/
+    isSecure?: boolean;
+    /** - sets the 'HttpOnly' flag.Defaults to false.*/
+    isHttpOnly?: boolean;
+    /** - the path scope.Defaults to null (no path).*/
+    path?: string;
+    /** - the domain scope.Defaults to null (no domain).*/
+    domain?: any;
+    /** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
+     request - the request object.
+     next - the continuation function using the function(err, value) signature.*/
+    autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
+    /** - encoding performs on the provided value before serialization.Options are:
+     'none' - no encoding.When used, the cookie value must be a string.This is the default value.
+     'base64' - string value is encoded using Base64.
+     'base64json' - object value is JSON- stringified than encoded using Base64.
+     'form' - object value is encoded using the x- www - form - urlencoded method. */
+    encoding?: string;
+    /**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
+     integrity - algorithm options.Defaults to require('iron').defaults.integrity.
+     password - password used for HMAC key generation. */
+    sign?: { integrity: any; password: string; }
+    password?: string;
+    iron?: any;
+    ignoreErrors?: boolean;
+    clearInvalid?: boolean;
+    strictHeader?: boolean;
+    passThrough?: any;
+}
+
+/** method - the method function with the signature is one of:
+ function(arg1, arg2, ..., argn, next) where:
+ arg1, arg2, etc. - the method function arguments.
+ next - the function called when the method is done with the signature function(err, result, ttl) where:
+ err - error response if the method failed.
+ result - the return value.
+ ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+ function(arg1, arg2, ..., argn) where:
+ arg1, arg2, etc. - the method function arguments.
+ the callback option is set to false.
+ the method must returns a value (result, Error, or a promise) or throw an Error.*/
+export interface IServerMethod {
+    //(): void;
+    //(next: (err: any, result: any, ttl: number) => void): void;
+    //(arg1: any): void;
+    //(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
+    //(arg1: any, arg2: any): void;
+    (...args: any[]): void;
+
+}
+/** options - optional configuration:
+ bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
+ cache - the same cache configuration used in server.cache().
+ callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
+ generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
+export interface IServerMethodOptions {
+    bind?: any;
+    cache?: ICatBoxCacheOptions;
+    callback?: boolean;
+    generateKey?(args: any[]): string;
+}
+/** Request object
+
+ The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
+ Request events
+
+ The request object supports the following events:
+
+ 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+ 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+ 'disconnect' - emitted when a request errors or aborts unexpectedly.
+ var Crypto = require('crypto');
+ var Hapi = require('hapi');
+ var server = new Hapi.Server();
+ server.connection({ port: 80 });
+
+ server.ext('onRequest', function (request, reply) {
+
+var hash = Crypto.createHash('sha1');
+request.on('peek', function (chunk) {
+
+hash.update(chunk);
+});
+
+request.once('finish', function () {
+
+console.log(hash.digest('hex'));
+});
+
+request.once('disconnect', function () {
+
+console.error('request aborted');
+});
+
+return reply.continue();
+});*/
+declare export class Request extends Events.EventEmitter {
+    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+    app: any;
+    /**  authentication information*/
+    auth: {
+        /** true is the request has been successfully authenticated, otherwise false.*/
+        isAuthenticated: boolean;
+        /**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.  can be set in the validate function's callback.*/
+        credentials: any;
+        /**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
+        artifacts: any;
+        /**  the route authentication mode.*/
+        mode: any;
+        /** the authentication error is failed and mode set to 'try'.*/
+        error: any;
+    };
+    /** the connection used by this request*/
+    connection: ServerConnection;
+    /**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
+    domain: any;
+    /** the raw request headers (references request.raw.headers).*/
+    headers: IDictionary<string>;
+    /** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
+    id: number;
+    /**  request information */
+    info: {
+        /**  the request preferred encoding. */
+        acceptEncoding: string;
+        /**  if CORS is enabled for the route, contains the following: */
+        cors: {
+            isOriginMatch: boolean; /**  true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle. */
+        };
+        /**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
+        host: string;
+        /**  the hostname part of the 'Host' header (e.g. 'example.com').*/
+        hostname: string;
+        /**  request reception timestamp. */
+        received: number;
+        /**  content of the HTTP 'Referrer' (or 'Referer') header. */
+        referrer: string;
+        /** remote client IP address. */
+        remoteAddress: string;
+        /**  remote client port. */
+        remotePort: number;
+        /**  request response timestamp (0 is not responded yet). */
+        responded: number;
+    };
+    /**  the request method in lower case (e.g. 'get', 'post'). */
+    method: string;
+    /**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
+    mime: string;
+    /**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
+    orig: {
+        params: any;
+        query: any;
+        payload: any;
+    };
+    /**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
+    params: IDictionary<string>;
+    /** an array containing all the path params values in the order they appeared in the path.*/
+    paramsArray: string[];
+    /**  the request URI's path component. */
+    path: string;
+    /** the request payload based on the route payload.output and payload.parse settings.*/
+    payload: stream.Readable | Buffer | any;
+    /**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
+    plugins: any;
+    /** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
+    pre: IDictionary<any>;
+    /** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
+    response: Response;
+    /**preResponses - same as pre but represented as the response object created by the pre method.*/
+    preResponses: any;
+    /**an object containing the query parameters.*/
+    query: any;
+    /**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
+    raw: {
+        req: http.ClientRequest;
+        res: http.ServerResponse;
+    };
+    /** the route public interface.*/
+    route: IRoute;
+    /** the server object. */
+    server: Server;
+    /** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
+    state: any;
+    /** complex object contining details on the url */
+    url: {
+        /** null when i tested */
+        auth: any;
+        /** null when i tested */
+        hash: any;
+        /** null when i tested */
+        host: any;
+        /** null when i tested */
+        hostname: any;
+        href: string;
+        path: string;
+        /** path without search*/
+        pathname: string;
+        /** null when i tested */
+        port: any;
+        /** null when i tested */
+        protocol: any;
+        /** querystring parameters*/
+        query: IDictionary<string>;
+        /** querystring parameters as a string*/
+        search: string;
+        /** null when i tested */
+        slashes: any;
+    };
+
+    /** request.setUrl(url)
+
+     Available only in 'onRequest' extension methods.
+
+     Changes the request URI before the router begins processing the request where:
+
+     url - the new request path value.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+
+     server.ext('onRequest', function (request, reply) {
+
+    // Change all requests to '/test'
+    request.setUrl('/test');
+    return reply.continue();
+    });*/
+    setUrl(url: string): void;
+
+    /** request.setMethod(method)
+
+     Available only in 'onRequest' extension methods.
+
+     Changes the request method before the router begins processing the request where:
+
+     method - is the request HTTP method (e.g. 'GET').
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+
+     server.ext('onRequest', function (request, reply) {
+
+    // Change all requests to 'GET'
+    request.setMethod('GET');
+    return reply.continue();
+    });*/
+    setMethod(method: string): void;
+
+    /** request.log(tags, [data, [timestamp]])
+
+     Always available.
+
+     Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
+
+     data - an optional message string or object with the application data being logged.
+     timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+     Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
+
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+
+     server.on('request', function (request, event, tags) {
+
+    if (tags.error) {
+    console.log(event);
+    }
+    });
+
+     var handler = function (request, reply) {
+
+    request.log(['test', 'error'], 'Test event');
+    return reply();
+    };
+     */
+    log(/** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
+        tags: string | string[],
+        /** an optional message string or object with the application data being logged.*/
+        data?: string,
+        /**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
+        timestamp?: number): void;
+
+    /** request.getLog([tags], [internal])
+
+     Always available.
+
+     Returns an array containing the events matching any of the tags specified (logical OR)
+     request.getLog();
+     request.getLog('error');
+     request.getLog(['error', 'auth']);
+     request.getLog(['error'], true);
+     request.getLog(false);*/
+
+    getLog(/** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
+        tags?: string,
+        /**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
+        internal?: boolean): string[];
+
+    /** request.tail([name])
+
+     Available until immediately after the 'response' event is emitted.
+
+     Adds a request tail which has to complete before the request lifecycle is complete where:
+
+     name - an optional tail name used for logging purposes.
+     Returns a tail function which must be called when the tail activity is completed.
+
+     Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
+
+     When all tails completed, the server emits a 'tail' event.
+
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+
+     var get = function (request, reply) {
+
+    var dbTail = request.tail('write to database');
+
+    db.save('key', 'value', function () {
+
+    dbTail();
+    });
+
+    return reply('Success!');
+    };
+
+     server.route({ method: 'GET', path: '/', handler: get });
+
+     server.on('tail', function (request) {
+
+    console.log('Request completed including db activity');
+    });*/
+    tail(/** an optional tail name used for logging purposes.*/
+        name?: string): Function;
+}
+/** Response events
+
+ The response object supports the following events:
+
+ 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+ 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+ var Crypto = require('crypto');
+ var Hapi = require('hapi');
+ var server = new Hapi.Server();
+ server.connection({ port: 80 });
+
+ server.ext('onPreResponse', function (request, reply) {
+
+var response = request.response;
+if (response.isBoom) {
+return reply();
+}
+
+var hash = Crypto.createHash('sha1');
+response.on('peek', function (chunk) {
+
+hash.update(chunk);
+});
+
+response.once('finish', function () {
+
+console.log(hash.digest('hex'));
+});
+
+return reply.continue();
+});*/
+declare export class Response extends Events.EventEmitter {
+    isBoom: boolean;
+    /**  the HTTP response status code. Defaults to 200 (except for errors).*/
+    statusCode: number;
+    /** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
+    headers: IDictionary<string>;
+    /** the value provided using the reply interface.*/
+    source: any;
+    /** a string indicating the type of source with available values:
+     'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
+     'buffer' - a Buffer.
+     'view' - a view generated with reply.view().
+     'file' - a file generated with reply.file() of via the directory handler.
+     'stream' - a Stream.
+     'promise' - a Promise object. */
+    variety: string;
+    /** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+    app: any;
+    /** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
+    plugins: any;
+    /** settings - response handling flags:
+     charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
+     encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
+     passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
+     stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
+     ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
+     varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
+    settings: {
+        charset: string;
+        encoding: string;
+        passThrough: boolean;
+        stringify: any;
+        ttl: number;
+        varyEtag: boolean;
+    }
+
+    /**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
+     length - the header value. Must match the actual payload size.*/
+    bytes(length: number): Response;
+
+    /**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
+    charset(charset: string): Response;
+
+    /**  sets the HTTP status code where:
+     statusCode - the HTTP status code.*/
+    code(statusCode: number): Response;
+
+    /** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
+    created(uri: string): Response;
+
+
+    /** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
+    encoding(encoding: string): Response;
+
+    /** etag(tag, options) - sets the representation entity tag where:
+     tag - the entity tag string without the double-quote.
+     options - optional settings where:
+     weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
+     vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
+    etag(tag: string, options: {
+        weak: boolean; vary: boolean;
+    }): Response;
+
+    /**header(name, value, options) - sets an HTTP header where:
+     name - the header name.
+     value - the header value.
+     options - optional settings where:
+     append - if true, the value is appended to any existing header value using separator. Defaults to false.
+     separator - string used as separator when appending to an exiting value. Defaults to ','.
+     override - if false, the header value is not set if an existing value present. Defaults to true.*/
+    header(name: string, value: string, options?: IHeaderOptions): Response;
+
+    /** hold() - puts the response on hold until response.send() is called. Available only after reply() is called and until response.hold() is invoked once. */
+    hold(): Response;
+
+    /** location(uri) - sets the HTTP 'Location' header where:
+     uri - an absolute or relative URI used as the 'Location' header value.*/
+    location(uri: string): Response;
+
+    /** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
+     uri - an absolute or relative URI used to redirect the client to another resource. */
+    redirect(uri: string): Response;
+
+    /** replacer(method) - sets the JSON.stringify() replacer argument where:
+     method - the replacer function or array. Defaults to none.*/
+    replacer(method: Function | Array<Function>): Response;
+
+    /** spaces(count) - sets the JSON.stringify() space argument where:
+     count - the number of spaces to indent nested object keys. Defaults to no indentation. */
+    spaces(count: number): Response;
+
+    /**state(name, value, [options]) - sets an HTTP cookie where:
+     name - the cookie name.
+     value - the cookie value. If no encoding is defined, must be a string.
+     options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
+    state(name: string, value: string, options?: any): Response;
+
+    /** send() - resume the response which will be transmitted in the next tick. Available only after response.hold() is called and until response.send() is invoked once. */
+    send(): void;
+
+    /** sets a string suffix when the response is process via JSON.stringify().*/
+    suffix(suffix: string): void;
+
+    /** overrides the default route cache expiration rule for this response instance where:
+     msec - the time-to-live value in milliseconds.*/
+    ttl(msec: number): void;
+
+    /** type(mimeType) - sets the HTTP 'Content-Type' header where:
+     mimeType - is the mime type. Should only be used to override the built-in default for each response type. */
+    type(mimeType: string): Response;
+
+    /** clears the HTTP cookie by setting an expired value where:
+     name - the cookie name.
+     options - optional configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
+    unstate(name: string, options?: { [key: string]: string }): Response;
+
+    /** adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header where:
+     header - the HTTP request header name.*/
+    vary(header: string): void;
+}
+/** When using the redirect() method, the response object provides these additional methods */
+declare export class ResponseRedirect extends Response {
+    /** sets the status code to 302 or 307 (based on the rewritable() setting) where:
+     isTemporary - if false, sets status to permanent. Defaults to true.*/
+    temporary(isTemporary: boolean): void;
+
+    /** sets the status code to 301 or 308 (based on the rewritable() setting) where:
+     isPermanent - if true, sets status to temporary. Defaults to false. */
+    permanent(isPermanent: boolean): void;
+
+    /** sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the temporary() or permanent() setting. Arguments:
+     isRewritable - if false, sets to non-rewritable. Defaults to true.
+     Permanent    Temporary
+     Rewritable    301    302(1)
+     Non-rewritable    308(2)    307
+     Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
+    rewritable(isRewritable: boolean): void;
+}
+/** info about a server connection */
+export interface IServerConnectionInfo {
+    /**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
+    id: string;
+    /**  - the connection creation timestamp.*/
+    created: number;
+    /**  - the connection start timestamp (0 when stopped).*/
+    started: number;
+    /**  the connection port based on the following rules:
+     the configured port value before the server has been started.
+     the actual port assigned when no port is configured or set to 0 after the server has been started.*/
+    port: number;
+
+    /** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
+    host: string;
+    /** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
+    address: string;
+    /**  - the protocol used:
+     'http' - HTTP.
+     'https' - HTTPS.
+     'socket' - UNIX domain socket or Windows named pipe.*/
+    protocol: string;
+    /** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
+    uri: string;
+}
+/**
+ *  undocumented.   The connection object constructed after calling server.connection();
+ * can be accessed via server.connections; or request.connection;
+ */
+declare export class ServerConnection extends Events.EventEmitter {
+    domain: any;
+    _events: { route: Function, domain: Function, _events: Function, _eventsCount: Function, _maxListeners: Function };
+    _eventsCount: number;
+    settings: IServerConnectionOptions;
+    server: Server;
+    /** ex: "tcp" */
+    type: string;
+    _started: boolean;
+    /** dictionary of sockets */
+    _connections: { [ip_port: string]: any };
+    _onConnection: Function;
+    registrations: any;
+    _extensions: any;
+    _requestCounter: { value: number; min: number; max: number };
+    _load: any;
+    states: {
+        settings: any; cookies: any; names: any[]
+    };
+    auth: { connection: ServerConnection; _schemes: any; _strategies: any; settings: any; api: any; };
+    _router: any;
+    MSPluginsCollection: any;
+    applicationCache: any;
+    addEventListener: any;
+    info: IServerConnectionInfo;
+}
+
+/** Server http://hapijs.com/api#server
+ rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
+ Server events
+ The server object inherits from Events.EventEmitter and emits the following events:
+ 'log' - events logged with server.log() and server events generated internally by the framework.
+ 'start' - emitted when the server is started using server.start().
+ 'stop' - emitted when the server is stopped using server.stop().
+ 'request' - events generated by request.log(). Does not include any internally generated events.
+ 'request-internal' - request events generated internally by the framework (multiple events per request).
+ 'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
+ 'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
+ 'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
+ Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
+ MORE EVENTS HERE: http://hapijs.com/api#server-events*/
+declare export class Server extends Events.EventEmitter {
+
+    constructor(options?: IServerOptions);
+
+    /** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
+     var Hapi = require('hapi');
+     server = new Hapi.Server();
+     server.app.key = 'value';
+     var handler = function (request, reply) {
+    return reply(request.server.app.key);
+    }; */
+    app: any;
+    /** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
+     var server = new Hapi.Server();
+     server.connection({ port: 80, labels: 'a' });
+     server.connection({ port: 8080, labels: 'b' });
+     // server.connections.length === 2
+     var a = server.select('a');
+     // a.connections.length === 1*/
+    connections: Array<ServerConnection>;
+    /** When the server contains exactly one connection, info is an object containing information about the sole connection.
+     * When the server contains more than one connection, each server.connections array member provides its own connection.info.
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     // server.info.port === 80
+     server.connection({ port: 8080 });
+     // server.info === null
+     // server.connections[1].info.port === 8080
+     */
+    info: IServerConnectionInfo;
+    /** An object containing the process load metrics (when load.sampleInterval is enabled):
+     rss - RSS memory usage.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
+     console.log(server.load.rss);*/
+    load: {
+        /** - event loop delay milliseconds.*/
+        eventLoopDelay: number;
+        /**  - V8 heap usage.*/
+        heapUsed: number;
+    };
+    /** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
+     When the server contains more than one connection, each server.connections array member provides its own connection.listener.
+     var Hapi = require('hapi');
+     var SocketIO = require('socket.io');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     var io = SocketIO.listen(server.listener);
+     io.sockets.on('connection', function(socket) {
+    socket.emit({ msg: 'welcome' });
+    });*/
+    listener: http.Server;
+
+    /** server.methods
+     An object providing access to the server methods where each server method name is an object property.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.method('add', function (a, b, next) {
+    return next(null, a + b);
+    });
+     server.methods.add(1, 2, function (err, result) {
+    // result === 3
+    });*/
+    methods: IDictionary<Function>;
+
+    /** server.mime
+     Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
+     var Hapi = require('hapi');
+     var options = {
+    mime: {
+    override: {
+    'node/module': {
+    source: 'steve',
+    compressible: false,
+    extensions: ['node', 'module', 'npm'],
+    type: 'node/module'
+    }
+    }
+    }
+    };
+     var server = new Hapi.Server(options);
+     // server.mime.path('code.js').type === 'application/javascript'
+     // server.mime.path('file.npm').type === 'node/module'*/
+    mime: any;
+    /**server.plugins
+     An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
+     exports.register = function (server, options, next) {
+    server.expose('key', 'value');
+    // server.plugins.example.key === 'value'
+    return next();
+    };
+     exports.register.attributes = {
+    name: 'example'
+    };*/
+    plugins: IDictionary<any>;
+    /** server.realm
+     The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+     modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
+     route - routes preferences:
+     prefix - the route path prefix used by any calls to server.route() from the server.
+     vhost - the route virtual host settings used by any calls to server.route() from the server.
+     plugin - the active plugin name (empty string if at the server root).
+     plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
+     settings - settings overrides:
+     files.relativeTo
+     bind
+     The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+     exports.register = function (server, options, next) {
+    console.log(server.realm.modifiers.route.prefix);
+    return next();
+    };*/
+    realm: IServerRealm;
+
+    /** server.root
+     The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
+    root: Server;
+    /** server.settings
+     The server configuration object after defaults applied.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server({
+    app: {
+    key: 'value'
+    }
+    });
+     // server.settings.app === { key: 'value' }*/
+    settings: IServerOptions;
+
+    /** server.version
+     The hapi module version number.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     // server.version === '8.0.0'*/
+    version: string;
+
+    /** server.after(method, [dependencies])
+     Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
+     after - the method with signature function(plugin, next) where:
+     server - server object the after() method was called on.
+     next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+     err - internal error which is returned back via the server.start() callback.
+     dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.after(function () {
+    // Perform some pre-start logic
+    });
+     server.start(function (err) {
+    // After method already executed
+    });
+     server.auth.default(options)*/
+    after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string | string[]): void;
+
+    auth: {
+        /** server.auth.api
+         An object where each key is a strategy name and the value is the exposed strategy API. Available on when the authentication scheme exposes an API by returning an api key in the object returned from its implementation function.
+         When the server contains more than one connection, each server.connections array member provides its own connection.auth.api object.
+         const server = new Hapi.Server();
+         server.connection({ port: 80 });
+         const scheme = function (server, options) {
+        return {
+        api: {
+        settings: {
+        x: 5
+        }
+        },
+        authenticate: function (request, reply) {
+        const req = request.raw.req;
+        const authorization = req.headers.authorization;
+        if (!authorization) {
+        return reply(Boom.unauthorized(null, 'Custom'));
+        }
+        return reply.continue({ credentials: { user: 'john' } });
+        }
+        };
+        };
+         server.auth.scheme('custom', scheme);
+         server.auth.strategy('default', 'custom');
+         console.log(server.auth.api.default.settings.x);    // 5
+         */
+        api: {
+            [index: string]: any;
+        }
+        /** server.auth.default(options)
+         Sets a default strategy which is applied to every route where:
+         options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
+         The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
+         The default auth strategy configuration can be accessed via connection.auth.settings.default.
+         var server = new Hapi.Server();
+         server.connection({ port: 80 });
+         server.auth.scheme('custom', scheme);
+         server.auth.strategy('default', 'custom');
+         server.auth.default('default');
+         server.route({
+        method: 'GET',
+        path: '/',
+        handler: function (request, reply) {
+        return reply(request.auth.credentials.user);
+        }
+        });*/
+        default(options: string): void;
+        default(options: { strategy: string }): void;
+        default(options: { strategies: string[] }): void;
+        /** server.auth.scheme(name, scheme)
+         Registers an authentication scheme where:
+         name - the scheme name.
+         scheme - the method implementing the scheme with signature function(server, options) where:
+         server - a reference to the server object the scheme is added to.
+         options - optional scheme settings used to instantiate a strategy.*/
+        scheme(name: string,
+            /** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+             n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
+             server = new Hapi.Server();
+             server.connection({ port: 80 });
+             scheme = function (server, options) {
+         urn {
+         authenticate: function (request, reply) {
+         req = request.raw.req;
+         var authorization = req.headers.authorization;
+         if (!authorization) {
+         return reply(Boom.unauthorized(null, 'Custom'));
+         }
+         urn reply(null, { credentials: { user: 'john' } });
+         }
+         };
+         };
+             */
+            scheme: (server: Server, options: any) => IServerAuthScheme): void;
+
+        /** server.auth.strategy(name, scheme, [mode], [options])
+         Registers an authentication strategy where:
+         name - the strategy name.
+         scheme - the scheme name (must be previously registered using server.auth.scheme()).
+         mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
+         options - scheme options based on the scheme requirements.
+         var server = new Hapi.Server();
+         server.connection({ port: 80 });
+         server.auth.scheme('custom', scheme);
+         server.auth.strategy('default', 'custom');
+         server.route({
+        method: 'GET',
+        path: '/',
+        config: {
+        auth: 'default',
+        handler: function (request, reply) {
+        return reply(request.auth.credentials.user);
+        }
+        }
+        });*/
+        strategy(name: string, scheme: any, mode?: boolean | string, options?: any): void;
+
+        /** server.auth.test(strategy, request, next)
+         Tests a request against an authentication strategy where:
+         strategy - the strategy name registered with server.auth.strategy().
+         request - the request object.
+         next - the callback function with signature function(err, credentials) where:
+         err - the error if authentication failed.
+         credentials - the authentication credentials object if authentication was successful.
+         Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
+         var server = new Hapi.Server();
+         server.connection({ port: 80 });
+         server.auth.scheme('custom', scheme);
+         server.auth.strategy('default', 'custom');
+         server.route({
+        method: 'GET',
+        path: '/',
+        handler: function (request, reply) {
+        request.server.auth.test('default', request, function (err, credentials) {
+        if (err) {
+        return reply({ status: false });
+        }
+        return reply({ status: true, user: credentials.name });
+        });
+        }
+        });*/
+        test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
+    };
+
+    /** server.bind(context)
+     Sets a global context used as the default bind object when adding a route or an extension where:
+     context - the object used to bind this in handler and extension methods.
+     When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
+     var handler = function (request, reply) {
+    return reply(this.message);
+    };
+     exports.register = function (server, options, next) {
+    var bind = {
+    message: 'hello'
+    };
+    server.bind(bind);
+    server.route({ method: 'GET', path: '/', handler: handler });
+    return next();
+    };*/
+    bind(context: any): void;
+
+
+    /** server.cache(options)
+     Provisions a cache segment within the server cache facility where:
+     options - catbox policy configuration where:
+     expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+     expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
+     generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
+     staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
+     staleTimeout - number of milliseconds to wait before checking if an item is stale.
+     generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
+     cache - the cache name configured in 'server.cache`. Defaults to the default cache.
+     segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
+     shared - if true, allows multiple cache provisions to share the same segment. Default to false.
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
+     cache.set('norway', { capital: 'oslo' }, null, function (err) {
+    cache.get('norway', function (err, value, cached, log) {
+    // value === { capital: 'oslo' };
+    });
+    });*/
+    cache(options: ICatBoxCacheOptions): void;
+
+    /** server.connection([options])
+     Adds an incoming server connection
+     Returns a server object with the new connection selected.
+     Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
+     Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
+     var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
+     // server.connections.length === 2
+     // web.connections.length === 1
+     // admin.connections.length === 1 */
+    connection(options: IServerConnectionOptions): Server;
+
+    /** server.decorate(type, property, method, [options])
+     Extends various framework interfaces with custom methods where:
+     type - the interface being decorated. Supported types:
+     'reply' - adds methods to the reply interface.
+     'server' - adds methods to the Server object.
+     property - the object decoration key name.
+     method - the extension function.
+     options - if the type is 'request', supports the following optional settings:
+     'apply' - if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
+     Note that decorations apply to the entire server and all its connections regardless of current selection.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.decorate('reply', 'success', function () {
+    return this.response({ status: 'ok' });
+    });
+     server.route({
+    method: 'GET',
+    path: '/',
+    handler: function (request, reply) {
+    return reply.success();
+    }
+    });*/
+    decorate(type: string, property: string, method: Function, options?: { apply: boolean }): void;
+
+    /** server.dependency(dependencies, [after])
+     Used within a plugin to declares a required dependency on other plugins where:
+     dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
+     after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
+     server - the server the dependency() method was called on.
+     next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+     err - internal error condition, which is returned back via the server.start() callback.
+     exports.register = function (server, options, next) {
+    server.dependency('yar', after);
+    return next();
+    };
+     var after = function (server, next) {
+    // Additional plugin registration logic
+    return next();
+    };*/
+    dependency(dependencies: string | string[], after?: (server: Server, next: (err: any) => void) => void): void;
+
+
+    /** server.expose(key, value)
+     Used within a plugin to expose a property via server.plugins[name] where:
+     key - the key assigned (server.plugins[name][key]).
+     value - the value assigned.
+     exports.register = function (server, options, next) {
+    server.expose('util', function () { console.log('something'); });
+    return next();
+    };*/
+    expose(key: string, value: any): void;
+
+    /** server.expose(obj)
+     Merges a deep copy of an object into to the existing content of server.plugins[name] where:
+     obj - the object merged into the exposed properties container.
+     exports.register = function (server, options, next) {
+    server.expose({ util: function () { console.log('something'); } });
+    return next();
+    };*/
+    expose(obj: any): void;
+
+    /** server.ext(event, method, [options])
+     Registers an extension function in one of the available extension points where:
+     event - the event name.
+     method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
+     request - the request object. NOTE: Access the Response via request.response
+     reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
+     this - the object provided via options.bind or the current active context set with server.bind().
+     options - an optional object with the following:
+     before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+     after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+     bind - a context object passed back to the provided method (via this) when called.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.ext('onRequest', function (request, reply) {
+    // Change all requests to '/test'
+    request.setUrl('/test');
+    return reply.continue();
+    });
+     var handler = function (request, reply) {
+    return reply({ status: 'ok' });
+    };
+     server.route({ method: 'GET', path: '/test', handler: handler });
+     server.start();
+     // All requests will get routed to '/test'*/
+    ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
+
+    /** server.handler(name, method)
+     Registers a new handler type to be used in routes where:
+     name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
+     method - the function used to generate the route handler using the signature function(route, options) where:
+     route - the route public interface object.
+     options - the configuration object provided in the handler config.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ host: 'localhost', port: 8000 });
+     // Defines new handler for routes on this server
+     server.handler('test', function (route, options) {
+    return function (request, reply) {
+    return reply('new handler: ' + options.msg);
+    }
+    });
+     server.route({
+    method: 'GET',
+    path: '/',
+    handler: { test: { msg: 'test' } }
+    });
+     server.start();
+     The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ host: 'localhost', port: 8000 });
+     var handler = function (route, options) {
+    return function (request, reply) {
+    return reply('new handler: ' + options.msg);
+    }
+    };
+     // Change the default payload processing for this handler
+     handler.defaults = {
+    payload: {
+    output: 'stream',
+    parse: false
+    }
+    };
+     server.handler('test', handler);*/
+    handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
+
+    /** server.initialize([callback])
+     Initializes the server (starts the caches, finalizes plugin registration) but does not start listening
+     on the connection ports, where:
+     - `callback` - the callback method when server initialization is completed or failed with the signature
+     `function(err)` where:
+     - `err` - any initialization error condition.
+
+     If no `callback` is provided, a `Promise` object is returned.
+
+     Note that if the method fails and the callback includes an error, the server is considered to be in
+     an undefined state and should be shut down. In most cases it would be impossible to fully recover as
+     the various plugins, caches, and other event listeners will get confused by repeated attempts to
+     start the server or make assumptions about the healthy state of the environment. It is recommended
+     to assert that no error has been returned after calling `initialize()` to abort the process when the
+     server fails to start properly. If you must try to resume after an error, call `server.stop()`
+     first to reset the server state.
+     */
+    initialize(callback?: (error: any) => void): IPromise<void>;
+
+    /** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
+     Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
+     Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
+     * When the server contains more than one connection, each server.connections array member provides its own connection.inject().
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     var handler = function (request, reply) {
+    return reply('Success!');
+    };
+     server.route({ method: 'GET', path: '/', handler: handler });
+     server.inject('/', function (res) {
+    console.log(res.result);
+    });
+     */
+    inject: IServerInject;
+
+    /** server.log(tags, [data, [timestamp]])
+     Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
+     tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
+     data - an optional message string or object with the application data being logged.
+     timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.on('log', function (event, tags) {
+    if (tags.error) {
+    console.log(event);
+    }
+    });
+     server.log(['test', 'error'], 'Test event');*/
+    log(tags: string | string[], data?: string | any, timestamp?: number): void;
+
+    /**server.lookup(id)
+     When the server contains exactly one connection, looks up a route configuration where:
+     id - the route identifier as set in the route options.
+     returns the route public interface object if found, otherwise null.
+     var server = new Hapi.Server();
+     server.connection();
+     server.route({
+    method: 'GET',
+    path: '/',
+    config: {
+    handler: function (request, reply) { return reply(); },
+    id: 'root'
+    }
+    });
+     var route = server.lookup('root');
+     When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
+    lookup(id: string): IRoute;
+
+    /** server.match(method, path, [host])
+     When the server contains exactly one connection, looks up a route configuration where:
+     method - the HTTP method (e.g. 'GET', 'POST').
+     path - the requested path (must begin with '/').
+     host - optional hostname (to match against routes with vhost).
+     returns the route public interface object if found, otherwise null.
+     var server = new Hapi.Server();
+     server.connection();
+     server.route({
+    method: 'GET',
+    path: '/',
+    config: {
+    handler: function (request, reply) { return reply(); },
+    id: 'root'
+    }
+    });
+     var route = server.match('get', '/');
+     When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
+    match(method: string, path: string, host?: string): IRoute;
+
+
+    /** server.method(name, method, [options])
+     Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
+     Methods are registered via server.method(name, method, [options])
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     // Simple arguments
+     var add = function (a, b, next) {
+    return next(null, a + b);
+    };
+     server.method('sum', add, { cache: { expiresIn: 2000 } });
+     server.methods.sum(4, 5, function (err, result) {
+    console.log(result);
+    });
+     // Object argument
+     var addArray = function (array, next) {
+    var sum = 0;
+    array.forEach(function (item) {
+    sum += item;
+    });
+    return next(null, sum);
+    };
+     server.method('sumObj', addArray, {
+    cache: { expiresIn: 2000 },
+    generateKey: function (array) {
+    return array.join(',');
+    }
+    });
+     server.methods.sumObj([5, 6], function (err, result) {
+    console.log(result);
+    });
+     // Synchronous method with cache
+     var addSync = function (a, b) {
+    return a + b;
+    };
+     server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
+     server.methods.sumSync(4, 5, function (err, result) {
+    console.log(result);
+    }); */
+    method(/**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
+        name: string,
+        method: IServerMethod,
+        options?: IServerMethodOptions): void;
+
+
+    /**server.method(methods)
+     Registers a server method function as described in server.method() using a configuration object where:
+     methods - an object or an array of objects where each one contains:
+     name - the method name.
+     method - the method function.
+     options - optional settings.
+     var add = function (a, b, next) {
+    next(null, a + b);
+    };
+     server.method({
+    name: 'sum',
+    method: add,
+    options: {
+    cache: {
+    expiresIn: 2000
+    }
+    }
+    });*/
+    method(methods: {
+        name: string; method: IServerMethod; options?: IServerMethodOptions
+    } | Array<{
+        name: string; method: IServerMethod; options?: IServerMethodOptions
+    }>): void;
+
+    /**server.path(relativeTo)
+     Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
+     relativeTo - the path prefix added to any relative file path starting with '.'.
+     Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
+     exports.register = function (server, options, next) {
+    server.path(__dirname + '../static');
+    server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
+    next();
+    };*/
+    path(relativeTo: string): void;
+
+
+    /**
+     * server.register(plugins, [options], callback)
+     * Registers a plugin where:
+     * plugins - an object or array of objects where each one is either:
+     * a plugin registration function.
+     * an object with the following:
+     * register - the plugin registration function.
+     * options - optional options passed to the registration function when called.
+     * options - optional registration options (different from the options passed to the registration function):
+     * select - a string or array of string labels used to pre-select connections for plugin registration.
+     * routes - modifiers applied to each route added by the plugin:
+     * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+     * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+     * callback - the callback function with signature function(err) where:
+     * err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
+     *
+     * If no callback is provided, a Promise object is returned.
+     */
+    register(plugins: any | any[], options: {
+        select: string | string[];
+        routes: {
+            prefix: string; vhost?: string | string[]
+        };
+    }, callback: (err: any) => void): void;
+    register(plugins: any | any[], options: {
+        select: string | string[];
+        routes: {
+            prefix: string; vhost?: string | string[]
+        };
+    }): IPromise<any>;
+
+    register(plugins: any | any[], callback: (err: any) => void): void;
+    register(plugins: any | any[]): IPromise<any>;
+
+    /**server.render(template, context, [options], callback)
+     Utilizes the server views manager to render a template where:
+     template - the template filename and path, relative to the views manager templates path (path or relativeTo).
+     context - optional object used by the template to render context-specific result. Defaults to no context ({}).
+     options - optional object used to override the views manager configuration.
+     callback - the callback function with signature function (err, rendered, config) where:
+     err - the rendering error if any.
+     rendered - the result view string.
+     config - the configuration used to render the template.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.views({
+    engines: { html: require('handlebars') },
+    path: __dirname + '/templates'
+    });
+     var context = {
+    title: 'Views Example',
+    message: 'Hello, World'
+    };
+     server.render('hello', context, function (err, rendered, config) {
+    console.log(rendered);
+    });*/
+    render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void): void;
+
+    /** server.route(options)
+     Adds a connection route where:
+     options - a route configuration object or an array of configuration objects.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
+     server.route([
+     { method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
+     { method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
+     ]);*/
+    route(options: IRouteConfiguration): void;
+    route(options: IRouteConfiguration[]): void;
+
+    /**server.select(labels)
+     Selects a subset of the server's connections where:
+     labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
+     Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80, labels: ['a'] });
+     server.connection({ port: 8080, labels: ['b'] });
+     server.connection({ port: 8081, labels: ['c'] });
+     server.connection({ port: 8082, labels: ['c','d'] });
+     var a = server.select('a');          // The server with port 80
+     var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
+     var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
+    select(labels: string | string[]): Server | Server[];
+
+    /** server.start([callback])
+     Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
+     callback - optional callback when server startup is completed or failed with the signature function(err) where:
+     err - any startup error condition.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.start(function (err) {
+    console.log('Server started at: ' + server.info.uri);
+    });*/
+    start(callback?: (err: any) => void): IPromise<void>;
+
+    /** server.state(name, [options])
+     HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
+     State defaults can be modified via the server connections.routes.state configuration option.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     // Set cookie definition
+     server.state('session', {
+    ttl: 24 * 60 * 60 * 1000,     // One day
+    isSecure: true,
+    path: '/',
+    encoding: 'base64json'
+    });
+     // Set state in route handler
+     var handler = function (request, reply) {
+    var session = request.state.session;
+    if (!session) {
+    session = { user: 'joe' };
+    }
+    session.last = Date.now();
+    return reply('Success').state('session', session);
+    };
+     Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.on('request-internal', function (request, event, tags) {
+    if (tags.error && tags.state) {
+    console.error(event);
+    }
+    });    */
+    state(name: string, options?: ICookieSettings): void;
+
+    /** server.stop([options], [callback])
+     Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
+     options - optional object with:
+     timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
+     callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80 });
+     server.stop({ timeout: 60 * 1000 }, function () {
+    console.log('Server stopped');
+    });*/
+    stop(options?: { timeout: number }, callback?: () => void): IPromise<void>;
+
+    /**server.table([host])
+     Returns a copy of the routing table where:
+     host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+     The return value is an array where each item is an object containing:
+     info - the connection.info the connection the table was generated for.
+     labels - the connection labels.
+     table - an array of routes where each route contains:
+     settings - the route config with defaults applied.
+     method - the HTTP method in lower case.
+     path - the route path.
+     Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80, host: 'example.com' });
+     server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+     var table = server.table();
+     When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.connection({ port: 80, host: 'example.com' });
+     server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+     var table = server.connections[0].table();
+     //[
+     //    {
+    //        method: 'get',
+    //        path: '/example',
+    //        settings: { ... }
+    //    }
+     //]
+     */
+    table(host?: any): IConnectionTable;
+
+    /**server.views(options)
+     Initializes the server views manager
+     var Hapi = require('hapi');
+     var server = new Hapi.Server();
+     server.views({
+    engines: {
+    html: require('handlebars'),
+    jade: require('jade')
+    },
+    path: '/static/templates'
+    });
+     When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
+    views(options: IServerViewsConfiguration): void;
+
 }
diff --git a/he/he.d.ts b/he/he.d.ts
index e0fb9847ac..6d829d912f 100644
--- a/he/he.d.ts
+++ b/he/he.d.ts
@@ -5,110 +5,109 @@
 
 // he - "HTML Entities" - A high quality pair of HTML encode and decode functions.
 
-declare module "he" {
-  
-    var version: string;
-    
-    interface EncodeOptions {
-        /**
-        * The default value for the useNamedReferences option is false. This
-        * means that encode() will not use any named character references
-        * (e.g. &copy;) in the output — hexadecimal escapes (e.g. &#xA9;) will
-        * be used instead. Set it to true to enable the use of named references.
-        */
-        useNamedReferences?: boolean;
-        
-        /**
-        * The default value for the encodeEverything option is false. This means
-        * that encode() will not use any character references for printable ASCII
-        * symbols that don’t need escaping. Set it to true to encode every symbol
-        * in the input string. When set to true, this option takes precedence over
-        * allowUnsafeSymbols (i.e. setting the latter to true in such a case has
-          * no effect).
-        */
-       encodeEverything?: boolean;
-        
-       /**
-        * The default value for the strict option is false. This means that
-        * encode() will encode any HTML text content you feed it, even if it
-        * contains any symbols that cause parse errors. To throw an error when such
-        * invalid HTML is encountered, set the strict option to true. This option
-        * makes it possible to use he as part of HTML parsers and HTML validators.
-        */
-        strict?: boolean;
-        
-        /**
-        * The default value for the allowUnsafeSymbols option is false. This means
-        * that characters that are unsafe for use in HTML content (&, <, >, ", ',
-        * and `) will be encoded. When set to true, only non-ASCII characters will
-        * be encoded. If the encodeEverything option is set to true, this option
-        * will be ignored.
-        */
-        allowUnsafeSymbols?: boolean;
-    }
-    
-    interface Encode {
-        /**
-        * Encode a string of text
-        *
-        * This function takes a string of text and encodes (by default) any symbols
-        * that aren’t printable ASCII symbols and &, <, >, ", ', and `, replacing
-        * them with character references.
-        *
-        * As long as the input string contains allowed code points only, the return
-        * value of this function is always valid HTML. Any (invalid) code points
-        * that cannot be represented using a character reference in the input are
-        * not encoded.
-        */
-        (text: string, options?: EncodeOptions): string;
-        
-        options: EncodeOptions;
-    }
-    var encode: Encode;
-    
-    interface DecodeOptions {
-        /**
-         * The default value for the isAttributeValue option is false. This means
-         * that decode() will decode the string as if it were used in a text
-         * context in an HTML document. HTML has different rules for parsing
-         * character references in attribute values — set this option to true to
-         * treat the input string as if it were used as an attribute value.
-         */
-        isAttributeValue?: boolean;
-        
-        /**
-         * The default value for the strict option is false. This means that
-         * decode() will decode any HTML text content you feed it, even if it
-         * contains any entities that cause parse errors. To throw an error when
-         * such invalid HTML is encountered, set the strict option to true. This
-         * option makes it possible to use he as part of HTML parsers and HTML
-         * validators.
-         */
-        strict?: boolean;
-    }
-    
-    interface Decode {
-        /**
-         * Decode a string of HTML text
-         *
-         * This function takes a string of HTML and decodes any named and numerical
-         * character references in it using the algorithm described in section
-         * 12.2.4.69 of the HTML spec.
-         */
-        (html: string, options?: DecodeOptions): string;
-        
-        options: DecodeOptions;
-    }
-    var decode: Decode;
-    
+
+
+declare var version: string;
+
+interface EncodeOptions {
     /**
-     * Escape XML entities
-     *
-     * This function takes a string of text and escapes it for use in text
-     * contexts in XML or HTML documents. Only the following characters are
-     * escaped: &, <, >, ", ', and `.
+    * The default value for the useNamedReferences option is false. This
+    * means that encode() will not use any named character references
+    * (e.g. &copy;) in the output — hexadecimal escapes (e.g. &#xA9;) will
+    * be used instead. Set it to true to enable the use of named references.
+    */
+    useNamedReferences?: boolean;
+
+    /**
+    * The default value for the encodeEverything option is false. This means
+    * that encode() will not use any character references for printable ASCII
+    * symbols that don’t need escaping. Set it to true to encode every symbol
+    * in the input string. When set to true, this option takes precedence over
+    * allowUnsafeSymbols (i.e. setting the latter to true in such a case has
+      * no effect).
+    */
+    encodeEverything?: boolean;
+
+    /**
+     * The default value for the strict option is false. This means that
+     * encode() will encode any HTML text content you feed it, even if it
+     * contains any symbols that cause parse errors. To throw an error when such
+     * invalid HTML is encountered, set the strict option to true. This option
+     * makes it possible to use he as part of HTML parsers and HTML validators.
      */
-    function escape(text: string): string;
-    
-    var unescape: Decode;
+    strict?: boolean;
+
+    /**
+    * The default value for the allowUnsafeSymbols option is false. This means
+    * that characters that are unsafe for use in HTML content (&, <, >, ", ',
+    * and `) will be encoded. When set to true, only non-ASCII characters will
+    * be encoded. If the encodeEverything option is set to true, this option
+    * will be ignored.
+    */
+    allowUnsafeSymbols?: boolean;
 }
+
+interface Encode {
+    /**
+    * Encode a string of text
+    *
+    * This function takes a string of text and encodes (by default) any symbols
+    * that aren’t printable ASCII symbols and &, <, >, ", ', and `, replacing
+    * them with character references.
+    *
+    * As long as the input string contains allowed code points only, the return
+    * value of this function is always valid HTML. Any (invalid) code points
+    * that cannot be represented using a character reference in the input are
+    * not encoded.
+    */
+    (text: string, options?: EncodeOptions): string;
+
+    options: EncodeOptions;
+}
+declare var encode: Encode;
+
+interface DecodeOptions {
+    /**
+     * The default value for the isAttributeValue option is false. This means
+     * that decode() will decode the string as if it were used in a text
+     * context in an HTML document. HTML has different rules for parsing
+     * character references in attribute values — set this option to true to
+     * treat the input string as if it were used as an attribute value.
+     */
+    isAttributeValue?: boolean;
+
+    /**
+     * The default value for the strict option is false. This means that
+     * decode() will decode any HTML text content you feed it, even if it
+     * contains any entities that cause parse errors. To throw an error when
+     * such invalid HTML is encountered, set the strict option to true. This
+     * option makes it possible to use he as part of HTML parsers and HTML
+     * validators.
+     */
+    strict?: boolean;
+}
+
+interface Decode {
+    /**
+     * Decode a string of HTML text
+     *
+     * This function takes a string of HTML and decodes any named and numerical
+     * character references in it using the algorithm described in section
+     * 12.2.4.69 of the HTML spec.
+     */
+    (html: string, options?: DecodeOptions): string;
+
+    options: DecodeOptions;
+}
+declare var decode: Decode;
+
+/**
+ * Escape XML entities
+ *
+ * This function takes a string of text and escapes it for use in text
+ * contexts in XML or HTML documents. Only the following characters are
+ * escaped: &, <, >, ", ', and `.
+ */
+declare function escape(text: string): string;
+
+declare var unescape: Decode;
diff --git a/helmet/helmet.d.ts b/helmet/helmet.d.ts
index 5c34378f04..056451917b 100644
--- a/helmet/helmet.d.ts
+++ b/helmet/helmet.d.ts
@@ -5,122 +5,121 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "helmet" {
-    import express = require("express");
-    
-    interface IHelmetCspDirectiveFunction {
-      (req: express.Request, res: express.Response): string;
-    }
-    type HelmetCspDirectiveValue = string | IHelmetCspDirectiveFunction;
 
-    interface IHelmetCspDirectives {
-        baseUri? : HelmetCspDirectiveValue[],
-        childSrc? : HelmetCspDirectiveValue[],
-        connectSrc? : HelmetCspDirectiveValue[],
-        defaultSrc? : HelmetCspDirectiveValue[],
-        fontSrc? : HelmetCspDirectiveValue[],
-        formAction? : HelmetCspDirectiveValue[],
-        frameAncestors? : HelmetCspDirectiveValue[],
-        frameSrc? : HelmetCspDirectiveValue[],
-        imgSrc? : HelmetCspDirectiveValue[],
-        mediaSrc? : HelmetCspDirectiveValue[],
-        objectSrc? : HelmetCspDirectiveValue[],
-        pluginTypes? : HelmetCspDirectiveValue[],
-        reportUri?: string,
-        sandbox? : HelmetCspDirectiveValue[],
-        scriptSrc? : HelmetCspDirectiveValue[],
-        styleSrc? : HelmetCspDirectiveValue[]
-    }
-    
-    interface IHelmetCspConfiguration {
-        reportOnly? : boolean;
-        setAllHeaders? : boolean;
-        disableAndroid? : boolean;
-        browserSniff?: boolean;
-        directives? : IHelmetCspDirectives
-    }
+import express = require("express");
 
-    interface IHelmetXssFilterConfiguration {
-        setOnOldIE? : boolean;
-    }
+interface IHelmetCspDirectiveFunction {
+    (req: express.Request, res: express.Response): string;
+}
+type HelmetCspDirectiveValue = string | IHelmetCspDirectiveFunction;
+
+interface IHelmetCspDirectives {
+    baseUri?: HelmetCspDirectiveValue[],
+    childSrc?: HelmetCspDirectiveValue[],
+    connectSrc?: HelmetCspDirectiveValue[],
+    defaultSrc?: HelmetCspDirectiveValue[],
+    fontSrc?: HelmetCspDirectiveValue[],
+    formAction?: HelmetCspDirectiveValue[],
+    frameAncestors?: HelmetCspDirectiveValue[],
+    frameSrc?: HelmetCspDirectiveValue[],
+    imgSrc?: HelmetCspDirectiveValue[],
+    mediaSrc?: HelmetCspDirectiveValue[],
+    objectSrc?: HelmetCspDirectiveValue[],
+    pluginTypes?: HelmetCspDirectiveValue[],
+    reportUri?: string,
+    sandbox?: HelmetCspDirectiveValue[],
+    scriptSrc?: HelmetCspDirectiveValue[],
+    styleSrc?: HelmetCspDirectiveValue[]
+}
+
+interface IHelmetCspConfiguration {
+    reportOnly?: boolean;
+    setAllHeaders?: boolean;
+    disableAndroid?: boolean;
+    browserSniff?: boolean;
+    directives?: IHelmetCspDirectives
+}
+
+interface IHelmetXssFilterConfiguration {
+    setOnOldIE?: boolean;
+}
+
+/**
+ * @summary Interface for helmet class.
+ * @interface
+ */
+interface Helmet {
+    /**
+     * @summary Constructor.
+     * @return {RequestHandler} The Request handler.
+     */
+    (): express.RequestHandler;
 
     /**
-     * @summary Interface for helmet class.
-     * @interface
+     * @summary Prevent clickjacking.
+     * @param {string} header The header.
+     * @return {RequestHandler} The Request handler.
      */
-    interface Helmet {
-        /**
-         * @summary Constructor.
-         * @return {RequestHandler} The Request handler.
-         */
-        ():express.RequestHandler;
+    frameguard(header?: string): express.RequestHandler;
 
-        /**
-         * @summary Prevent clickjacking.
-         * @param {string} header The header.
-         * @return {RequestHandler} The Request handler.
-         */
-        frameguard(header ?: string):express.RequestHandler;
+    /**
+     * @summary Hide "X-Powered-By" header.
+     * @param {Object} options The options.
+     * @return {RequestHandler} The Request handler.
+     */
+    hidePoweredBy(options?: Object): express.RequestHandler;
 
-        /**
-         * @summary Hide "X-Powered-By" header.
-         * @param {Object} options The options.
-         * @return {RequestHandler} The Request handler.
-         */
-        hidePoweredBy(options ?: Object):express.RequestHandler;
+    /**
+     * @summary Adds the "Strict-Transport-Security" header.
+     * @param {Object} options The options.
+     * @return {RequestHandler} The Request handler.
+     */
+    hsts(options?: Object): express.RequestHandler;
 
-        /**
-         * @summary Adds the "Strict-Transport-Security" header.
-         * @param {Object} options The options.
-         * @return {RequestHandler} The Request handler.
-         */
-        hsts(options ?: Object):express.RequestHandler;
+    /**
+     * @summary Add the "X-Download-Options" header.
+     * @return {RequestHandler} The Request handler.
+     */
+    ieNoOpen(): express.RequestHandler;
 
-        /**
-         * @summary Add the "X-Download-Options" header.
-         * @return {RequestHandler} The Request handler.
-         */
-        ieNoOpen():express.RequestHandler;
+    /**
+     * @summary Add the "Cache-Control" and "Pragma" headers to stop caching.
+     * @return {RequestHandler} The Request handler.
+     */
+    noCache(options?: Object): express.RequestHandler;
 
-        /**
-         * @summary Add the "Cache-Control" and "Pragma" headers to stop caching.
-         * @return {RequestHandler} The Request handler.
-         */
-        noCache(options ?: Object):express.RequestHandler;
+    /**
+     * @summary Adds the "X-Content-Type-Options" header.
+     * @return {RequestHandler} The Request handler.
+     */
+    noSniff(): express.RequestHandler;
 
-        /**
-         * @summary Adds the "X-Content-Type-Options" header.
-         * @return {RequestHandler} The Request handler.
-         */
-        noSniff():express.RequestHandler;
+    /**
+     * @summary Adds the "Public-Key-Pins" header.
+     * @return {RequestHandler} The Request handler.
+     */
+    publicKeyPins(options?: Object): express.RequestHandler;
 
-        /**
-         * @summary Adds the "Public-Key-Pins" header.
-         * @return {RequestHandler} The Request handler.
-         */
-        publicKeyPins(options ?: Object):express.RequestHandler;
+    /**
+     * @summary Mitigate cross-site scripting attacks with the "X-XSS-Protection" header.
+     * @return {RequestHandler} The Request handler.
+     * @param {Object} options The options.
+     */
+    xssFilter(options?: IHelmetXssFilterConfiguration): express.RequestHandler;
 
-        /**
-         * @summary Mitigate cross-site scripting attacks with the "X-XSS-Protection" header.
-         * @return {RequestHandler} The Request handler.
-         * @param {Object} options The options.
-         */
-        xssFilter(options ?: IHelmetXssFilterConfiguration):express.RequestHandler;
+    /**
+     * @summary Set policy around third-party content via headers
+     * @return {RequestHandler} The Request handler
+     * @param {Object} options The options
+     */
+    csp(options?: IHelmetCspConfiguration): express.RequestHandler;
 
-        /**
-         * @summary Set policy around third-party content via headers
-         * @return {RequestHandler} The Request handler
-         * @param {Object} options The options
-         */
-        csp(options ?: IHelmetCspConfiguration): express.RequestHandler;
+    /**
+     * @see csp
+     */
+    contentSecurityPolicy(options?: IHelmetCspConfiguration): express.RequestHandler;
 
-        /**
-         * @see csp
-         */
-        contentSecurityPolicy(options ?: IHelmetCspConfiguration): express.RequestHandler;
-
-    }
-
-    var helmet: Helmet;
-    export = helmet;
 }
+
+declare var helmet: Helmet;
+export = helmet;
diff --git a/html-entities/html-entities.d.ts b/html-entities/html-entities.d.ts
index 1539b0c4d5..f7b0aa38c5 100644
--- a/html-entities/html-entities.d.ts
+++ b/html-entities/html-entities.d.ts
@@ -3,15 +3,14 @@
 // Definitions by: Xavier Stouder <https://github.com/xstoudi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "html-entities" {
-    abstract class Entities {
-        encode(toEncode: string): string;
-        encodeNonUTF(toEncode: string): string;
-        encodeNonASCII(toEncode: string): string;
-        decode(toDecode: string): string;
-    }
-    class XmlEntities extends Entities {}
-    class Html4Entities extends Entities {}
-    class Html5Entities extends Entities {}
-    class AllHtmlEntities extends Entities {}
-}
\ No newline at end of file
+
+declare abstract class Entities {
+    encode(toEncode: string): string;
+    encodeNonUTF(toEncode: string): string;
+    encodeNonASCII(toEncode: string): string;
+    decode(toDecode: string): string;
+}
+declare class XmlEntities extends Entities { }
+declare class Html4Entities extends Entities { }
+declare class Html5Entities extends Entities { }
+declare class AllHtmlEntities extends Entities { }
diff --git a/html-minifier/html-minifier.d.ts b/html-minifier/html-minifier.d.ts
index f55e73bd15..e024951bf9 100644
--- a/html-minifier/html-minifier.d.ts
+++ b/html-minifier/html-minifier.d.ts
@@ -7,109 +7,108 @@
 /// <reference path="../clean-css/clean-css.d.ts" />
 /// <reference path="../relateurl/relateurl.d.ts" />
 
-declare module 'html-minifier' {
-  import * as UglifyJS from 'uglify-js';
-  import * as CleanCSS from 'clean-css';
-  import * as RelateUrl from 'relateurl';
 
-  namespace HTMLMinifier {
+import * as UglifyJS from 'uglify-js';
+import * as CleanCSS from 'clean-css';
+import * as RelateUrl from 'relateurl';
+
+declare namespace HTMLMinifier {
     function minify(text: string, options?: Options): string;
 
     interface Options {
-      // Strip HTML comments
-      removeComments?: boolean;
+        // Strip HTML comments
+        removeComments?: boolean;
 
-      // Strip HTML comments from scripts and styles
-      removeCommentsFromCDATA?: boolean;
+        // Strip HTML comments from scripts and styles
+        removeCommentsFromCDATA?: boolean;
 
-      // Remove CDATA sections from script and style elements
-      removeCDATASectionsFromCDATA?: boolean;
+        // Remove CDATA sections from script and style elements
+        removeCDATASectionsFromCDATA?: boolean;
 
-      // Collapse white space that contributes to text nodes in a document tree
-      collapseWhitespace?: boolean;
+        // Collapse white space that contributes to text nodes in a document tree
+        collapseWhitespace?: boolean;
 
-      // Always collapse to 1 space (never remove it entirely). Must be used in conjunction with collapseWhitespace=true
-      conservativeCollapse?: boolean;
+        // Always collapse to 1 space (never remove it entirely). Must be used in conjunction with collapseWhitespace=true
+        conservativeCollapse?: boolean;
 
-      // Don't leave any spaces between display:inline; elements when collapsing. Must be used in conjunction with collapseWhitespace=true
-      collapseInlineTagWhitespace?: boolean;
+        // Don't leave any spaces between display:inline; elements when collapsing. Must be used in conjunction with collapseWhitespace=true
+        collapseInlineTagWhitespace?: boolean;
 
-      // Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break. Must be used in conjunction with collapseWhitespace=true
-      preserveLineBreaks?: boolean;
+        // Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break. Must be used in conjunction with collapseWhitespace=true
+        preserveLineBreaks?: boolean;
 
-      // Omit attribute values from boolean attributes
-      collapseBooleanAttributes?: boolean;
+        // Omit attribute values from boolean attributes
+        collapseBooleanAttributes?: boolean;
 
-      // Remove quotes around attributes when possible
-      removeAttributeQuotes?: boolean;
+        // Remove quotes around attributes when possible
+        removeAttributeQuotes?: boolean;
 
-      // Remove attributes when value matches default
-      removeRedundantAttributes?: boolean;
+        // Remove attributes when value matches default
+        removeRedundantAttributes?: boolean;
 
-      // Prevents the escaping of the values of attributes.
-      preventAttributesEscaping?: boolean;
+        // Prevents the escaping of the values of attributes.
+        preventAttributesEscaping?: boolean;
 
-      // Replaces the doctype with the short (HTML5) doctype
-      useShortDoctype?: boolean;
+        // Replaces the doctype with the short (HTML5) doctype
+        useShortDoctype?: boolean;
 
-      // Remove all attributes with whitespace-only values
-      removeEmptyAttributes?: boolean;
+        // Remove all attributes with whitespace-only values
+        removeEmptyAttributes?: boolean;
 
-      // Remove type="text/javascript" from script tags. Other type attribute values are left intact.
-      removeScriptTypeAttributes?: boolean;
+        // Remove type="text/javascript" from script tags. Other type attribute values are left intact.
+        removeScriptTypeAttributes?: boolean;
 
-      // Remove type="text/css" from style and link tags. Other type attribute values are left intact.
-      removeStyleLinkTypeAttributes?: boolean;
+        // Remove type="text/css" from style and link tags. Other type attribute values are left intact.
+        removeStyleLinkTypeAttributes?: boolean;
 
-      // Remove unrequired tags
-      removeOptionalTags?: boolean;
+        // Remove unrequired tags
+        removeOptionalTags?: boolean;
 
-      // Remove all elements with empty contents
-      removeEmptyElements?: boolean;
+        // Remove all elements with empty contents
+        removeEmptyElements?: boolean;
 
-      // Toggle linting
-      lint?: boolean;
+        // Toggle linting
+        lint?: boolean;
 
-      // Keep the trailing slash on singleton elements
-      keepClosingSlash?: boolean;
+        // Keep the trailing slash on singleton elements
+        keepClosingSlash?: boolean;
 
-      // Treat attributes in case sensitive manner (useful for custom HTML tags.)
-      caseSensitive?: boolean;
+        // Treat attributes in case sensitive manner (useful for custom HTML tags.)
+        caseSensitive?: boolean;
 
-      // Minify Javascript in script elements and on* attributes (uses UglifyJS)
-      minifyJS?: boolean | UglifyJS.MinifyOptions;
+        // Minify Javascript in script elements and on* attributes (uses UglifyJS)
+        minifyJS?: boolean | UglifyJS.MinifyOptions;
 
-      // Minify CSS in style elements and style attributes (uses clean-css)
-      minifyCSS?: boolean | CleanCSS.Options;
+        // Minify CSS in style elements and style attributes (uses clean-css)
+        minifyCSS?: boolean | CleanCSS.Options;
 
-      // Minify URLs in various attributes (uses relateurl)
-      minifyURLs?: boolean | RelateUrl.Options;
+        // Minify URLs in various attributes (uses relateurl)
+        minifyURLs?: boolean | RelateUrl.Options;
 
-      // Array of regex'es that allow to ignore certain comments, when matched
-      ignoreCustomComments?: Array<RegExp>;
+        // Array of regex'es that allow to ignore certain comments, when matched
+        ignoreCustomComments?: Array<RegExp>;
 
-      // Array of regex'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }}, etc.)
-      ignoreCustomFragments?: Array<RegExp>;
+        // Array of regex'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }}, etc.)
+        ignoreCustomFragments?: Array<RegExp>;
 
-      // Array of strings corresponding to types of script elements to process through minifier (e.g. text/ng-template, text/x-handlebars-template, etc.)
-      processScripts?: Array<string>;
+        // Array of strings corresponding to types of script elements to process through minifier (e.g. text/ng-template, text/x-handlebars-template, etc.)
+        processScripts?: Array<string>;
 
-      // Specify a maximum line length. Compressed output will be split by newlines at valid HTML split-points
-      maxLineLength?: number;
+        // Specify a maximum line length. Compressed output will be split by newlines at valid HTML split-points
+        maxLineLength?: number;
 
-      // Arrays of regex'es that allow to support custom attribute assign expressions (e.g. '<div flex?="{{mode != cover}}"></div>')
-      customAttrAssign?: Array<RegExp>;
+        // Arrays of regex'es that allow to support custom attribute assign expressions (e.g. '<div flex?="{{mode != cover}}"></div>')
+        customAttrAssign?: Array<RegExp>;
 
-      // Arrays of regex'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)
-      customAttrSurround?: Array<RegExp>;
+        // Arrays of regex'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)
+        customAttrSurround?: Array<RegExp>;
 
-      // Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)
-      customAttrCollapse?: RegExp;
+        // Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)
+        customAttrCollapse?: RegExp;
 
-      // Type of quote to use for attribute values (' or ")
-      quoteCharacter?: string;
+        // Type of quote to use for attribute values (' or ")
+        quoteCharacter?: string;
     }
-  }
-
-  export = HTMLMinifier;
 }
+
+export = HTMLMinifier;
diff --git a/htmlparser2/htmlparser2.d.ts b/htmlparser2/htmlparser2.d.ts
index e139eee696..5db2d773fd 100644
--- a/htmlparser2/htmlparser2.d.ts
+++ b/htmlparser2/htmlparser2.d.ts
@@ -4,94 +4,93 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare module "htmlparser2" {
-
-    export interface Handler {
-        onopentag?:(name:string, attribs:{[type:string]: string}) => void;
-        onopentagname?:(name:string) => void;
-        onattribute?:(name:string, value:string) => void;
-        ontext?:(text:string) => void;
-        onclosetag?: (text:string) => void;
-        onprocessinginstruction?:(name:string, data:string) => void;
-        oncomment?:(data:string) => void;
-        oncommentend?:() => void;
-        oncdatastart?:() => void;
-        oncdataend?:() => void;
-        onerror?:(error:Error) => void;
-        onreset?:() => void;
-        onend?:() => void;
-    }
-
-    export interface Options {
-
-        /***
-         * Indicates whether special tags (<script> and <style>) should get special treatment
-         * and if "empty" tags (eg. <br>) can have children.  If false, the content of special tags
-         * will be text only. For feeds and other XML content (documents that don't consist of HTML),
-         * set this to true. Default: false.
-         */
-        xmlMode?:boolean;
-
-        /***
-         * If set to true, entities within the document will be decoded. Defaults to false.
-         */
-        decodeEntities?:boolean;
-
-        /***
-         * If set to true, all tags will be lowercased. If xmlMode is disabled, this defaults to true.
-         */
-        lowerCaseTags?:boolean;
-
-        /***
-         * If set to true, all attribute names will be lowercased. This has noticeable impact on speed, so it defaults to false.
-         */
-        lowerCaseAttributeNames?:boolean;
-
-        /***
-         * If set to true, CDATA sections will be recognized as text even if the xmlMode option is not enabled.
-         * NOTE: If xmlMode is set to true then CDATA sections will always be recognized as text.
-         */
-        recognizeCDATA?:boolean;
-
-        /***
-         * If set to true, self-closing tags will trigger the onclosetag event even if xmlMode is not set to true.
-         * NOTE: If xmlMode is set to true then self-closing tags will always be recognized.
-         */
-        recognizeSelfClosing?:boolean;
-    }
-
-    export class Parser {
-        constructor(handler: Handler, options?: Options);
-
-        /***
-         * Parses a chunk of data and calls the corresponding callbacks.
-         * @param input
-         */
-        write(input:string):void;
-        /***
-         * alias for backwards compat
-         */
-        parseChunk(input:string):void;
-
-        /***
-         * Parses the end of the buffer and clears the stack, calls onend.
-         */
-        end():void;
-        /***
-         * alias for backwards compat
-         */
-        done():void;
 
 
-        /***
-         * Resets the parser, parses the data & calls end.
-         * @param input
-         */
-        parseComplete(input:string):void;
-
-        /***
-         * Resets buffer & stack, calls onreset.
-         */
-        reset():void;
-    }
+export interface Handler {
+    onopentag?: (name: string, attribs: { [type: string]: string }) => void;
+    onopentagname?: (name: string) => void;
+    onattribute?: (name: string, value: string) => void;
+    ontext?: (text: string) => void;
+    onclosetag?: (text: string) => void;
+    onprocessinginstruction?: (name: string, data: string) => void;
+    oncomment?: (data: string) => void;
+    oncommentend?: () => void;
+    oncdatastart?: () => void;
+    oncdataend?: () => void;
+    onerror?: (error: Error) => void;
+    onreset?: () => void;
+    onend?: () => void;
+}
+
+export interface Options {
+
+    /***
+     * Indicates whether special tags (<script> and <style>) should get special treatment
+     * and if "empty" tags (eg. <br>) can have children.  If false, the content of special tags
+     * will be text only. For feeds and other XML content (documents that don't consist of HTML),
+     * set this to true. Default: false.
+     */
+    xmlMode?: boolean;
+
+    /***
+     * If set to true, entities within the document will be decoded. Defaults to false.
+     */
+    decodeEntities?: boolean;
+
+    /***
+     * If set to true, all tags will be lowercased. If xmlMode is disabled, this defaults to true.
+     */
+    lowerCaseTags?: boolean;
+
+    /***
+     * If set to true, all attribute names will be lowercased. This has noticeable impact on speed, so it defaults to false.
+     */
+    lowerCaseAttributeNames?: boolean;
+
+    /***
+     * If set to true, CDATA sections will be recognized as text even if the xmlMode option is not enabled.
+     * NOTE: If xmlMode is set to true then CDATA sections will always be recognized as text.
+     */
+    recognizeCDATA?: boolean;
+
+    /***
+     * If set to true, self-closing tags will trigger the onclosetag event even if xmlMode is not set to true.
+     * NOTE: If xmlMode is set to true then self-closing tags will always be recognized.
+     */
+    recognizeSelfClosing?: boolean;
+}
+
+declare export class Parser {
+    constructor(handler: Handler, options?: Options);
+
+    /***
+     * Parses a chunk of data and calls the corresponding callbacks.
+     * @param input
+     */
+    write(input: string): void;
+    /***
+     * alias for backwards compat
+     */
+    parseChunk(input: string): void;
+
+    /***
+     * Parses the end of the buffer and clears the stack, calls onend.
+     */
+    end(): void;
+    /***
+     * alias for backwards compat
+     */
+    done(): void;
+
+
+    /***
+     * Resets the parser, parses the data & calls end.
+     * @param input
+     */
+    parseComplete(input: string): void;
+
+    /***
+     * Resets buffer & stack, calls onreset.
+     */
+    reset(): void;
 }
diff --git a/htmltojsx/htmltojsx.d.ts b/htmltojsx/htmltojsx.d.ts
index 7fb29fd636..6a1362ccfe 100644
--- a/htmltojsx/htmltojsx.d.ts
+++ b/htmltojsx/htmltojsx.d.ts
@@ -3,15 +3,14 @@
 // Definitions by: Basarat Ali Syed <https://github.com/basarat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'htmltojsx' {
-    class HTMLtoJSX {
-        constructor(options?: {
-            createClass?: boolean;
-            outputClassName?: string;
-            /** as a string e.g. '    ' or '\t' */
-            indent?: string;
-        });
-        convert(html: string): string;
-    }
-    export = HTMLtoJSX;
+
+declare class HTMLtoJSX {
+    constructor(options?: {
+        createClass?: boolean;
+        outputClassName?: string;
+        /** as a string e.g. '    ' or '\t' */
+        indent?: string;
+    });
+    convert(html: string): string;
 }
+export = HTMLtoJSX;
diff --git a/http-errors/http-errors.d.ts b/http-errors/http-errors.d.ts
index 48d7469ba4..199a521b06 100644
--- a/http-errors/http-errors.d.ts
+++ b/http-errors/http-errors.d.ts
@@ -3,87 +3,86 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'http-errors' {
-    namespace createHttpError {
 
-      // See https://github.com/jshttp/http-errors/blob/1.3.1/index.js#L42
-      interface HttpError extends Error {
-          status: number;
-          statusCode: number;
-          expose: boolean;
-      }
+declare namespace createHttpError {
 
-      interface CreateHttpError {
-          // See https://github.com/Microsoft/TypeScript/issues/227#issuecomment-50092674
-          [code: string]: new() => HttpError;
-
-          (...args: Array<Error | string | number | Object>): HttpError;
-
-          Continue: new() => HttpError;
-          SwitchingProtocols: new() => HttpError;
-          Processing: new() => HttpError;
-          OK: new() => HttpError;
-          Created: new() => HttpError;
-          Accepted: new() => HttpError;
-          NonAuthoritativeInformation: new() => HttpError;
-          NoContent: new() => HttpError;
-          ResetContent: new() => HttpError;
-          PartialContent: new() => HttpError;
-          MultiStatus: new() => HttpError;
-          AlreadyReported: new() => HttpError;
-          IMUsed: new() => HttpError;
-          MultipleChoices: new() => HttpError;
-          MovedPermanently: new() => HttpError;
-          Found: new() => HttpError;
-          SeeOther: new() => HttpError;
-          NotModified: new() => HttpError;
-          UseProxy: new() => HttpError;
-          Unused: new() => HttpError;
-          TemporaryRedirect: new() => HttpError;
-          PermanentRedirect: new() => HttpError;
-          BadRequest: new() => HttpError;
-          Unauthorized: new() => HttpError;
-          PaymentRequired: new() => HttpError;
-          Forbidden: new() => HttpError;
-          NotFound: new() => HttpError;
-          MethodNotAllowed: new() => HttpError;
-          NotAcceptable: new() => HttpError;
-          ProxyAuthenticationRequired: new() => HttpError;
-          RequestTimeout: new() => HttpError;
-          Conflict: new() => HttpError;
-          Gone: new() => HttpError;
-          LengthRequired: new() => HttpError;
-          PreconditionFailed: new() => HttpError;
-          PayloadTooLarge: new() => HttpError;
-          URITooLong: new() => HttpError;
-          UnsupportedMediaType: new() => HttpError;
-          RangeNotSatisfiable: new() => HttpError;
-          ExpectationFailed: new() => HttpError;
-          ImATeapot: new() => HttpError;
-          UnprocessableEntity: new() => HttpError;
-          Locked: new() => HttpError;
-          FailedDependency: new() => HttpError;
-          UnorderedCollection: new() => HttpError;
-          UpgradeRequired: new() => HttpError;
-          PreconditionRequired: new() => HttpError;
-          TooManyRequests: new() => HttpError;
-          RequestHeaderFieldsTooLarge: new() => HttpError;
-          UnavailableForLegalReasons: new() => HttpError;
-          InternalServerError: new() => HttpError;
-          NotImplemented: new() => HttpError;
-          BadGateway: new() => HttpError;
-          ServiceUnavailable: new() => HttpError;
-          GatewayTimeout: new() => HttpError;
-          HTTPVersionNotSupported: new() => HttpError;
-          VariantAlsoNegotiates: new() => HttpError;
-          InsufficientStorage: new() => HttpError;
-          LoopDetected: new() => HttpError;
-          BandwidthLimitExceeded: new() => HttpError;
-          NotExtended: new() => HttpError;
-          NetworkAuthenticationRequired: new() => HttpError;
-      }
+    // See https://github.com/jshttp/http-errors/blob/1.3.1/index.js#L42
+    interface HttpError extends Error {
+        status: number;
+        statusCode: number;
+        expose: boolean;
     }
 
-    var createHttpError: createHttpError.CreateHttpError;
-    export = createHttpError;
+    interface CreateHttpError {
+        // See https://github.com/Microsoft/TypeScript/issues/227#issuecomment-50092674
+        [code: string]: new () => HttpError;
+
+        (...args: Array<Error | string | number | Object>): HttpError;
+
+        Continue: new () => HttpError;
+        SwitchingProtocols: new () => HttpError;
+        Processing: new () => HttpError;
+        OK: new () => HttpError;
+        Created: new () => HttpError;
+        Accepted: new () => HttpError;
+        NonAuthoritativeInformation: new () => HttpError;
+        NoContent: new () => HttpError;
+        ResetContent: new () => HttpError;
+        PartialContent: new () => HttpError;
+        MultiStatus: new () => HttpError;
+        AlreadyReported: new () => HttpError;
+        IMUsed: new () => HttpError;
+        MultipleChoices: new () => HttpError;
+        MovedPermanently: new () => HttpError;
+        Found: new () => HttpError;
+        SeeOther: new () => HttpError;
+        NotModified: new () => HttpError;
+        UseProxy: new () => HttpError;
+        Unused: new () => HttpError;
+        TemporaryRedirect: new () => HttpError;
+        PermanentRedirect: new () => HttpError;
+        BadRequest: new () => HttpError;
+        Unauthorized: new () => HttpError;
+        PaymentRequired: new () => HttpError;
+        Forbidden: new () => HttpError;
+        NotFound: new () => HttpError;
+        MethodNotAllowed: new () => HttpError;
+        NotAcceptable: new () => HttpError;
+        ProxyAuthenticationRequired: new () => HttpError;
+        RequestTimeout: new () => HttpError;
+        Conflict: new () => HttpError;
+        Gone: new () => HttpError;
+        LengthRequired: new () => HttpError;
+        PreconditionFailed: new () => HttpError;
+        PayloadTooLarge: new () => HttpError;
+        URITooLong: new () => HttpError;
+        UnsupportedMediaType: new () => HttpError;
+        RangeNotSatisfiable: new () => HttpError;
+        ExpectationFailed: new () => HttpError;
+        ImATeapot: new () => HttpError;
+        UnprocessableEntity: new () => HttpError;
+        Locked: new () => HttpError;
+        FailedDependency: new () => HttpError;
+        UnorderedCollection: new () => HttpError;
+        UpgradeRequired: new () => HttpError;
+        PreconditionRequired: new () => HttpError;
+        TooManyRequests: new () => HttpError;
+        RequestHeaderFieldsTooLarge: new () => HttpError;
+        UnavailableForLegalReasons: new () => HttpError;
+        InternalServerError: new () => HttpError;
+        NotImplemented: new () => HttpError;
+        BadGateway: new () => HttpError;
+        ServiceUnavailable: new () => HttpError;
+        GatewayTimeout: new () => HttpError;
+        HTTPVersionNotSupported: new () => HttpError;
+        VariantAlsoNegotiates: new () => HttpError;
+        InsufficientStorage: new () => HttpError;
+        LoopDetected: new () => HttpError;
+        BandwidthLimitExceeded: new () => HttpError;
+        NotExtended: new () => HttpError;
+        NetworkAuthenticationRequired: new () => HttpError;
+    }
 }
+
+declare var createHttpError: createHttpError.CreateHttpError;
+export = createHttpError;
diff --git a/http-status-codes/http-status-codes.d.ts b/http-status-codes/http-status-codes.d.ts
index ebea4d75bc..147cf3b017 100644
--- a/http-status-codes/http-status-codes.d.ts
+++ b/http-status-codes/http-status-codes.d.ts
@@ -3,59 +3,58 @@
 // Definitions by: Josh McCullough <https://github.com/JoshMcCullough>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "http-status-codes" {
-    export var ACCEPTED: number;
-    export var BAD_GATEWAY: number;
-    export var BAD_REQUEST: number;
-    export var CONFLICT: number;
-    export var CONTINUE: number;
-    export var CREATED: number;
-    export var EXPECTATION_FAILED: number;
-    export var FAILED_DEPENDENCY: number;
-    export var FORBIDDEN: number;
-    export var GATEWAY_TIMEOUT: number;
-    export var GONE: number;
-    export var HTTP_VERSION_NOT_SUPPORTED: number;
-    export var INSUFFICIENT_SPACE_ON_RESOURCE: number;
-    export var INSUFFICIENT_STORAGE: number;
-    export var INTERNAL_SERVER_ERROR: number;
-    export var LENGTH_REQUIRED: number;
-    export var LOCKED: number;
-    export var METHOD_FAILURE: number;
-    export var METHOD_NOT_ALLOWED: number;
-    export var MOVED_PERMANENTLY: number;
-    export var MOVED_TEMPORARILY: number;
-    export var MULTI_STATUS: number;
-    export var MULTIPLE_CHOICES: number;
-    export var NETWORK_AUTHENTICATION_REQUIRED: number;
-    export var NO_CONTENT: number;
-    export var NON_AUTHORITATIVE_INFORMATION: number;
-    export var NOT_ACCEPTABLE: number;
-    export var NOT_FOUND: number;
-    export var NOT_IMPLEMENTED: number;
-    export var NOT_MODIFIED: number;
-    export var OK: number;
-    export var PARTIAL_CONTENT: number;
-    export var PAYMENT_REQUIRED: number;
-    export var PRECONDITION_FAILED: number;
-    export var PRECONDITION_REQUIRED: number;
-    export var PROCESSING: number;
-    export var PROXY_AUTHENTICATION_REQUIRED: number;
-    export var REQUEST_HEADER_FIELDS_TOO_LARGE: number;
-    export var REQUEST_TIMEOUT: number;
-    export var REQUEST_TOO_LONG: number;
-    export var REQUEST_URI_TOO_LONG: number;
-    export var REQUESTED_RANGE_NOT_SATISFIABLE: number;
-    export var RESET_CONTENT: number;
-    export var SEE_OTHER: number;
-    export var SERVICE_UNAVAILABLE: number;
-    export var SWITCHING_PROTOCOLS: number;
-    export var TEMPORARY_REDIRECT: number;
-    export var TOO_MANY_REQUESTS: number;
-    export var UNAUTHORIZED: number;
-    export var UNPROCESSABLE_ENTITY: number;
-    export var UNSUPPORTED_MEDIA_TYPE: number;
-    export var USE_PROXY: number;
-    
-    export function getStatusText(statusCode: number): string;
-}
\ No newline at end of file
+
+declare export var ACCEPTED: number;
+declare export var BAD_GATEWAY: number;
+declare export var BAD_REQUEST: number;
+declare export var CONFLICT: number;
+declare export var CONTINUE: number;
+declare export var CREATED: number;
+declare export var EXPECTATION_FAILED: number;
+declare export var FAILED_DEPENDENCY: number;
+declare export var FORBIDDEN: number;
+declare export var GATEWAY_TIMEOUT: number;
+declare export var GONE: number;
+declare export var HTTP_VERSION_NOT_SUPPORTED: number;
+declare export var INSUFFICIENT_SPACE_ON_RESOURCE: number;
+declare export var INSUFFICIENT_STORAGE: number;
+declare export var INTERNAL_SERVER_ERROR: number;
+declare export var LENGTH_REQUIRED: number;
+declare export var LOCKED: number;
+declare export var METHOD_FAILURE: number;
+declare export var METHOD_NOT_ALLOWED: number;
+declare export var MOVED_PERMANENTLY: number;
+declare export var MOVED_TEMPORARILY: number;
+declare export var MULTI_STATUS: number;
+declare export var MULTIPLE_CHOICES: number;
+declare export var NETWORK_AUTHENTICATION_REQUIRED: number;
+declare export var NO_CONTENT: number;
+declare export var NON_AUTHORITATIVE_INFORMATION: number;
+declare export var NOT_ACCEPTABLE: number;
+declare export var NOT_FOUND: number;
+declare export var NOT_IMPLEMENTED: number;
+declare export var NOT_MODIFIED: number;
+declare export var OK: number;
+declare export var PARTIAL_CONTENT: number;
+declare export var PAYMENT_REQUIRED: number;
+declare export var PRECONDITION_FAILED: number;
+declare export var PRECONDITION_REQUIRED: number;
+declare export var PROCESSING: number;
+declare export var PROXY_AUTHENTICATION_REQUIRED: number;
+declare export var REQUEST_HEADER_FIELDS_TOO_LARGE: number;
+declare export var REQUEST_TIMEOUT: number;
+declare export var REQUEST_TOO_LONG: number;
+declare export var REQUEST_URI_TOO_LONG: number;
+declare export var REQUESTED_RANGE_NOT_SATISFIABLE: number;
+declare export var RESET_CONTENT: number;
+declare export var SEE_OTHER: number;
+declare export var SERVICE_UNAVAILABLE: number;
+declare export var SWITCHING_PROTOCOLS: number;
+declare export var TEMPORARY_REDIRECT: number;
+declare export var TOO_MANY_REQUESTS: number;
+declare export var UNAUTHORIZED: number;
+declare export var UNPROCESSABLE_ENTITY: number;
+declare export var UNSUPPORTED_MEDIA_TYPE: number;
+declare export var USE_PROXY: number;
+
+declare export function getStatusText(statusCode: number): string;
diff --git a/http-string-parser/http-string-parser.d.ts b/http-string-parser/http-string-parser.d.ts
index 96e6b85f88..cf8808f619 100644
--- a/http-string-parser/http-string-parser.d.ts
+++ b/http-string-parser/http-string-parser.d.ts
@@ -3,36 +3,35 @@
 // Definitions by: MIZUNE Pine <https://github.com/pine613>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "http-string-parser" {
-    interface ParseRequestResult {
-        method: string;
-        uri: string;
-        headers: { [key: string]: string };
-        body: string;
-    }
 
-    interface ParseResponseResult {
-        statusCode: string;
-        statusMessage: string;
-        headers: { [key: string]: string };
-        body: string;
-    }
-
-    interface ParseRequestLineResult {
-        method: string;
-        uri: string;
-        protocol: string;
-    }
-
-    interface ParseStatusLineResult {
-        protocol: string;
-        statusCode: string;
-        statusMessage: string;
-    }
-
-    export function parseRequest(requestString: string): ParseRequestResult;
-    export function parseResponse(responseString: string): ParseResponseResult;
-    export function parseRequestLine(requestLineString: string): ParseRequestLineResult;
-    export function parseStatusLine(statusLine: string): ParseStatusLineResult;
-    export function parseHeaders(headerLines: string[]): { [key: string]: string };
+interface ParseRequestResult {
+    method: string;
+    uri: string;
+    headers: { [key: string]: string };
+    body: string;
 }
+
+interface ParseResponseResult {
+    statusCode: string;
+    statusMessage: string;
+    headers: { [key: string]: string };
+    body: string;
+}
+
+interface ParseRequestLineResult {
+    method: string;
+    uri: string;
+    protocol: string;
+}
+
+interface ParseStatusLineResult {
+    protocol: string;
+    statusCode: string;
+    statusMessage: string;
+}
+
+declare export function parseRequest(requestString: string): ParseRequestResult;
+declare export function parseResponse(responseString: string): ParseResponseResult;
+declare export function parseRequestLine(requestLineString: string): ParseRequestLineResult;
+declare export function parseStatusLine(statusLine: string): ParseStatusLineResult;
+declare export function parseHeaders(headerLines: string[]): { [key: string]: string };
diff --git a/httperr/httperr.d.ts b/httperr/httperr.d.ts
index e058e4a7a5..aa7e237db1 100644
--- a/httperr/httperr.d.ts
+++ b/httperr/httperr.d.ts
@@ -3,290 +3,289 @@
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "httperr" {
-
-    /** Overall module shape, expressed as an interface. */
-    interface HttpErr {
-
-        /** The base type for all httperr error types. You probably don't want to use this directly. */
-        HttpError: HttpErrorStatic;
-
-        /**
-         * Creates a new error type for the given HTTP error status.
-         * @param {number} status - The HTTP response status code for the HTTP error.
-         * @param {string} title - A human-readable title for the HTTP error.
-         * @param {Function} init - (optional) A function which will be invoked as a method of the
-         *                          new error with the config argument immediately after the error
-         *                          is created by the factory. Can be used to process additional
-         *                          error-specific configuration parameters.
-         */
-        createHttpError(status: number, title: string, init?: (config: Config) => void): HttpErrorStatic;
-
-        // Error builders by camel-cased name.
-        badRequest: ErrorBuilder;
-        unauthorized: ErrorBuilder;
-        paymentRequired: ErrorBuilder;
-        forbidden: ErrorBuilder;
-        notFound: ErrorBuilder;
-        methodNotAllowed: ErrorBuilder;
-        notAcceptable: ErrorBuilder;
-        proxyAuthenticationRequired: ErrorBuilder;
-        requestTimeout: ErrorBuilder;
-        conflict: ErrorBuilder;
-        gone: ErrorBuilder;
-        lengthRequired: ErrorBuilder;
-        preconditionFailed: ErrorBuilder;
-        requestEntityTooLarge: ErrorBuilder;
-        requestUriTooLong: ErrorBuilder;
-        unsupportedMediaType: ErrorBuilder;
-        requestedRangeNotSatisfiable: ErrorBuilder;
-        expectationFailed: ErrorBuilder;
-        imATeapot: ErrorBuilder;
-        authenticationTimeout: ErrorBuilder;
-        enhanceYourCalm: ErrorBuilder;
-        unprocessableEntity: ErrorBuilder;
-        locked: ErrorBuilder;
-        methodFailure: ErrorBuilder;
-        failedDependency: ErrorBuilder;
-        unorderedCollection: ErrorBuilder;
-        upgradeRequired: ErrorBuilder;
-        preconditionRequired: ErrorBuilder;
-        tooManyRequests: ErrorBuilder;
-        requestHeaderFieldsTooLarge: ErrorBuilder;
-        loginTimeout: ErrorBuilder;
-        noResponse: ErrorBuilder;
-        retryWith: ErrorBuilder;
-        blockedByWindowsParentalControls: ErrorBuilder;
-        redirect: ErrorBuilder;
-        unavailableForLegalReasons: ErrorBuilder;
-        requestHeaderTooLarge: ErrorBuilder;
-        certError: ErrorBuilder;
-        noCert: ErrorBuilder;
-        httpToHttps: ErrorBuilder;
-        clientClosedRequest: ErrorBuilder;
-        internalServerError: ErrorBuilder;
-        notImplemented: ErrorBuilder;
-        badGateway: ErrorBuilder;
-        serviceUnavailable: ErrorBuilder;
-        gatewayTimeout: ErrorBuilder;
-        httpVersionNotSupported: ErrorBuilder;
-        variantAlsoNegotiates: ErrorBuilder;
-        insufficientStorage: ErrorBuilder;
-        loopDetected: ErrorBuilder;
-        bandwidthLimitExceeded: ErrorBuilder;
-        notExtended: ErrorBuilder;
-        networkAuthenticationRequired: ErrorBuilder;
-        originError: ErrorBuilder;
-        connectionTimedOut: ErrorBuilder;
-        proxyDeclinedRequest: ErrorBuilder;
-        aTimeoutOccured: ErrorBuilder;
-        networkReadTimeoutError: ErrorBuilder;
-        networkConnectTimeoutError: ErrorBuilder;
-
-        // Error builders by title-cased name.
-        BadRequest: ErrorBuilder;
-        Unauthorized: ErrorBuilder;
-        PaymentRequired: ErrorBuilder;
-        Forbidden: ErrorBuilder;
-        NotFound: ErrorBuilder;
-        MethodNotAllowed: ErrorBuilder;
-        NotAcceptable: ErrorBuilder;
-        ProxyAuthenticationRequired: ErrorBuilder;
-        RequestTimeout: ErrorBuilder;
-        Conflict: ErrorBuilder;
-        Gone: ErrorBuilder;
-        LengthRequired: ErrorBuilder;
-        PreconditionFailed: ErrorBuilder;
-        RequestEntityTooLarge: ErrorBuilder;
-        RequestUriTooLong: ErrorBuilder;
-        UnsupportedMediaType: ErrorBuilder;
-        RequestedRangeNotSatisfiable: ErrorBuilder;
-        ExpectationFailed: ErrorBuilder;
-        ImATeapot: ErrorBuilder;
-        AuthenticationTimeout: ErrorBuilder;
-        EnhanceYourCalm: ErrorBuilder;
-        UnprocessableEntity: ErrorBuilder;
-        Locked: ErrorBuilder;
-        MethodFailure: ErrorBuilder;
-        FailedDependency: ErrorBuilder;
-        UnorderedCollection: ErrorBuilder;
-        UpgradeRequired: ErrorBuilder;
-        PreconditionRequired: ErrorBuilder;
-        TooManyRequests: ErrorBuilder;
-        RequestHeaderFieldsTooLarge: ErrorBuilder;
-        LoginTimeout: ErrorBuilder;
-        NoResponse: ErrorBuilder;
-        RetryWith: ErrorBuilder;
-        BlockedByWindowsParentalControls: ErrorBuilder;
-        Redirect: ErrorBuilder;
-        UnavailableForLegalReasons: ErrorBuilder;
-        RequestHeaderTooLarge: ErrorBuilder;
-        CertError: ErrorBuilder;
-        NoCert: ErrorBuilder;
-        HttpToHttps: ErrorBuilder;
-        ClientClosedRequest: ErrorBuilder;
-        InternalServerError: ErrorBuilder;
-        NotImplemented: ErrorBuilder;
-        BadGateway: ErrorBuilder;
-        ServiceUnavailable: ErrorBuilder;
-        GatewayTimeout: ErrorBuilder;
-        HttpVersionNotSupported: ErrorBuilder;
-        VariantAlsoNegotiates: ErrorBuilder;
-        InsufficientStorage: ErrorBuilder;
-        LoopDetected: ErrorBuilder;
-        BandwidthLimitExceeded: ErrorBuilder;
-        NotExtended: ErrorBuilder;
-        NetworkAuthenticationRequired: ErrorBuilder;
-        OriginError: ErrorBuilder;
-        ConnectionTimedOut: ErrorBuilder;
-        ProxyDeclinedRequest: ErrorBuilder;
-        ATimeoutOccured: ErrorBuilder;
-        NetworkReadTimeoutError: ErrorBuilder;
-        NetworkConnectTimeoutError: ErrorBuilder;
-
-        // Error builders by statusCode.
-        400: ErrorBuilder;
-        401: ErrorBuilder;
-        402: ErrorBuilder;
-        403: ErrorBuilder;
-        404: ErrorBuilder;
-        405: ErrorBuilder;
-        406: ErrorBuilder;
-        407: ErrorBuilder;
-        408: ErrorBuilder;
-        409: ErrorBuilder;
-        410: ErrorBuilder;
-        411: ErrorBuilder;
-        412: ErrorBuilder;
-        413: ErrorBuilder;
-        414: ErrorBuilder;
-        415: ErrorBuilder;
-        416: ErrorBuilder;
-        417: ErrorBuilder;
-        418: ErrorBuilder;
-        419: ErrorBuilder;
-        420: ErrorBuilder;
-        422: ErrorBuilder;
-        423: ErrorBuilder;
-        424: ErrorBuilder;
-        425: ErrorBuilder;
-        426: ErrorBuilder;
-        428: ErrorBuilder;
-        429: ErrorBuilder;
-        431: ErrorBuilder;
-        440: ErrorBuilder;
-        444: ErrorBuilder;
-        449: ErrorBuilder;
-        450: ErrorBuilder;
-        451: ErrorBuilder;
-        494: ErrorBuilder;
-        495: ErrorBuilder;
-        496: ErrorBuilder;
-        497: ErrorBuilder;
-        499: ErrorBuilder;
-        500: ErrorBuilder;
-        501: ErrorBuilder;
-        502: ErrorBuilder;
-        503: ErrorBuilder;
-        504: ErrorBuilder;
-        505: ErrorBuilder;
-        506: ErrorBuilder;
-        507: ErrorBuilder;
-        508: ErrorBuilder;
-        509: ErrorBuilder;
-        510: ErrorBuilder;
-        511: ErrorBuilder;
-        520: ErrorBuilder;
-        522: ErrorBuilder;
-        523: ErrorBuilder;
-        524: ErrorBuilder;
-        598: ErrorBuilder;
-        599: ErrorBuilder;
-    }
-
-    /** Constructor function for the HttpError class. */
-    interface HttpErrorStatic {
-        new(config?: string | Error | Config, extra?: {}): HttpError;
-    }
 
 
-    /** An instance of the HttpError class. */
-    interface HttpError extends Error {
+/** Overall module shape, expressed as an interface. */
+interface HttpErr {
 
-        /** A human-readable title for the HTTP error. */
-        title: string;
+    /** The base type for all httperr error types. You probably don't want to use this directly. */
+    HttpError: HttpErrorStatic;
 
-        code: string;
+    /**
+     * Creates a new error type for the given HTTP error status.
+     * @param {number} status - The HTTP response status code for the HTTP error.
+     * @param {string} title - A human-readable title for the HTTP error.
+     * @param {Function} init - (optional) A function which will be invoked as a method of the
+     *                          new error with the config argument immediately after the error
+     *                          is created by the factory. Can be used to process additional
+     *                          error-specific configuration parameters.
+     */
+    createHttpError(status: number, title: string, init?: (config: Config) => void): HttpErrorStatic;
 
-        /** The HTTP response status code for the HTTP error. */
-        statusCode: number;
+    // Error builders by camel-cased name.
+    badRequest: ErrorBuilder;
+    unauthorized: ErrorBuilder;
+    paymentRequired: ErrorBuilder;
+    forbidden: ErrorBuilder;
+    notFound: ErrorBuilder;
+    methodNotAllowed: ErrorBuilder;
+    notAcceptable: ErrorBuilder;
+    proxyAuthenticationRequired: ErrorBuilder;
+    requestTimeout: ErrorBuilder;
+    conflict: ErrorBuilder;
+    gone: ErrorBuilder;
+    lengthRequired: ErrorBuilder;
+    preconditionFailed: ErrorBuilder;
+    requestEntityTooLarge: ErrorBuilder;
+    requestUriTooLong: ErrorBuilder;
+    unsupportedMediaType: ErrorBuilder;
+    requestedRangeNotSatisfiable: ErrorBuilder;
+    expectationFailed: ErrorBuilder;
+    imATeapot: ErrorBuilder;
+    authenticationTimeout: ErrorBuilder;
+    enhanceYourCalm: ErrorBuilder;
+    unprocessableEntity: ErrorBuilder;
+    locked: ErrorBuilder;
+    methodFailure: ErrorBuilder;
+    failedDependency: ErrorBuilder;
+    unorderedCollection: ErrorBuilder;
+    upgradeRequired: ErrorBuilder;
+    preconditionRequired: ErrorBuilder;
+    tooManyRequests: ErrorBuilder;
+    requestHeaderFieldsTooLarge: ErrorBuilder;
+    loginTimeout: ErrorBuilder;
+    noResponse: ErrorBuilder;
+    retryWith: ErrorBuilder;
+    blockedByWindowsParentalControls: ErrorBuilder;
+    redirect: ErrorBuilder;
+    unavailableForLegalReasons: ErrorBuilder;
+    requestHeaderTooLarge: ErrorBuilder;
+    certError: ErrorBuilder;
+    noCert: ErrorBuilder;
+    httpToHttps: ErrorBuilder;
+    clientClosedRequest: ErrorBuilder;
+    internalServerError: ErrorBuilder;
+    notImplemented: ErrorBuilder;
+    badGateway: ErrorBuilder;
+    serviceUnavailable: ErrorBuilder;
+    gatewayTimeout: ErrorBuilder;
+    httpVersionNotSupported: ErrorBuilder;
+    variantAlsoNegotiates: ErrorBuilder;
+    insufficientStorage: ErrorBuilder;
+    loopDetected: ErrorBuilder;
+    bandwidthLimitExceeded: ErrorBuilder;
+    notExtended: ErrorBuilder;
+    networkAuthenticationRequired: ErrorBuilder;
+    originError: ErrorBuilder;
+    connectionTimedOut: ErrorBuilder;
+    proxyDeclinedRequest: ErrorBuilder;
+    aTimeoutOccured: ErrorBuilder;
+    networkReadTimeoutError: ErrorBuilder;
+    networkConnectTimeoutError: ErrorBuilder;
 
-        toObject(...skip: (string|RegExp)[]): any;
-    }
+    // Error builders by title-cased name.
+    BadRequest: ErrorBuilder;
+    Unauthorized: ErrorBuilder;
+    PaymentRequired: ErrorBuilder;
+    Forbidden: ErrorBuilder;
+    NotFound: ErrorBuilder;
+    MethodNotAllowed: ErrorBuilder;
+    NotAcceptable: ErrorBuilder;
+    ProxyAuthenticationRequired: ErrorBuilder;
+    RequestTimeout: ErrorBuilder;
+    Conflict: ErrorBuilder;
+    Gone: ErrorBuilder;
+    LengthRequired: ErrorBuilder;
+    PreconditionFailed: ErrorBuilder;
+    RequestEntityTooLarge: ErrorBuilder;
+    RequestUriTooLong: ErrorBuilder;
+    UnsupportedMediaType: ErrorBuilder;
+    RequestedRangeNotSatisfiable: ErrorBuilder;
+    ExpectationFailed: ErrorBuilder;
+    ImATeapot: ErrorBuilder;
+    AuthenticationTimeout: ErrorBuilder;
+    EnhanceYourCalm: ErrorBuilder;
+    UnprocessableEntity: ErrorBuilder;
+    Locked: ErrorBuilder;
+    MethodFailure: ErrorBuilder;
+    FailedDependency: ErrorBuilder;
+    UnorderedCollection: ErrorBuilder;
+    UpgradeRequired: ErrorBuilder;
+    PreconditionRequired: ErrorBuilder;
+    TooManyRequests: ErrorBuilder;
+    RequestHeaderFieldsTooLarge: ErrorBuilder;
+    LoginTimeout: ErrorBuilder;
+    NoResponse: ErrorBuilder;
+    RetryWith: ErrorBuilder;
+    BlockedByWindowsParentalControls: ErrorBuilder;
+    Redirect: ErrorBuilder;
+    UnavailableForLegalReasons: ErrorBuilder;
+    RequestHeaderTooLarge: ErrorBuilder;
+    CertError: ErrorBuilder;
+    NoCert: ErrorBuilder;
+    HttpToHttps: ErrorBuilder;
+    ClientClosedRequest: ErrorBuilder;
+    InternalServerError: ErrorBuilder;
+    NotImplemented: ErrorBuilder;
+    BadGateway: ErrorBuilder;
+    ServiceUnavailable: ErrorBuilder;
+    GatewayTimeout: ErrorBuilder;
+    HttpVersionNotSupported: ErrorBuilder;
+    VariantAlsoNegotiates: ErrorBuilder;
+    InsufficientStorage: ErrorBuilder;
+    LoopDetected: ErrorBuilder;
+    BandwidthLimitExceeded: ErrorBuilder;
+    NotExtended: ErrorBuilder;
+    NetworkAuthenticationRequired: ErrorBuilder;
+    OriginError: ErrorBuilder;
+    ConnectionTimedOut: ErrorBuilder;
+    ProxyDeclinedRequest: ErrorBuilder;
+    ATimeoutOccured: ErrorBuilder;
+    NetworkReadTimeoutError: ErrorBuilder;
+    NetworkConnectTimeoutError: ErrorBuilder;
 
-
-    /** Configuration object for constructing HttpErrors. */
-    interface Config {
-
-        /** A descriptive human-readable title describing the error's cause. */
-        message?: string;
-
-        /** The underlying exception that caused the HTTP error. */
-        cause?: Error;
-
-        /** A detailed human-readable description of the error's cause and possible solutions. */
-        details?: string;
-
-        /**
-         *  The methods allowed for this URL.
-         *  This property is only available for 405 Method Not Allowed errors
-         *  and can be used to populate the Allow header.
-         */
-        allowed?: string[];
-
-        /**
-         *  The minimum delay before the request should be attempted again.
-         *  This property is only available for 429 Too Many Requests and 420 Enhance Your Calm
-         *  (Twitter API) errors and can be used to populate the Retry-After header.
-         */
-        retryAfter?: any;
-
-        /**
-         *  The parameters with which the request should be retried.
-         *  This property is only available for 449 Retry With (Microsoft) errors and can be
-         *  used to populate the response status message.
-         */
-        parameters?: any;
-
-        /**
-         *  The location for which the request should be repeated.
-         *  This property is only available for 451 Redirect (Microsoft) errors and can be
-         *  used to populate the proprietary X-MS-Location response header.
-         */
-        location?: any;
-    }
-
-
-    /** Factory function for creating an Error object. */
-    interface ErrorBuilder {
-
-        /**
-         *  Creates an Error object. The new keyword is optional.
-         * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
-         *                                           If config is an Error object, it will be treated as config.cause.
-         */
-        (config?: string | Error | Config): HttpError;
-
-        /**
-         *  Creates an Error object. The new keyword is optional.
-         * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
-         *                                           If config is an Error object, it will be treated as config.cause.
-         */
-        new (config?: string | Error | Config): HttpError;
-    }
-
-
-    // The module value satisfies the HttpErr interface.
-    var _: HttpErr;
-    export = _;
+    // Error builders by statusCode.
+    400: ErrorBuilder;
+    401: ErrorBuilder;
+    402: ErrorBuilder;
+    403: ErrorBuilder;
+    404: ErrorBuilder;
+    405: ErrorBuilder;
+    406: ErrorBuilder;
+    407: ErrorBuilder;
+    408: ErrorBuilder;
+    409: ErrorBuilder;
+    410: ErrorBuilder;
+    411: ErrorBuilder;
+    412: ErrorBuilder;
+    413: ErrorBuilder;
+    414: ErrorBuilder;
+    415: ErrorBuilder;
+    416: ErrorBuilder;
+    417: ErrorBuilder;
+    418: ErrorBuilder;
+    419: ErrorBuilder;
+    420: ErrorBuilder;
+    422: ErrorBuilder;
+    423: ErrorBuilder;
+    424: ErrorBuilder;
+    425: ErrorBuilder;
+    426: ErrorBuilder;
+    428: ErrorBuilder;
+    429: ErrorBuilder;
+    431: ErrorBuilder;
+    440: ErrorBuilder;
+    444: ErrorBuilder;
+    449: ErrorBuilder;
+    450: ErrorBuilder;
+    451: ErrorBuilder;
+    494: ErrorBuilder;
+    495: ErrorBuilder;
+    496: ErrorBuilder;
+    497: ErrorBuilder;
+    499: ErrorBuilder;
+    500: ErrorBuilder;
+    501: ErrorBuilder;
+    502: ErrorBuilder;
+    503: ErrorBuilder;
+    504: ErrorBuilder;
+    505: ErrorBuilder;
+    506: ErrorBuilder;
+    507: ErrorBuilder;
+    508: ErrorBuilder;
+    509: ErrorBuilder;
+    510: ErrorBuilder;
+    511: ErrorBuilder;
+    520: ErrorBuilder;
+    522: ErrorBuilder;
+    523: ErrorBuilder;
+    524: ErrorBuilder;
+    598: ErrorBuilder;
+    599: ErrorBuilder;
 }
+
+/** Constructor function for the HttpError class. */
+interface HttpErrorStatic {
+    new (config?: string | Error | Config, extra?: {}): HttpError;
+}
+
+
+/** An instance of the HttpError class. */
+interface HttpError extends Error {
+
+    /** A human-readable title for the HTTP error. */
+    title: string;
+
+    code: string;
+
+    /** The HTTP response status code for the HTTP error. */
+    statusCode: number;
+
+    toObject(...skip: (string | RegExp)[]): any;
+}
+
+
+/** Configuration object for constructing HttpErrors. */
+interface Config {
+
+    /** A descriptive human-readable title describing the error's cause. */
+    message?: string;
+
+    /** The underlying exception that caused the HTTP error. */
+    cause?: Error;
+
+    /** A detailed human-readable description of the error's cause and possible solutions. */
+    details?: string;
+
+    /**
+     *  The methods allowed for this URL.
+     *  This property is only available for 405 Method Not Allowed errors
+     *  and can be used to populate the Allow header.
+     */
+    allowed?: string[];
+
+    /**
+     *  The minimum delay before the request should be attempted again.
+     *  This property is only available for 429 Too Many Requests and 420 Enhance Your Calm
+     *  (Twitter API) errors and can be used to populate the Retry-After header.
+     */
+    retryAfter?: any;
+
+    /**
+     *  The parameters with which the request should be retried.
+     *  This property is only available for 449 Retry With (Microsoft) errors and can be
+     *  used to populate the response status message.
+     */
+    parameters?: any;
+
+    /**
+     *  The location for which the request should be repeated.
+     *  This property is only available for 451 Redirect (Microsoft) errors and can be
+     *  used to populate the proprietary X-MS-Location response header.
+     */
+    location?: any;
+}
+
+
+/** Factory function for creating an Error object. */
+interface ErrorBuilder {
+
+    /**
+     *  Creates an Error object. The new keyword is optional.
+     * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
+     *                                           If config is an Error object, it will be treated as config.cause.
+     */
+    (config?: string | Error | Config): HttpError;
+
+    /**
+     *  Creates an Error object. The new keyword is optional.
+     * @param {string | Error | Config} config - If config is a string, it will be treated as config.message.
+     *                                           If config is an Error object, it will be treated as config.cause.
+     */
+    new (config?: string | Error | Config): HttpError;
+}
+
+
+// The module value satisfies the HttpErr interface.
+declare var _: HttpErr;
+export = _;
diff --git a/icepick/icepick.d.ts b/icepick/icepick.d.ts
index 87b8d4bbac..235a498ab4 100644
--- a/icepick/icepick.d.ts
+++ b/icepick/icepick.d.ts
@@ -3,42 +3,42 @@
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "icepick" {
-  export function freeze<T>(collection: T): T;
-  export function thaw<T>(collection: T): T;
-  export function assoc<T>(collection: T, key: number | string, value: any): T;
-  export function dissoc<T>(collection: T, key: number | string): T;
-  export function assocIn<T>(collection: T, path: Array<number | string>, value: any): T;
-  export function getIn<Result>(collection: any, path: Array<number | string>): Result;
-  export function updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): T;
 
-  export {assoc as set};
-  export {dissoc as unset};
-  export {assocIn as setIn};
+declare export function freeze<T>(collection: T): T;
+declare export function thaw<T>(collection: T): T;
+declare export function assoc<T>(collection: T, key: number | string, value: any): T;
+declare export function dissoc<T>(collection: T, key: number | string): T;
+declare export function assocIn<T>(collection: T, path: Array<number | string>, value: any): T;
+declare export function getIn<Result>(collection: any, path: Array<number | string>): Result;
+declare export function updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): T;
 
-  export function assign<T>(target: T): T;
-  export function assign<T, S1>(target: T, source1: S1): (T & S1);
-  export function assign<T, S1, S2>(target: T, s1: S1, s2: S2): (T & S1 & S2);
-  export function assign<T, S1, S2, S3>(target: T, s1: S1, s2: S2, s3: S3): (T & S1 & S2 & S3);
-  export function assign<T, S1, S2, S3, S4>(target: T, s1: S1, s2: S2, s3: S3, s4: S4): (T & S1 & S2 & S3 & S4);
+export {assoc as set};
+export {dissoc as unset};
+export {assocIn as setIn};
 
-  export {assign as extend};
+declare export function assign<T>(target: T): T;
+declare export function assign<T, S1>(target: T, source1: S1): (T & S1);
+declare export function assign<T, S1, S2>(target: T, s1: S1, s2: S2): (T & S1 & S2);
+declare export function assign<T, S1, S2, S3>(target: T, s1: S1, s2: S2, s3: S3): (T & S1 & S2 & S3);
+declare export function assign<T, S1, S2, S3, S4>(target: T, s1: S1, s2: S2, s3: S3, s4: S4): (T & S1 & S2 & S3 & S4);
 
-  export function merge<T, S1>(target: T, source: S1): (T & S1);
+export {assign as extend};
 
-  export function push<T>(array: T[], element: T): T[];
-  export function pop<T>(array: T[]): T[];
-  export function shift<T>(array: T[]): T[];
-  export function unshift<T>(array: T[], element: T): T[];
-  export function reverse<T>(array: T[]): T[];
-  export function sort<T>(array: T[], compareFunction?: (a:T, b:T) => number): T[];
-  export function splice<T>(array: T[], start: number, deleteCount: number, ...items: T[]): T[];
-  export function slice<T>(array: T[], begin?: number, end?: number): T[];
+declare export function merge<T, S1>(target: T, source: S1): (T & S1);
 
-  export function map<T, U>(fn: (value: T) => U, array: T[]): U[];
-  export function filter<T>(fn: (value: T) => boolean, array: T[]): T[];
+declare export function push<T>(array: T[], element: T): T[];
+declare export function pop<T>(array: T[]): T[];
+declare export function shift<T>(array: T[]): T[];
+declare export function unshift<T>(array: T[], element: T): T[];
+declare export function reverse<T>(array: T[]): T[];
+declare export function sort<T>(array: T[], compareFunction?: (a: T, b: T) => number): T[];
+declare export function splice<T>(array: T[], start: number, deleteCount: number, ...items: T[]): T[];
+declare export function slice<T>(array: T[], begin?: number, end?: number): T[];
 
-  interface IcepickWrapper<T> {
+declare export function map<T, U>(fn: (value: T) => U, array: T[]): U[];
+declare export function filter<T>(fn: (value: T) => boolean, array: T[]): T[];
+
+interface IcepickWrapper<T> {
     value(): T;
 
     freeze(): IcepickWrapper<T>;
@@ -66,7 +66,6 @@ declare module "icepick" {
     extend<S1, S2, S3, S4>(s1: S1, s2: S2, s3: S3, s4: S4): IcepickWrapper<T & S1 & S2 & S3 & S4>;
 
     merge<S1>(source: S1): IcepickWrapper<T & S1>;
-  }
-
-  export function chain<T>(target: T): IcepickWrapper<T>;
 }
+
+declare export function chain<T>(target: T): IcepickWrapper<T>;
diff --git a/image-size/image-size.d.ts b/image-size/image-size.d.ts
index 6b553630c8..646a5da3e8 100644
--- a/image-size/image-size.d.ts
+++ b/image-size/image-size.d.ts
@@ -5,20 +5,19 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "image-size" {
 
-  interface ImageInfo {
+
+interface ImageInfo {
     width: number;
     height: number;
     type: string;
-  }
-
-  function sizeOf(path: string): ImageInfo;
-  function sizeOf(path: string, callback: (err: Error, dimensions: ImageInfo) => void): void;
-
-  function sizeOf(buffer: Buffer): ImageInfo;
-
-  namespace sizeOf {}
-
-  export = sizeOf;
 }
+
+declare function sizeOf(path: string): ImageInfo;
+declare function sizeOf(path: string, callback: (err: Error, dimensions: ImageInfo) => void): void;
+
+declare function sizeOf(buffer: Buffer): ImageInfo;
+
+declare namespace sizeOf { }
+
+export = sizeOf;
diff --git a/imagemagick-native/imagemagick-native.d.ts b/imagemagick-native/imagemagick-native.d.ts
index 7397161bbe..f0fab60560 100644
--- a/imagemagick-native/imagemagick-native.d.ts
+++ b/imagemagick-native/imagemagick-native.d.ts
@@ -5,113 +5,110 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "imagemagick-native" {
 
-    import stream = require('stream');
-    export module streams {
-        export function convert(options: IStreamConvertOptions): stream.Transform;
-    }
-
-    function convert(options: IConvertOptions): Buffer;
-    function convert(options: IConvertOptions, callback: (err: any, result: Buffer) => void): void;
-    function identify(options: IIdentifyOptions): IIdentifyResult;
-    function identify(options: IIdentifyOptions, callback: (err: any, result: IIdentifyResult) => void): void;
-    function quantizeColors(options: IQuantizeColorsOptions): IQuantizeColorsItem[];
-    function composite(options: ICompositeOptions): Buffer;
-    function composite(options: ICompositeOptions, callback: (err: any, result: Buffer) => void): void;
-    function getConstPixels(options: IConstPixelsOptions): IConstPixelsItem[];
-    function quantumDepth(): number;
-    function version(): string;
-
-    export interface IStreamConvertOptions {
-        srcFormat?: string;
-        quality?: number;
-        trim?: boolean;
-        trimFuzz?: number;
-        width?: number;
-        height?: number;
-        density?: number;
-        resizeStyle?: string;
-        gravity?: string;
-        format?: string;
-        filter?: string;
-        blur?: number;
-        strip?: boolean;
-        rotate?: number;
-        flip?: boolean;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IConvertOptions {
-        srcData: Buffer;
-        srcFormat?: string;
-        quality?: number;
-        trim?: boolean;
-        trimFuzz?: number;
-        width?: number;
-        height?: number;
-        density?: number;
-        resizeStyle?: string;
-        gravity?: string;
-        format?: string;
-        filter?: string;
-        blur?: number;
-        strip?: boolean;
-        rotate?: number;
-        flip?: boolean;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IIdentifyOptions {
-        srcData: Buffer;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IIdentifyResult {
-        format: string;
-        width: number;
-        height: number;
-        depth: number;
-        density : {
-            width : number;
-            height : number;
-        };
-        exif: {
-            orientation: number; // 0 if none exists or e.g. 3 (portrait iPad pictures)
-        };
-    }
-    export interface IQuantizeColorsOptions {
-        srcData: Buffer;
-        colors: number;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IQuantizeColorsItem {
-        r: number;
-        g: number;
-        b: number;
-        hex: string;
-    }
-    export interface ICompositeOptions {
-        srcData: Buffer;
-        compositeData: Buffer;
-        gravity?: string;
-        debug?: boolean;
-        ignoreWarnings?: boolean;
-    }
-    export interface IConstPixelsOptions {
-        srcData: Buffer;
-        x: number;
-        y: number;
-        columns: number;
-        rows: number;
-    }
-    export interface IConstPixelsItem {
-        red: number;
-        green: number;
-        blue: number;
-        opacity: number;
-    }
 
+import stream = require('stream');
+declare export module streams {
+    export function convert(options: IStreamConvertOptions): stream.Transform;
 }
 
+declare function convert(options: IConvertOptions): Buffer;
+declare function convert(options: IConvertOptions, callback: (err: any, result: Buffer) => void): void;
+declare function identify(options: IIdentifyOptions): IIdentifyResult;
+declare function identify(options: IIdentifyOptions, callback: (err: any, result: IIdentifyResult) => void): void;
+declare function quantizeColors(options: IQuantizeColorsOptions): IQuantizeColorsItem[];
+declare function composite(options: ICompositeOptions): Buffer;
+declare function composite(options: ICompositeOptions, callback: (err: any, result: Buffer) => void): void;
+declare function getConstPixels(options: IConstPixelsOptions): IConstPixelsItem[];
+declare function quantumDepth(): number;
+declare function version(): string;
+
+export interface IStreamConvertOptions {
+    srcFormat?: string;
+    quality?: number;
+    trim?: boolean;
+    trimFuzz?: number;
+    width?: number;
+    height?: number;
+    density?: number;
+    resizeStyle?: string;
+    gravity?: string;
+    format?: string;
+    filter?: string;
+    blur?: number;
+    strip?: boolean;
+    rotate?: number;
+    flip?: boolean;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IConvertOptions {
+    srcData: Buffer;
+    srcFormat?: string;
+    quality?: number;
+    trim?: boolean;
+    trimFuzz?: number;
+    width?: number;
+    height?: number;
+    density?: number;
+    resizeStyle?: string;
+    gravity?: string;
+    format?: string;
+    filter?: string;
+    blur?: number;
+    strip?: boolean;
+    rotate?: number;
+    flip?: boolean;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IIdentifyOptions {
+    srcData: Buffer;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IIdentifyResult {
+    format: string;
+    width: number;
+    height: number;
+    depth: number;
+    density: {
+        width: number;
+        height: number;
+    };
+    exif: {
+        orientation: number; // 0 if none exists or e.g. 3 (portrait iPad pictures)
+    };
+}
+export interface IQuantizeColorsOptions {
+    srcData: Buffer;
+    colors: number;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IQuantizeColorsItem {
+    r: number;
+    g: number;
+    b: number;
+    hex: string;
+}
+export interface ICompositeOptions {
+    srcData: Buffer;
+    compositeData: Buffer;
+    gravity?: string;
+    debug?: boolean;
+    ignoreWarnings?: boolean;
+}
+export interface IConstPixelsOptions {
+    srcData: Buffer;
+    x: number;
+    y: number;
+    columns: number;
+    rows: number;
+}
+export interface IConstPixelsItem {
+    red: number;
+    green: number;
+    blue: number;
+    opacity: number;
+}
diff --git a/imagemagick/imagemagick.d.ts b/imagemagick/imagemagick.d.ts
index d226d6a6cc..2dc0ee7b04 100644
--- a/imagemagick/imagemagick.d.ts
+++ b/imagemagick/imagemagick.d.ts
@@ -7,53 +7,52 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "imagemagick" {
-	import child_process = require("child_process");
 
-	export function identify(path: string, callback: (err: Error, features: Features) => void): child_process.ChildProcess;
-	export function identify(path: any[], callback: (err: Error, result: string) => void): child_process.ChildProcess;
-	export module identify {
-		export var path: string;
-	}
-	export function readMetadata(path: string, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+import child_process = require("child_process");
 
-	export function convert(args: any, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-	export function convert(args: any, timeout: number, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-	export module convert {
-		export var path: string;
-	}
-
-	export function resize(options: Options, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-	export function crop(options: Options, callback: (err: Error, result: any) => void): child_process.ChildProcess;
-	export function resizeArgs(options: Options): ResizeArgs;
-
-	export interface Features {
-		format?: string;
-		width?: number;
-		height?: number;
-		depth?: number;
-	}
-
-	export interface Options {
-		srcPath?: string; //: null,
-		srcData?: string; //: null,
-		srcFormat?: string; //: null,
-		dstPath?: string; //: null,
-		quality?: number; //: 0.8,
-		format?: string; //: 'jpg',
-		progressive?: boolean; //: false,
-		colorspace?: any; //: null,
-		width?: number; //: 0,
-		height?: number; //: 0,
-		strip?: boolean; //: true,
-		filter?: string; //: 'Lagrange',
-		sharpening?: number; //: 0.2,
-		customArgs?: any[]; //: [],
-		timeout?: number; //: 0
-	}
-
-	export interface ResizeArgs {
-		opt: Options;
-		args: string[];
-	}
+declare export function identify(path: string, callback: (err: Error, features: Features) => void): child_process.ChildProcess;
+declare export function identify(path: any[], callback: (err: Error, result: string) => void): child_process.ChildProcess;
+declare export module identify {
+    export var path: string;
+}
+declare export function readMetadata(path: string, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+
+declare export function convert(args: any, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+declare export function convert(args: any, timeout: number, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+declare export module convert {
+    export var path: string;
+}
+
+declare export function resize(options: Options, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+declare export function crop(options: Options, callback: (err: Error, result: any) => void): child_process.ChildProcess;
+declare export function resizeArgs(options: Options): ResizeArgs;
+
+export interface Features {
+    format?: string;
+    width?: number;
+    height?: number;
+    depth?: number;
+}
+
+export interface Options {
+    srcPath?: string; //: null,
+    srcData?: string; //: null,
+    srcFormat?: string; //: null,
+    dstPath?: string; //: null,
+    quality?: number; //: 0.8,
+    format?: string; //: 'jpg',
+    progressive?: boolean; //: false,
+    colorspace?: any; //: null,
+    width?: number; //: 0,
+    height?: number; //: 0,
+    strip?: boolean; //: true,
+    filter?: string; //: 'Lagrange',
+    sharpening?: number; //: 0.2,
+    customArgs?: any[]; //: [],
+    timeout?: number; //: 0
+}
+
+export interface ResizeArgs {
+    opt: Options;
+    args: string[];
 }
diff --git a/immutability-helper/immutability-helper.d.ts b/immutability-helper/immutability-helper.d.ts
index 5941f5da6e..1da6c87b05 100644
--- a/immutability-helper/immutability-helper.d.ts
+++ b/immutability-helper/immutability-helper.d.ts
@@ -3,39 +3,38 @@
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "immutability-helper" {
-  interface UpdateSpecCommand {
+
+interface UpdateSpecCommand {
     $set?: any;
     $merge?: {};
     $apply?(value: any): any;
     [customCommand: string]: any;
-  }
+}
 
-  interface UpdateSpecPath {
+interface UpdateSpecPath {
     [pathPart: string]: UpdateSpec;
-  }
+}
 
-  type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
+type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
 
-  interface UpdateArraySpec extends UpdateSpecCommand {
+interface UpdateArraySpec extends UpdateSpecCommand {
     $push?: any[];
     $unshift?: any[];
     $splice?: any[][];
     [customCommand: string]: any;
-  }
+}
 
-  type CommandHandler = (specValue: any, originalValue: any) => any;
+type CommandHandler = (specValue: any, originalValue: any) => any;
 
-  interface UpdateFunction {
+interface UpdateFunction {
     (value: any[], spec: UpdateArraySpec): any[];
     (value: {}, spec: UpdateSpec): any;
     extend: (commandName: string, handler: CommandHandler) => any;
-  }
-
-  interface Update extends UpdateFunction {
-    newContext(): UpdateFunction;
-  }
-
-  const update: Update;
-  export = update;
 }
+
+interface Update extends UpdateFunction {
+    newContext(): UpdateFunction;
+}
+
+declare const update: Update;
+export = update;
diff --git a/incremental-dom/incremental-dom.d.ts b/incremental-dom/incremental-dom.d.ts
index 56fd84542f..3e40fa1241 100644
--- a/incremental-dom/incremental-dom.d.ts
+++ b/incremental-dom/incremental-dom.d.ts
@@ -3,80 +3,79 @@
 // Definitions by: Basarat Ali Syed <https://github.com/basarat>, Markus Lanthaler <https://github.com/lanthaler>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "incremental-dom" {
-    /**
-     * Patches the document starting at el with the provided function. This function
-     * may be called during an existing patch operation.
-     * @param {!Element} el the element to patch
-     * @param {!function(T)} fn A function containing elementOpen/elementClose/etc.
-     *     calls that describe the DOM.
-     * @param {?T} data An argument passed to fn to represent DOM state.
-     */
-    export var patch: <T>(el: Node, fn: (data: T) => void, data?: T) => void;
 
-    /**
-     * Declares a virtual Element at the current location in the document. This
-     * corresponds to an opening tag and a elementClose tag is required.
-     * @param {string} tag The element's tag.
-     * @param {?string} key The key used to identify this element. This can be an
-     *     empty string, but performance may be better if a unique value is used
-     *     when iterating over an array of items.
-     * @param {?Array<*>} statics An array of attribute name/value pairs of the
-     *     static attributes for the Element. These will only be set once when the
-     *     Element is created.
-     * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
-     *     for the Element.
-     */
-    export var elementOpen: (tag: string, key?: string, statics?: any[], ...var_args: any[]) => void;
-    /**
-     * Declares a virtual Element at the current location in the document. This
-     * corresponds to an opening tag and a elementClose tag is required. This is
-     * like elementOpen, but the attributes are defined using the attr function
-     * rather than being passed as arguments. Must be folllowed by 0 or more calls
-     * to attr, then a call to elementOpenEnd.
-     * @param {string} tag The element's tag.
-     * @param {?string} key The key used to identify this element. This can be an
-     *     empty string, but performance may be better if a unique value is used
-     *     when iterating over an array of items.
-     * @param {?Array<*>} statics An array of attribute name/value pairs of the
-     *     static attributes for the Element. These will only be set once when the
-     *     Element is created.
-     */
-    export var elementOpenStart: (tag: string, key?: any, ...statics: any[]) => void;
-    /***
-     * Defines a virtual attribute at this point of the DOM. This is only valid
-     * when called between elementOpenStart and elementOpenEnd.
-     *
-     * @param {string} name
-     * @param {*} value
-     */
-    export var attr: (name: string, value: any) => void;
-    /**
-     * Closes an open tag started with elementOpenStart.
-     */
-    export var elementOpenEnd: () => void;
-    /**
-     * Closes an open virtual Element.
-     */
-    export var elementClose: (tag: string) => void;
-    /**
-     * Declares a virtual Element at the current location in the document that has
-     * no children.
-     * @param {string} tag The element's tag.
-     * @param {?string} key The key used to identify this element. This can be an
-     *     empty string, but performance may be better if a unique value is used
-     *     when iterating over an array of items.
-     * @param {?Array<*>} statics An array of attribute name/value pairs of the
-     *     static attributes for the Element. These will only be set once when the
-     *     Element is created.
-     * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
-     *     for the Element.
-     */
-    export var elementVoid: (tag: string, key?: string, statics?: any, ...var_args: any[]) => void;
-    /**
-     * Declares a virtual Text at this point in the document.
-     *
-     * @param {string} value The text of the Text.
-     */
-    export var text: (value: string) => void;
-}
+/**
+ * Patches the document starting at el with the provided function. This function
+ * may be called during an existing patch operation.
+ * @param {!Element} el the element to patch
+ * @param {!function(T)} fn A function containing elementOpen/elementClose/etc.
+ *     calls that describe the DOM.
+ * @param {?T} data An argument passed to fn to represent DOM state.
+ */
+declare export var patch: <T>(el: Node, fn: (data: T) => void, data?: T) => void;
+
+/**
+ * Declares a virtual Element at the current location in the document. This
+ * corresponds to an opening tag and a elementClose tag is required.
+ * @param {string} tag The element's tag.
+ * @param {?string} key The key used to identify this element. This can be an
+ *     empty string, but performance may be better if a unique value is used
+ *     when iterating over an array of items.
+ * @param {?Array<*>} statics An array of attribute name/value pairs of the
+ *     static attributes for the Element. These will only be set once when the
+ *     Element is created.
+ * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
+ *     for the Element.
+ */
+declare export var elementOpen: (tag: string, key?: string, statics?: any[], ...var_args: any[]) => void;
+/**
+ * Declares a virtual Element at the current location in the document. This
+ * corresponds to an opening tag and a elementClose tag is required. This is
+ * like elementOpen, but the attributes are defined using the attr function
+ * rather than being passed as arguments. Must be folllowed by 0 or more calls
+ * to attr, then a call to elementOpenEnd.
+ * @param {string} tag The element's tag.
+ * @param {?string} key The key used to identify this element. This can be an
+ *     empty string, but performance may be better if a unique value is used
+ *     when iterating over an array of items.
+ * @param {?Array<*>} statics An array of attribute name/value pairs of the
+ *     static attributes for the Element. These will only be set once when the
+ *     Element is created.
+ */
+declare export var elementOpenStart: (tag: string, key?: any, ...statics: any[]) => void;
+/***
+ * Defines a virtual attribute at this point of the DOM. This is only valid
+ * when called between elementOpenStart and elementOpenEnd.
+ *
+ * @param {string} name
+ * @param {*} value
+ */
+declare export var attr: (name: string, value: any) => void;
+/**
+ * Closes an open tag started with elementOpenStart.
+ */
+declare export var elementOpenEnd: () => void;
+/**
+ * Closes an open virtual Element.
+ */
+declare export var elementClose: (tag: string) => void;
+/**
+ * Declares a virtual Element at the current location in the document that has
+ * no children.
+ * @param {string} tag The element's tag.
+ * @param {?string} key The key used to identify this element. This can be an
+ *     empty string, but performance may be better if a unique value is used
+ *     when iterating over an array of items.
+ * @param {?Array<*>} statics An array of attribute name/value pairs of the
+ *     static attributes for the Element. These will only be set once when the
+ *     Element is created.
+ * @param {...*} var_args Attribute name/value pairs of the dynamic attributes
+ *     for the Element.
+ */
+declare export var elementVoid: (tag: string, key?: string, statics?: any, ...var_args: any[]) => void;
+/**
+ * Declares a virtual Text at this point in the document.
+ *
+ * @param {string} value The text of the Text.
+ */
+declare export var text: (value: string) => void;
diff --git a/inflected/inflected.d.ts b/inflected/inflected.d.ts
index c26476c381..bbd4509367 100644
--- a/inflected/inflected.d.ts
+++ b/inflected/inflected.d.ts
@@ -3,42 +3,41 @@
 // Definitions by: Daniel Schmidt <https://github.com/dsci>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "inflected" {
 
-  namespace Options {
+
+declare namespace Options {
     interface Humanize {
-      capitalize: boolean;
+        capitalize: boolean;
     }
 
     interface Transliterate {
-      locale: string;
-      replacement: string;
+        locale: string;
+        replacement: string;
     }
 
     interface Parameterize {
-      separator: string;
+        separator: string;
     }
-  }
+}
 
-  interface Inflected {
+interface Inflected {
     pluralize(word: string, locale?: string): string;
     singularize(word: string, locale?: string): string;
     camelize(term: string, uppercaseFirstLetter?: boolean): string;
     underscore(camelCaseWord: string): string;
     humanize(lowerCaseAndUnderscoredWord: string,
-             options?: Options.Humanize): string;
+        options?: Options.Humanize): string;
     titleize(sentence: string): string;
     tableize(className: string): string;
     classify(tableName: string): string;
     dasherize(underscoredWord: string): string;
     foreignKey(className: string,
-               separateClassNameAndIdWithUnderscore?:boolean): string;
+        separateClassNameAndIdWithUnderscore?: boolean): string;
     ordinal(number: number): string;
     ordinalize(number: number): string;
     transliterate(sentence: string, options?: Options.Transliterate): string;
     parameterize(sentence: string, options?: Options.Parameterize): string;
-  }
-
-  var Inflector:Inflected;
-  export = Inflector;
 }
+
+declare var Inflector: Inflected;
+export = Inflector;
diff --git a/inherits/inherits.d.ts b/inherits/inherits.d.ts
index 22ea03eb59..4b83485f9e 100644
--- a/inherits/inherits.d.ts
+++ b/inherits/inherits.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "inherits" {
-	import {inherits} from "util";
-	export = inherits;
-}
+
+import {inherits} from "util";
+export = inherits;
diff --git a/ini/ini.d.ts b/ini/ini.d.ts
index e194f9ebe6..a54769d9c7 100644
--- a/ini/ini.d.ts
+++ b/ini/ini.d.ts
@@ -3,23 +3,20 @@
 // Definitions by: Marcin Porębski <https://github.com/marcinporebski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "ini"
-{
-    interface EncodeOptions {
-        section: string
-        whitespace: boolean
-    }
-
-    function decode(inistring: string): any;
-
-    function parse(initstring: string): any;
-
-    function encode(object: any, options?: EncodeOptions): string;
-
-    function stringify(object: any, options?: EncodeOptions): string;
-
-    function safe(val: string): string;
-
-    function unsafe(val: string): string;
 
+interface EncodeOptions {
+    section: string
+    whitespace: boolean
 }
+
+declare function decode(inistring: string): any;
+
+declare function parse(initstring: string): any;
+
+declare function encode(object: any, options?: EncodeOptions): string;
+
+declare function stringify(object: any, options?: EncodeOptions): string;
+
+declare function safe(val: string): string;
+
+declare function unsafe(val: string): string;
diff --git a/iniparser/iniparser.d.ts b/iniparser/iniparser.d.ts
index ab97dd01f1..045c07a6fe 100644
--- a/iniparser/iniparser.d.ts
+++ b/iniparser/iniparser.d.ts
@@ -3,13 +3,12 @@
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "iniparser" {
-	export function parse<T>(
-		file: string,
-		callback: (err: any, data: T) => void
-	): void;
 
-	export function parseSync<T>(file: string): T;
+declare export function parse<T>(
+    file: string,
+    callback: (err: any, data: T) => void
+): void;
 
-	export function parseString<T>(data: string): T;
-}
+declare export function parseSync<T>(file: string): T;
+
+declare export function parseString<T>(data: string): T;
diff --git a/inline-css/inline-css.d.ts b/inline-css/inline-css.d.ts
index 478f25226b..c17b86f9f8 100644
--- a/inline-css/inline-css.d.ts
+++ b/inline-css/inline-css.d.ts
@@ -5,24 +5,23 @@
 
 /// <reference path="../bluebird/bluebird.d.ts" />
 
-declare module 'inline-css' {
-	import Promise = require('bluebird');
 
-	namespace InlineCss {
-		export interface Options {
-			url:string;
-			extraCss?:string;
-			applyStyleTags?:boolean;
-			applyLinkTags?:boolean;
-			removeStyleTags?:boolean;
-			removeLinkTags?:boolean;
-			preserveMediaQueries?:boolean;
-			applyWidthAttributes?:boolean;
-			applyTableAttributes?:boolean;
-		}
-	}
+import Promise = require('bluebird');
 
-	function InlineCss(html:string, options:InlineCss.Options):Promise<string>;
-
-	export = InlineCss;
+declare namespace InlineCss {
+    export interface Options {
+        url: string;
+        extraCss?: string;
+        applyStyleTags?: boolean;
+        applyLinkTags?: boolean;
+        removeStyleTags?: boolean;
+        removeLinkTags?: boolean;
+        preserveMediaQueries?: boolean;
+        applyWidthAttributes?: boolean;
+        applyTableAttributes?: boolean;
+    }
 }
+
+declare function InlineCss(html: string, options: InlineCss.Options): Promise<string>;
+
+export = InlineCss;
diff --git a/inquirer/inquirer.d.ts b/inquirer/inquirer.d.ts
index aef3ae8fcc..2015e4581b 100644
--- a/inquirer/inquirer.d.ts
+++ b/inquirer/inquirer.d.ts
@@ -6,294 +6,292 @@
 /// <reference path="../rx/rx-lite.d.ts" />
 /// <reference path="../through/through.d.ts" />
 
-declare module "inquirer" {
-    import through = require('through');
 
-    namespace inquirer {
-        type Prompts = { [name: string]: PromptModule };
-        type ChoiceType = string|objects.ChoiceOption|objects.Separator;
-        type Questions = Question|Question[]|Rx.Observable<Question>;
+import through = require('through');
 
-        interface Inquirer {
-            restoreDefaultPrompts(): void;
-            /**
-             * Expose helper functions on the top level for easiest usage by common users
-             * @param name
-             * @param prompt
-             */
-            registerPrompt(name: string, prompt: PromptModule): void;
-            /**
-             * Create a new self-contained prompt module.
-             */
-            createPromptModule(): PromptModule;
-            /**
-             * Public CLI helper interface
-             * @param questions Questions settings array
-             * @param cb Callback being passed the user answers
-             * @return
-             */
-            prompt(questions: Questions, cb?: (answers: Answers) => any): ui.Prompt;
-            prompts: Prompts;
-            Separator: objects.SeparatorStatic;
-            ui: {
-                BottomBar: ui.BottomBar;
-                Prompt: ui.Prompt;
-            }
-        }
-
-        interface PromptModule {
-            (questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
-            /**
-             * Register a prompt type
-             * @param name Prompt type name
-             * @param prompt Prompt constructor
-             */
-            registerPrompt(name: string, prompt: PromptModule): ui.Prompt;
-            /**
-             * Register the defaults provider prompts
-             */
-            restoreDefaultPrompts(): void;
-        }
-
-        interface Question {
-            /**
-             * Type of the prompt.
-             * Possible values:
-             * <ul>
-             *      <li>input</li>
-             *      <li>confirm</li>
-             *      <li>list</li>
-             *      <li>rawlist</li>
-             *      <li>password</li>
-             * </ul>
-             * @defaults: 'input'
-             */
-            type?: string;
-            /**
-             * The name to use when storing the answer in the anwers hash.
-             */
-            name?: string;
-            /**
-             * The question to print. If defined as a function,
-             * the first parameter will be the current inquirer session answers.
-             */
-            message?: string|((answers: Answers) => string);
-            /**
-             * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
-             * If defined as a function, the first parameter will be the current inquirer session answers.
-             */
-            default?: any|((answers: Answers) => any);
-            /**
-             * Choices array or a function returning a choices array. If defined as a function,
-             * the first parameter will be the current inquirer session answers.
-             * Array values can be simple strings, or objects containing a name (to display) and a value properties
-             * (to save in the answers hash). Values can also be a Separator.
-             */
-            choices?: ChoiceType[]|((answers: Answers) => ChoiceType[]);
-            /**
-             * Receive the user input and should return true if the value is valid, and an error message (String)
-             * otherwise. If false is returned, a default error message is provided.
-             */
-            validate?(input: string): boolean|string;
-            /**
-             * Receive the user input and return the filtered value to be used inside the program.
-             * The value returned will be added to the Answers hash.
-             */
-            filter?(input: string): string;
-            /**
-             * Receive the current user answers hash and should return true or false depending on whether or
-             * not this question should be asked. The value can also be a simple boolean.
-             */
-            when?: boolean|((answers: Answers) => boolean);
-            paginated?: boolean;
-        }
+declare namespace inquirer {
+    type Prompts = { [name: string]: PromptModule };
+    type ChoiceType = string | objects.ChoiceOption | objects.Separator;
+    type Questions = Question | Question[] | Rx.Observable<Question>;
 
+    interface Inquirer {
+        restoreDefaultPrompts(): void;
         /**
-         * A key/value hash containing the client answers in each prompt.
+         * Expose helper functions on the top level for easiest usage by common users
+         * @param name
+         * @param prompt
          */
-        interface Answers {
-            [key: string]: string|boolean;
-        }
-
-        namespace ui {
-            /**
-             * Base interface class other can inherits from
-             */
-            interface Prompt extends BaseUI<Prompts> {
-                new(promptModule: Prompts): Prompt;
-                /**
-                 * Once all prompt are over
-                 */
-                onCompletion(): void;
-                processQuestion(question: Question): any;
-                fetchAnswer(question: Question): any;
-                setDefaultType(question: Question): any;
-                filterIfRunnable(question: Question): any;
-            }
-
-            /**
-             * Sticky bottom bar user interface
-             */
-            interface BottomBar extends BaseUI<BottomBarOption> {
-                new(opt?: BottomBarOption): BottomBar;
-                /**
-                 * Render the prompt to screen
-                 * @return self
-                 */
-                render(): BottomBar;
-                /**
-                 * Update the bottom bar content and rerender
-                 * @param bottomBar Bottom bar content
-                 * @return self
-                 */
-                updateBottomBar(bottomBar: string): BottomBar;
-                /**
-                 * Rerender the prompt
-                 * @return self
-                 */
-                writeLog(data: any): BottomBar;
-                /**
-                 * Make sure line end on a line feed
-                 * @param str Input string
-                 * @return The input string with a final line feed
-                 */
-                enforceLF(str: string): string;
-                /**
-                 * Helper for writing message in Prompt
-                 * @param message The message to be output
-                 */
-                write(message: string): void;
-                log: through.ThroughStream;
-            }
-
-            interface BottomBarOption {
-                bottomBar?: string;
-            }
-            /**
-             * Base interface class other can inherits from
-             */
-            interface BaseUI<TOpt> {
-                new(opt: TOpt): void;
-                /**
-                 * Handle the ^C exit
-                 * @return {null}
-                 */
-                onForceClose(): void;
-                /**
-                 * Close the interface and cleanup listeners
-                 */
-                close(): void;
-                /**
-                 * Handle and propagate keypress events
-                 */
-                onKeypress(s: string, key: Key): void;
-            }
-
-            interface Key {
-                sequence: string;
-                name: string;
-                meta: boolean;
-                shift: boolean;
-                ctrl: boolean;
-            }
-        }
-
-        namespace objects {
-            /**
-             * Choice object
-             * Normalize input as choice object
-             * @constructor
-             * @param {String|Object} val  Choice value. If an object is passed, it should contains
-             *                             at least one of `value` or `name` property
-             */
-            interface Choice {
-                new(str: string): Choice;
-                new(separator: Separator): Choice;
-                new(option: ChoiceOption): Choice;
-            }
-
-            interface ChoiceOption {
-                name?: string;
-                value?: string;
-                type?: string;
-                extra?: any;
-                key?: string;
-                checked?: boolean;
-                disabled?: string|((answers: Answers) => any);
-            }
-
-            /**
-             * Choices collection
-             * Collection of multiple `choice` object
-             * @constructor
-             * @param choices  All `choice` to keep in the collection
-             */
-            interface Choices {
-                new(choices: (string|Separator|ChoiceOption)[], answers?: Answers): Choices;
-                choices: Choice[];
-                realChoices: Choice[];
-                length: number;
-                realLength: number;
-                /**
-                 * Get a valid choice from the collection
-                 * @param selector The selected choice index
-                 * @return Return the matched choice or undefined
-                 */
-                getChoice(selector: number): Choice;
-                /**
-                 * Get a raw element from the collection
-                 * @param selector The selected index value
-                 * @return Return the matched choice or undefined
-                 */
-                get(selector: number): Choice;
-                /**
-                 * Match the valid choices against a where clause
-                 * @param whereClause Lodash `where` clause
-                 * @return Matching choices or empty array
-                 */
-                where<U extends {}>(whereClause: U): Choice[];
-                /**
-                 * Pluck a particular key from the choices
-                 * @param propertyName Property name to select
-                 * @return Selected properties
-                 */
-                pluck(propertyName: string): any[];
-                forEach<T>(application: (choice: Choice) => T): T[];
-            }
-
-            interface SeparatorStatic {
-                /**
-                 * @param line Separation line content (facultative)
-                 */
-                new(line?: string): Separator;
-                /**
-                 * Helper function returning false if object is a separator
-                 * @param obj object to test against
-                 * @return `false` if object is a separator
-                 */
-                exclude(obj: any): boolean;
-            }
-
-            /**
-             * Separator object
-             * Used to space/separate choices group
-             * @constructor
-             * @param {String} line   Separation line content (facultative)
-             */
-            interface Separator {
-                type: string;
-                line: string;
-                /**
-                 * Stringify separator
-                 * @return {String} the separator display string
-                 */
-                toString(): string;
-            }
+        registerPrompt(name: string, prompt: PromptModule): void;
+        /**
+         * Create a new self-contained prompt module.
+         */
+        createPromptModule(): PromptModule;
+        /**
+         * Public CLI helper interface
+         * @param questions Questions settings array
+         * @param cb Callback being passed the user answers
+         * @return
+         */
+        prompt(questions: Questions, cb?: (answers: Answers) => any): ui.Prompt;
+        prompts: Prompts;
+        Separator: objects.SeparatorStatic;
+        ui: {
+            BottomBar: ui.BottomBar;
+            Prompt: ui.Prompt;
         }
     }
 
-    var inquirer: inquirer.Inquirer;
+    interface PromptModule {
+        (questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
+        /**
+         * Register a prompt type
+         * @param name Prompt type name
+         * @param prompt Prompt constructor
+         */
+        registerPrompt(name: string, prompt: PromptModule): ui.Prompt;
+        /**
+         * Register the defaults provider prompts
+         */
+        restoreDefaultPrompts(): void;
+    }
 
-    export = inquirer;
+    interface Question {
+        /**
+         * Type of the prompt.
+         * Possible values:
+         * <ul>
+         *      <li>input</li>
+         *      <li>confirm</li>
+         *      <li>list</li>
+         *      <li>rawlist</li>
+         *      <li>password</li>
+         * </ul>
+         * @defaults: 'input'
+         */
+        type?: string;
+        /**
+         * The name to use when storing the answer in the anwers hash.
+         */
+        name?: string;
+        /**
+         * The question to print. If defined as a function,
+         * the first parameter will be the current inquirer session answers.
+         */
+        message?: string | ((answers: Answers) => string);
+        /**
+         * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
+         * If defined as a function, the first parameter will be the current inquirer session answers.
+         */
+        default?: any | ((answers: Answers) => any);
+        /**
+         * Choices array or a function returning a choices array. If defined as a function,
+         * the first parameter will be the current inquirer session answers.
+         * Array values can be simple strings, or objects containing a name (to display) and a value properties
+         * (to save in the answers hash). Values can also be a Separator.
+         */
+        choices?: ChoiceType[] | ((answers: Answers) => ChoiceType[]);
+        /**
+         * Receive the user input and should return true if the value is valid, and an error message (String)
+         * otherwise. If false is returned, a default error message is provided.
+         */
+        validate?(input: string): boolean | string;
+        /**
+         * Receive the user input and return the filtered value to be used inside the program.
+         * The value returned will be added to the Answers hash.
+         */
+        filter?(input: string): string;
+        /**
+         * Receive the current user answers hash and should return true or false depending on whether or
+         * not this question should be asked. The value can also be a simple boolean.
+         */
+        when?: boolean | ((answers: Answers) => boolean);
+        paginated?: boolean;
+    }
+
+    /**
+     * A key/value hash containing the client answers in each prompt.
+     */
+    interface Answers {
+        [key: string]: string | boolean;
+    }
+
+    namespace ui {
+        /**
+         * Base interface class other can inherits from
+         */
+        interface Prompt extends BaseUI<Prompts> {
+            new (promptModule: Prompts): Prompt;
+            /**
+             * Once all prompt are over
+             */
+            onCompletion(): void;
+            processQuestion(question: Question): any;
+            fetchAnswer(question: Question): any;
+            setDefaultType(question: Question): any;
+            filterIfRunnable(question: Question): any;
+        }
+
+        /**
+         * Sticky bottom bar user interface
+         */
+        interface BottomBar extends BaseUI<BottomBarOption> {
+            new (opt?: BottomBarOption): BottomBar;
+            /**
+             * Render the prompt to screen
+             * @return self
+             */
+            render(): BottomBar;
+            /**
+             * Update the bottom bar content and rerender
+             * @param bottomBar Bottom bar content
+             * @return self
+             */
+            updateBottomBar(bottomBar: string): BottomBar;
+            /**
+             * Rerender the prompt
+             * @return self
+             */
+            writeLog(data: any): BottomBar;
+            /**
+             * Make sure line end on a line feed
+             * @param str Input string
+             * @return The input string with a final line feed
+             */
+            enforceLF(str: string): string;
+            /**
+             * Helper for writing message in Prompt
+             * @param message The message to be output
+             */
+            write(message: string): void;
+            log: through.ThroughStream;
+        }
+
+        interface BottomBarOption {
+            bottomBar?: string;
+        }
+        /**
+         * Base interface class other can inherits from
+         */
+        interface BaseUI<TOpt> {
+            new (opt: TOpt): void;
+            /**
+             * Handle the ^C exit
+             * @return {null}
+             */
+            onForceClose(): void;
+            /**
+             * Close the interface and cleanup listeners
+             */
+            close(): void;
+            /**
+             * Handle and propagate keypress events
+             */
+            onKeypress(s: string, key: Key): void;
+        }
+
+        interface Key {
+            sequence: string;
+            name: string;
+            meta: boolean;
+            shift: boolean;
+            ctrl: boolean;
+        }
+    }
+
+    namespace objects {
+        /**
+         * Choice object
+         * Normalize input as choice object
+         * @constructor
+         * @param {String|Object} val  Choice value. If an object is passed, it should contains
+         *                             at least one of `value` or `name` property
+         */
+        interface Choice {
+            new (str: string): Choice;
+            new (separator: Separator): Choice;
+            new (option: ChoiceOption): Choice;
+        }
+
+        interface ChoiceOption {
+            name?: string;
+            value?: string;
+            type?: string;
+            extra?: any;
+            key?: string;
+            checked?: boolean;
+            disabled?: string | ((answers: Answers) => any);
+        }
+
+        /**
+         * Choices collection
+         * Collection of multiple `choice` object
+         * @constructor
+         * @param choices  All `choice` to keep in the collection
+         */
+        interface Choices {
+            new (choices: (string | Separator | ChoiceOption)[], answers?: Answers): Choices;
+            choices: Choice[];
+            realChoices: Choice[];
+            length: number;
+            realLength: number;
+            /**
+             * Get a valid choice from the collection
+             * @param selector The selected choice index
+             * @return Return the matched choice or undefined
+             */
+            getChoice(selector: number): Choice;
+            /**
+             * Get a raw element from the collection
+             * @param selector The selected index value
+             * @return Return the matched choice or undefined
+             */
+            get(selector: number): Choice;
+            /**
+             * Match the valid choices against a where clause
+             * @param whereClause Lodash `where` clause
+             * @return Matching choices or empty array
+             */
+            where<U extends {}>(whereClause: U): Choice[];
+            /**
+             * Pluck a particular key from the choices
+             * @param propertyName Property name to select
+             * @return Selected properties
+             */
+            pluck(propertyName: string): any[];
+            forEach<T>(application: (choice: Choice) => T): T[];
+        }
+
+        interface SeparatorStatic {
+            /**
+             * @param line Separation line content (facultative)
+             */
+            new (line?: string): Separator;
+            /**
+             * Helper function returning false if object is a separator
+             * @param obj object to test against
+             * @return `false` if object is a separator
+             */
+            exclude(obj: any): boolean;
+        }
+
+        /**
+         * Separator object
+         * Used to space/separate choices group
+         * @constructor
+         * @param {String} line   Separation line content (facultative)
+         */
+        interface Separator {
+            type: string;
+            line: string;
+            /**
+             * Stringify separator
+             * @return {String} the separator display string
+             */
+            toString(): string;
+        }
+    }
 }
 
+declare var inquirer: inquirer.Inquirer;
+
+export = inquirer;
diff --git a/irc/irc.d.ts b/irc/irc.d.ts
index 00dd3220e1..e62ac18649 100644
--- a/irc/irc.d.ts
+++ b/irc/irc.d.ts
@@ -6,874 +6,873 @@
 /// <reference path="../node/node-0.10.d.ts" />
 
 /** This library provides IRC client functionality. */
-declare module 'irc' {
-    import events = require('events');
-    import crypto = require('crypto');
-    import net = require('net');
 
-    /** This library provides IRC client functionality. */
-    namespace NodeIRC {
-        /** A nick connect to an IRC server. */
-        export class Client extends events.EventEmitter {
-            /**
-             * Socket to the server. Rarely, if ever needed. Use Client#send
-             * instead.
-             */
-            public conn: net.Socket
+import events = require('events');
+import crypto = require('crypto');
+import net = require('net');
 
-            /**
-             * Channels joined. Includes channel modes, user list, and topic
-             * information. Only updated after the server recognizes the join.
-             */
-            public chans: {
-                [index: string]: {
-                    key: string;
-                    serverName: string;
-                    users: {
-                        [index: string]: string;
-                    };
-                    mode: string;
-                    created: string;
-                }
-            }
+/** This library provides IRC client functionality. */
+declare namespace NodeIRC {
+    /** A nick connect to an IRC server. */
+    export class Client extends events.EventEmitter {
+        /**
+         * Socket to the server. Rarely, if ever needed. Use Client#send
+         * instead.
+         */
+        public conn: net.Socket
 
-            /** Features supported by the server */
-            public supported: {
-                channel: {
-                    idlength: string[];
-                    length: number;
-                    limit: string[];
-                    modes: {
-                        [index: string]: string;
-                    }
-                    types: string;
+        /**
+         * Channels joined. Includes channel modes, user list, and topic
+         * information. Only updated after the server recognizes the join.
+         */
+        public chans: {
+            [index: string]: {
+                key: string;
+                serverName: string;
+                users: {
+                    [index: string]: string;
                 };
-
-                kicklength: number;
-                maxlist: number[];
-                maxtargets: string[];
-                modes: number;
-                nicklength: number
-                topiclength: number;
-                usermodes: string;
+                mode: string;
+                created: string;
             }
+        }
 
+        /** Features supported by the server */
+        public supported: {
+            channel: {
+                idlength: string[];
+                length: number;
+                limit: string[];
+                modes: {
+                    [index: string]: string;
+                }
+                types: string;
+            };
+
+            kicklength: number;
+            maxlist: number[];
+            maxtargets: string[];
+            modes: number;
+            nicklength: number
+            topiclength: number;
+            usermodes: string;
+        }
+
+        /**
+         * The current nick of the client. Updated if the nick changes
+         */
+        public nick: string;
+
+        /** Channel listing data. */
+        public channellist: IChannel[];
+
+        /** IRC server MOTD */
+        public motd: string;
+
+        /** Maximum line length */
+        public maxLineLength: number;
+
+        /** Bot options */
+        public opt: IClientOpts;
+
+        /** Host mask */
+        public hostMask: string;
+
+        /**
+         * Connect to an IRC server
+         * @param server - server hostname
+         * @param nick - nickname
+         * @param opts
+         */
+        constructor(
+            server: string,
+            nick: string,
+            opts?: IClientOpts
+        );
+
+        /**
+         * Send a raw message to the server; generally speaking, it’s best
+         * not to use this method unless you know what you’re doing.
+         * @param command - irc command
+         * @param args - command arguments (splat)
+         */
+        public send(
+            command: string,
+            ...args: string[]
+        ): void;
+
+        /**
+         * Join the specified channel
+         * @param channel - channel to join
+         * @param callback
+         */
+        public join(
+            channel: string,
+            callback?: handlers.IJoinChannel
+        ): void;
+
+        /**
+         * Part the specified channel
+         * @param channel - channel to part
+         * @param message - optional message to send
+         * @param callback
+         */
+        public part(
+            channel: string,
+            message: string,
+            callback: handlers.IPartChannel
+        ): void;
+
+        /**
+         * Send a message to the specified target
+         * @param target - nick or channel
+         * @param message - message to send
+         */
+        public say(
+            target: string,
+            message: string
+        ): void;
+
+        /**
+         * Send a CTCP message to the specified target
+         * @param target - nick or channel
+         * @param type - "privmsg" for PRIVMSG, anything else for NOTICE
+         * @param text - CTCP message
+         */
+        public ctcp(
+            target: string,
+            type: string,
+            text: string
+        ): void;
+
+        /**
+         * Send an action to the specified target
+         * @param target - target
+         * @param message - message
+         */
+        public action(
+            target: string,
+            message: string
+        ): void;
+
+        /**
+         * Send a notice to the specified target.
+         * @param target - nick or channel
+         * @param message - message to send
+         */
+        public notice(
+            target: string,
+            message: string
+        ): void;
+
+        /**
+         * Request a whois for the specified nick
+         * @param nick - nickname
+         * @param callback
+         */
+        public whois(
+            nick: string,
+            callback: handlers.IWhois
+        ): void;
+
+        /**
+         * Request a channel listing from the server. The arguments for this
+         * are farily server specific, this method passes them as specified.
+         *
+         * Responses from the server are available via `channellist_start`,
+         * `channellist_item`, and `channellist` events.
+         *
+         * @param args - arguments
+         */
+        public list(
+            ...args: string[]
+        ): void;
+
+        /**
+         * Connect to the server. Use when `autoConnect` is false.
+         * @param retryCount - times to retry
+         * @param callback
+         */
+        public connect(
+            retryCount?: number,
+            callback?: handlers.IRaw
+        ): void;
+
+        /**
+         * Disconnect from the IRC server
+         * @param message - message to send
+         * @param callback
+         */
+        public disconnect(
+            message: string,
+            callback: () => void
+        ): void;
+
+        /**
+         * Activate flood protection “after the fact�. You can also use
+         * floodProtection while instantiating the Client to enable flood
+         * protection, and floodProtectionDelay to set the default message
+         * interval.
+         * @param interval - ms to wait between messages
+         */
+        public activateFloodProtection(
+            interval: number
+        ): void;
+    }
+
+    /** Client options object */
+    export interface IClientOpts {
+        /**
+         * IRC username
+         * @default 'nodebot'
+         */
+        userName?: string;
+
+        /**
+         * IRC "real name"
+         * @default 'nodeJS IRC client'
+         */
+        realName?: string;
+
+        /**
+         * IRC connection port. See
+         * https://nodejs.org/api/net.html#net_socket_remoteport
+         * @default 6667
+         */
+        port?: number;
+
+        /**
+         * Local interface to bind to for network connections. See
+         * https://nodejs.org/api/net.html#net_socket_localaddress
+         */
+        localAddress?: string;
+
+        /**
+         * Should we output debug messages to STDOUT?
+         * @default false
+         */
+        debug?: boolean;
+
+        /**
+         * Should we output IRC errors?
+         * @default false
+         */
+        showErrors?: boolean;
+
+        /**
+         * Should we auto-rejoin channels?
+         * @default false
+         */
+        autoRejoin?: boolean;
+
+        /**
+         * Should we auto-reconnect to networks?
+         * @default true
+         */
+        autoConnect?: boolean;
+
+        /**
+         * Channels to join
+         * @default []
+         */
+        channels?: string[];
+
+        /**
+         * Should SSL be used? Can either be true or crypto credentials.
+         * @default false
+         */
+        secure?: boolean | crypto.Credentials;
+
+        /**
+         * Should we accept self-signed certificates?
+         * @default false
+         */
+        selfSigned?: boolean;
+
+
+        /**
+         * Should we accept expired certificates?
+         * @default false
+         */
+        certExpired?: boolean;
+
+        /**
+         * Should we queue our messages to ensure we don't get kicked?
+         * @default false
+         */
+        floodProtection?: boolean;
+
+        /**
+         * Delay between messages when flood protection is active
+         * @default 1000
+         */
+        floodProtectionDelay?: number;
+
+        /**
+         * Should we use SASL authentication?
+         * @default false
+         */
+        sasl?: boolean;
+
+        /**
+         * Should we strip mIRC colors from the output messages?
+         * @default false
+         */
+        stripColors?: boolean;
+
+        /**
+         * Channel prefix
+         * @default '&#'
+         */
+        channelPrefixes?: string;
+
+        /**
+         * Characters to split a message at.
+         * @default 512
+         */
+        messageSplit?: number;
+
+        /**
+         * Encoding to use. See
+         * https://nodejs.org/api/stream.html#stream_readable_setencoding_encoding
+         * @default 'utf-8'
+         */
+        encoding?: string;
+    }
+
+    /** Command types */
+    export enum CommandType {
+        normal, reply, error
+    }
+
+    /** Parsed IRC message. */
+    export interface IMessage {
+        /** Prefix */
+        prefix?: string;
+
+        /** Mapped IRC command */
+        command: string;
+
+        /** Raw IRC command */
+        rawCommand: string;
+
+        /** Command type */
+        commandType: CommandType;
+
+        /** Command arguments */
+        args: string[];
+    }
+
+    /** Whois data */
+    export interface IWhoisData {
+        /** Nickname */
+        nick: string;
+
+        /** Username */
+        user: string;
+
+        /** Hostnamej */
+        host: string;
+
+        /** Real name" */
+        realname: string;
+
+        /** Channels */
+        channels: string[];
+
+        /** Server */
+        server: string;
+
+        /** Server description string */
+        serverinfo: string;
+
+        /** Is this user an operator? */
+        operator: string;
+    }
+
+    /** A channel returned by a channel listing. */
+    export interface IChannel {
+        /** Channel name */
+        name: string;
+
+        /** User count */
+        users: string;
+
+        /** Topic string */
+        topic: string;
+    }
+
+    /**
+     * Handler functions for Client.
+     */
+    namespace handlers {
+        /**
+         * 'registered': Emitted when the server sends the initial 001 line,
+         * indicating you’ve connected to the server. See the raw event for
+         * details on the message object.
+         */
+        export interface IRegistered {
             /**
-             * The current nick of the client. Updated if the nick changes
+             * @param message - raw message
              */
-            public nick: string;
-
-            /** Channel listing data. */
-            public channellist: IChannel[];
-
-            /** IRC server MOTD */
-            public motd: string;
-
-            /** Maximum line length */
-            public maxLineLength: number;
-
-            /** Bot options */
-            public opt: IClientOpts;
-
-            /** Host mask */
-            public hostMask: string;
+            (message: IMessage): void;
+        }
 
+        /**
+         * 'motd': Emitted when the server sends the message of the day to
+         * clients.
+         */
+        export interface IMotd {
             /**
-             * Connect to an IRC server
-             * @param server - server hostname
-             * @param nick - nickname
-             * @param opts
+             * @param motd - motd string
              */
-            constructor(
-                server: string,
+            (motd: string): void;
+        }
+
+        /**
+         * 'names': Emitted when the server sends a list of nicks for a channel
+         * (which happens immediately after joining and on request. The nicks
+         * object passed to the callback is keyed by nick names, and has
+         * values ‘’, ‘+’, or ‘@’ depending on the level of that nick in the
+         * channel.
+         */
+        export interface INames {
+            /**
+             * @param channel - channel name
+             * @param nicks - nicks list
+             */
+            (channel: string, nicks: string[]): void;
+        }
+
+        /**
+         * 'names#*' As per ‘names’ event but only emits for the subscribed
+         * channel.
+         */
+        export interface INamesChannel {
+            /**
+             * @param channel - channel name
+             * @param nicks - nicks list
+             */
+            (nicks: string[]): void;
+        }
+
+        /**
+         * 'topic': Emitted when the server sends the channel topic on joining
+         * a channel, or when a user changes the topic on a channel. See the
+         * raw event for details on the message object.
+         */
+        export interface ITopic {
+            /**
+             * @param channel - channel name
+             * @param topic - topic
+             * @param nick - nick
+             * @param message - raw message
+             */
+            (
+                channel: string,
+                topic: string,
                 nick: string,
-                opts?: IClientOpts
-            );
-
-            /**
-             * Send a raw message to the server; generally speaking, it’s best
-             * not to use this method unless you know what you’re doing.
-             * @param command - irc command
-             * @param args - command arguments (splat)
-             */
-            public send(
-                command: string,
-                ...args: string[]
+                message: IMessage
             ): void;
+        }
 
+        /**
+         * 'join': Emitted when a user joins a channel (including when the
+         * client itself joins a channel). See the raw event for details on the
+         * message object.
+         */
+        export interface IJoin {
             /**
-             * Join the specified channel
-             * @param channel - channel to join
-             * @param callback
+             * @param channel - channel name
+             * @param nick - who joined
+             * @param message - raw message
              */
-            public join(
+            (channel: string, nick: string, message: IMessage): void;
+        }
+
+        /**
+         * 'join#*': As per ‘join’ event but only emits for the subscribed
+         * channel. See the raw event for details on the message object.
+         */
+        export interface IJoinChannel {
+            /**
+             * @param nick - who joined
+             * @param message - raw message
+             */
+            (nick: string, message: IMessage): void;
+        }
+
+        /**
+         * 'part': Emitted when a user parts a channel (including when the
+         * client itself parts a channel). See the raw event for details on the
+         * message object.
+         */
+        export interface IPart {
+            /**
+             * @param channel - channel name
+             * @param nick - who parted
+             * @param reason - part reason
+             * @param message - raw message
+             */
+            (
                 channel: string,
-                callback?: handlers.IJoinChannel
-            ): void;
+                nick: string,
+                reason: string,
+                message: IMessage
+            ): void
+        }
 
+        /**
+         * 'part': As per ‘part’ event but only emits for the subscribed
+         * channel. See the raw event for details on the message object.
+         */
+        export interface IPartChannel {
             /**
-             * Part the specified channel
-             * @param channel - channel to part
-             * @param message - optional message to send
-             * @param callback
+             * @param nick - who parted
+             * @param reason - part reason
+             * @param message - raw message
              */
-            public part(
+            (
+                nick: string,
+                reason: string,
+                message: IMessage
+            ): void
+        }
+
+        /**
+         * 'kick': Emitted when a user is kicked from a channel. See the raw
+         * event for details on the message object.
+         */
+        export interface IKick {
+            /**
+             * @param channel - channel name
+             * @param nick - who was kicked
+             * @param by - kicker
+             * @param reason - kick reason
+             * @param message - raw message
+             */
+            (
                 channel: string,
-                message: string,
-                callback: handlers.IPartChannel
+                nick: string,
+                by: string,
+                reason: string,
+                message: IMessage
             ): void;
+        }
 
+        /**
+         * 'kick#*': Emitted when a user is kicked from a channel. See the raw
+         * event for details on the message object.
+         */
+        export interface IKickChannel {
             /**
-             * Send a message to the specified target
-             * @param target - nick or channel
-             * @param message - message to send
+             * @param nick - who was kicked
+             * @param by - kicker
+             * @param reason - kick reason
+             * @param message - raw message
              */
-            public say(
-                target: string,
-                message: string
+            (
+                nick: string,
+                by: string,
+                reason: string,
+                message: IMessage
             ): void;
+        }
 
+        /**
+         * 'message': Emitted when a message is sent. to can be either a nick
+         * (which is most likely this clients nick and means a private message),
+         * or a channel (which means a message to that channel). See the raw
+         * event for details on the message object.
+         */
+        export interface IRecievedMessage {
             /**
-             * Send a CTCP message to the specified target
-             * @param target - nick or channel
-             * @param type - "privmsg" for PRIVMSG, anything else for NOTICE
-             * @param text - CTCP message
+             * @param nick - who sent the message
+             * @param to - to whom was the message sent
+             * @param text - message text
+             * @param message - raw message
              */
-            public ctcp(
-                target: string,
+            (
+                nick: string, to: string, text: string, message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'message#': Emitted when a message is sent to any channel (i.e.
+         * exactly the same as the message event but excluding private
+         * messages. See the raw event for details on the message object.
+         */
+        export interface IMessageAllChannels {
+            /**
+             * @param nick - who sent the message
+             * @param to - to whom was the message sent
+             * @param text - message text
+             * @param message - raw message
+             */
+            (
+                nick: string, to: string, text: string, message: IMessage
+            ): void;
+        }
+
+        /**
+         * 'message#*': As per ‘message’ event but only emits for the
+         * subscribed channel. See the raw event for details on the message
+         * object.
+         */
+        export interface IMessageChannel {
+            /**
+             * @param nick - who sent the message
+             * @param text - message text
+             * @param message - raw message
+             */
+            (nick: string, text: string, message: IMessage): void;
+        }
+
+        /**
+         * 'selfMessage': Emitted when a message is sent from the client.
+         * `to` is who the message was sent to. It can be either a nick
+         * (which most likely means a private message), or a channel (which
+         * means a message to that channel).
+         */
+        export interface ISelfMessage {
+            (to: string, text: string): void;
+        }
+
+        /**
+         * 'notice': Emitted when a notice is sent. to can be either a nick
+         * (which is most likely this clients nick and means a private
+         * message), or a channel (which means a message to that channel). nick
+         * is either the senders nick or null which means that the notice comes
+         * from the server. See the raw event for details on the message object.
+         */
+        export interface INotice {
+            /**
+             * @param nick - from
+             * @param to - to
+             * @param text - text
+             * @param message - raw message
+             */
+            (nick: string, to: string, text: string, message: IMessage): void;
+        }
+
+        /**
+         * 'ping': Emitted when a server PINGs the client. The client will
+         * automatically send a PONG request just before this is emitted.
+         */
+        export interface IPing {
+            /**
+             * @param server - server that adiministered the ping
+             */
+            (server: string): void;
+        }
+
+        /**
+         * 'pm': As per ‘message’ event but only emits when the message is
+         * direct to the client. See the raw event for details on the message
+         * object.
+         */
+        export interface IPm {
+            /**
+             * @param nick - sender
+             * @param text - message text
+             * @param message - raw message
+             */
+            (nick: string, text: string, message: IMessage): void;
+        }
+
+        /**
+         * 'ctcp': Emitted when a CTCP notice or privmsg was received (type
+         * is either ‘notice’ or ‘privmsg’). See the raw event for details
+         * on the message object.
+         */
+        export interface ICtcp {
+            /**
+             * @param from - sender
+             * @param to - recievier
+             * @param text - ctcp text
+             * @param type - ctcp type
+             * @param message - raw message
+             */
+            (
+                from: string,
+                to: string,
+                text: string,
                 type: string,
-                text: string
-            ): void;
-
-            /**
-             * Send an action to the specified target
-             * @param target - target
-             * @param message - message
-             */
-            public action(
-                target: string,
-                message: string
-            ): void;
-
-            /**
-             * Send a notice to the specified target.
-             * @param target - nick or channel
-             * @param message - message to send
-             */
-            public notice(
-                target: string,
-                message: string
-            ): void;
-
-            /**
-             * Request a whois for the specified nick
-             * @param nick - nickname
-             * @param callback
-             */
-            public whois(
-                nick: string,
-                callback: handlers.IWhois
-            ): void;
-
-            /**
-             * Request a channel listing from the server. The arguments for this
-             * are farily server specific, this method passes them as specified.
-             *
-             * Responses from the server are available via `channellist_start`,
-             * `channellist_item`, and `channellist` events.
-             *
-             * @param args - arguments
-             */
-            public list(
-                ...args:  string[]
-            ): void;
-
-            /**
-             * Connect to the server. Use when `autoConnect` is false.
-             * @param retryCount - times to retry
-             * @param callback
-             */
-            public connect(
-                retryCount?: number,
-                callback?: handlers.IRaw
-            ): void;
-
-            /**
-             * Disconnect from the IRC server
-             * @param message - message to send
-             * @param callback
-             */
-            public disconnect(
-                message: string,
-                callback: () => void
-            ): void;
-
-            /**
-             * Activate flood protection “after the fact�. You can also use
-             * floodProtection while instantiating the Client to enable flood
-             * protection, and floodProtectionDelay to set the default message
-             * interval.
-             * @param interval - ms to wait between messages
-             */
-            public activateFloodProtection(
-                interval: number
+                message: IMessage
             ): void;
         }
 
-        /** Client options object */
-        export interface IClientOpts {
+
+        /**
+         * 'ctcp-*': Emitted when a specific type of CTCP request was
+         * recieved.
+         */
+        export interface ICtcpSpecific {
             /**
-             * IRC username
-             * @default 'nodebot'
+             * @param from - sender
+             * @param to - recievier
+             * @param message - raw message
              */
-            userName?: string;
+            (
+                from: string,
+                to: string,
+                text: string,
+                message: IMessage
+            ): void;
 
-            /**
-             * IRC "real name"
-             * @default 'nodeJS IRC client'
-             */
-            realName?: string;
-
-            /**
-             * IRC connection port. See
-             * https://nodejs.org/api/net.html#net_socket_remoteport
-             * @default 6667
-             */
-            port?: number;
-
-            /**
-             * Local interface to bind to for network connections. See
-             * https://nodejs.org/api/net.html#net_socket_localaddress
-             */
-            localAddress?: string;
-
-            /**
-             * Should we output debug messages to STDOUT?
-             * @default false
-             */
-            debug?: boolean;
-
-            /**
-             * Should we output IRC errors?
-             * @default false
-             */
-            showErrors?: boolean;
-
-            /**
-             * Should we auto-rejoin channels?
-             * @default false
-             */
-            autoRejoin?: boolean;
-
-            /**
-             * Should we auto-reconnect to networks?
-             * @default true
-             */
-            autoConnect?: boolean;
-
-            /**
-             * Channels to join
-             * @default []
-             */
-            channels?: string[];
-
-            /**
-             * Should SSL be used? Can either be true or crypto credentials.
-             * @default false
-             */
-            secure?: boolean | crypto.Credentials;
-
-            /**
-             * Should we accept self-signed certificates?
-             * @default false
-             */
-            selfSigned?: boolean;
-
-
-            /**
-             * Should we accept expired certificates?
-             * @default false
-             */
-            certExpired?: boolean;
-
-            /**
-             * Should we queue our messages to ensure we don't get kicked?
-             * @default false
-             */
-            floodProtection?: boolean;
-
-            /**
-             * Delay between messages when flood protection is active
-             * @default 1000
-             */
-            floodProtectionDelay?: number;
-
-            /**
-             * Should we use SASL authentication?
-             * @default false
-             */
-            sasl?: boolean;
-
-            /**
-             * Should we strip mIRC colors from the output messages?
-             * @default false
-             */
-            stripColors?: boolean;
-
-            /**
-             * Channel prefix
-             * @default '&#'
-             */
-            channelPrefixes?: string;
-
-            /**
-             * Characters to split a message at.
-             * @default 512
-             */
-            messageSplit?: number;
-
-            /**
-             * Encoding to use. See
-             * https://nodejs.org/api/stream.html#stream_readable_setencoding_encoding
-             * @default 'utf-8'
-             */
-            encoding?: string;
-        }
-
-        /** Command types */
-        export enum CommandType {
-            normal, reply, error
-        }
-
-        /** Parsed IRC message. */
-        export interface IMessage {
-            /** Prefix */
-            prefix?: string;
-
-            /** Mapped IRC command */
-            command: string;
-
-            /** Raw IRC command */
-            rawCommand: string;
-
-            /** Command type */
-            commandType: CommandType;
-
-            /** Command arguments */
-            args: string[];
-        }
-
-        /** Whois data */
-        export interface IWhoisData {
-            /** Nickname */
-            nick: string;
-
-            /** Username */
-            user: string;
-
-            /** Hostnamej */
-            host: string;
-
-            /** Real name" */
-            realname: string;
-
-            /** Channels */
-            channels: string[];
-
-            /** Server */
-            server: string;
-
-            /** Server description string */
-            serverinfo: string;
-
-            /** Is this user an operator? */
-            operator: string;
-        }
-
-        /** A channel returned by a channel listing. */
-        export interface IChannel {
-            /** Channel name */
-            name: string;
-
-            /** User count */
-            users: string;
-
-            /** Topic string */
-            topic: string;
+            (
+                from: string,
+                to: string,
+                text: string,
+                type: string,
+                message: IMessage
+            ): void;
         }
 
         /**
-         * Handler functions for Client.
+         * 'nick': Emitted when a user changes nick along with the channels
+         * the user is in. See the raw event for details on the message
+         * object.
          */
-        namespace handlers {
+        export interface INick {
             /**
-             * 'registered': Emitted when the server sends the initial 001 line,
-             * indicating you’ve connected to the server. See the raw event for
-             * details on the message object.
+             * @param oldnick - old nickname
+             * @param newnick - new nickname
+             * @param channels - channels the nick changed in
+             * @param message - raw message
              */
-            export interface IRegistered {
-                /**
-                 * @param message - raw message
-                 */
-                (message: IMessage): void;
-            }
+            (
+                oldnick: string,
+                newnick: string,
+                channels: string[],
+                message: IMessage
+            ): void;
+        }
 
+        /**
+         * 'invite': Emitted when the client receives an /invite. See the
+         * raw event for details on the message object.
+         */
+        export interface IInvite {
             /**
-             * 'motd': Emitted when the server sends the message of the day to
-             * clients.
+             * @param channel - channel user was invited to
+             * @param from - user who invited
+             * @param message - raw message
              */
-            export interface IMotd {
-                /**
-                 * @param motd - motd string
-                 */
-                (motd: string): void;
-            }
+            (channel: string, from: string, message: IMessage): void;
+        }
 
+        /**
+         * '+mode'/'-mode': Emitted when a mode is added or removed from a user or
+         * channel. channel is the channel which the mode is being set on/in
+         * . by is the user setting the mode. mode is the single character
+         * mode identifier. If the mode is being set on a user, argument is
+         * the nick of the user. If the mode is being set on a channel,
+         * argument is the argument to the mode. If a channel mode doesn’t
+         * have any arguments, argument will be ‘undefined’. See the raw
+         * event for details on the message object.
+         */
+        export interface IModeChange {
             /**
-             * 'names': Emitted when the server sends a list of nicks for a channel
-             * (which happens immediately after joining and on request. The nicks
-             * object passed to the callback is keyed by nick names, and has
-             * values ‘’, ‘+’, or ‘@’ depending on the level of that nick in the
-             * channel.
+             * @param channel - channel
+             * @param by - nick that changed mode
+             * @param mode - single character mode identifier
+             * @param argument - mode argument
+             * @param message - raw message
              */
-            export interface INames {
-                /**
-                 * @param channel - channel name
-                 * @param nicks - nicks list
-                 */
-                (channel: string, nicks: string[]): void;
-            }
+            (
+                channel: string,
+                by: string,
+                mode: string,
+                argument: string,
+                message: IMessage
+            ): void;
+        }
 
+        /**
+         * 'whois': Emitted whenever the server finishes outputting a WHOIS
+         * response.
+         */
+        export interface IWhois {
+            (info: IWhoisData): void;
+        }
+
+        /**
+         * 'channellist': Emitted when the server has finished returning a
+         * channel list. The channel_list array is simply a list of the
+         * objects that were returned in the intervening channellist_item
+         * events.
+         *
+         * This data is also available via the Client.channellist property
+         * after this event has fired.
+         */
+        export interface IChannelList {
             /**
-             * 'names#*' As per ‘names’ event but only emits for the subscribed
-             * channel.
+             * @param list - channels
              */
-            export interface INamesChannel {
-                /**
-                 * @param channel - channel name
-                 * @param nicks - nicks list
-                 */
-                (nicks: string[]): void;
-            }
+            (
+                list: IChannel[]
+            ): void;
+        }
 
+        /**
+         * 'raw': Emitted when ever the client receives a “message� from
+         * the server. A message is a parsed line from the server.
+         */
+        export interface IRaw {
             /**
-             * 'topic': Emitted when the server sends the channel topic on joining
-             * a channel, or when a user changes the topic on a channel. See the
-             * raw event for details on the message object.
+             * @param message - raw message
              */
-            export interface ITopic {
-                /**
-                 * @param channel - channel name
-                 * @param topic - topic
-                 * @param nick - nick
-                 * @param message - raw message
-                 */
-                (
-                    channel: string,
-                    topic: string,
-                    nick: string,
-                    message: IMessage
-                ): void;
-            }
+            (message: IMessage): void;
+        }
 
+        /**
+         * 'error': Emitted when ever the server responds with an error-type message. The message parameter is exactly as in the ‘raw’ event.
+         */
+        export interface IError {
             /**
-             * 'join': Emitted when a user joins a channel (including when the
-             * client itself joins a channel). See the raw event for details on the
-             * message object.
+             * @param message - raw message
              */
-            export interface IJoin {
-                /**
-                 * @param channel - channel name
-                 * @param nick - who joined
-                 * @param message - raw message
-                 */
-                (channel: string, nick: string, message: IMessage): void;
-            }
+            (message: IMessage): void;
+        }
 
+        /**
+         * 'action': Emitted whenever a user performs an action
+         * (e.g. /me waves).
+         */
+        export interface IAction {
             /**
-             * 'join#*': As per ‘join’ event but only emits for the subscribed
-             * channel. See the raw event for details on the message object.
+             * @param from - sender
+             * @param to - reciever
+             * @param text - text
+             * @param message - raw message
              */
-            export interface IJoinChannel {
-                /**
-                 * @param nick - who joined
-                 * @param message - raw message
-                 */
-                (nick: string, message: IMessage): void;
-            }
-
-            /**
-             * 'part': Emitted when a user parts a channel (including when the
-             * client itself parts a channel). See the raw event for details on the
-             * message object.
-             */
-            export interface IPart {
-                /**
-                 * @param channel - channel name
-                 * @param nick - who parted
-                 * @param reason - part reason
-                 * @param message - raw message
-                 */
-                (
-                    channel: string,
-                    nick: string,
-                    reason: string,
-                    message: IMessage
-                ): void
-            }
-
-            /**
-             * 'part': As per ‘part’ event but only emits for the subscribed
-             * channel. See the raw event for details on the message object.
-             */
-            export interface IPartChannel {
-                /**
-                 * @param nick - who parted
-                 * @param reason - part reason
-                 * @param message - raw message
-                 */
-                (
-                    nick: string,
-                    reason: string,
-                    message: IMessage
-                ): void
-            }
-
-            /**
-             * 'kick': Emitted when a user is kicked from a channel. See the raw
-             * event for details on the message object.
-             */
-            export interface IKick {
-                /**
-                 * @param channel - channel name
-                 * @param nick - who was kicked
-                 * @param by - kicker
-                 * @param reason - kick reason
-                 * @param message - raw message
-                 */
-                (
-                    channel: string,
-                    nick: string,
-                    by: string,
-                    reason: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'kick#*': Emitted when a user is kicked from a channel. See the raw
-             * event for details on the message object.
-             */
-            export interface IKickChannel {
-                /**
-                 * @param nick - who was kicked
-                 * @param by - kicker
-                 * @param reason - kick reason
-                 * @param message - raw message
-                 */
-                (
-                    nick: string,
-                    by: string,
-                    reason: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'message': Emitted when a message is sent. to can be either a nick
-             * (which is most likely this clients nick and means a private message),
-             * or a channel (which means a message to that channel). See the raw
-             * event for details on the message object.
-             */
-            export interface IRecievedMessage {
-                /**
-                 * @param nick - who sent the message
-                 * @param to - to whom was the message sent
-                 * @param text - message text
-                 * @param message - raw message
-                 */
-                (
-                    nick: string, to: string, text: string, message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'message#': Emitted when a message is sent to any channel (i.e.
-             * exactly the same as the message event but excluding private
-             * messages. See the raw event for details on the message object.
-             */
-            export interface IMessageAllChannels {
-                /**
-                 * @param nick - who sent the message
-                 * @param to - to whom was the message sent
-                 * @param text - message text
-                 * @param message - raw message
-                 */
-                (
-                    nick: string, to: string, text: string, message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'message#*': As per ‘message’ event but only emits for the
-             * subscribed channel. See the raw event for details on the message
-             * object.
-             */
-            export interface IMessageChannel {
-                /**
-                 * @param nick - who sent the message
-                 * @param text - message text
-                 * @param message - raw message
-                 */
-                (nick: string, text: string, message: IMessage): void;
-            }
-
-            /**
-             * 'selfMessage': Emitted when a message is sent from the client.
-             * `to` is who the message was sent to. It can be either a nick
-             * (which most likely means a private message), or a channel (which
-             * means a message to that channel).
-             */
-            export interface ISelfMessage {
-                (to: string, text: string): void;
-            }
-
-            /**
-             * 'notice': Emitted when a notice is sent. to can be either a nick
-             * (which is most likely this clients nick and means a private
-             * message), or a channel (which means a message to that channel). nick
-             * is either the senders nick or null which means that the notice comes
-             * from the server. See the raw event for details on the message object.
-             */
-            export interface INotice {
-                /**
-                 * @param nick - from
-                 * @param to - to
-                 * @param text - text
-                 * @param message - raw message
-                 */
-                (nick: string, to: string, text: string, message: IMessage): void;
-            }
-
-            /**
-             * 'ping': Emitted when a server PINGs the client. The client will
-             * automatically send a PONG request just before this is emitted.
-             */
-            export interface IPing {
-                /**
-                 * @param server - server that adiministered the ping
-                 */
-                (server: string): void;
-            }
-
-            /**
-             * 'pm': As per ‘message’ event but only emits when the message is
-             * direct to the client. See the raw event for details on the message
-             * object.
-             */
-            export interface IPm {
-                /**
-                 * @param nick - sender
-                 * @param text - message text
-                 * @param message - raw message
-                 */
-                (nick: string, text: string, message: IMessage): void;
-            }
-
-            /**
-             * 'ctcp': Emitted when a CTCP notice or privmsg was received (type
-             * is either ‘notice’ or ‘privmsg’). See the raw event for details
-             * on the message object.
-             */
-            export interface ICtcp {
-                /**
-                 * @param from - sender
-                 * @param to - recievier
-                 * @param text - ctcp text
-                 * @param type - ctcp type
-                 * @param message - raw message
-                 */
-                (
-                    from: string,
-                    to: string,
-                    text: string,
-                    type: string,
-                    message: IMessage
-                ): void;
-            }
-
-
-            /**
-             * 'ctcp-*': Emitted when a specific type of CTCP request was
-             * recieved.
-             */
-            export interface ICtcpSpecific {
-                /**
-                 * @param from - sender
-                 * @param to - recievier
-                 * @param message - raw message
-                 */
-                (
-                    from: string,
-                    to: string,
-                    text: string,
-                    message: IMessage
-                ): void;
-
-                (
-                    from: string,
-                    to: string,
-                    text: string,
-                    type: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'nick': Emitted when a user changes nick along with the channels
-             * the user is in. See the raw event for details on the message
-             * object.
-             */
-            export interface INick {
-                /**
-                 * @param oldnick - old nickname
-                 * @param newnick - new nickname
-                 * @param channels - channels the nick changed in
-                 * @param message - raw message
-                 */
-                (
-                    oldnick: string,
-                    newnick: string,
-                    channels: string[],
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'invite': Emitted when the client receives an /invite. See the
-             * raw event for details on the message object.
-             */
-            export interface IInvite {
-                /**
-                 * @param channel - channel user was invited to
-                 * @param from - user who invited
-                 * @param message - raw message
-                 */
-                (channel: string, from: string, message: IMessage): void;
-            }
-
-            /**
-             * '+mode'/'-mode': Emitted when a mode is added or removed from a user or
-             * channel. channel is the channel which the mode is being set on/in
-             * . by is the user setting the mode. mode is the single character
-             * mode identifier. If the mode is being set on a user, argument is
-             * the nick of the user. If the mode is being set on a channel,
-             * argument is the argument to the mode. If a channel mode doesn’t
-             * have any arguments, argument will be ‘undefined’. See the raw
-             * event for details on the message object.
-             */
-            export interface IModeChange {
-                /**
-                 * @param channel - channel
-                 * @param by - nick that changed mode
-                 * @param mode - single character mode identifier
-                 * @param argument - mode argument
-                 * @param message - raw message
-                 */
-                (
-                    channel: string,
-                    by: string,
-                    mode: string,
-                    argument: string,
-                    message: IMessage
-                ): void;
-            }
-
-            /**
-             * 'whois': Emitted whenever the server finishes outputting a WHOIS
-             * response.
-             */
-            export interface IWhois {
-                (info: IWhoisData): void;
-            }
-
-            /**
-             * 'channellist': Emitted when the server has finished returning a
-             * channel list. The channel_list array is simply a list of the
-             * objects that were returned in the intervening channellist_item
-             * events.
-             *
-             * This data is also available via the Client.channellist property
-             * after this event has fired.
-             */
-            export interface IChannelList {
-                /**
-                 * @param list - channels
-                 */
-                (
-                    list: IChannel[]
-                ): void;
-            }
-
-            /**
-             * 'raw': Emitted when ever the client receives a “message� from
-             * the server. A message is a parsed line from the server.
-             */
-            export interface IRaw {
-                /**
-                 * @param message - raw message
-                 */
-                (message: IMessage): void;
-            }
-
-            /**
-             * 'error': Emitted when ever the server responds with an error-type message. The message parameter is exactly as in the ‘raw’ event.
-             */
-            export interface IError {
-                /**
-                 * @param message - raw message
-                 */
-                (message: IMessage): void;
-            }
-
-            /**
-             * 'action': Emitted whenever a user performs an action
-             * (e.g. /me waves).
-             */
-            export interface IAction {
-                /**
-                 * @param from - sender
-                 * @param to - reciever
-                 * @param text - text
-                 * @param message - raw message
-                 */
-                (
-                    from: string, to: string, text: string, message: IMessage
-                ): void;
-            }
+            (
+                from: string, to: string, text: string, message: IMessage
+            ): void;
         }
     }
-
-    /** Colors */
-    namespace NodeIRC.colors {
-        /**
-         * Takes a color by name, text, and optionally what color to return.
-         * @param color - name of color
-         * @param text - text to color
-         * @param reset_color - color to set after text
-         */
-        export function wrap(
-            color: string, text: string, reset_color?: string
-        ): string;
-
-        /**
-         * This contains the set of colors available and a function to wrap
-         * text in a color.
-         */
-        export var codes: {
-            [index: string]: string;
-        };
-    }
-
-    export = NodeIRC;
 }
+
+/** Colors */
+declare namespace NodeIRC.colors {
+    /**
+     * Takes a color by name, text, and optionally what color to return.
+     * @param color - name of color
+     * @param text - text to color
+     * @param reset_color - color to set after text
+     */
+    export function wrap(
+        color: string, text: string, reset_color?: string
+    ): string;
+
+    /**
+     * This contains the set of colors available and a function to wrap
+     * text in a color.
+     */
+    export var codes: {
+        [index: string]: string;
+    };
+}
+
+export = NodeIRC;
diff --git a/is-lower-case/is-lower-case.d.ts b/is-lower-case/is-lower-case.d.ts
index 7fad69960e..1a489738f3 100644
--- a/is-lower-case/is-lower-case.d.ts
+++ b/is-lower-case/is-lower-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "is-lower-case" {
-	function isLowerCase(string: string): boolean;
-	export = isLowerCase;
-}
+
+declare function isLowerCase(string: string): boolean;
+export = isLowerCase;
diff --git a/is-my-json-valid/is-my-json-valid.d.ts b/is-my-json-valid/is-my-json-valid.d.ts
index e584b8c4b2..f51281be22 100644
--- a/is-my-json-valid/is-my-json-valid.d.ts
+++ b/is-my-json-valid/is-my-json-valid.d.ts
@@ -3,28 +3,26 @@
 // Definitions by: kruncher <https://github.com/kruncher/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module "is-my-json-valid" {
 
-  interface ValidationError {
+
+interface ValidationError {
     field: string;
     message: string;
     value: any;
     type: string;
-  }
+}
 
-  interface ValidateFunction {
+interface ValidateFunction {
     (data: any): boolean;
 
     errors: ValidationError[];
-  }
+}
 
-  interface Validator {
+interface Validator {
     (schema: any, options?: any): ValidateFunction;
 
     filter(schema: any): any;
-  }
-
-  var validator: Validator;
-  export = validator;
-
 }
+
+declare var validator: Validator;
+export = validator;
diff --git a/is-upper-case/is-upper-case.d.ts b/is-upper-case/is-upper-case.d.ts
index 904b34f9bd..3bec58c214 100644
--- a/is-upper-case/is-upper-case.d.ts
+++ b/is-upper-case/is-upper-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "is-upper-case" {
-	function isUpperCase(string: string, locale?: string): boolean;
-	export = isUpperCase;
-}
\ No newline at end of file
+
+declare function isUpperCase(string: string, locale?: string): boolean;
+export = isUpperCase;
diff --git a/is-url/is-url.d.ts b/is-url/is-url.d.ts
index 67fe542b94..00d9993e99 100644
--- a/is-url/is-url.d.ts
+++ b/is-url/is-url.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Ryota Murohoshi <https://github.com/RyotaMurohoshi>
 // Definitions: https://github.com/RyotaMurohoshi/DefinitelyTyped
 
-declare module "is-url" {
-    export = isUrl
 
-    function isUrl(string: string): boolean;
-}
+export = isUrl
+
+declare function isUrl(string: string): boolean;
diff --git a/istanbul/istanbul.d.ts b/istanbul/istanbul.d.ts
index 1ccbd14ae6..ee23e27782 100644
--- a/istanbul/istanbul.d.ts
+++ b/istanbul/istanbul.d.ts
@@ -3,27 +3,27 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'istanbul' {
-  namespace istanbul {
+
+declare namespace istanbul {
     interface Istanbul {
-      new (options?: any): Istanbul;
-      Collector: Collector;
-      config: Config;
-      ContentWriter: ContentWriter;
-      FileWriter: FileWriter;
-      hook: Hook;
-      Instrumenter: Instrumenter;
-      Report: Report;
-      Reporter: Reporter;
-      Store: Store;
-      utils: ObjectUtils;
-      VERSION: string;
-      Writer: Writer;
+        new (options?: any): Istanbul;
+        Collector: Collector;
+        config: Config;
+        ContentWriter: ContentWriter;
+        FileWriter: FileWriter;
+        hook: Hook;
+        Instrumenter: Instrumenter;
+        Report: Report;
+        Reporter: Reporter;
+        Store: Store;
+        utils: ObjectUtils;
+        VERSION: string;
+        Writer: Writer;
     }
 
     interface Collector {
-      new (options?: any): Collector;
-      add(coverage: any, testName?: string): void;
+        new (options?: any): Collector;
+        add(coverage: any, testName?: string): void;
     }
 
     interface Config {
@@ -39,22 +39,22 @@ declare module 'istanbul' {
     }
 
     interface Instrumenter {
-      new (options?: any): Instrumenter;
-      instrumentSync(code: string, filename: string): string;
+        new (options?: any): Instrumenter;
+        instrumentSync(code: string, filename: string): string;
     }
 
     interface Report {
     }
 
     interface Configuration {
-      new (obj: any, overrides: any): Configuration;
+        new (obj: any, overrides: any): Configuration;
     }
 
     interface Reporter {
-      new (cfg?: Configuration, dir?: string): Reporter;
-      add(fmt: string): void;
-      addAll(fmts: Array<string>): void;
-      write(collector: Collector, sync: boolean, callback: Function): void;
+        new (cfg?: Configuration, dir?: string): Reporter;
+        add(fmt: string): void;
+        addAll(fmts: Array<string>): void;
+        write(collector: Collector, sync: boolean, callback: Function): void;
     }
 
     interface Store {
@@ -65,9 +65,8 @@ declare module 'istanbul' {
 
     interface Writer {
     }
-  }
-
-  var istanbul: istanbul.Istanbul;
-
-  export = istanbul;
 }
+
+declare var istanbul: istanbul.Istanbul;
+
+export = istanbul;
diff --git a/jade/jade.d.ts b/jade/jade.d.ts
index 2dfd311256..6be4b8b45f 100644
--- a/jade/jade.d.ts
+++ b/jade/jade.d.ts
@@ -3,14 +3,13 @@
 // Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'jade' {
-    export function compile(template: string, options?: any): (locals?: any) => string;
-    export function compileFile(path: string, options?: any): (locals?: any) => string;
-    export function compileClient(template: string, options?: any): (locals?: any) => string;
-    export function compileClientWithDependenciesTracked(template: string, options?: any): {
-        body: (locals?: any) => string;
-        dependencies: string[];
-    };
-    export function render(template: string, options?: any): string;
-    export function renderFile(path: string, options?: any): string;
-}
+
+declare export function compile(template: string, options?: any): (locals?: any) => string;
+declare export function compileFile(path: string, options?: any): (locals?: any) => string;
+declare export function compileClient(template: string, options?: any): (locals?: any) => string;
+declare export function compileClientWithDependenciesTracked(template: string, options?: any): {
+    body: (locals?: any) => string;
+    dependencies: string[];
+};
+declare export function render(template: string, options?: any): string;
+declare export function renderFile(path: string, options?: any): string;
diff --git a/jjv/jjv.d.ts b/jjv/jjv.d.ts
index 5eebaa5e10..c3c42aa032 100644
--- a/jjv/jjv.d.ts
+++ b/jjv/jjv.d.ts
@@ -3,40 +3,39 @@
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "jjv" {
-	function jjv(): jjv.Env;
 
-	namespace jjv {
-		interface Errors {
-			validation: {
-				[property: string]: {
-					required?: boolean;
-					type?: string;
-				}
-			};
-		}
+declare function jjv(): jjv.Env;
 
-		interface Options {
-			checkRequired?: boolean;
-			useDefault?: boolean;
-			useCoerce?: boolean;
-			removeAdditional?: boolean;
-		}
+declare namespace jjv {
+    interface Errors {
+        validation: {
+            [property: string]: {
+                required?: boolean;
+                type?: string;
+            }
+        };
+    }
 
-		interface Env {
-			defaultOptions: Options;
+    interface Options {
+        checkRequired?: boolean;
+        useDefault?: boolean;
+        useCoerce?: boolean;
+        removeAdditional?: boolean;
+    }
 
-			addSchema(name: string, schema: Object): void;
+    interface Env {
+        defaultOptions: Options;
 
-			addType(name: string, parse: (input: any) => any): void;
-			addFormat(name: string, parse: (input: any) => any): void;
-			addCheck(name: string, check: (input: any, comparator: any) => any): void;
-			addTypeCoercion(name: string, coerce: (input: any) => any): void;
+        addSchema(name: string, schema: Object): void;
 
-			validate(name: string, object: any, options?: Options): Errors;
-			validate(schema: Object, object: any, options?: Options): Errors;
-		}
-	}
+        addType(name: string, parse: (input: any) => any): void;
+        addFormat(name: string, parse: (input: any) => any): void;
+        addCheck(name: string, check: (input: any, comparator: any) => any): void;
+        addTypeCoercion(name: string, coerce: (input: any) => any): void;
 
-	export = jjv;
+        validate(name: string, object: any, options?: Options): Errors;
+        validate(schema: Object, object: any, options?: Options): Errors;
+    }
 }
+
+export = jjv;
diff --git a/jjve/jjve.d.ts b/jjve/jjve.d.ts
index fcb5241670..926fd04883 100644
--- a/jjve/jjve.d.ts
+++ b/jjve/jjve.d.ts
@@ -5,22 +5,21 @@
 
 /// <reference path="../jjv/jjv.d.ts" />
 
-declare module 'jjve' {
-	import jjv  = require('jjv');
 
-	function jjve(jjv: jjv.Env): jjve.Env;
-	namespace jjve {
-		interface Issue {
-			code: string;
-			message: string;
-			data: any;
-			path: string;
-		}
+import jjv = require('jjv');
 
-		interface Env {
-			(schema: Object, data: any, errors: jjv.Errors): Issue[];
-		}
-	}
+declare function jjve(jjv: jjv.Env): jjve.Env;
+declare namespace jjve {
+    interface Issue {
+        code: string;
+        message: string;
+        data: any;
+        path: string;
+    }
 
-	export = jjve;
+    interface Env {
+        (schema: Object, data: any, errors: jjv.Errors): Issue[];
+    }
 }
+
+export = jjve;
diff --git a/johnny-five/johnny-five.d.ts b/johnny-five/johnny-five.d.ts
index 25763e8f8a..4c917f4e0f 100644
--- a/johnny-five/johnny-five.d.ts
+++ b/johnny-five/johnny-five.d.ts
@@ -5,586 +5,584 @@
 
 ///<reference path="../node/node.d.ts"/>
 
-declare module "johnny-five" {
-    export interface AccelerometerOption{
+
+export interface AccelerometerOption {
+    controller: string;
+}
+
+export interface AccelerometerGeneralOption {
+    controller?: string;
+}
+
+export interface AccelerometerAnalogOption extends AccelerometerGeneralOption {
+    pins: Array<string>;
+    sensitivity?: number;
+    aref?: number;
+    zeroV?: number | Array<number>;
+    autoCalibrate?: boolean;
+}
+
+export interface AccelerometerMPU6050Option extends AccelerometerGeneralOption {
+    sensitivity?: number;
+}
+
+export interface AccelerometerMMA7361Option extends AccelerometerGeneralOption {
+    sleepPin?: number | string;
+}
+
+declare export class Accelerometer {
+    constructor(option: AccelerometerGeneralOption | AccelerometerAnalogOption | AccelerometerMPU6050Option | AccelerometerMMA7361Option);
+    on(event: string, cb: () => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "data", cb: (freq: any) => void): void;
+    hasAxis(name: string): void;
+    enable(): void;
+    disable(): void;
+}
+
+declare export class Animation {
+    constructor(option: Servo | Array<Servo>);
+    enqueue(segment: any): void;
+    play(): void;
+    pause(): void;
+    stop(): void;
+    next(): void;
+    speed(speed: Array<number>): void;
+
+    target: number;
+    duration: number;
+    cuePoints: Array<number>;
+    keyFrames: number;
+    easing: string;
+    loop: boolean;
+    loopback: number;
+    metronomic: boolean;
+    progress: number;
+    currentSpeed: number;
+    fps: number;
+}
+
+export interface ButtonOptions {
+    pin: number | string;
+    invert?: boolean;
+    isPullup?: boolean;
+    holdtime?: number;
+}
+
+declare export class Button {
+    constructor(pin: number | string | ButtonOptions);
+    on(event: string, cb: () => void): void;
+    on(event: "hold", cb: (holdTime: number) => void): void;
+    on(event: "down", cb: () => void): void;
+    on(event: "press", cb: () => void): void;
+    on(event: "up", cb: () => void): void;
+    on(event: "release", cb: () => void): void;
+}
+
+export interface BoardOptions {
+    id?: number | string;
+    port?: string | any;
+    repl?: boolean;
+}
+
+export interface Repl {
+    inject(object: any): void;
+}
+
+declare export class Board {
+    constructor(option?: BoardOptions);
+    on(event: string, cb: () => void): void;
+    on(event: "ready", cb: () => void): void;
+    on(event: "connect", cb: () => void): void;
+    pinMode(pin: number, mode: number): void;
+    analogWrite(pin: number, value: number): void;
+    analogRead(pin: number, cb: (item: number) => void): void;
+    digitalWrite(pin: number, value: number): void;
+    digitalRead(pin: number, cb: (item: number) => void): void;
+    shiftOut(dataPin: Pin, clockPin: Pin, isBigEndian: boolean, value: number): void;
+    wait(ms: number, cb: () => void): void;
+    loop(ms: number, cb: () => void): void;
+
+    isReady: boolean;
+    io: any;
+    id: string;
+    pins: Array<Pin>;
+    port: string;
+    inject: Repl;
+}
+
+export interface CompassOptions {
+    controller: string;
+    gauss?: number;
+}
+
+declare export class Compass {
+    constructor(option: CompassOptions);
+    on(event: string, cb: () => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+}
+
+export interface ESCOption {
+    pin: number | string;
+    range?: Array<number>;
+    startAt?: number;
+}
+
+declare export class ESC {
+    constructor(option: number | string | ESCOption);
+    speed(value: number): void;
+    min(): void;
+    max(): void;
+    stop(): void;
+}
+
+export interface GyroGeneralOption {
+    controller?: string;
+}
+
+export interface GyroAnalogOption extends GyroGeneralOption {
+    pins: Array<string>;
+    sensitivity: number;
+    resolution?: number;
+}
+
+export interface GyroMPU6050Option extends GyroGeneralOption {
+    sensitivity: number;
+}
+
+declare export class Gyro {
+    constructor(option: GyroGeneralOption | GyroAnalogOption | GyroMPU6050Option);
+    on(event: string, cb: () => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    recalibrate(): void;
+}
+
+export interface IMUGeneralOption {
+    controller?: string;
+    freq?: number;
+}
+
+export interface IMUMPU6050Option extends IMUGeneralOption {
+    address: number;
+}
+
+declare export class IMU {
+    constructor(option: IMUGeneralOption | IMUMPU6050Option);
+    on(event: string, cb: () => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+}
+
+declare export module IR {
+    export interface MotionOption {
+        pin: number | string;
+    }
+
+    export class Motion {
+        constructor(option: number | MotionOption);
+        on(event: string, cb: () => void): void;
+        on(event: "data", cb: (data: any) => void): void;
+        on(event: "motionstart", cb: () => void): void;
+        on(event: "motionend", cb: () => void): void;
+        on(event: "calibrated", cb: () => void): void;
+    }
+
+    export interface PloximityOption {
+        pin: number | string;
         controller: string;
     }
 
-    export interface AccelerometerGeneralOption{
-        controller?: string;
+    export class Proximity {
+        constructor(option: number | PloximityOption);
+        on(event: string, cb: () => void): void;
+        on(event: "data", cb: (data: any) => void): void;
+        on(event: "change", cb: () => void): void;
     }
 
-    export interface AccelerometerAnalogOption extends AccelerometerGeneralOption{
-        pins: Array<string>;
-        sensitivity?: number;
-        aref?: number;
-        zeroV?: number | Array<number>;
-        autoCalibrate?: boolean;
-    }
-
-    export interface AccelerometerMPU6050Option extends AccelerometerGeneralOption{
-        sensitivity?: number;
-    }
-
-    export interface AccelerometerMMA7361Option extends AccelerometerGeneralOption{
-        sleepPin?: number | string;
-    }
-
-    export class Accelerometer{
-        constructor(option: AccelerometerGeneralOption | AccelerometerAnalogOption | AccelerometerMPU6050Option | AccelerometerMMA7361Option);
-        on(event: string, cb: ()=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "data", cb: (freq: any)=>void): void;
-        hasAxis(name: string): void;
-        enable(): void;
-        disable(): void;
-    }
-
-    export class Animation{
-        constructor(option: Servo | Array<Servo>);
-        enqueue(segment: any): void;
-        play(): void;
-        pause(): void;
-        stop(): void;
-        next(): void;
-        speed(speed: Array<number>): void;
-
-        target: number;
-        duration: number;
-        cuePoints: Array<number>;
-        keyFrames: number;
-        easing: string;
-        loop: boolean;
-        loopback: number;
-        metronomic: boolean;
-        progress: number;
-        currentSpeed: number;
-        fps: number;
-    }
-
-    export interface ButtonOptions{
-        pin: number | string;
-        invert?: boolean;
-        isPullup?: boolean;
-        holdtime?: number;
-    }
-
-    export class Button{
-        constructor(pin: number | string | ButtonOptions);
-        on(event: string, cb: ()=>void): void;
-        on(event: "hold", cb: (holdTime: number)=>void): void;
-        on(event: "down", cb: ()=>void): void;
-        on(event: "press", cb: ()=>void): void;
-        on(event: "up", cb: ()=>void): void;
-        on(event: "release", cb: ()=>void): void;
-    }
-
-    export interface BoardOptions{
-        id?: number | string;
-        port?: string | any;
-        repl?: boolean;
-    }
-
-    export interface Repl{
-        inject(object: any): void;
-    }
-
-    export class Board{
-        constructor(option?: BoardOptions);
-        on(event: string, cb: ()=>void): void;
-        on(event: "ready", cb: ()=>void): void;
-        on(event: "connect", cb: ()=>void): void;
-        pinMode(pin: number, mode: number): void;
-        analogWrite(pin: number, value: number): void;
-        analogRead(pin: number, cb: (item: number)=>void): void;
-        digitalWrite(pin: number, value: number): void;
-        digitalRead(pin: number, cb: (item: number)=>void): void;
-        shiftOut(dataPin: Pin, clockPin: Pin, isBigEndian: boolean, value: number): void;
-        wait(ms: number, cb: ()=>void): void;
-        loop(ms: number, cb: ()=>void): void;
-
-        isReady: boolean;
-        io: any;
-        id: string;
-        pins: Array<Pin>;
-        port: string;
-        inject: Repl;
-    }
-
-    export interface CompassOptions{
-        controller: string;
-        gauss?: number;
-    }
-
-    export class Compass{
-        constructor(option: CompassOptions);
-        on(event: string, cb: ()=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-    }
-
-    export interface ESCOption{
-        pin: number | string;
-        range?: Array<number>;
-        startAt?: number;
-    }
-
-    export class ESC{
-        constructor(option: number | string | ESCOption);
-        speed(value: number): void;
-        min(): void;
-        max(): void;
-        stop(): void;
-    }
-
-    export interface GyroGeneralOption{
-        controller?: string;
-    }
-
-    export interface GyroAnalogOption extends GyroGeneralOption{
-        pins: Array<string>;
-        sensitivity: number;
-        resolution?: number;
-    }
-
-    export interface GyroMPU6050Option extends GyroGeneralOption{
-        sensitivity: number;
-    }
-
-    export class Gyro{
-        constructor(option: GyroGeneralOption | GyroAnalogOption | GyroMPU6050Option);
-        on(event: string, cb: ()=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        recalibrate(): void;
-    }
-
-    export interface IMUGeneralOption{
-        controller?: string;
+    export interface ArrayOption {
+        pins: Array<number> | Array<string>;
+        emitter: number | string;
         freq?: number;
     }
 
-    export interface IMUMPU6050Option extends IMUGeneralOption{
-        address: number;
+    export interface LoadCalibrationOption {
+        min: Array<number>;
+        max: Array<number>;
     }
 
-    export class IMU{
-        constructor(option: IMUGeneralOption | IMUMPU6050Option);
-        on(event: string, cb: ()=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-    }
-
-    export module IR{
-        export interface MotionOption{
-            pin: number | string;
-        }
-
-        export class Motion{
-            constructor(option: number | MotionOption);
-            on(event: string, cb: ()=>void): void;
-            on(event: "data", cb: (data: any)=>void): void;
-            on(event: "motionstart", cb: ()=>void): void;
-            on(event: "motionend", cb: ()=>void): void;
-            on(event: "calibrated", cb: ()=>void): void;
-        }
-
-        export interface PloximityOption{
-            pin: number | string;
-            controller: string;
-        }
-
-        export class Proximity{
-            constructor(option: number | PloximityOption);
-            on(event: string, cb: ()=>void): void;
-            on(event: "data", cb: (data: any)=>void): void;
-            on(event: "change", cb: ()=>void): void;
-        }
-
-        export interface ArrayOption{
-            pins: Array<number> | Array<string>;
-            emitter: number | string;
-            freq?: number;
-        }
-
-        export interface LoadCalibrationOption{
-            min: Array<number>;
-            max: Array<number>;
-        }
-
-        export module Reflect{
-            export class Array{
-                constructor(option: ArrayOption);
-                enable(): void;
-                disable(): void;
-                calibrate(): void;
-                calibrateUntil(predicate: ()=>void): void;
-                loadCalibration(option: LoadCalibrationOption): void;
-                on(event: string, cb: ()=>void): void;
-                on(event: "data", cb: (data: any)=>void): void;
-                on(event: "calibratedData", cb: (data: any)=>void): void;
-                on(event: "line", cb: (data: any)=>void): void;
-            }
+    export module Reflect {
+        export class Array {
+            constructor(option: ArrayOption);
+            enable(): void;
+            disable(): void;
+            calibrate(): void;
+            calibrateUntil(predicate: () => void): void;
+            loadCalibration(option: LoadCalibrationOption): void;
+            on(event: string, cb: () => void): void;
+            on(event: "data", cb: (data: any) => void): void;
+            on(event: "calibratedData", cb: (data: any) => void): void;
+            on(event: "line", cb: (data: any) => void): void;
         }
     }
+}
 
-    export interface JoystickOption{
-        pins: Array<string>;
+export interface JoystickOption {
+    pins: Array<string>;
+}
+
+declare export class Joystick {
+    constructor(option: JoystickOption);
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+    on(event: "axismove", cb: (error: Error, date: Date) => void): void;
+
+    axis: Array<number>;
+    raw: Array<number>;
+}
+
+
+export interface LCDGeneralOption {
+    rows?: number;
+    cols?: number;
+}
+
+export interface LCDI2COption extends LCDGeneralOption {
+    controller: string;
+    backlight?: number;
+}
+
+export interface LCDParallelOption extends LCDGeneralOption {
+    pins: Array<any>;
+    backlight?: number;
+}
+
+declare export class LCD {
+    constructor(option: LCDGeneralOption | LCDI2COption | LCDParallelOption);
+    print(message: string): void;
+    useChar(char: string): void;
+    clear(): void;
+    cursor(row: number, col: number): void;
+    home(): void;
+    display(): void;
+    noDisplay(): void;
+    blink(): void;
+    noBlink(): void;
+    autoscroll(): void;
+    noAutoscroll(): void;
+}
+
+export interface LedOption {
+    pin: number;
+    type?: string;
+    controller?: string;
+    address?: number;
+    isAnode?: boolean;
+}
+
+declare export class Led {
+    constructor(option: number | LedOption);
+    on(): void;
+    off(): void;
+    toggle(): void;
+    strobe(ms: number): void;
+    blink(): void;
+    blink(ms: number): void;
+    brightness(val: number): void;
+    fade(brightness: number, ms: number): void;
+    fadeIn(ms: number): void;
+    fadeOut(ms: number): void;
+    pulse(ms: number): void;
+    stop(ms: number): void;
+}
+
+declare export module Led {
+    export interface DigitsOption {
+        pins: any;
+        devices?: number;
     }
 
-    export class Joystick{
-        constructor(option: JoystickOption);
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-        on(event: "axismove", cb: (error: Error, date: Date)=>void): void;
-
-        axis: Array<number>;
-        raw: Array<number>;
-    }
-
-
-    export interface LCDGeneralOption{
-        rows?: number;
-        cols?: number;
-    }
-
-    export interface LCDI2COption extends LCDGeneralOption{
-        controller: string;
-        backlight?: number;
-    }
-
-    export interface LCDParallelOption extends LCDGeneralOption{
-        pins: Array<any>;
-        backlight?: number;
-    }
-
-    export class LCD{
-        constructor(option: LCDGeneralOption | LCDI2COption | LCDParallelOption);
-        print(message: string): void;
-        useChar(char: string): void;
+    export class Digits {
+        constructor(option: DigitsOption);
+        on(): void;
+        on(index: number): void;
+        off(): void;
+        off(index: number): void;
         clear(): void;
-        cursor(row: number, col: number): void;
-        home(): void;
-        display(): void;
-        noDisplay(): void;
-        blink(): void;
-        noBlink(): void;
-        autoscroll(): void;
-        noAutoscroll(): void;
+        clear(index: number): void;
+        brightness(value: number): void;
+        brightness(index: number, value: number): void;
+        draw(position: number, character: number): void;
+        draw(index: number, position: number, character: number): void;
     }
 
-    export interface LedOption{
-        pin: number;
-        type?: string;
-        controller?: string;
-        address?: number;
+    export interface MatrixOption {
+        pins: any;
+        devices?: number;
+    }
+
+    export interface MatrixIC2Option {
+        controller: string;
+        addresses?: Array<any>;
+        isBicolor?: boolean;
+        dims?: any;
+        rotation?: number;
+    }
+
+    export class Matrix {
+        constructor(option: MatrixOption | MatrixIC2Option);
+        on(): void;
+        on(index: number): void;
+        off(): void;
+        off(index: number): void;
+        clear(): void;
+        clear(index: number): void;
+        brightness(value: number): void;
+        brightness(index: number, value: number): void;
+        led(row: number, col: number, state: any): void;
+        led(index: number, row: number, col: number, state: any): void;
+        row(row: number, val: number): void;
+        row(index: number, row: number, val: number): void;
+        column(row: number, val: number): void;
+        column(index: number, row: number, val: number): void;
+        draw(position: number, character: number): void;
+        draw(index: number, position: number, character: number): void;
+    }
+
+    export interface RGBOption {
+        pins: Array<number>;
         isAnode?: boolean;
+        controller?: string;
     }
 
-    export class Led{
-        constructor(option: number | LedOption);
+    export class RGB {
+        constructor(option: RGBOption);
         on(): void;
         off(): void;
+        color(value: number): void;
         toggle(): void;
         strobe(ms: number): void;
-        blink(): void;
-        blink(ms: number): void;
-        brightness(val: number): void;
-        fade(brightness: number, ms: number): void;
+        brightness(value: number): void;
         fadeIn(ms: number): void;
         fadeOut(ms: number): void;
         pulse(ms: number): void;
         stop(ms: number): void;
     }
+}
 
-    export module Led{
-        export interface DigitsOption{
-            pins: any;
-            devices?: number;
-        }
+export interface MotorOption {
+    pins: any;
+    current?: any;
+    invertPWM?: boolean;
+    address?: number;
+    controller?: string;
+    register?: any;
+    bits?: any;
+}
 
-        export class Digits{
-            constructor(option: DigitsOption);
-            on(): void;
-            on(index: number): void;
-            off(): void;
-            off(index: number): void;
-            clear(): void;
-            clear(index: number): void;
-            brightness(value: number): void;
-            brightness(index: number, value: number): void;
-            draw(position: number, character: number): void;
-            draw(index: number, position: number, character: number): void;
-        }
+declare export class Motor {
+    constructor(option: Array<number> | MotorOption);
+    forward(speed: number): void;
+    fwd(speed: number): void;
+    reverse(speed: number): void;
+    rev(speed: number): void;
+    start(): void;
+    start(speed: number): void;
+    stop(): void;
+    brake(): void;
+    release(): void;
+}
 
-        export interface MatrixOption{
-            pins: any;
-            devices?: number;
-        }
+export interface PiezoOption {
+    pin: number;
+}
 
-        export interface MatrixIC2Option{
-            controller: string;
-            addresses?: Array<any>;
-            isBicolor?: boolean;
-            dims? :any;
-            rotation?: number;
-        }
+declare export class Piezo {
+    constructor(option: number | PiezoOption);
+    frequency(frequency: number, duration: number): void;
+    play(tune: any, cb?: () => void): void;
+    tone(frequency: number, duration: number): void;
+    noTone(): void;
+    off(): void;
+}
 
-        export class Matrix{
-            constructor(option: MatrixOption | MatrixIC2Option);
-            on(): void;
-            on(index: number): void;
-            off(): void;
-            off(index: number): void;
-            clear(): void;
-            clear(index: number): void;
-            brightness(value: number): void;
-            brightness(index: number, value: number): void;
-            led(row: number, col: number, state: any): void;
-            led(index: number, row: number, col: number, state: any): void;
-            row(row: number, val: number): void;
-            row(index: number, row: number, val: number): void;
-            column(row: number, val: number): void;
-            column(index: number, row: number, val: number): void;
-            draw(position: number, character: number): void;
-            draw(index: number, position: number, character: number): void;
-        }
+export interface PinOption {
+    id?: number | string;
+    pin: number | string;
+    type?: string;
+}
 
-        export interface RGBOption{
-            pins: Array<number>;
-            isAnode?: boolean;
-            controller?: string;
-        }
+export interface PinState {
+    supportedModes: Array<number>;
+    mode: number;
+    value: number;
+    report: number;
+    analogChannel: number;
+}
 
-        export class RGB{
-            constructor(option: RGBOption);
-            on(): void;
-            off(): void;
-            color(value: number): void;
-            toggle(): void;
-            strobe(ms: number): void;
-            brightness(value: number): void;
-            fadeIn(ms: number): void;
-            fadeOut(ms: number): void;
-            pulse(ms: number): void;
-            stop(ms: number): void;
-        }
-    }
+declare export class Pin {
+    constructor(option: number | string | PinOption);
+    query(cb: (pin: PinState) => void): void;
+    high(): void;
+    low(): void;
+    write(value: number): void;
+    read(cb: (value: number) => void): void;
+    static write(pin: number, value: number): void;
+    static read(pin: number, cb: (data: number) => void): void;
+}
 
-    export interface MotorOption{
-        pins: any;
-        current?: any;
-        invertPWM?: boolean;
-        address?: number;
-        controller?: string;
-        register?: any;
-        bits?: any;
-    }
+export interface PingOption {
+    pin: number | string;
+    freq?: number;
+    pulse?: number;
+}
 
-    export class Motor{
-        constructor(option: Array<number> | MotorOption);
-        forward(speed: number): void;
-        fwd(speed: number): void;
-        reverse(speed: number): void;
-        rev(speed: number): void;
-        start(): void;
-        start(speed: number): void;
-        stop(): void;
-        brake(): void;
-        release(): void;
-    }
+declare export class Ping {
+    constructor(option: number | PingOption);
+}
 
-    export interface PiezoOption{
-        pin: number;
-    }
+export interface RelayOption {
+    pin: number | string;
+    type?: string;
+}
 
-    export class Piezo{
-        constructor(option: number | PiezoOption);
-        frequency(frequency: number, duration: number): void;
-        play(tune: any, cb?: ()=>void): void;
-        tone(frequency: number, duration: number): void;
-        noTone(): void;
-        off(): void;
-    }
+declare export class Relay {
+    constructor(option: number | RelayOption);
+    open(): void;
+    close(): void;
+    toggle(): void;
+}
 
-    export interface PinOption{
-        id?: number | string;
-        pin: number | string;
-        type?: string;
-    }
+export interface SensorOption {
+    pin: number | string;
+    freq?: boolean;
+    threshold?: number;
+}
 
-    export interface PinState{
-        supportedModes: Array<number>;
-        mode: number;
-        value: number;
-        report: number;
-        analogChannel: number;
-    }
+declare export class Sensor {
+    constructor(option: number | string | SensorOption);
+    scale(low: number, high: number): Sensor;
+    scale(range: number[]): Sensor;
+    scale(): Sensor;
+    booleanAt(barrier: number): boolean;
+    within(range: Array<number>, cb: () => void): void;
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+}
 
-    export class Pin{
-        constructor(option: number | string | PinOption);
-        query(cb: (pin: PinState)=>void): void;
-        high(): void;
-        low(): void;
-        write(value: number): void;
-        read(cb: (value: number)=>void): void;
-        static write(pin: number, value: number): void;
-        static read(pin: number, cb: (data: number)=>void): void;
-    }
+export interface ServoGeneralOption {
+    pin: number | string;
+    range?: Array<number>;
+    type?: string;
+    startAt?: number;
+    isInverted?: boolean;
+    center?: boolean;
+    controller?: string;
+}
 
-    export interface PingOption{
-        pin: number | string;
-        freq?: number;
-        pulse?: number;
-    }
+export interface ServoPCA9685Option extends ServoGeneralOption {
+    address?: number;
+}
 
-    export class Ping{
-        constructor(option: number | PingOption);
-    }
+export interface ServoSweepOpts {
+    range: Array<number>;
+    interval?: number;
+    step?: number;
+}
 
-    export interface RelayOption{
-        pin: number | string;
-        type?: string;
-    }
+declare export class Servo {
+    constructor(option: number | string | ServoGeneralOption);
+    to(degrees: number, ms?: number, rage?: number): void;
+    min(): void;
+    max(): void;
+    center(): void;
+    sweep(): void;
+    sweep(range: Array<number>): void;
+    sweep(opt: ServoSweepOpts): void;
+    stop(): void;
+    cw(speed: number): void;
+    ccw(speed: number): void;
+    on(event: string, cb: () => void): void;
+    on(event: "move:complete", cb: () => void): void;
+}
 
-    export class Relay{
-        constructor(option: number | RelayOption);
-        open(): void;
-        close(): void;
-        toggle(): void;
-    }
+export interface ShiftRegisterOption {
+    pins: any;
+}
 
-    export interface SensorOption{
-        pin: number | string;
-        freq?: boolean;
-        threshold?: number;
-    }
+declare export class ShiftRegister {
+    constructor(option: ShiftRegisterOption);
+    send(...value: number[]): void;
+}
 
-    export class Sensor{
-        constructor(option: number | string | SensorOption);
-        scale(low: number, high: number): Sensor;
-        scale(range: number[]): Sensor;
-        scale(): Sensor;
-        booleanAt(barrier: number): boolean;
-        within(range: Array<number>, cb: ()=>void): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-    }
+export interface SonarOption {
+    pin: number | string;
+    device: string;
+    freq?: number;
+    threshold?: number;
+}
 
-    export interface ServoGeneralOption{
-        pin: number | string;
-        range?: Array<number>;
-        type?: string;
-        startAt?: number;
-        isInverted?: boolean;
-        center?: boolean;
-        controller?: string;
-    }
+declare export class Sonar {
+    constructor(option: number | string | SonarOption);
+    within(range: Array<number>, cb: () => void): void;
+    within(range: Array<number>, unit: string, cb: () => void): void;
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+}
 
-    export interface ServoPCA9685Option extends ServoGeneralOption{
-        address?: number;
-    }
+export interface StepperOption {
+    pins: any;
+    stepsPerRev: number;
+    type: number;
+    rpm?: number;
+    direction?: number;
+}
 
-    export interface ServoSweepOpts{
-        range: Array<number>;
-        interval?: number;
-        step?: number;
-    }
-
-    export class Servo{
-        constructor(option: number | string | ServoGeneralOption);
-        to(degrees: number, ms?: number, rage?: number): void;
-        min(): void;
-        max(): void;
-        center(): void;
-        sweep(): void;
-        sweep(range: Array<number>): void;
-        sweep(opt: ServoSweepOpts): void;
-        stop(): void;
-        cw(speed: number): void;
-        ccw(speed: number): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: "move:complete", cb: ()=>void): void;
-    }
-
-    export interface ShiftRegisterOption{
-        pins: any;
-    }
-
-    export class ShiftRegister{
-        constructor(option: ShiftRegisterOption);
-        send(...value: number[]): void;
-    }
-
-    export interface SonarOption{
-        pin: number | string;
-        device: string;
-        freq?: number;
-        threshold?: number;
-    }
-
-    export class Sonar{
-        constructor(option: number | string | SonarOption);
-        within(range: Array<number>, cb: ()=>void): void;
-        within(range: Array<number>, unit: string, cb: ()=>void): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-    }
-
-    export interface StepperOption{
-        pins: any;
-        stepsPerRev: number;
-        type: number;
-        rpm?: number;
-        direction?: number;
-    }
-
-    export module Stepper{
-        export class TYPE{
-            static DRIVER: number;
-            static TWO_WIRE: number;
-            static FOUR_WIRE: number;
-        }
-    }
-
-    export class Stepper{
-        constructor(option: number | string | StepperOption);
-        step(stepsOrOpts: any, cb: ()=>void): void;
-        rpm(): Stepper;
-        rpm(value: number): Stepper;
-        speed(): Stepper;
-        speed(value: number): Stepper;
-        direction(): Stepper;
-        direction(value: number): Stepper;
-        accel(): Stepper;
-        accel(value: number): Stepper;
-        decel(): Stepper;
-        decel(value: number): Stepper;
-        cw(): Stepper;
-        ccw(): Stepper;
-
-        within(range: Array<number>, cb: ()=>void): void;
-        within(range: Array<number>, unit: string, cb: ()=>void): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
-    }
-
-    export interface TemperatureOption{
-        controller?: string;
-        pin: string | number;
-        toCelsius?: (val: number)=>number;
-        freq?: number;
-    }
-
-    export class Temperature{
-        constructor(option: TemperatureOption);
-        on(event: string, cb: ()=>void): void;
-        on(event: "data", cb: (data: any)=>void): void;
-        on(event: "change", cb: ()=>void): void;
+declare export module Stepper {
+    export class TYPE {
+        static DRIVER: number;
+        static TWO_WIRE: number;
+        static FOUR_WIRE: number;
     }
 }
 
+declare export class Stepper {
+    constructor(option: number | string | StepperOption);
+    step(stepsOrOpts: any, cb: () => void): void;
+    rpm(): Stepper;
+    rpm(value: number): Stepper;
+    speed(): Stepper;
+    speed(value: number): Stepper;
+    direction(): Stepper;
+    direction(value: number): Stepper;
+    accel(): Stepper;
+    accel(value: number): Stepper;
+    decel(): Stepper;
+    decel(value: number): Stepper;
+    cw(): Stepper;
+    ccw(): Stepper;
+
+    within(range: Array<number>, cb: () => void): void;
+    within(range: Array<number>, unit: string, cb: () => void): void;
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+}
+
+export interface TemperatureOption {
+    controller?: string;
+    pin: string | number;
+    toCelsius?: (val: number) => number;
+    freq?: number;
+}
+
+declare export class Temperature {
+    constructor(option: TemperatureOption);
+    on(event: string, cb: () => void): void;
+    on(event: "data", cb: (data: any) => void): void;
+    on(event: "change", cb: () => void): void;
+}
diff --git a/joi/joi.d.ts b/joi/joi.d.ts
index d9ee7c20d1..dc84af752d 100644
--- a/joi/joi.d.ts
+++ b/joi/joi.d.ts
@@ -5,774 +5,773 @@
 
 // TODO express type of Schema in a type-parameter (.default, .valid, .example etc)
 
-declare module 'joi' {
 
-	export interface ValidationOptions {
-		/**
-		 * when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
-		 */
-		abortEarly?: boolean;
-		/**
-		 * when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
-		 */
-		convert?: boolean;
-		/**
-		 * when true, allows object to contain unknown keys which are ignored. Defaults to false.
-		 */
-		allowUnknown?: boolean;
-		/**
-		 * when true, ignores unknown keys with a function value. Defaults to false.
-		 */
-		skipFunctions?: boolean;
-		/**
-		 * when true, unknown keys are deleted (only when value is an object). Defaults to false.
-		 */
-		stripUnknown?: boolean;
-		/**
-		 * overrides individual error messages. Defaults to no override ({}).
-		 */
-		language?: Object;
-		/**
-		 * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
-		 */
-		presence?: string;
-		/**
-		 * provides an external data set to be used in references
-		 */
-		context?: Object;
-	}
 
-	export interface RenameOptions {
-		/**
-		 * if true, does not delete the old key name, keeping both the new and old keys in place. Defaults to false.
-		 */
-		alias?: boolean;
-		/**
-		 * if true, allows renaming multiple keys to the same destination where the last rename wins. Defaults to false.
-		 */
-		multiple?: boolean;
-		/**
-		 * if true, allows renaming a key over an existing key. Defaults to false.
-		 */
-		override?: boolean;
-		/**
-		 * if true, skip renaming of a key if it's undefined. Defaults to false.
-		 */
-		ignoreUndefined?: boolean;
-	}
-
-	export interface EmailOptions {
-		/**
-		 * Numerical threshold at which an email address is considered invalid
-		 */
-		errorLevel?: number | boolean;
-		/**
-		 * Specifies a list of acceptable TLDs.
-		 */
-		tldWhitelist?: string[] | Object;
-		/**
-		 * Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
-		 */
-		minDomainAtoms?: number;
-	}
-
-	export interface IpOptions {
-		/**
-		 * One or more IP address versions to validate against. Valid values: ipv4, ipv6, ipvfuture
-		 */
-		version ?: string | string[];
-		/**
-		 * Used to determine if a CIDR is allowed or not. Valid values: optional, required, forbidden
-		 */
-		cidr?: string;
-	}
-
-	export interface UriOptions {
-		/**
-		 * Specifies one or more acceptable Schemes, should only include the scheme name.
-		 * Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
-		 */
-		scheme ?: string | RegExp | Array<string | RegExp>;
-	}
-
-	export interface WhenOptions<T> {
-		/**
-		 * the required condition joi type.
-		 */
-		is: T;
-		/**
-		 * the alternative schema type if the condition is true. Required if otherwise is missing.
-		 */
-		then?: Schema;
-		/**
-		 * the alternative schema type if the condition is false. Required if then is missing
-		 */
-		otherwise?: Schema;
-	}
-
-	export interface ReferenceOptions {
-		separator?: string;
-		contextPrefix?: string;
-	}
-
-	export interface IPOptions {
-		version?: Array<string>;
-		cidr?: string
-	}
-
-	export interface ValidationError extends Error {
-		message: string;
-		details: ValidationErrorItem[];
-		simple(): string;
-		annotated(): string;
-	}
-
-	export interface ValidationErrorItem {
-		message: string;
-		type: string;
-		path: string;
-		options?: ValidationOptions;
-	}
-
-	export interface ValidationResult<T> {
-		error: ValidationError;
-		value: T;
-	}
-
-	export interface SchemaMap {
-		[key: string]: Schema;
-	}
-
-	export interface Schema extends AnySchema<Schema> {
-
-	}
-
-	export interface Reference extends Schema {
-
-	}
-
-	export interface AnySchema<T extends AnySchema<Schema>> {
-		/**
-		 * Whitelists a value
-		 */
-		allow(value: any, ...values: any[]): T;
-		allow(values: any[]): T;
-
-		/**
-		 * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
-		 */
-		valid(value: any, ...values: any[]): T;
-		valid(values: any[]): T;
-		only(value: any, ...values : any[]): T;
-		only(values: any[]): T;
-		equal(value: any, ...values : any[]): T;
-		equal(values: any[]): T;
-
-		/**
-		 * Blacklists a value
-		 */
-		invalid(value: any, ...values: any[]): T;
-		invalid(values: any[]): T;
-		disallow(value: any, ...values : any[]): T;
-		disallow(values: any[]): T;
-		not(value: any, ...values : any[]): T;
-		not(values: any[]): T;
-
-		/**
-		 * Marks a key as required which will not allow undefined as value. All keys are optional by default.
-		 */
-		required(): T;
-
-		/**
-		 * Marks a key as optional which will allow undefined as values. Used to annotate the schema for readability as all keys are optional by default.
-		 */
-		optional(): T;
-
-		/**
-		 * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
-		 */
-		forbidden(): T;
-
-		/**
-		 * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
-		 */
-		strip(): T;
-
-		/**
-		 * Annotates the key
-		 */
-		description(desc: string): T;
-
-		/**
-		 * Annotates the key
-		 */
-		notes(notes: string): T;
-		notes(notes: string[]): T;
-
-		/**
-		 * Annotates the key
-		 */
-		tags(notes: string): T;
-		tags(notes: string[]): T;
-
-		/**
-		 * Attaches metadata to the key.
-		 */
-		meta(meta: Object): T;
-
-		/**
-		 * Annotates the key with an example value, must be valid.
-		 */
-		example(value: any): T;
-
-		/**
-		 * Annotates the key with an unit name.
-		 */
-		unit(name: string): T;
-
-		/**
-		 * Overrides the global validate() options for the current key and any sub-key.
-		 */
-		options(options: ValidationOptions): T;
-
-		/**
-		 * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
-		 */
-		strict(isStrict?: boolean): T;
-
-		/**
-		 * Sets a default value if the original value is undefined.
-		 * @param value - the value.
-		 *   value supports references.
-		 *   value may also be a function which returns the default value.
-		 *   If value is specified as a function that accepts a single parameter, that parameter will be a context
-		 *    object that can be used to derive the resulting value. This clones the object however, which incurs some
-		 *    overhead so if you don't need access to the context define your method so that it does not accept any
-		 *    parameters.
-		 *   Without any value, default has no effect, except for object that will then create nested defaults
-		 *    (applying inner defaults of that object).
-		 *
-		 * Note that if value is an object, any changes to the object after default() is called will change the
-		 *  reference and any future assignment.
-		 *
-		 * Additionally, when specifying a method you must either have a description property on your method or the
-		 *  second parameter is required.
-		 */
-		default(value: any, description?: string): T;
-		default(): T;
-
-		/**
-		 * Returns a new type that is the result of adding the rules of one type to another.
-		 */
-		concat(schema: T): T;
-
-		/**
-		 * Converts the type into an alternatives type where the conditions are merged into the type definition where:
-		 */
-		when<U>(ref: string, options: WhenOptions<U>): AlternativesSchema;
-		when<U>(ref: Reference, options: WhenOptions<U>): AlternativesSchema;
-
-		/**
-		 * Overrides the key name in error messages.
-		 */
-		label(name: string): T;
-
-		/**
-		 * Outputs the original untouched value instead of the casted value.
-		 */
-		raw(isRaw?: boolean): T;
-
-		/**
-		 * Considers anything that matches the schema to be empty (undefined).
-		 * @param schema - any object or joi schema to match. An undefined schema unsets that rule.
-		 */
-		empty(schema?: any) : T;
-	}
-
-	export interface BooleanSchema extends AnySchema<BooleanSchema> {
-
-	}
-
-	export interface NumberSchema extends AnySchema<NumberSchema> {
-		/**
-		 * Specifies the minimum value.
-		 * It can also be a reference to another field.
-		 */
-		min(limit: number): NumberSchema;
-		min(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies the maximum value.
-		 * It can also be a reference to another field.
-		 */
-		max(limit: number): NumberSchema;
-		max(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies that the value must be greater than limit.
-		 * It can also be a reference to another field.
-		 */
-		greater(limit: number): NumberSchema;
-		greater(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies that the value must be less than limit.
-		 * It can also be a reference to another field.
-		 */
-		less(limit: number): NumberSchema;
-		less(limit: Reference): NumberSchema;
-
-		/**
-		 * Requires the number to be an integer (no floating point).
-		 */
-		integer(): NumberSchema;
-
-		/**
-		 * Specifies the maximum number of decimal places where:
-		 *  limit - the maximum number of decimal places allowed.
-		 */
-		precision(limit: number): NumberSchema;
-
-		/**
-		 * Specifies that the value must be a multiple of base.
-		 */
-		multiple(base: number): NumberSchema;
-
-		/**
-		 * Requires the number to be positive.
-		 */
-		positive(): NumberSchema;
-
-		/**
-		 * Requires the number to be negative.
-		 */
-		negative(): NumberSchema;
-	}
-
-	export interface StringSchema extends AnySchema<StringSchema> {
-		/**
-		 * Allows the value to match any whitelist of blacklist item in a case insensitive comparison.
-		 */
-		insensitive(): StringSchema;
-
-		/**
-		 * Specifies the minimum number string characters.
-		 * @param limit - the minimum number of string characters required. It can also be a reference to another field.
-		 * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
-		 */
-		min(limit: number, encoding?: string): StringSchema;
-		min(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * Specifies the maximum number of string characters.
-		 * @param limit - the maximum number of string characters allowed. It can also be a reference to another field.
-		 * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
-		 */
-		max(limit: number, encoding?: string): StringSchema;
-		max(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * Requires the number to be a credit card number (Using Lunh Algorithm).
-		 */
-		creditCard(): StringSchema;
-
-		/**
-		 * Specifies the exact string length required
-		 * @param limit - the required string length. It can also be a reference to another field.
-		 * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
-		 */
-		length(limit: number, encoding?: string): StringSchema;
-		length(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * Defines a regular expression rule.
-		 * @param pattern - a regular expression object the string value must match against.
-		 * @param name - optional name for patterns (useful with multiple patterns). Defaults to 'required'.
-		 */
-		regex(pattern: RegExp, name?: string): StringSchema;
-
-		/**
-		 * Replace characters matching the given pattern with the specified replacement string where:
-		 * @param pattern - a regular expression object to match against, or a string of which all occurrences will be replaced.
-		 * @param replacement - the string that will replace the pattern.
-		 */
-		replace(pattern: RegExp, replacement: string): StringSchema;
-		replace(pattern: string, replacement: string): StringSchema;
-
-		/**
-		 * Requires the string value to only contain a-z, A-Z, and 0-9.
-		 */
-		alphanum(): StringSchema;
-
-		/**
-		 * Requires the string value to only contain a-z, A-Z, 0-9, and underscore _.
-		 */
-		token(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid email address.
-		 */
-		email(options?: EmailOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid ip address.
-		 */
-		ip(options?: IpOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid RFC 3986 URI.
-		 */
-		uri(options?: UriOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid GUID.
-		 */
-		guid(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid hexadecimal string.
-		 */
-		hex(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid hostname as per RFC1123.
-		 */
-		hostname(): StringSchema;
-
-		/**
-		 * Requires the string value to be in valid ISO 8601 date format.
-		 */
-		isoDate(): StringSchema;
-
-		/**
-		 * Requires the string value to be all lowercase. If the validation convert option is on (enabled by default), the string will be forced to lowercase.
-		 */
-		lowercase(): StringSchema;
-
-		/**
-		 * Requires the string value to be all uppercase. If the validation convert option is on (enabled by default), the string will be forced to uppercase.
-		 */
-		uppercase(): StringSchema;
-
-		/**
-		 * Requires the string value to contain no whitespace before or after. If the validation convert option is on (enabled by default), the string will be trimmed.
-		 */
-		trim(): StringSchema;
-	}
-
-	export interface ArraySchema extends AnySchema<ArraySchema> {
-		/**
-		 * Allow this array to be sparse.
-		 * enabled can be used with a falsy value to go back to the default behavior.
-		 */
-		sparse(enabled?: any): ArraySchema;
-
-		/**
-		 * Allow single values to be checked against rules as if it were provided as an array.
-		 * enabled can be used with a falsy value to go back to the default behavior.
-		 */
-		single(enabled?: any): ArraySchema;
-
-		/**
-		 * List the types allowed for the array values.
-		 * type can be an array of values, or multiple values can be passed as individual arguments.
-		 * If a given type is .required() then there must be a matching item in the array.
-		 * If a type is .forbidden() then it cannot appear in the array.
-		 * Required items can be added multiple times to signify that multiple items must be found.
-		 * Errors will contain the number of items that didn't match.
-		 * Any unmatched item having a label will be mentioned explicitly.
-		 *
-		 * @param type - a joi schema object to validate each array item against.
-		 */
-		items(type: Schema, ...types: Schema[]): ArraySchema;
-		items(types: Schema[]): ArraySchema;
-
-		/**
-		 * Specifies the minimum number of items in the array.
-		 */
-		min(limit: number): ArraySchema;
-
-		/**
-		 * Specifies the maximum number of items in the array.
-		 */
-		max(limit: number): ArraySchema;
-
-		/**
-		 * Specifies the exact number of items in the array.
-		 */
-		length(limit: number): ArraySchema;
-
-		/**
-		 * Requires the array values to be unique.
-		 * Be aware that a deep equality is performed on elements of the array having a type of object,
-		 * a performance penalty is to be expected for this kind of operation.
-		 */
-		unique(): ArraySchema;
-	}
-
-	export interface ObjectSchema extends AnySchema<ObjectSchema> {
-		/**
-		 * Sets the allowed object keys.
-		 */
-		keys(schema?: SchemaMap): ObjectSchema;
-
-		/**
-		 * Specifies the minimum number of keys in the object.
-		 */
-		min(limit: number): ObjectSchema;
-
-		/**
-		 * Specifies the maximum number of keys in the object.
-		 */
-		max(limit: number): ObjectSchema;
-
-		/**
-		 * Specifies the exact number of keys in the object.
-		 */
-		length(limit: number): ObjectSchema;
-
-		/**
-		 * Specify validation rules for unknown keys matching a pattern.
-		 */
-		pattern(regex: RegExp, schema: Schema): ObjectSchema;
-
-		/**
-		 * Defines an all-or-nothing relationship between keys where if one of the peers is present, all of them are required as well.
-		 * @param peers - the key names of which if one present, all are required. peers can be a single string value,
-		 * an array of string values, or each peer provided as an argument.
-		 */
-		and(peer1: string, ...peers: string[]): ObjectSchema;
-		and(peers: string[]): ObjectSchema;
-
-		/**
-		 * Defines a relationship between keys where not all peers can be present at the same time.
-		 * @param peers - the key names of which if one present, the others may not all be present.
-		 * peers can be a single string value, an array of string values, or each peer provided as an argument.
-		 */
-		nand(peer1: string, ...peers: string[]): ObjectSchema;
-		nand(peers: string[]): ObjectSchema;
-
-		/**
-		 * Defines a relationship between keys where one of the peers is required (and more than one is allowed).
-		 */
-		or(peer1: string, ...peers: string[]): ObjectSchema;
-		or(peers: string[]): ObjectSchema;
-
-		/**
-		 * Defines an exclusive relationship between a set of keys. one of them is required but not at the same time where:
-		 */
-		xor(peer1: string, ...peers: string[]): ObjectSchema;
-		xor(peers: string[]): ObjectSchema;
-
-		/**
-		 * Requires the presence of other keys whenever the specified key is present.
-		 */
-		with(key: string, peers: string): ObjectSchema;
-		with(key: string, peers: string[]): ObjectSchema;
-
-		/**
-		 * Forbids the presence of other keys whenever the specified is present.
-		 */
-		without(key: string, peers: string): ObjectSchema;
-		without(key: string, peers: string[]): ObjectSchema;
-
-		/**
-		 * Renames a key to another name (deletes the renamed key).
-		 */
-		rename(from: string, to: string, options?: RenameOptions): ObjectSchema;
-
-		/**
-		 * Verifies an assertion where.
-		 */
-		assert(ref: string, schema: Schema, message?: string): ObjectSchema;
-		assert(ref: Reference, schema: Schema, message?: string): ObjectSchema;
-
-		/**
-		 * Overrides the handling of unknown keys for the scope of the current object only (does not apply to children).
-		 */
-		unknown(allow?: boolean): ObjectSchema;
-
-		/**
-		 * Requires the object to be an instance of a given constructor.
-		 *
-		 * @param constructor - the constructor function that the object must be an instance of.
-		 * @param name - an alternate name to use in validation errors. This is useful when the constructor function does not have a name.
-		 */
-		type(constructor: Function, name?: string): ObjectSchema;
-
-		/**
-		 * Sets the specified children to required.
-		 *
-		 * @param children - can be a single string value, an array of string values, or each child provided as an argument.
-		 *
-		 *   var schema = Joi.object().keys({ a: { b: Joi.number() }, c: { d: Joi.string() } });
-		 *   var requiredSchema = schema.requiredKeys('', 'a.b', 'c', 'c.d');
-		 *
-		 * Note that in this example '' means the current object, a is not required but b is, as well as c and d.
-		 */
-		requiredKeys(children: string): ObjectSchema;
-		requiredKeys(children: string[]): ObjectSchema;
-		requiredKeys(child:string, ...children: string[]): ObjectSchema;
-
-		/**
-		 * Sets the specified children to optional.
-		 *
-		 * @param children - can be a single string value, an array of string values, or each child provided as an argument.
-		 *
-		 * The behavior is exactly the same as requiredKeys.
-		 */
-		optionalKeys(children: string): ObjectSchema;
-		optionalKeys(children: string[]): ObjectSchema;
-		optionalKeys(child:string, ...children: string[]): ObjectSchema;
-	}
-
-	export interface BinarySchema extends AnySchema<BinarySchema> {
-		/**
-		 * Sets the string encoding format if a string input is converted to a buffer.
-		 */
-		encoding(encoding: string): BinarySchema;
-
-		/**
-		 * Specifies the minimum length of the buffer.
-		 */
-		min(limit: number): BinarySchema;
-
-		/**
-		 * Specifies the maximum length of the buffer.
-		 */
-		max(limit: number): BinarySchema;
-
-		/**
-		 * Specifies the exact length of the buffer:
-		 */
-		length(limit: number): BinarySchema;
-	}
-
-	export interface DateSchema extends AnySchema<DateSchema> {
-
-		/**
-		 * Specifies the oldest date allowed.
-		 * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
-		 * allowing to explicitly ensure a date is either in the past or in the future.
-		 * It can also be a reference to another field.
-		 */
-		min(date: Date): DateSchema;
-		min(date: number): DateSchema;
-		min(date: string): DateSchema;
-		min(date: Reference): DateSchema;
-
-		/**
-		 * Specifies the latest date allowed.
-		 * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
-		 * allowing to explicitly ensure a date is either in the past or in the future.
-		 * It can also be a reference to another field.
-		 */
-		max(date: Date): DateSchema;
-		max(date: number): DateSchema;
-		max(date: string): DateSchema;
-		max(date: Reference): DateSchema;
-
-		/**
-		 * Specifies the allowed date format:
-		 * @param format - string or array of strings that follow the moment.js format.
-		 */
-		format(format: string): DateSchema;
-		format(format: string[]): DateSchema;
-
-		/**
-		 * Requires the string value to be in valid ISO 8601 date format.
-		 */
-		iso(): DateSchema;
-	}
-
-	export interface FunctionSchema extends AnySchema<FunctionSchema> {
-
-	}
-
-	export interface AlternativesSchema extends AnySchema<FunctionSchema> {
-		try(schemas: Schema[]): AlternativesSchema;
-		when<T>(ref: string, options: WhenOptions<T>): AlternativesSchema;
-		when<T>(ref: Reference, options: WhenOptions<T>): AlternativesSchema;
-	}
-
-	// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-
-	/**
-	 * Generates a schema object that matches any data type.
-	 */
-	export function any(): Schema;
-
-	/**
-	 * Generates a schema object that matches an array data type.
-	 */
-	export function array(): ArraySchema;
-
-	/**
-	 * Generates a schema object that matches a boolean data type (as well as the strings 'true', 'false', 'yes', and 'no'). Can also be called via bool().
-	 */
-	export function bool(): BooleanSchema;
-
-	export function boolean(): BooleanSchema;
-
-	/**
-	 * Generates a schema object that matches a Buffer data type (as well as the strings which will be converted to Buffers).
-	 */
-	export function binary(): BinarySchema;
-
-	/**
-	 * Generates a schema object that matches a date type (as well as a JavaScript date string or number of milliseconds).
-	 */
-	export function date(): DateSchema;
-
-	/**
-	 * Generates a schema object that matches a function type.
-	 */
-	export function func(): FunctionSchema;
-
-	/**
-	 * Generates a schema object that matches a number data type (as well as strings that can be converted to numbers).
-	 */
-	export function number(): NumberSchema;
-
-	/**
-	 * Generates a schema object that matches an object data type (as well as JSON strings that parsed into objects).
-	 */
-	export function object(schema?: SchemaMap): ObjectSchema;
-
-	/**
-	 * Generates a schema object that matches a string data type. Note that empty strings are not allowed by default and must be enabled with allow('').
-	 */
-	export function string(): StringSchema;
-
-	/**
-	 * Generates a type that will match one of the provided alternative schemas
-	 */
-	export function alternatives(types: Schema[]): Schema;
-	export function alternatives(type1: Schema, type2: Schema, ...types: Schema[]): Schema;
-
-	/**
-	 * Validates a value using the given schema and options.
-	 */
-	export function validate<T>(value: T, schema: Schema, callback: (err: ValidationError, value: T) => void): void;
-	export function validate<T>(value: T, schema: Object, callback: (err: ValidationError, value: T) => void): void;
-	export function validate<T>(value: T, schema: Object, options?: ValidationOptions, callback?: (err: ValidationError, value: T) => void): ValidationResult<T>;
-
-	/**
-	 * Converts literal schema definition to joi schema object (or returns the same back if already a joi schema object).
-	 */
-	export function compile(schema: Object): Schema;
-
-	/**
-	 * Validates a value against a schema and throws if validation fails.
-	 *
-	 * @param value - the value to validate.
-	 * @param schema - the schema object.
-	 * @param message - optional message string prefix added in front of the error message. may also be an Error object.
-	 */
-	export function assert(value: any, schema: Schema, message?: string | Error): void;
-
-	/**
-	 * Generates a reference to the value of the named key.
-	 */
-	export function ref(key: string, options?: ReferenceOptions): Reference;
+export interface ValidationOptions {
+    /**
+     * when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
+     */
+    abortEarly?: boolean;
+    /**
+     * when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
+     */
+    convert?: boolean;
+    /**
+     * when true, allows object to contain unknown keys which are ignored. Defaults to false.
+     */
+    allowUnknown?: boolean;
+    /**
+     * when true, ignores unknown keys with a function value. Defaults to false.
+     */
+    skipFunctions?: boolean;
+    /**
+     * when true, unknown keys are deleted (only when value is an object). Defaults to false.
+     */
+    stripUnknown?: boolean;
+    /**
+     * overrides individual error messages. Defaults to no override ({}).
+     */
+    language?: Object;
+    /**
+     * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
+     */
+    presence?: string;
+    /**
+     * provides an external data set to be used in references
+     */
+    context?: Object;
 }
+
+export interface RenameOptions {
+    /**
+     * if true, does not delete the old key name, keeping both the new and old keys in place. Defaults to false.
+     */
+    alias?: boolean;
+    /**
+     * if true, allows renaming multiple keys to the same destination where the last rename wins. Defaults to false.
+     */
+    multiple?: boolean;
+    /**
+     * if true, allows renaming a key over an existing key. Defaults to false.
+     */
+    override?: boolean;
+    /**
+     * if true, skip renaming of a key if it's undefined. Defaults to false.
+     */
+    ignoreUndefined?: boolean;
+}
+
+export interface EmailOptions {
+    /**
+     * Numerical threshold at which an email address is considered invalid
+     */
+    errorLevel?: number | boolean;
+    /**
+     * Specifies a list of acceptable TLDs.
+     */
+    tldWhitelist?: string[] | Object;
+    /**
+     * Number of atoms required for the domain. Be careful since some domains, such as io, directly allow email.
+     */
+    minDomainAtoms?: number;
+}
+
+export interface IpOptions {
+    /**
+     * One or more IP address versions to validate against. Valid values: ipv4, ipv6, ipvfuture
+     */
+    version?: string | string[];
+    /**
+     * Used to determine if a CIDR is allowed or not. Valid values: optional, required, forbidden
+     */
+    cidr?: string;
+}
+
+export interface UriOptions {
+    /**
+     * Specifies one or more acceptable Schemes, should only include the scheme name.
+     * Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
+     */
+    scheme?: string | RegExp | Array<string | RegExp>;
+}
+
+export interface WhenOptions<T> {
+    /**
+     * the required condition joi type.
+     */
+    is: T;
+    /**
+     * the alternative schema type if the condition is true. Required if otherwise is missing.
+     */
+    then?: Schema;
+    /**
+     * the alternative schema type if the condition is false. Required if then is missing
+     */
+    otherwise?: Schema;
+}
+
+export interface ReferenceOptions {
+    separator?: string;
+    contextPrefix?: string;
+}
+
+export interface IPOptions {
+    version?: Array<string>;
+    cidr?: string
+}
+
+export interface ValidationError extends Error {
+    message: string;
+    details: ValidationErrorItem[];
+    simple(): string;
+    annotated(): string;
+}
+
+export interface ValidationErrorItem {
+    message: string;
+    type: string;
+    path: string;
+    options?: ValidationOptions;
+}
+
+export interface ValidationResult<T> {
+    error: ValidationError;
+    value: T;
+}
+
+export interface SchemaMap {
+    [key: string]: Schema;
+}
+
+export interface Schema extends AnySchema<Schema> {
+
+}
+
+export interface Reference extends Schema {
+
+}
+
+export interface AnySchema<T extends AnySchema<Schema>> {
+    /**
+     * Whitelists a value
+     */
+    allow(value: any, ...values: any[]): T;
+    allow(values: any[]): T;
+
+    /**
+     * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
+     */
+    valid(value: any, ...values: any[]): T;
+    valid(values: any[]): T;
+    only(value: any, ...values: any[]): T;
+    only(values: any[]): T;
+    equal(value: any, ...values: any[]): T;
+    equal(values: any[]): T;
+
+    /**
+     * Blacklists a value
+     */
+    invalid(value: any, ...values: any[]): T;
+    invalid(values: any[]): T;
+    disallow(value: any, ...values: any[]): T;
+    disallow(values: any[]): T;
+    not(value: any, ...values: any[]): T;
+    not(values: any[]): T;
+
+    /**
+     * Marks a key as required which will not allow undefined as value. All keys are optional by default.
+     */
+    required(): T;
+
+    /**
+     * Marks a key as optional which will allow undefined as values. Used to annotate the schema for readability as all keys are optional by default.
+     */
+    optional(): T;
+
+    /**
+     * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
+     */
+    forbidden(): T;
+
+    /**
+     * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
+     */
+    strip(): T;
+
+    /**
+     * Annotates the key
+     */
+    description(desc: string): T;
+
+    /**
+     * Annotates the key
+     */
+    notes(notes: string): T;
+    notes(notes: string[]): T;
+
+    /**
+     * Annotates the key
+     */
+    tags(notes: string): T;
+    tags(notes: string[]): T;
+
+    /**
+     * Attaches metadata to the key.
+     */
+    meta(meta: Object): T;
+
+    /**
+     * Annotates the key with an example value, must be valid.
+     */
+    example(value: any): T;
+
+    /**
+     * Annotates the key with an unit name.
+     */
+    unit(name: string): T;
+
+    /**
+     * Overrides the global validate() options for the current key and any sub-key.
+     */
+    options(options: ValidationOptions): T;
+
+    /**
+     * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
+     */
+    strict(isStrict?: boolean): T;
+
+    /**
+     * Sets a default value if the original value is undefined.
+     * @param value - the value.
+     *   value supports references.
+     *   value may also be a function which returns the default value.
+     *   If value is specified as a function that accepts a single parameter, that parameter will be a context
+     *    object that can be used to derive the resulting value. This clones the object however, which incurs some
+     *    overhead so if you don't need access to the context define your method so that it does not accept any
+     *    parameters.
+     *   Without any value, default has no effect, except for object that will then create nested defaults
+     *    (applying inner defaults of that object).
+     *
+     * Note that if value is an object, any changes to the object after default() is called will change the
+     *  reference and any future assignment.
+     *
+     * Additionally, when specifying a method you must either have a description property on your method or the
+     *  second parameter is required.
+     */
+    default(value: any, description?: string): T;
+    default(): T;
+
+    /**
+     * Returns a new type that is the result of adding the rules of one type to another.
+     */
+    concat(schema: T): T;
+
+    /**
+     * Converts the type into an alternatives type where the conditions are merged into the type definition where:
+     */
+    when<U>(ref: string, options: WhenOptions<U>): AlternativesSchema;
+    when<U>(ref: Reference, options: WhenOptions<U>): AlternativesSchema;
+
+    /**
+     * Overrides the key name in error messages.
+     */
+    label(name: string): T;
+
+    /**
+     * Outputs the original untouched value instead of the casted value.
+     */
+    raw(isRaw?: boolean): T;
+
+    /**
+     * Considers anything that matches the schema to be empty (undefined).
+     * @param schema - any object or joi schema to match. An undefined schema unsets that rule.
+     */
+    empty(schema?: any): T;
+}
+
+export interface BooleanSchema extends AnySchema<BooleanSchema> {
+
+}
+
+export interface NumberSchema extends AnySchema<NumberSchema> {
+    /**
+     * Specifies the minimum value.
+     * It can also be a reference to another field.
+     */
+    min(limit: number): NumberSchema;
+    min(limit: Reference): NumberSchema;
+
+    /**
+     * Specifies the maximum value.
+     * It can also be a reference to another field.
+     */
+    max(limit: number): NumberSchema;
+    max(limit: Reference): NumberSchema;
+
+    /**
+     * Specifies that the value must be greater than limit.
+     * It can also be a reference to another field.
+     */
+    greater(limit: number): NumberSchema;
+    greater(limit: Reference): NumberSchema;
+
+    /**
+     * Specifies that the value must be less than limit.
+     * It can also be a reference to another field.
+     */
+    less(limit: number): NumberSchema;
+    less(limit: Reference): NumberSchema;
+
+    /**
+     * Requires the number to be an integer (no floating point).
+     */
+    integer(): NumberSchema;
+
+    /**
+     * Specifies the maximum number of decimal places where:
+     *  limit - the maximum number of decimal places allowed.
+     */
+    precision(limit: number): NumberSchema;
+
+    /**
+     * Specifies that the value must be a multiple of base.
+     */
+    multiple(base: number): NumberSchema;
+
+    /**
+     * Requires the number to be positive.
+     */
+    positive(): NumberSchema;
+
+    /**
+     * Requires the number to be negative.
+     */
+    negative(): NumberSchema;
+}
+
+export interface StringSchema extends AnySchema<StringSchema> {
+    /**
+     * Allows the value to match any whitelist of blacklist item in a case insensitive comparison.
+     */
+    insensitive(): StringSchema;
+
+    /**
+     * Specifies the minimum number string characters.
+     * @param limit - the minimum number of string characters required. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    min(limit: number, encoding?: string): StringSchema;
+    min(limit: Reference, encoding?: string): StringSchema;
+
+    /**
+     * Specifies the maximum number of string characters.
+     * @param limit - the maximum number of string characters allowed. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    max(limit: number, encoding?: string): StringSchema;
+    max(limit: Reference, encoding?: string): StringSchema;
+
+    /**
+     * Requires the number to be a credit card number (Using Lunh Algorithm).
+     */
+    creditCard(): StringSchema;
+
+    /**
+     * Specifies the exact string length required
+     * @param limit - the required string length. It can also be a reference to another field.
+     * @param encoding - if specified, the string length is calculated in bytes using the provided encoding.
+     */
+    length(limit: number, encoding?: string): StringSchema;
+    length(limit: Reference, encoding?: string): StringSchema;
+
+    /**
+     * Defines a regular expression rule.
+     * @param pattern - a regular expression object the string value must match against.
+     * @param name - optional name for patterns (useful with multiple patterns). Defaults to 'required'.
+     */
+    regex(pattern: RegExp, name?: string): StringSchema;
+
+    /**
+     * Replace characters matching the given pattern with the specified replacement string where:
+     * @param pattern - a regular expression object to match against, or a string of which all occurrences will be replaced.
+     * @param replacement - the string that will replace the pattern.
+     */
+    replace(pattern: RegExp, replacement: string): StringSchema;
+    replace(pattern: string, replacement: string): StringSchema;
+
+    /**
+     * Requires the string value to only contain a-z, A-Z, and 0-9.
+     */
+    alphanum(): StringSchema;
+
+    /**
+     * Requires the string value to only contain a-z, A-Z, 0-9, and underscore _.
+     */
+    token(): StringSchema;
+
+    /**
+     * Requires the string value to be a valid email address.
+     */
+    email(options?: EmailOptions): StringSchema;
+
+    /**
+     * Requires the string value to be a valid ip address.
+     */
+    ip(options?: IpOptions): StringSchema;
+
+    /**
+     * Requires the string value to be a valid RFC 3986 URI.
+     */
+    uri(options?: UriOptions): StringSchema;
+
+    /**
+     * Requires the string value to be a valid GUID.
+     */
+    guid(): StringSchema;
+
+    /**
+     * Requires the string value to be a valid hexadecimal string.
+     */
+    hex(): StringSchema;
+
+    /**
+     * Requires the string value to be a valid hostname as per RFC1123.
+     */
+    hostname(): StringSchema;
+
+    /**
+     * Requires the string value to be in valid ISO 8601 date format.
+     */
+    isoDate(): StringSchema;
+
+    /**
+     * Requires the string value to be all lowercase. If the validation convert option is on (enabled by default), the string will be forced to lowercase.
+     */
+    lowercase(): StringSchema;
+
+    /**
+     * Requires the string value to be all uppercase. If the validation convert option is on (enabled by default), the string will be forced to uppercase.
+     */
+    uppercase(): StringSchema;
+
+    /**
+     * Requires the string value to contain no whitespace before or after. If the validation convert option is on (enabled by default), the string will be trimmed.
+     */
+    trim(): StringSchema;
+}
+
+export interface ArraySchema extends AnySchema<ArraySchema> {
+    /**
+     * Allow this array to be sparse.
+     * enabled can be used with a falsy value to go back to the default behavior.
+     */
+    sparse(enabled?: any): ArraySchema;
+
+    /**
+     * Allow single values to be checked against rules as if it were provided as an array.
+     * enabled can be used with a falsy value to go back to the default behavior.
+     */
+    single(enabled?: any): ArraySchema;
+
+    /**
+     * List the types allowed for the array values.
+     * type can be an array of values, or multiple values can be passed as individual arguments.
+     * If a given type is .required() then there must be a matching item in the array.
+     * If a type is .forbidden() then it cannot appear in the array.
+     * Required items can be added multiple times to signify that multiple items must be found.
+     * Errors will contain the number of items that didn't match.
+     * Any unmatched item having a label will be mentioned explicitly.
+     *
+     * @param type - a joi schema object to validate each array item against.
+     */
+    items(type: Schema, ...types: Schema[]): ArraySchema;
+    items(types: Schema[]): ArraySchema;
+
+    /**
+     * Specifies the minimum number of items in the array.
+     */
+    min(limit: number): ArraySchema;
+
+    /**
+     * Specifies the maximum number of items in the array.
+     */
+    max(limit: number): ArraySchema;
+
+    /**
+     * Specifies the exact number of items in the array.
+     */
+    length(limit: number): ArraySchema;
+
+    /**
+     * Requires the array values to be unique.
+     * Be aware that a deep equality is performed on elements of the array having a type of object,
+     * a performance penalty is to be expected for this kind of operation.
+     */
+    unique(): ArraySchema;
+}
+
+export interface ObjectSchema extends AnySchema<ObjectSchema> {
+    /**
+     * Sets the allowed object keys.
+     */
+    keys(schema?: SchemaMap): ObjectSchema;
+
+    /**
+     * Specifies the minimum number of keys in the object.
+     */
+    min(limit: number): ObjectSchema;
+
+    /**
+     * Specifies the maximum number of keys in the object.
+     */
+    max(limit: number): ObjectSchema;
+
+    /**
+     * Specifies the exact number of keys in the object.
+     */
+    length(limit: number): ObjectSchema;
+
+    /**
+     * Specify validation rules for unknown keys matching a pattern.
+     */
+    pattern(regex: RegExp, schema: Schema): ObjectSchema;
+
+    /**
+     * Defines an all-or-nothing relationship between keys where if one of the peers is present, all of them are required as well.
+     * @param peers - the key names of which if one present, all are required. peers can be a single string value,
+     * an array of string values, or each peer provided as an argument.
+     */
+    and(peer1: string, ...peers: string[]): ObjectSchema;
+    and(peers: string[]): ObjectSchema;
+
+    /**
+     * Defines a relationship between keys where not all peers can be present at the same time.
+     * @param peers - the key names of which if one present, the others may not all be present.
+     * peers can be a single string value, an array of string values, or each peer provided as an argument.
+     */
+    nand(peer1: string, ...peers: string[]): ObjectSchema;
+    nand(peers: string[]): ObjectSchema;
+
+    /**
+     * Defines a relationship between keys where one of the peers is required (and more than one is allowed).
+     */
+    or(peer1: string, ...peers: string[]): ObjectSchema;
+    or(peers: string[]): ObjectSchema;
+
+    /**
+     * Defines an exclusive relationship between a set of keys. one of them is required but not at the same time where:
+     */
+    xor(peer1: string, ...peers: string[]): ObjectSchema;
+    xor(peers: string[]): ObjectSchema;
+
+    /**
+     * Requires the presence of other keys whenever the specified key is present.
+     */
+    with(key: string, peers: string): ObjectSchema;
+    with(key: string, peers: string[]): ObjectSchema;
+
+    /**
+     * Forbids the presence of other keys whenever the specified is present.
+     */
+    without(key: string, peers: string): ObjectSchema;
+    without(key: string, peers: string[]): ObjectSchema;
+
+    /**
+     * Renames a key to another name (deletes the renamed key).
+     */
+    rename(from: string, to: string, options?: RenameOptions): ObjectSchema;
+
+    /**
+     * Verifies an assertion where.
+     */
+    assert(ref: string, schema: Schema, message?: string): ObjectSchema;
+    assert(ref: Reference, schema: Schema, message?: string): ObjectSchema;
+
+    /**
+     * Overrides the handling of unknown keys for the scope of the current object only (does not apply to children).
+     */
+    unknown(allow?: boolean): ObjectSchema;
+
+    /**
+     * Requires the object to be an instance of a given constructor.
+     *
+     * @param constructor - the constructor function that the object must be an instance of.
+     * @param name - an alternate name to use in validation errors. This is useful when the constructor function does not have a name.
+     */
+    type(constructor: Function, name?: string): ObjectSchema;
+
+    /**
+     * Sets the specified children to required.
+     *
+     * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+     *
+     *   var schema = Joi.object().keys({ a: { b: Joi.number() }, c: { d: Joi.string() } });
+     *   var requiredSchema = schema.requiredKeys('', 'a.b', 'c', 'c.d');
+     *
+     * Note that in this example '' means the current object, a is not required but b is, as well as c and d.
+     */
+    requiredKeys(children: string): ObjectSchema;
+    requiredKeys(children: string[]): ObjectSchema;
+    requiredKeys(child: string, ...children: string[]): ObjectSchema;
+
+    /**
+     * Sets the specified children to optional.
+     *
+     * @param children - can be a single string value, an array of string values, or each child provided as an argument.
+     *
+     * The behavior is exactly the same as requiredKeys.
+     */
+    optionalKeys(children: string): ObjectSchema;
+    optionalKeys(children: string[]): ObjectSchema;
+    optionalKeys(child: string, ...children: string[]): ObjectSchema;
+}
+
+export interface BinarySchema extends AnySchema<BinarySchema> {
+    /**
+     * Sets the string encoding format if a string input is converted to a buffer.
+     */
+    encoding(encoding: string): BinarySchema;
+
+    /**
+     * Specifies the minimum length of the buffer.
+     */
+    min(limit: number): BinarySchema;
+
+    /**
+     * Specifies the maximum length of the buffer.
+     */
+    max(limit: number): BinarySchema;
+
+    /**
+     * Specifies the exact length of the buffer:
+     */
+    length(limit: number): BinarySchema;
+}
+
+export interface DateSchema extends AnySchema<DateSchema> {
+
+    /**
+     * Specifies the oldest date allowed.
+     * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
+     * allowing to explicitly ensure a date is either in the past or in the future.
+     * It can also be a reference to another field.
+     */
+    min(date: Date): DateSchema;
+    min(date: number): DateSchema;
+    min(date: string): DateSchema;
+    min(date: Reference): DateSchema;
+
+    /**
+     * Specifies the latest date allowed.
+     * Notes: 'now' can be passed in lieu of date so as to always compare relatively to the current date,
+     * allowing to explicitly ensure a date is either in the past or in the future.
+     * It can also be a reference to another field.
+     */
+    max(date: Date): DateSchema;
+    max(date: number): DateSchema;
+    max(date: string): DateSchema;
+    max(date: Reference): DateSchema;
+
+    /**
+     * Specifies the allowed date format:
+     * @param format - string or array of strings that follow the moment.js format.
+     */
+    format(format: string): DateSchema;
+    format(format: string[]): DateSchema;
+
+    /**
+     * Requires the string value to be in valid ISO 8601 date format.
+     */
+    iso(): DateSchema;
+}
+
+export interface FunctionSchema extends AnySchema<FunctionSchema> {
+
+}
+
+export interface AlternativesSchema extends AnySchema<FunctionSchema> {
+    try(schemas: Schema[]): AlternativesSchema;
+    when<T>(ref: string, options: WhenOptions<T>): AlternativesSchema;
+    when<T>(ref: Reference, options: WhenOptions<T>): AlternativesSchema;
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+/**
+ * Generates a schema object that matches any data type.
+ */
+declare export function any(): Schema;
+
+/**
+ * Generates a schema object that matches an array data type.
+ */
+declare export function array(): ArraySchema;
+
+/**
+ * Generates a schema object that matches a boolean data type (as well as the strings 'true', 'false', 'yes', and 'no'). Can also be called via bool().
+ */
+declare export function bool(): BooleanSchema;
+
+declare export function boolean(): BooleanSchema;
+
+/**
+ * Generates a schema object that matches a Buffer data type (as well as the strings which will be converted to Buffers).
+ */
+declare export function binary(): BinarySchema;
+
+/**
+ * Generates a schema object that matches a date type (as well as a JavaScript date string or number of milliseconds).
+ */
+declare export function date(): DateSchema;
+
+/**
+ * Generates a schema object that matches a function type.
+ */
+declare export function func(): FunctionSchema;
+
+/**
+ * Generates a schema object that matches a number data type (as well as strings that can be converted to numbers).
+ */
+declare export function number(): NumberSchema;
+
+/**
+ * Generates a schema object that matches an object data type (as well as JSON strings that parsed into objects).
+ */
+declare export function object(schema?: SchemaMap): ObjectSchema;
+
+/**
+ * Generates a schema object that matches a string data type. Note that empty strings are not allowed by default and must be enabled with allow('').
+ */
+declare export function string(): StringSchema;
+
+/**
+ * Generates a type that will match one of the provided alternative schemas
+ */
+declare export function alternatives(types: Schema[]): Schema;
+declare export function alternatives(type1: Schema, type2: Schema, ...types: Schema[]): Schema;
+
+/**
+ * Validates a value using the given schema and options.
+ */
+declare export function validate<T>(value: T, schema: Schema, callback: (err: ValidationError, value: T) => void): void;
+declare export function validate<T>(value: T, schema: Object, callback: (err: ValidationError, value: T) => void): void;
+declare export function validate<T>(value: T, schema: Object, options?: ValidationOptions, callback?: (err: ValidationError, value: T) => void): ValidationResult<T>;
+
+/**
+ * Converts literal schema definition to joi schema object (or returns the same back if already a joi schema object).
+ */
+declare export function compile(schema: Object): Schema;
+
+/**
+ * Validates a value against a schema and throws if validation fails.
+ *
+ * @param value - the value to validate.
+ * @param schema - the schema object.
+ * @param message - optional message string prefix added in front of the error message. may also be an Error object.
+ */
+declare export function assert(value: any, schema: Schema, message?: string | Error): void;
+
+/**
+ * Generates a reference to the value of the named key.
+ */
+declare export function ref(key: string, options?: ReferenceOptions): Reference;
diff --git a/jsdom/jsdom.d.ts b/jsdom/jsdom.d.ts
index c6ebde2ce3..47cfec2783 100644
--- a/jsdom/jsdom.d.ts
+++ b/jsdom/jsdom.d.ts
@@ -6,193 +6,192 @@
 /// <reference path='../node/node.d.ts' />
 /// <reference path='../jquery/jquery.d.ts' />
 
-declare module "jsdom" {
 
-    import EventEmitter = NodeJS.EventEmitter;
 
-	/**
-	 * The do-what-I-mean API.
-	 *
-	 * Example:
-	 * jsdom.env(html, function (errors, window) {
-	 *  // free memory associated with the window
-	 *  window.close();
-	 * });
-	 *
-	 * @param urlOrSource may be a URL, file name, or HTML fragment
-	 * @param scriptUrlsOrSources a string or array of strings, containing file names or URLs that will be inserted as
-	 * @param config  Configuration object
-	 * @param callback 
-	 */
-	export function env(urlOrHtml: string, scripts: string, config: Config, callback?: Callback): void;
-	export function env(urlOrHtml: string, scripts: string, callback: Callback): void;
-	export function env(urlOrHtml: string, scripts: string[], config: Config, callback?: Callback): void;
-	export function env(urlOrHtml: string, scripts: string[], callback: Callback): void;
-	export function env(urlOrHtml: string, callback: Callback): void;
-	export function env(urlOrHtml: string, config: Config, callback?: Callback): void;
-	export function env(config: Config, callback?: Callback): void;
+import EventEmitter = NodeJS.EventEmitter;
 
-	export function serializeDocument(doc: Document): string;
+/**
+ * The do-what-I-mean API.
+ *
+ * Example:
+ * jsdom.env(html, function (errors, window) {
+ *  // free memory associated with the window
+ *  window.close();
+ * });
+ *
+ * @param urlOrSource may be a URL, file name, or HTML fragment
+ * @param scriptUrlsOrSources a string or array of strings, containing file names or URLs that will be inserted as
+ * @param config  Configuration object
+ * @param callback 
+ */
+declare export function env(urlOrHtml: string, scripts: string, config: Config, callback?: Callback): void;
+declare export function env(urlOrHtml: string, scripts: string, callback: Callback): void;
+declare export function env(urlOrHtml: string, scripts: string[], config: Config, callback?: Callback): void;
+declare export function env(urlOrHtml: string, scripts: string[], callback: Callback): void;
+declare export function env(urlOrHtml: string, callback: Callback): void;
+declare export function env(urlOrHtml: string, config: Config, callback?: Callback): void;
+declare export function env(config: Config, callback?: Callback): void;
 
-	export interface VirtualConsole extends EventEmitter {
-		sendTo(console: Console): VirtualConsole;
-	}
-	
-	export interface VirtualConsoleOptions {
-	}
-	
-	export interface WindowProperties {
-		parsingMode?: string; // html, xml, auto, undefined
-		contentType?: string;
-		parser?: any;
-		url?: string;
-		referrer?: string;
-		cookieJar?: CookieJar;
-		cookie?: string;
-		resourceLoader?: any;
-		deferClose?: boolean;
-		concurrentNodeIterators?: number;
-		virtualConsole?: VirtualConsole;
-		created?: (something: any, window: Window) => any;
-		features?: FeatureOptions;
-		top?: Window;
-	}
+declare export function serializeDocument(doc: Document): string;
 
-    // tough-cookie
-    export interface CookieJar {
-        
-    }
-
-	export function createVirtualConsole(options?: VirtualConsoleOptions): VirtualConsole;
-	export function getVirtualConsole(window: Window): VirtualConsole;
-	export function createCookieJar(): CookieJar;
-	export function nodeLocation(node: Node): any;
-	export function reconfigureWindow(window: Window, newProps: WindowProperties): void;
-	
-	export function jQueryify(window: Window, jqueryUrl: string, callback: (window: Window, jquery: JQuery) => any): void;
-	
-	export var debugMode: boolean;
-	
-	export interface DocumentWithParentWindow extends Document {
-		parentWindow: Window;
-	}
-
-	/**
-	 * The jsdom.jsdom method does less things automatically; it takes in only HTML source, and does not let you to
-	 * separately supply script that it will inject and execute. It just gives you back a document object,
-	 * with usable document.parentWindow, and starts asynchronously executing any <script>s included in the HTML source.
-	 * You can listen for the 'load' event to wait until scripts are done loading and executing, just like you would in a
-	 * normal HTML page.
-	 *
-	 * @param markup	is a HTML document to be parsed. You can also pass undefined to get the basic document,
-	 *					equivalent to what a browser will give if you open up an empty .html file.
-	 * @param options	see the explanation of the config object above.
-	 */
-	export function jsdom(markup: string, config?: Config): DocumentWithParentWindow;
-
-	/**
-	 * Before creating any documents, you can modify the defaults for all future documents:
-	 */
-	export var availableDocumentFeatures: FeatureOptions;
- 	export var defaultDocumentFeatures: FeatureOptions;
-	export var applyDocumentFeatures: FeatureOptions;
-
-    export interface Callback {
-        (errors: Error[], window: Window): any;
-    }
-	
-	export interface FeatureOptions {
-		/**
-		 * Enables/disables fetching files over the file system/HTTP
-		 * Allowed: ["script", "img", "css", "frame", "iframe", "link"] or false
-		 * Default for jsdom.env: false
-		 */
-		FetchExternalResources?: string[] | boolean;
-
-		/**
-		 * Enables/disables JavaScript execution
-		 * Default: ["script"]
-		 * Allowed: ["script"] or false, 
-		 * Default for jsdom.env: false
-		 */
-		ProcessExternalResources?: string[] | boolean;
-
-		/**
-		 * Filters resource downloading and processing to disallow those matching the given regular expression
-		 * Default: false (allow all)
-		 * Allowed: /url to be skipped/ or false
-		 * Example: /http:\/\/example.org/js/bad\.js/
-		 */
-		SkipExternalResources?: string | boolean;
-	}
-
-	export interface EnvDocument {
-		/**
-		 * the new document will have this referrer.
-		 */
-		referrer?: string;
-		/**
-		 * manually set a cookie value, e.g. 'key=value; expires=Wed, Sep 21 2011 12:00:00 GMT; path=/'.
-		 */
-		cookie?: string;
-		/**
-		 * a cookie domain for the manually set cookie; defaults to 127.0.0.1.
-		 */
-		cookieDomain?: string;
-	}
-	
-    export interface Config {
-		/**
-		 * a HTML fragment
-		 */
-		html?: string;
-		/**
-		 * a file which jsdom will load HTML from; the resulting window's location.href will be a file:// URL.
-		 */
-		file?: string;
-		/**
-		 * sets the resulting window's location.href; if config.html and config.file are not provided, jsdom will load HTML from this URL
-		 */
-		url?: string;
-		/**
-		 * a string or array of strings, containing file names or URLs that will be inserted as <script> tags
-		 */
-		scripts?: string[];
-		/**
-		 * an array of JavaScript strings that will be evaluated against the resulting document. Similar to scripts, but it accepts JavaScript instead of paths/URLs.
-		 */
-		src?: string[];
-		/**
-		 * a custom cookie jar, if desired; see mikeal/request documentation.
-		 */
-		jar?: CookieJar;
-		/**
-		 *  either "auto", "html", or "xml". The default is "auto", which uses HTML behavior unless config.url responds with an XML Content-Type, or config.file contains a filename ending in .xml or .xhtml. Setting to "xml" will attempt to parse the document as an XHTML document. (jsdom is currently only OK at doing that.)
-		 */
-		parsingMode?: string;
-		document?: EnvDocument;
-		/**
-		 * Note: the default feature set for jsdom.env does not include fetching remote JavaScript and executing it. This is something that you will need to carefully enable yourself.
-		 */
-		features?: FeatureOptions;
-		
-		virtualConsole?: VirtualConsole;
-		
-		/**
-		 * Now that you know about created and loaded, you can see that done is essentially both of them smashed together:
-		 * If window creation succeeds and no <script>s cause errors, then errors will be null, and window will be usable.
-		 * If window creation succeeds but there are script errors, then errors will be an array containing those errors, but window will still be usable.
-		 * If window creation fails, then errors will be an array containing the creation error, and window will not be passed.
-		 */
-		done?: Callback;
-		/**
-		 * The loaded callback is called along with the window's 'load' event. This means it will only be called if creation succeeds without error. Note that by the time it has called, any external resources will have been downloaded, and any <script>s will have finished executing. If errors is non-null, it will contain an array of all JavaScript errors that occured during script execution. window will still be passed, however.
-		 */
-		loaded?: Callback;
-		
-		/**
-		 * The created callback is called as soon as the window is created, or if that process fails. You may access all window properties here; however, window.document is not ready for use yet, as the HTML has not been parsed. The primary use-case for created is to modify the window object (e.g. add new functions on built-in prototypes) before any scripts execute. You can also set an event handler for 'load' or other events on the window if you wish. But the loaded callback, below, can be more useful, since it includes script errors. If the error argument is non-null, it will contain whatever loading error caused the window creation to fail; in that case window will not be passed.
-		 */
-		created?: (error: Error, window: Window) => void;
-    }
+export interface VirtualConsole extends EventEmitter {
+    sendTo(console: Console): VirtualConsole;
+}
+
+export interface VirtualConsoleOptions {
+}
+
+export interface WindowProperties {
+    parsingMode?: string; // html, xml, auto, undefined
+    contentType?: string;
+    parser?: any;
+    url?: string;
+    referrer?: string;
+    cookieJar?: CookieJar;
+    cookie?: string;
+    resourceLoader?: any;
+    deferClose?: boolean;
+    concurrentNodeIterators?: number;
+    virtualConsole?: VirtualConsole;
+    created?: (something: any, window: Window) => any;
+    features?: FeatureOptions;
+    top?: Window;
+}
+
+// tough-cookie
+export interface CookieJar {
+
+}
+
+declare export function createVirtualConsole(options?: VirtualConsoleOptions): VirtualConsole;
+declare export function getVirtualConsole(window: Window): VirtualConsole;
+declare export function createCookieJar(): CookieJar;
+declare export function nodeLocation(node: Node): any;
+declare export function reconfigureWindow(window: Window, newProps: WindowProperties): void;
+
+declare export function jQueryify(window: Window, jqueryUrl: string, callback: (window: Window, jquery: JQuery) => any): void;
+
+declare export var debugMode: boolean;
+
+export interface DocumentWithParentWindow extends Document {
+    parentWindow: Window;
+}
+
+/**
+ * The jsdom.jsdom method does less things automatically; it takes in only HTML source, and does not let you to
+ * separately supply script that it will inject and execute. It just gives you back a document object,
+ * with usable document.parentWindow, and starts asynchronously executing any <script>s included in the HTML source.
+ * You can listen for the 'load' event to wait until scripts are done loading and executing, just like you would in a
+ * normal HTML page.
+ *
+ * @param markup	is a HTML document to be parsed. You can also pass undefined to get the basic document,
+ *					equivalent to what a browser will give if you open up an empty .html file.
+ * @param options	see the explanation of the config object above.
+ */
+declare export function jsdom(markup: string, config?: Config): DocumentWithParentWindow;
+
+/**
+ * Before creating any documents, you can modify the defaults for all future documents:
+ */
+declare export var availableDocumentFeatures: FeatureOptions;
+declare export var defaultDocumentFeatures: FeatureOptions;
+declare export var applyDocumentFeatures: FeatureOptions;
+
+export interface Callback {
+    (errors: Error[], window: Window): any;
+}
+
+export interface FeatureOptions {
+    /**
+     * Enables/disables fetching files over the file system/HTTP
+     * Allowed: ["script", "img", "css", "frame", "iframe", "link"] or false
+     * Default for jsdom.env: false
+     */
+    FetchExternalResources?: string[] | boolean;
+
+    /**
+     * Enables/disables JavaScript execution
+     * Default: ["script"]
+     * Allowed: ["script"] or false, 
+     * Default for jsdom.env: false
+     */
+    ProcessExternalResources?: string[] | boolean;
+
+    /**
+     * Filters resource downloading and processing to disallow those matching the given regular expression
+     * Default: false (allow all)
+     * Allowed: /url to be skipped/ or false
+     * Example: /http:\/\/example.org/js/bad\.js/
+     */
+    SkipExternalResources?: string | boolean;
+}
+
+export interface EnvDocument {
+    /**
+     * the new document will have this referrer.
+     */
+    referrer?: string;
+    /**
+     * manually set a cookie value, e.g. 'key=value; expires=Wed, Sep 21 2011 12:00:00 GMT; path=/'.
+     */
+    cookie?: string;
+    /**
+     * a cookie domain for the manually set cookie; defaults to 127.0.0.1.
+     */
+    cookieDomain?: string;
+}
+
+export interface Config {
+    /**
+     * a HTML fragment
+     */
+    html?: string;
+    /**
+     * a file which jsdom will load HTML from; the resulting window's location.href will be a file:// URL.
+     */
+    file?: string;
+    /**
+     * sets the resulting window's location.href; if config.html and config.file are not provided, jsdom will load HTML from this URL
+     */
+    url?: string;
+    /**
+     * a string or array of strings, containing file names or URLs that will be inserted as <script> tags
+     */
+    scripts?: string[];
+    /**
+     * an array of JavaScript strings that will be evaluated against the resulting document. Similar to scripts, but it accepts JavaScript instead of paths/URLs.
+     */
+    src?: string[];
+    /**
+     * a custom cookie jar, if desired; see mikeal/request documentation.
+     */
+    jar?: CookieJar;
+    /**
+     *  either "auto", "html", or "xml". The default is "auto", which uses HTML behavior unless config.url responds with an XML Content-Type, or config.file contains a filename ending in .xml or .xhtml. Setting to "xml" will attempt to parse the document as an XHTML document. (jsdom is currently only OK at doing that.)
+     */
+    parsingMode?: string;
+    document?: EnvDocument;
+    /**
+     * Note: the default feature set for jsdom.env does not include fetching remote JavaScript and executing it. This is something that you will need to carefully enable yourself.
+     */
+    features?: FeatureOptions;
+
+    virtualConsole?: VirtualConsole;
+
+    /**
+     * Now that you know about created and loaded, you can see that done is essentially both of them smashed together:
+     * If window creation succeeds and no <script>s cause errors, then errors will be null, and window will be usable.
+     * If window creation succeeds but there are script errors, then errors will be an array containing those errors, but window will still be usable.
+     * If window creation fails, then errors will be an array containing the creation error, and window will not be passed.
+     */
+    done?: Callback;
+    /**
+     * The loaded callback is called along with the window's 'load' event. This means it will only be called if creation succeeds without error. Note that by the time it has called, any external resources will have been downloaded, and any <script>s will have finished executing. If errors is non-null, it will contain an array of all JavaScript errors that occured during script execution. window will still be passed, however.
+     */
+    loaded?: Callback;
+
+    /**
+     * The created callback is called as soon as the window is created, or if that process fails. You may access all window properties here; however, window.document is not ready for use yet, as the HTML has not been parsed. The primary use-case for created is to modify the window object (e.g. add new functions on built-in prototypes) before any scripts execute. You can also set an event handler for 'load' or other events on the window if you wish. But the loaded callback, below, can be more useful, since it includes script errors. If the error argument is non-null, it will contain whatever loading error caused the window creation to fail; in that case window will not be passed.
+     */
+    created?: (error: Error, window: Window) => void;
 }
diff --git a/jsesc/jsesc.d.ts b/jsesc/jsesc.d.ts
index 9034aa76f7..10e322f379 100644
--- a/jsesc/jsesc.d.ts
+++ b/jsesc/jsesc.d.ts
@@ -3,23 +3,22 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'jsesc' {
 
-	function jsesc(str: string, opts?: any): string;
 
-	namespace jsesc {
-		var version: string;
+declare function jsesc(str: string, opts?: any): string;
 
-		interface Opts {
-			quotes?: string;
-			wrap?: boolean;
-			es6?: boolean;
-			escapeEverything?: boolean;
-			compact?: boolean;
-			indent?: string;
-			json?: boolean;
-		}
-	}
+declare namespace jsesc {
+    var version: string;
 
-	export = jsesc;
+    interface Opts {
+        quotes?: string;
+        wrap?: boolean;
+        es6?: boolean;
+        escapeEverything?: boolean;
+        compact?: boolean;
+        indent?: string;
+        json?: boolean;
+    }
 }
+
+export = jsesc;
diff --git a/jsnox/jsnox.d.ts b/jsnox/jsnox.d.ts
index aec7265739..01d2431d41 100644
--- a/jsnox/jsnox.d.ts
+++ b/jsnox/jsnox.d.ts
@@ -5,66 +5,65 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module 'jsnox' {
-
-    import React = require("react");
-    
-    /*
-     * JSnoX requires an object with a createElement method.
-     * This will normally be the React object but could be something else
-     */
-    interface ReactLikeObject {
-        createElement<P>(type: React.ComponentClass<P> | string,
-            props: P, children: React.ReactNode): React.ReactElement<P>;
-    }
-
-    interface Module {
-        (reactObj: ReactLikeObject): CreateElement
-    }
-
-    interface CreateElement {
-        /**
-         * Renders an HTML element from the given spec string, with children but without
-         * extra props.
-         * @param specString A string that defines a component in a way that resembles 
-         * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
-         * @param children A single React node (string or ReactElement) or array of nodes.
-         * Note that unlike with React itself, multiple children must be placed into an array. 
-         */
-        <P>(specString: string, children: React.ReactNode): React.DOMElement<P, Element>
-
-        /**
-         * Renders an HTML element from the given spec string, with optional props 
-         * and children
-         * @param specString A string that defines a component in a way that resembles 
-         * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
-         * @param props Object of html attribute key-value pairs
-         * @param children A single React node (string or ReactElement) or array of nodes.
-         * Note that unlike with React itself, multiple children must be placed into an array. 
-         */
-        <P>(specString: string, props?: React.HTMLAttributes, children?: React.ReactNode): React.DOMElement<P, Element>
 
 
-        /**
-         * Renders a React component, with children but no props
-         * @param component A plain React component (created from React.createClass()) or 
-         * component factory (created from React.createFactory())
-         * @param children A single React node (string or ReactElement) or array of nodes.
-         * Note that unlike with React itself, multiple children must be placed into an array. 
-         */
-        <P>(component: React.ComponentClass<P>, children: React.ReactNode): React.ReactElement<P>
+import React = require("react");
 
-        /** 
-         * Renders a React component, with optional props and children
-         * @param component A plain React component (created from React.createClass()) or 
-         * component factory (created from React.createFactory())
-         * @param props Props object to pass to the component
-         * @param children A single React node (string or ReactElement) or array of nodes.
-         * Note that unlike with React itself, multiple children must be placed into an array. 
-         */
-        <P>(component: React.ComponentClass<P>, props?: P, children?: React.ReactNode): React.ReactElement<P>
-    }
-
-    var exports: Module
-    export = exports
+/*
+ * JSnoX requires an object with a createElement method.
+ * This will normally be the React object but could be something else
+ */
+interface ReactLikeObject {
+    createElement<P>(type: React.ComponentClass<P> | string,
+        props: P, children: React.ReactNode): React.ReactElement<P>;
 }
+
+interface Module {
+    (reactObj: ReactLikeObject): CreateElement
+}
+
+interface CreateElement {
+    /**
+     * Renders an HTML element from the given spec string, with children but without
+     * extra props.
+     * @param specString A string that defines a component in a way that resembles 
+     * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
+     * @param children A single React node (string or ReactElement) or array of nodes.
+     * Note that unlike with React itself, multiple children must be placed into an array. 
+     */
+    <P>(specString: string, children: React.ReactNode): React.DOMElement<P, Element>
+
+    /**
+     * Renders an HTML element from the given spec string, with optional props 
+     * and children
+     * @param specString A string that defines a component in a way that resembles 
+     * CSS selectors. Eg. "input:email#foo.bar.baz[name=email][required]"
+     * @param props Object of html attribute key-value pairs
+     * @param children A single React node (string or ReactElement) or array of nodes.
+     * Note that unlike with React itself, multiple children must be placed into an array. 
+     */
+    <P>(specString: string, props?: React.HTMLAttributes, children?: React.ReactNode): React.DOMElement<P, Element>
+
+
+    /**
+     * Renders a React component, with children but no props
+     * @param component A plain React component (created from React.createClass()) or 
+     * component factory (created from React.createFactory())
+     * @param children A single React node (string or ReactElement) or array of nodes.
+     * Note that unlike with React itself, multiple children must be placed into an array. 
+     */
+    <P>(component: React.ComponentClass<P>, children: React.ReactNode): React.ReactElement<P>
+
+    /** 
+     * Renders a React component, with optional props and children
+     * @param component A plain React component (created from React.createClass()) or 
+     * component factory (created from React.createFactory())
+     * @param props Props object to pass to the component
+     * @param children A single React node (string or ReactElement) or array of nodes.
+     * Note that unlike with React itself, multiple children must be placed into an array. 
+     */
+    <P>(component: React.ComponentClass<P>, props?: P, children?: React.ReactNode): React.ReactElement<P>
+}
+
+declare var exports: Module
+export = exports
diff --git a/json-pointer/json-pointer.d.ts b/json-pointer/json-pointer.d.ts
index ba8fc00b3a..a462801795 100644
--- a/json-pointer/json-pointer.d.ts
+++ b/json-pointer/json-pointer.d.ts
@@ -3,81 +3,80 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "json-pointer" {
-	function JSON_Pointer(object: Object): JSON_Pointer.JSON_PointerWrap;
 
-	namespace JSON_Pointer {
-		/**
-		 *  Wrap an object with accessors
-		 */
-		/**
-		 *  Looks up a JSON pointer in an object.
-		 */
-		function get(object: Object, pointer: string): any;
-		/**
-		 *  Set a value for a JSON pointer on object.
-		 */
-		function set(object: Object, pointer: string, value: any): void;
-		/**
-		 *  Removes an attribute of object referenced by pointer
-		 */
-		function remove(object: Object, pointer: string): void;
-		/**
-		 *  Creates a dictionary object (pointer -> value).
-		 */
-		function dict(object: Object): Object;
-		/**
-		 *  Just like: each(pointer.dict(obj), iterator);
-		 */
-		function walk(object: Object, iterator: (value: any, key: string) =>  void): void;
-		/**
-		 *  Tests if an object has a value for a JSON pointer.
-		 */
-		function has(object: Object, pointer: string): boolean;
-		/**
-		 *  Escapes a reference token.
-		 */
-		function escape(str: string): string;
-		/**
-		 *  Unescape a reference token.
-		 */
-		function unescape(str: string): string;
-		/**
-		 *  Converts a JSON pointer into an array of reference tokens.
-		 */
-		function parse(str: string): string[];
-		/**
-		 *  Builds a json pointer from an array of reference tokens.
-		 */
-		function compile(str: string[]): string;
+declare function JSON_Pointer(object: Object): JSON_Pointer.JSON_PointerWrap;
 
-		interface JSON_PointerWrap {
-			/**
-			 *  Looks up a JSON pointer in an object.
-			 */
-			get(pointer: string): any;
-			/**
-			 *  Set a value for a JSON pointer on object.
-			 */
-			set(pointer: string, value: any): void;
-			/**
-			 *  Removes an attribute of object referenced by pointer
-			 */
-			remove(pointer: string): void;
-			/**
-			 *  Creates a dictionary object (pointer -> value).
-			 */
-			dict(): Object;
-			/**
-			 *  Just like: each(pointer.dict(obj), iterator);
-			 */
-			walk(iterator: (value: any, key: string) =>  void): void;
-			/**
-			 *  Tests if an object has a value for a JSON pointer.
-			 */
-			has(pointer: string): boolean;
-		}
-	}
+declare namespace JSON_Pointer {
+    /**
+     *  Wrap an object with accessors
+     */
+    /**
+     *  Looks up a JSON pointer in an object.
+     */
+    function get(object: Object, pointer: string): any;
+    /**
+     *  Set a value for a JSON pointer on object.
+     */
+    function set(object: Object, pointer: string, value: any): void;
+    /**
+     *  Removes an attribute of object referenced by pointer
+     */
+    function remove(object: Object, pointer: string): void;
+    /**
+     *  Creates a dictionary object (pointer -> value).
+     */
+    function dict(object: Object): Object;
+    /**
+     *  Just like: each(pointer.dict(obj), iterator);
+     */
+    function walk(object: Object, iterator: (value: any, key: string) => void): void;
+    /**
+     *  Tests if an object has a value for a JSON pointer.
+     */
+    function has(object: Object, pointer: string): boolean;
+    /**
+     *  Escapes a reference token.
+     */
+    function escape(str: string): string;
+    /**
+     *  Unescape a reference token.
+     */
+    function unescape(str: string): string;
+    /**
+     *  Converts a JSON pointer into an array of reference tokens.
+     */
+    function parse(str: string): string[];
+    /**
+     *  Builds a json pointer from an array of reference tokens.
+     */
+    function compile(str: string[]): string;
 
-	export = JSON_Pointer;
+    interface JSON_PointerWrap {
+        /**
+         *  Looks up a JSON pointer in an object.
+         */
+        get(pointer: string): any;
+        /**
+         *  Set a value for a JSON pointer on object.
+         */
+        set(pointer: string, value: any): void;
+        /**
+         *  Removes an attribute of object referenced by pointer
+         */
+        remove(pointer: string): void;
+        /**
+         *  Creates a dictionary object (pointer -> value).
+         */
+        dict(): Object;
+        /**
+         *  Just like: each(pointer.dict(obj), iterator);
+         */
+        walk(iterator: (value: any, key: string) => void): void;
+        /**
+         *  Tests if an object has a value for a JSON pointer.
+         */
+        has(pointer: string): boolean;
+    }
 }
+
+export = JSON_Pointer;
diff --git a/json-socket/json-socket.d.ts b/json-socket/json-socket.d.ts
index 198dbf5f51..d9c2f2b700 100644
--- a/json-socket/json-socket.d.ts
+++ b/json-socket/json-socket.d.ts
@@ -5,67 +5,66 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "json-socket" {
 
-    import {Socket} from "net";
 
-    class JsonSocket extends Socket {
+import {Socket} from "net";
 
-        constructor(socket: Socket);
+declare class JsonSocket extends Socket {
 
-        /**
-         * sends a single message and closes the connection instantly. Use this if you need to send a server a message,
-         * but you don't need any response.
-         * @param port port to send the message to
-         * @param host host to send the message to
-         * @param message the message to send
-         * @param callback will be called after the message has been sent
-         */
-        static sendSingleMessage(port: number, host: string, message: any, callback: (err: Error) => void): void;
+    constructor(socket: Socket);
 
-        /**
-         * sends a single message, waits for a single response message from the server and closes the connection right after.
-         * Use this if you need to send a server a message, and get a response, but you don't need the connection to stay
-         * open.
-         * @param port port to send the message to
-         * @param host host to send the message to
-         * @param message the message to send
-         * @param callback will be called when the response message has been received
-         */
-        static sendSingleMessageAndReceive(port: number, host: string, message: any, callback: (err: Error, message: any) => void): void;
+    /**
+     * sends a single message and closes the connection instantly. Use this if you need to send a server a message,
+     * but you don't need any response.
+     * @param port port to send the message to
+     * @param host host to send the message to
+     * @param message the message to send
+     * @param callback will be called after the message has been sent
+     */
+    static sendSingleMessage(port: number, host: string, message: any, callback: (err: Error) => void): void;
 
-        /**
-        * Convenience method for sending an error as a message.
-        * @param err an Error object that should be formatted as a message
-        * @param callback will be called after the message has been sent
-        */
-        sendError(err: Error, callback: (err: Error) => void): void;
+    /**
+     * sends a single message, waits for a single response message from the server and closes the connection right after.
+     * Use this if you need to send a server a message, and get a response, but you don't need the connection to stay
+     * open.
+     * @param port port to send the message to
+     * @param host host to send the message to
+     * @param message the message to send
+     * @param callback will be called when the response message has been received
+     */
+    static sendSingleMessageAndReceive(port: number, host: string, message: any, callback: (err: Error, message: any) => void): void;
 
-        /**
-         * Same as {@link JsonSocket.sendError}, except that the socket is closed right after the message has been sent
-         * using <a href="https://nodejs.org/api/net.html#net_socket_end_data_encoding">net.end()</a>.
-         * No more messages can be sent from either the server or client through this socket.
-         * @param err
-         * @param callback
-         */
-        sendEndError(err: Error, callback: (err: Error) => void): void;
+    /**
+    * Convenience method for sending an error as a message.
+    * @param err an Error object that should be formatted as a message
+    * @param callback will be called after the message has been sent
+    */
+    sendError(err: Error, callback: (err: Error) => void): void;
 
-        /**
-         * Sends a JSON message over the socket.
-         * @param message the message to send
-         * @param callback will be called after the message has been sent
-         */
-        sendMessage(message: any, callback: (err: Error) => void): void;
+    /**
+     * Same as {@link JsonSocket.sendError}, except that the socket is closed right after the message has been sent
+     * using <a href="https://nodejs.org/api/net.html#net_socket_end_data_encoding">net.end()</a>.
+     * No more messages can be sent from either the server or client through this socket.
+     * @param err
+     * @param callback
+     */
+    sendEndError(err: Error, callback: (err: Error) => void): void;
 
-        /**
-         * Same as {@link JsonSocket.sendMessage}, except that the socket is closed right after the message has been sent
-         * using <a href="https://nodejs.org/api/net.html#net_socket_end_data_encoding">net.end()</a>.
-         * No more messages can be sent from either the server or client through this socket.
-         * @param message the message to send
-         * @param callback will be called after the message has been sent
-         */
-        sendEndMessage(message: any, callback: (err: Error) => void): void;
-    }
+    /**
+     * Sends a JSON message over the socket.
+     * @param message the message to send
+     * @param callback will be called after the message has been sent
+     */
+    sendMessage(message: any, callback: (err: Error) => void): void;
 
-    export = JsonSocket;
+    /**
+     * Same as {@link JsonSocket.sendMessage}, except that the socket is closed right after the message has been sent
+     * using <a href="https://nodejs.org/api/net.html#net_socket_end_data_encoding">net.end()</a>.
+     * No more messages can be sent from either the server or client through this socket.
+     * @param message the message to send
+     * @param callback will be called after the message has been sent
+     */
+    sendEndMessage(message: any, callback: (err: Error) => void): void;
 }
+
+export = JsonSocket;
diff --git a/json-stable-stringify/json-stable-stringify.d.ts b/json-stable-stringify/json-stable-stringify.d.ts
index eafc8bd899..79402210f3 100644
--- a/json-stable-stringify/json-stable-stringify.d.ts
+++ b/json-stable-stringify/json-stable-stringify.d.ts
@@ -3,31 +3,30 @@
 // Definitions by: Matt Frantz <https://github.com/mhfrantz/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'json-stable-stringify' {
 
-  function stringify(obj: any, opts?: stringify.Comparator | stringify.Options): string;
 
-  namespace stringify {
+declare function stringify(obj: any, opts?: stringify.Comparator | stringify.Options): string;
+
+declare namespace stringify {
 
     interface Element {
-      key: string;
-      value: any;
+        key: string;
+        value: any;
     }
 
     interface Comparator {
-      (a: Element, b: Element): number;
+        (a: Element, b: Element): number;
     }
 
     interface Replacer {
-      (key: string, value: any): any;
+        (key: string, value: any): any;
     }
 
     interface Options {
-      cmp?: Comparator;
-      space?: number | string;
-      replacer?: Replacer;
+        cmp?: Comparator;
+        space?: number | string;
+        replacer?: Replacer;
     }
-  }
-
-  export = stringify;
 }
+
+export = stringify;
diff --git a/json5/json5.d.ts b/json5/json5.d.ts
index c1dac8622d..76a0352616 100644
--- a/json5/json5.d.ts
+++ b/json5/json5.d.ts
@@ -5,9 +5,9 @@
 
 
 //commonjs loader
-declare module "json5" {
-	/** 
-	 * The following is the exact list of additions to JSON's syntax introduced by JSON5. All of these are optional, and all of these come from ES5.
+
+/** 
+ * The following is the exact list of additions to JSON's syntax introduced by JSON5. All of these are optional, and all of these come from ES5.
 
 Objects
 
@@ -39,7 +39,6 @@ Numbers can begin with an explicit plus sign.
 Comments
 
 Both inline (single-line) and block (multi-line) comments are allowed.
-	  */
-    var json5: JSON;
-    export = json5;
-}
\ No newline at end of file
+  */
+declare var json5: JSON;
+export = json5;
diff --git a/jsonpath/jsonpath.d.ts b/jsonpath/jsonpath.d.ts
index e80f536187..4d6c03e2fa 100644
--- a/jsonpath/jsonpath.d.ts
+++ b/jsonpath/jsonpath.d.ts
@@ -3,19 +3,16 @@
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "jsonpath" {
 
-  type PathComponent = string|number;
 
-  export function query(obj: any, pathExpression: string): any[];
-  export function paths(obj: any, pathExpression: string): PathComponent[][];
-  export function nodes(obj: any, pathExpression: string): { path: PathComponent[]; value: any; }[];
-  export function value(obj: any, pathExpression: string): any;
-  export function value(obj: any, pathExpression: string, newValue: any): any;
-  export function parent(obj: any, pathExpression: string): any;
-  export function apply(obj: any, pathExpression: string, fn: (x: any) => any): { path: PathComponent[]; value: any; }[];
-  export function parse(pathExpression: string): any[];
-  export function stringify(path: PathComponent[]): string;
-
-}
+type PathComponent = string | number;
 
+declare export function query(obj: any, pathExpression: string): any[];
+declare export function paths(obj: any, pathExpression: string): PathComponent[][];
+declare export function nodes(obj: any, pathExpression: string): { path: PathComponent[]; value: any; }[];
+declare export function value(obj: any, pathExpression: string): any;
+declare export function value(obj: any, pathExpression: string, newValue: any): any;
+declare export function parent(obj: any, pathExpression: string): any;
+declare export function apply(obj: any, pathExpression: string, fn: (x: any) => any): { path: PathComponent[]; value: any; }[];
+declare export function parse(pathExpression: string): any[];
+declare export function stringify(path: PathComponent[]): string;
diff --git a/jsonwebtoken/jsonwebtoken.d.ts b/jsonwebtoken/jsonwebtoken.d.ts
index bddb01226b..8455c6261b 100644
--- a/jsonwebtoken/jsonwebtoken.d.ts
+++ b/jsonwebtoken/jsonwebtoken.d.ts
@@ -5,110 +5,109 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "jsonwebtoken" {
 
-    export interface SignOptions {
-        /**
-         * Signature algorithm. Could be one of these values :
-         * - HS256:    HMAC using SHA-256 hash algorithm
-         * - HS384:    HMAC using SHA-384 hash algorithm
-         * - HS512:    HMAC using SHA-512 hash algorithm
-         * - RS256:    RSASSA using SHA-256 hash algorithm
-         * - RS384:    RSASSA using SHA-384 hash algorithm
-         * - RS512:    RSASSA using SHA-512 hash algorithm
-         * - ES256:    ECDSA using P-256 curve and SHA-256 hash algorithm
-         * - ES384:    ECDSA using P-384 curve and SHA-384 hash algorithm
-         * - ES512:    ECDSA using P-521 curve and SHA-512 hash algorithm
-         * - none:     No digital signature or MAC value included
-         */
-        algorithm?: string;
-        /**
-         *@deprecated - see expiresIn
-         *@member {number} - Lifetime for the token in minutes
-         */
-        expiresInMinutes?: number;
-        /** @member {string} - Lifetime for the token expressed in a string describing a time span [rauchg/ms](https://github.com/rauchg/ms.js). Eg: `60`, `"2 days"`, `"10h"`, `"7d"` */
-        expiresIn?: string;
-        notBefore?: string;
-        audience?: string;
-        subject?: string;
-        issuer?: string;
-        jwtid?: string;
-        noTimestamp?: boolean;
-        headers?: Object;
-    }
-
-    export interface VerifyOptions {
-        algorithms?: string[];
-        audience?: string;
-        issuer?: string;
-        ignoreExpiration?: boolean;
-        ignoreNotBefore?: boolean;
-        subject?: string;
-        /**
-         *@deprecated
-         *@member {string} - Max age of token
-         */
-        maxAge?: string;
-    }
-
-    export interface DecodeOptions {
-      complete?: boolean;
-      json?: boolean;
-    }
-
-    export interface VerifyCallback {
-        (err: Error, decoded: any): void;
-    }
-
-    export interface SignCallback {
-        (encoded: string): void;
-    }
 
+export interface SignOptions {
     /**
-     * Synchronously sign the given payload into a JSON Web Token string
-     * @param {String|Object|Buffer} payload - Payload to sign, could be an literal, buffer or string
-     * @param {String|Buffer} secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
-     * @param {SignOptions} [options] - Options for the signature
-     * @returns {String} The JSON Web Token string
+     * Signature algorithm. Could be one of these values :
+     * - HS256:    HMAC using SHA-256 hash algorithm
+     * - HS384:    HMAC using SHA-384 hash algorithm
+     * - HS512:    HMAC using SHA-512 hash algorithm
+     * - RS256:    RSASSA using SHA-256 hash algorithm
+     * - RS384:    RSASSA using SHA-384 hash algorithm
+     * - RS512:    RSASSA using SHA-512 hash algorithm
+     * - ES256:    ECDSA using P-256 curve and SHA-256 hash algorithm
+     * - ES384:    ECDSA using P-384 curve and SHA-384 hash algorithm
+     * - ES512:    ECDSA using P-521 curve and SHA-512 hash algorithm
+     * - none:     No digital signature or MAC value included
      */
-    export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options?: SignOptions): string;
-
+    algorithm?: string;
     /**
-     * Sign the given payload into a JSON Web Token string
-     * @param {String|Object|Buffer} payload - Payload to sign, could be an literal, buffer or string
-     * @param {String|Buffer} secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
-     * @param {SignOptions} [options] - Options for the signature
-     * @param {Function} callback - Callback to get the encoded token on
+     *@deprecated - see expiresIn
+     *@member {number} - Lifetime for the token in minutes
      */
-    export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, callback: SignCallback): void;
-    export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options: SignOptions, callback: SignCallback): void;
-
-    /**
-     * Synchronously verify given token using a secret or a public key to get a decoded token
-     * @param {String} token - JWT string to verify
-     * @param {String|Buffer} secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
-     * @param {VerifyOptions} [options] - Options for the verification
-     * @returns The decoded token.
-     */
-    function verify(token: string, secretOrPublicKey: string | Buffer): any;
-    function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions): any;
-
-    /**
-     * Asynchronously verify given token using a secret or a public key to get a decoded token
-     * @param {String} token - JWT string to verify
-     * @param {String|Buffer} secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
-     * @param {VerifyOptions} [options] - Options for the verification
-     * @param {Function} callback - Callback to get the decoded token on
-     */
-    function verify(token: string, secretOrPublicKey: string | Buffer, callback?: VerifyCallback): void;
-    function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions, callback?: VerifyCallback): void;
-
-    /**
-     * Returns the decoded payload without verifying if the signature is valid.
-     * @param {String} token - JWT string to decode
-     * @param {DecodeOptions} [options] - Options for decoding
-     * @returns {Object} The decoded Token
-     */
-    function decode(token: string, options?: DecodeOptions): any;
+    expiresInMinutes?: number;
+    /** @member {string} - Lifetime for the token expressed in a string describing a time span [rauchg/ms](https://github.com/rauchg/ms.js). Eg: `60`, `"2 days"`, `"10h"`, `"7d"` */
+    expiresIn?: string;
+    notBefore?: string;
+    audience?: string;
+    subject?: string;
+    issuer?: string;
+    jwtid?: string;
+    noTimestamp?: boolean;
+    headers?: Object;
 }
+
+export interface VerifyOptions {
+    algorithms?: string[];
+    audience?: string;
+    issuer?: string;
+    ignoreExpiration?: boolean;
+    ignoreNotBefore?: boolean;
+    subject?: string;
+    /**
+     *@deprecated
+     *@member {string} - Max age of token
+     */
+    maxAge?: string;
+}
+
+export interface DecodeOptions {
+    complete?: boolean;
+    json?: boolean;
+}
+
+export interface VerifyCallback {
+    (err: Error, decoded: any): void;
+}
+
+export interface SignCallback {
+    (encoded: string): void;
+}
+
+/**
+ * Synchronously sign the given payload into a JSON Web Token string
+ * @param {String|Object|Buffer} payload - Payload to sign, could be an literal, buffer or string
+ * @param {String|Buffer} secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
+ * @param {SignOptions} [options] - Options for the signature
+ * @returns {String} The JSON Web Token string
+ */
+declare export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options?: SignOptions): string;
+
+/**
+ * Sign the given payload into a JSON Web Token string
+ * @param {String|Object|Buffer} payload - Payload to sign, could be an literal, buffer or string
+ * @param {String|Buffer} secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
+ * @param {SignOptions} [options] - Options for the signature
+ * @param {Function} callback - Callback to get the encoded token on
+ */
+declare export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, callback: SignCallback): void;
+declare export function sign(payload: string | Buffer | Object, secretOrPrivateKey: string | Buffer, options: SignOptions, callback: SignCallback): void;
+
+/**
+ * Synchronously verify given token using a secret or a public key to get a decoded token
+ * @param {String} token - JWT string to verify
+ * @param {String|Buffer} secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
+ * @param {VerifyOptions} [options] - Options for the verification
+ * @returns The decoded token.
+ */
+declare function verify(token: string, secretOrPublicKey: string | Buffer): any;
+declare function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions): any;
+
+/**
+ * Asynchronously verify given token using a secret or a public key to get a decoded token
+ * @param {String} token - JWT string to verify
+ * @param {String|Buffer} secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
+ * @param {VerifyOptions} [options] - Options for the verification
+ * @param {Function} callback - Callback to get the decoded token on
+ */
+declare function verify(token: string, secretOrPublicKey: string | Buffer, callback?: VerifyCallback): void;
+declare function verify(token: string, secretOrPublicKey: string | Buffer, options?: VerifyOptions, callback?: VerifyCallback): void;
+
+/**
+ * Returns the decoded payload without verifying if the signature is valid.
+ * @param {String} token - JWT string to decode
+ * @param {DecodeOptions} [options] - Options for decoding
+ * @returns {Object} The decoded Token
+ */
+declare function decode(token: string, options?: DecodeOptions): any;
diff --git a/jsx-chai/jsx-chai.d.ts b/jsx-chai/jsx-chai.d.ts
index 28782dda59..86217f0206 100644
--- a/jsx-chai/jsx-chai.d.ts
+++ b/jsx-chai/jsx-chai.d.ts
@@ -5,16 +5,15 @@
 
 /// <reference path="../chai/chai.d.ts" />
 
-declare module 'jsx-chai' {
-    interface JsxChaiStatic {
-        jsxChai: jsxChaiFunction;
-    }
 
-    interface jsxChaiFunction {
-        (chai: any, utils: any): void;
-    }
-
-    var jsxChai: JsxChaiStatic;
-
-    export = jsxChai;
+interface JsxChaiStatic {
+    jsxChai: jsxChaiFunction;
 }
+
+interface jsxChaiFunction {
+    (chai: any, utils: any): void;
+}
+
+declare var jsxChai: JsxChaiStatic;
+
+export = jsxChai;
diff --git a/jug/jug.d.ts b/jug/jug.d.ts
index ed86a30d6d..cdd9daa927 100644
--- a/jug/jug.d.ts
+++ b/jug/jug.d.ts
@@ -3,133 +3,132 @@
 // Definitions by: yevt <https://github.com/yevt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "jug" {
-    /**
-     * Internal structure of a vertex
-     */
-    interface VertexStructure {
-        level: number;
-        edge: Array<Vertex>,
-        data: VertexData,
-        parent: Vertex
-    }
 
-    /**
-     * User data of a vertex.
-     */
-    type VertexData = Object;
-
-    /**
-     * Graph constructor function.
-     */
-    interface GraphConstructor {
-        new():Graph;
-    }
-
-    /**
-     * Creates root node of a graph.
-     */
-    interface Graph {
-        vertex:VertexConstructor;
-        init(data?:VertexData):Vertex;
-    }
-
-    /**
-     * Vertex constructor function.
-     */
-    interface VertexConstructor {
-        new(obj?:VertexData):Vertex;
-    }
-
-    /**
-     * Represents one node of a graph.
-     */
-    interface Vertex {
-
-        /**
-         * Initial vertex data.
-         */
-        internal: VertexStructure;
-
-        /**
-         * Verify the level.
-         */
-        level(): number;
-
-        /**
-         * Get edge count.
-         */
-        edge(): number;
-
-        /**
-         * Access node.
-         * @param index - edge index.
-         */
-        edge(index:number): Vertex;
-
-        /**
-         * Seed node.
-         * @param [data] - created vertex UserData.
-         */
-        seed(data?:VertexData): Vertex;
-
-        /**
-         * Verify if the current node is the root.
-         */
-        isRoot(): boolean;
-
-        /**
-         * Set node data.
-         * @param obj - data to be set.
-         */
-        data(obj:VertexData): Vertex;
-
-        /**
-         * Get node data.
-         */
-        data(): VertexData;
-
-        /**
-         * Get distance between nodes.
-         * @param from
-         * @param to
-         */
-        proximity(from:string, to:string): Array<number>;
-
-        /**
-         * Find a node.
-         * @param {string} type - object type.
-         * @param {Object} query - _.where query object.
-         */
-        find(type:string|void, query:Object): Array<VertexData>;
-
-        /**
-         * Get siblings of specified edge.
-         * @param {number} index - edge index.
-         */
-        getSiblingsOf(index:number): Array<VertexData>;
-
-        /**
-         * Getting childs of an specified edge.
-         * @param egde - target vertex;
-         */
-        getChildsOf(egde:number): Array<VertexData>;
-
-        /**
-         * Getting parents of an specified level and edge.
-         * @param {number} level - max level.
-         * @param {number} edge - edge index.
-         */
-        getParentsFrom(level:number, edge:number): Array<VertexData>;
-
-        /**
-         * Getting the length of childs of an specified edge.
-         * @param {number} edge - edge index.
-         */
-        getScopeOf(edge:number): number;
-    }
-
-    var jug:Graph;
-
-    export = jug;
+/**
+ * Internal structure of a vertex
+ */
+interface VertexStructure {
+    level: number;
+    edge: Array<Vertex>,
+    data: VertexData,
+    parent: Vertex
 }
+
+/**
+ * User data of a vertex.
+ */
+type VertexData = Object;
+
+/**
+ * Graph constructor function.
+ */
+interface GraphConstructor {
+    new (): Graph;
+}
+
+/**
+ * Creates root node of a graph.
+ */
+interface Graph {
+    vertex: VertexConstructor;
+    init(data?: VertexData): Vertex;
+}
+
+/**
+ * Vertex constructor function.
+ */
+interface VertexConstructor {
+    new (obj?: VertexData): Vertex;
+}
+
+/**
+ * Represents one node of a graph.
+ */
+interface Vertex {
+
+    /**
+     * Initial vertex data.
+     */
+    internal: VertexStructure;
+
+    /**
+     * Verify the level.
+     */
+    level(): number;
+
+    /**
+     * Get edge count.
+     */
+    edge(): number;
+
+    /**
+     * Access node.
+     * @param index - edge index.
+     */
+    edge(index: number): Vertex;
+
+    /**
+     * Seed node.
+     * @param [data] - created vertex UserData.
+     */
+    seed(data?: VertexData): Vertex;
+
+    /**
+     * Verify if the current node is the root.
+     */
+    isRoot(): boolean;
+
+    /**
+     * Set node data.
+     * @param obj - data to be set.
+     */
+    data(obj: VertexData): Vertex;
+
+    /**
+     * Get node data.
+     */
+    data(): VertexData;
+
+    /**
+     * Get distance between nodes.
+     * @param from
+     * @param to
+     */
+    proximity(from: string, to: string): Array<number>;
+
+    /**
+     * Find a node.
+     * @param {string} type - object type.
+     * @param {Object} query - _.where query object.
+     */
+    find(type: string | void, query: Object): Array<VertexData>;
+
+    /**
+     * Get siblings of specified edge.
+     * @param {number} index - edge index.
+     */
+    getSiblingsOf(index: number): Array<VertexData>;
+
+    /**
+     * Getting childs of an specified edge.
+     * @param egde - target vertex;
+     */
+    getChildsOf(egde: number): Array<VertexData>;
+
+    /**
+     * Getting parents of an specified level and edge.
+     * @param {number} level - max level.
+     * @param {number} edge - edge index.
+     */
+    getParentsFrom(level: number, edge: number): Array<VertexData>;
+
+    /**
+     * Getting the length of childs of an specified edge.
+     * @param {number} edge - edge index.
+     */
+    getScopeOf(edge: number): number;
+}
+
+declare var jug: Graph;
+
+export = jug;
diff --git a/jwt-simple/jwt-simple.d.ts b/jwt-simple/jwt-simple.d.ts
index 208c7e6beb..657f8ea51d 100644
--- a/jwt-simple/jwt-simple.d.ts
+++ b/jwt-simple/jwt-simple.d.ts
@@ -2,21 +2,20 @@
 // Project: https://github.com/hokaccha/node-jwt-simple
 // Definitions by: Ken Fukuyama <https://github.com/kenfdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "jwt-simple" {
-  /**
-   * Decode jwt
-   * @param token
-   * @param key
-   * @param noVerify
-   * @api public
-   */
-  export function decode(token:any, key:string, noVerify?:boolean):any;
-  /**
-   * Encode jwt
-   * @param payload
-   * @param key
-   * @param algorithm default is HS256
-   * @api public
-   */
-  export function encode(payload:any, key:string, algorithm?:string):string;
-}
+
+/**
+ * Decode jwt
+ * @param token
+ * @param key
+ * @param noVerify
+ * @api public
+ */
+declare export function decode(token: any, key: string, noVerify?: boolean): any;
+/**
+ * Encode jwt
+ * @param payload
+ * @param key
+ * @param algorithm default is HS256
+ * @api public
+ */
+declare export function encode(payload: any, key: string, algorithm?: string): string;
diff --git a/kafka-node/kafka-node.d.ts b/kafka-node/kafka-node.d.ts
index 5af357021d..3786d16a4d 100644
--- a/kafka-node/kafka-node.d.ts
+++ b/kafka-node/kafka-node.d.ts
@@ -3,121 +3,119 @@
 // Definitions by: Daniel Imrie-Situnayake <https://github.com/dansitu/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'kafka-node' {
 
-    // # Classes
-    export class Client {
-        constructor(connectionString: string, clientId: string, options?: ZKOptions);
-        close(callback?: Function): void;
-    }
-
-    export class Producer {
-        constructor(client: Client);
-        on(eventName: string, cb: () => any): void;
-        on(eventName: string, cb: (error: any) => any): void;
-        send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
-        createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
-    }
-
-    export class HighLevelProducer {
-        constructor(client: Client);
-        on(eventName: string, cb: () => any): void;
-        on(eventName: string, cb: (error: any) => any): void;
-        send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
-        createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
-    }
-
-    export class Consumer {
-        constructor(client: Client, fetchRequests: Array<Topic>, options: ConsumerOptions);
-        on(eventName: string, cb: (message: string) => any): void;
-        on(eventName: string, cb: (error: any) => any): void;
-        addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
-        addTopics(topics: Array<Topic>, cb: (error: any, added: boolean) => any, fromOffset: boolean): void;
-        removeTopics(topics: Array<string>, cb: (error: any, removed: boolean) => any): void;
-        commit(cb: (error: any, data: any) => any): void;
-        setOffset(topic: string, partition: number, offset: number): void;
-        pause(): void;
-        resume(): void;
-        pauseTopics(topics: Array<any> /* Array<string|Topic> */): void;
-        resumeTopics(topics: Array<any> /* Array<string|Topic> */): void;
-        close(force: boolean, cb: () => any): void;
-    }
-
-    export class HighLevelConsumer {
-        constructor(client: Client, payloads: Array<Topic>, options: ConsumerOptions);
-        on(eventName: string, cb: (message: string) => any): void;
-        on(eventName: string, cb: (error: any) => any): void;
-        addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
-        addTopics(topics: Array<Topic>, cb: (error: any, added: boolean) => any, fromOffset: boolean): void;
-        removeTopics(topics: Array<string>, cb: (error: any, removed: boolean) => any): void;
-        commit(cb: (error: any, data: any) => any): void;
-        setOffset(topic: string, partition: number, offset: number): void;
-        pause(): void;
-        resume(): void;
-        pauseTopics(topics: Array<any> /* Array<string|Topic> */): void;
-        resumeTopics(topics: Array<any> /* Array<string|Topic> */): void;
-        close(force: boolean, cb: () => any): void;
-    }
-
-    export class Offset {
-        constructor(client: Client);
-        on(eventName: string, cb: () => any): void;
-        fetch(payloads: Array<OffsetRequest>, cb: (error: any, data: any) => any): void;
-        commit(groupId: string, payloads: Array<OffsetCommitRequest>, cb: (error: any, data: any) => any): void;
-        fetchCommits(groupId: string, payloads: Array<OffsetFetchRequest>, cb: (error: any, data: any) => any): void;
-    }
-
-    export class KeyedMessage {
-        constructor(key: string, message: string);
-    }
-
-    // # Interfaces
-    export interface ZKOptions {
-        sessionTimeout?: number;
-        spinDelay?: number;
-        retries?: number;
-    }
-
-    export interface ProduceRequest {
-        topic: string;
-        messages: any; // Array<string> | Array<KeyedMessage> | string | KeyedMessage
-        partition?: number;
-        attributes?: number;
-    }
-
-    export interface ConsumerOptions {
-        groupId?: string;
-        autoCommit?: boolean;
-        autoCommitIntervalMs?: number;
-        fetchMaxWaitMs?: number;
-        fetchMinBytes?: number;
-        fetchMaxBytes?: number;
-        fromOffset?: boolean;
-        encoding?: string;
-    }
-
-    export interface Topic {
-        topic: string;
-        offset?: number;
-    }
-
-    export interface OffsetRequest {
-        topic: string;
-        partition?: number;
-        time?: number;
-        maxNum?: number;
-    }
-
-    export interface OffsetCommitRequest {
-        topic: string;
-        partition?: number;
-        offset: number;
-        metadata?: string;
-    }
-
-    export interface OffsetFetchRequest {
-        topic: string;
-        partition?: number;
-    }
 
+// # Classes
+declare export class Client {
+    constructor(connectionString: string, clientId: string, options?: ZKOptions);
+    close(callback?: Function): void;
+}
+
+declare export class Producer {
+    constructor(client: Client);
+    on(eventName: string, cb: () => any): void;
+    on(eventName: string, cb: (error: any) => any): void;
+    send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
+    createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
+}
+
+declare export class HighLevelProducer {
+    constructor(client: Client);
+    on(eventName: string, cb: () => any): void;
+    on(eventName: string, cb: (error: any) => any): void;
+    send(payloads: Array<ProduceRequest>, cb: (error: any, data: any) => any): void;
+    createTopics(topics: Array<string>, async: boolean, cb?: (error: any, data: any) => any): void;
+}
+
+declare export class Consumer {
+    constructor(client: Client, fetchRequests: Array<Topic>, options: ConsumerOptions);
+    on(eventName: string, cb: (message: string) => any): void;
+    on(eventName: string, cb: (error: any) => any): void;
+    addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
+    addTopics(topics: Array<Topic>, cb: (error: any, added: boolean) => any, fromOffset: boolean): void;
+    removeTopics(topics: Array<string>, cb: (error: any, removed: boolean) => any): void;
+    commit(cb: (error: any, data: any) => any): void;
+    setOffset(topic: string, partition: number, offset: number): void;
+    pause(): void;
+    resume(): void;
+    pauseTopics(topics: Array<any> /* Array<string|Topic> */): void;
+    resumeTopics(topics: Array<any> /* Array<string|Topic> */): void;
+    close(force: boolean, cb: () => any): void;
+}
+
+declare export class HighLevelConsumer {
+    constructor(client: Client, payloads: Array<Topic>, options: ConsumerOptions);
+    on(eventName: string, cb: (message: string) => any): void;
+    on(eventName: string, cb: (error: any) => any): void;
+    addTopics(topics: Array<string>, cb: (error: any, added: boolean) => any): void;
+    addTopics(topics: Array<Topic>, cb: (error: any, added: boolean) => any, fromOffset: boolean): void;
+    removeTopics(topics: Array<string>, cb: (error: any, removed: boolean) => any): void;
+    commit(cb: (error: any, data: any) => any): void;
+    setOffset(topic: string, partition: number, offset: number): void;
+    pause(): void;
+    resume(): void;
+    pauseTopics(topics: Array<any> /* Array<string|Topic> */): void;
+    resumeTopics(topics: Array<any> /* Array<string|Topic> */): void;
+    close(force: boolean, cb: () => any): void;
+}
+
+declare export class Offset {
+    constructor(client: Client);
+    on(eventName: string, cb: () => any): void;
+    fetch(payloads: Array<OffsetRequest>, cb: (error: any, data: any) => any): void;
+    commit(groupId: string, payloads: Array<OffsetCommitRequest>, cb: (error: any, data: any) => any): void;
+    fetchCommits(groupId: string, payloads: Array<OffsetFetchRequest>, cb: (error: any, data: any) => any): void;
+}
+
+declare export class KeyedMessage {
+    constructor(key: string, message: string);
+}
+
+// # Interfaces
+export interface ZKOptions {
+    sessionTimeout?: number;
+    spinDelay?: number;
+    retries?: number;
+}
+
+export interface ProduceRequest {
+    topic: string;
+    messages: any; // Array<string> | Array<KeyedMessage> | string | KeyedMessage
+    partition?: number;
+    attributes?: number;
+}
+
+export interface ConsumerOptions {
+    groupId?: string;
+    autoCommit?: boolean;
+    autoCommitIntervalMs?: number;
+    fetchMaxWaitMs?: number;
+    fetchMinBytes?: number;
+    fetchMaxBytes?: number;
+    fromOffset?: boolean;
+    encoding?: string;
+}
+
+export interface Topic {
+    topic: string;
+    offset?: number;
+}
+
+export interface OffsetRequest {
+    topic: string;
+    partition?: number;
+    time?: number;
+    maxNum?: number;
+}
+
+export interface OffsetCommitRequest {
+    topic: string;
+    partition?: number;
+    offset: number;
+    metadata?: string;
+}
+
+export interface OffsetFetchRequest {
+    topic: string;
+    partition?: number;
 }
diff --git a/karma-coverage/karma-coverage.d.ts b/karma-coverage/karma-coverage.d.ts
index 8e2717cf24..ef28799697 100644
--- a/karma-coverage/karma-coverage.d.ts
+++ b/karma-coverage/karma-coverage.d.ts
@@ -6,37 +6,36 @@
 /// <reference path="../karma/karma.d.ts" />
 /// <reference path="../istanbul/istanbul.d.ts" />
 
-declare module 'karma-coverage' {
-  import * as karma from 'karma';
-  import * as istanbul from 'istanbul';
 
-  namespace karmaCoverage {
-    interface Karma extends karma.Karma {}
+import * as karma from 'karma';
+import * as istanbul from 'istanbul';
+
+declare namespace karmaCoverage {
+    interface Karma extends karma.Karma { }
 
     interface Config extends karma.Config {
-      set: (config: ConfigOptions) => void;
+        set: (config: ConfigOptions) => void;
     }
 
     interface ConfigOptions extends karma.ConfigOptions {
-      /**
-       * See https://github.com/karma-runner/karma-coverage/blob/master/docs/configuration.md
-       */
-      coverageReporter?: (Reporter|Reporter[]);
+        /**
+         * See https://github.com/karma-runner/karma-coverage/blob/master/docs/configuration.md
+         */
+        coverageReporter?: (Reporter | Reporter[]);
     }
 
     interface Reporter {
-      type?: string;
-      dir?: string;
-      subdir?: string | ((browser: string) => string);
-      check?: any;
-      watermarks?: any;
-      includeAllSources?: boolean;
-      sourceStore?: istanbul.Store;
-      instrumenter?: any;
+        type?: string;
+        dir?: string;
+        subdir?: string | ((browser: string) => string);
+        check?: any;
+        watermarks?: any;
+        includeAllSources?: boolean;
+        sourceStore?: istanbul.Store;
+        instrumenter?: any;
     }
-  }
-
-  var karmaCoverage: karmaCoverage.Karma;
-
-  export = karmaCoverage;
 }
+
+declare var karmaCoverage: karmaCoverage.Karma;
+
+export = karmaCoverage;
diff --git a/karma/karma-0.12.d.ts b/karma/karma-0.12.d.ts
index fe7af6d29a..dc9939d205 100644
--- a/karma/karma-0.12.d.ts
+++ b/karma/karma-0.12.d.ts
@@ -3,22 +3,21 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'karma' {
-    // See Karma public API https://karma-runner.github.io/0.12/dev/public-api.html
 
-    interface IKarmaServer {
-        start(options?: any, callback?: (exitCode: number) => void): void;
-    }
+// See Karma public API https://karma-runner.github.io/0.12/dev/public-api.html
 
-    interface IKarmaRunner {
-        run(options?: any, callback?: (exitCode: number) => void): void;
-    }
-
-    interface IKarma {
-        server: IKarmaServer;
-        runner: IKarmaRunner;
-    }
-
-    var karma: IKarma;
-    export = karma;
+interface IKarmaServer {
+    start(options?: any, callback?: (exitCode: number) => void): void;
 }
+
+interface IKarmaRunner {
+    run(options?: any, callback?: (exitCode: number) => void): void;
+}
+
+interface IKarma {
+    server: IKarmaServer;
+    runner: IKarmaRunner;
+}
+
+declare var karma: IKarma;
+export = karma;
diff --git a/karma/karma.d.ts b/karma/karma.d.ts
index 455d1df911..88fa016a54 100644
--- a/karma/karma.d.ts
+++ b/karma/karma.d.ts
@@ -7,375 +7,374 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../log4js/log4js.d.ts" />
 
-declare module 'karma' {
-    // See Karma public API https://karma-runner.github.io/0.13/dev/public-api.html
-    import Promise = require('bluebird');
-    import https = require('https');
-    import log4js = require('log4js');
 
-    namespace karma {
-        interface Karma {
-            /**
-             * `start` method is deprecated since 0.13. It will be removed in 0.14.
-             * Please use
-             * <code>
-             *     server = new Server(config, [done])
-             *     server.start()
-             * </code>
-             * instead.
-             */
-            server: DeprecatedServer;
-            Server: Server;
-            runner: Runner;
-            launcher: Launcher;
-            VERSION: string;
-        }
+// See Karma public API https://karma-runner.github.io/0.13/dev/public-api.html
+import Promise = require('bluebird');
+import https = require('https');
+import log4js = require('log4js');
 
-        interface LauncherStatic {
-            generateId(): string;
-            //TODO: injector should be of type `di.Injector`
-            new(emitter: NodeJS.EventEmitter, injector: any): Launcher;
-        }
-
-        interface Launcher {
-            Launcher: LauncherStatic;
-            //TODO: Can this return value ever be typified?
-            launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
-            kill(id: string, callback: Function): boolean;
-            restart(id: string): boolean;
-            killAll(callback: Function): void;
-            areAllCaptured(): boolean;
-            markCaptured(id: string): void;
-        }
-
-        interface DeprecatedServer {
-            start(options?: any, callback?: ServerCallback): void;
-        }
-
-        interface Runner {
-            run(options?: ConfigOptions|ConfigFile, callback?: ServerCallback): void;
-        }
-
-        interface Server extends NodeJS.EventEmitter {
-            new(options?: ConfigOptions|ConfigFile, callback?: ServerCallback): Server;
-            /**
-             * Start the server
-             */
-            start(): void;
-            /**
-             * Get properties from the injector
-             * @param token
-             */
-            get(token: string): any;
-            /**
-             * Force a refresh of the file list
-             */
-            refreshFiles(): Promise<any>;
-
-            ///**
-            // * Backward-compatibility with karma-intellij bundled with WebStorm.
-            // * Deprecated since version 0.13, to be removed in 0.14
-            // */
-            //static start(): void;
-        }
-
-        interface ServerCallback {
-            (exitCode: number): void;
-        }
-
-        interface Config {
-            set: (config: ConfigOptions) => void;
-            LOG_DISABLE: string;
-            LOG_ERROR: string;
-            LOG_WARN: string;
-            LOG_INFO: string;
-            LOG_DEBUG: string;
-        }
-
-        interface ConfigFile {
-            configFile: string;
-        }
-
-        interface ConfigOptions {
-            /**
-             * @description Enable or disable watching files and executing the tests whenever one of these files changes.
-             * @default true
-             */
-            autoWatch?: boolean;
-            /**
-             * @description When Karma is watching the files for changes, it tries to batch multiple changes into a single run
-             * so that the test runner doesn't try to start and restart running tests more than it should.
-             * The configuration setting tells Karma how long to wait (in milliseconds) after any changes have occurred
-             * before starting the test process again.
-             * @default 250
-             */
-            autoWatchBatchDelay?: number;
-            /**
-             * @default ''
-             * @description The root path location that will be used to resolve all relative paths defined in <code>files</code> and <code>exclude</code>.
-             * If the basePath configuration is a relative path then it will be resolved to
-             * the <code>__dirname</code> of the configuration file.
-             */
-            basePath?: string;
-            /**
-             * @default 2000
-             * @description How long does Karma wait for a browser to reconnect (in ms).
-             * <p>
-             * With a flaky connection it is pretty common that the browser disconnects,
-             * but the actual test execution is still running without any problems. Karma does not treat a disconnection
-             * as immediate failure and will wait <code>browserDisconnectTimeout</code> (ms).
-             * If the browser reconnects during that time, everything is fine.
-             * </p>
-             */
-            browserDisconnectTimeout?: number;
-            /**
-             * @default 0
-             * @description The number of disconnections tolerated.
-             * <p>
-             * The <code>disconnectTolerance</code> value represents the maximum number of tries a browser will attempt
-             * in the case of a disconnection. Usually any disconnection is considered a failure,
-             * but this option allows you to define a tolerance level when there is a flaky network link between
-             * the Karma server and the browsers.
-             * </p>
-             */
-            browserDisconnectTolerance?: number;
-            /**
-             * @default 10000
-             * @description How long will Karma wait for a message from a browser before disconnecting from it (in ms).
-             * <p>
-             * If, during test execution, Karma does not receive any message from a browser within
-             * <code>browserNoActivityTimeout</code> (ms), it will disconnect from the browser
-             * </p>
-             */
-            browserNoActivityTimeout?: number;
-            /**
-             * @default []
-             * Possible Values:
-             * <ul>
-             *     <li>Chrome (launcher comes installed with Karma)</li>
-             *     <li>ChromeCanary (launcher comes installed with Karma)</li>
-             *     <li>PhantomJS (launcher comes installed with Karma)</li>
-             *     <li>Firefox (launcher requires karma-firefox-launcher plugin)</li>
-             *     <li>Opera (launcher requires karma-opera-launcher plugin)</li>
-             *     <li>Internet Explorer (launcher requires karma-ie-launcher plugin)</li>
-             *     <li>Safari (launcher requires karma-safari-launcher plugin)</li>
-             * </ul>
-             * @description A list of browsers to launch and capture. When Karma starts up, it will also start up each browser
-             * which is placed within this setting. Once Karma is shut down, it will shut down these browsers as well.
-             * You can capture any browser manually by opening the browser and visiting the URL where
-             * the Karma web server is listening (by default it is <code>http://localhost:9876/</code>).
-             */
-            browsers?: string[];
-            /**
-             * @default 60000
-             * @description Timeout for capturing a browser (in ms).
-             * <p>
-             * The <code>captureTimeout</code> value represents the maximum boot-up time allowed for a
-             * browser to start and connect to Karma. If any browser does not get captured within the timeout, Karma
-             * will kill it and try to launch it again and, after three attempts to capture it, Karma will give up.
-             * </p>
-             */
-            captureTimeout?: number;
-            client?: ClientOptions;
-            /**
-             * @default true
-             * @description Enable or disable colors in the output (reporters and logs).
-             */
-            colors?: boolean;
-            /**
-             * @default []
-             * @description List of files/patterns to exclude from loaded files.
-             */
-            exclude?: string[];
-            /**
-             * @default []
-             * @description List of files/patterns to load in the browser.
-             */
-            files?: (FilePattern|string)[];
-            /**
-             * @default []
-             * @description List of test frameworks you want to use. Typically, you will set this to ['jasmine'], ['mocha'] or ['qunit']...
-             * Please note just about all frameworks in Karma require an additional plugin/framework library to be installed (via NPM).
-             */
-            frameworks?: string[];
-            /**
-             * @default 'localhost'
-             * @description Hostname to be used when capturing browsers.
-             */
-            hostname?: string;
-            /**
-             * @default {}
-             * @description Options object to be used by Node's https class.
-             * Object description can be found in the
-             * [NodeJS.org API docs](https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener)
-             */
-            httpsServerOptions?: https.ServerOptions;
-            /**
-             * @default config.LOG_INFO
-             * Possible values:
-             * <ul>
-             *   <li>config.LOG_DISABLE</li>
-             *   <li>config.LOG_ERROR</li>
-             *   <li>config.LOG_WARN</li>
-             *   <li>config.LOG_INFO</li>
-             *   <li>config.LOG_DEBUG</li>
-             * </ul>
-             * @description Level of logging.
-             */
-            logLevel?: string;
-            /**
-             * @default [{type: 'console'}]
-             * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
-             */
-            loggers?: log4js.AppenderConfigBase[];
-            /**
-             * @default ['karma-*']
-             * @description List of plugins to load. A plugin can be a string (in which case it will be required
-             * by Karma) or an inlined plugin - Object.
-             * By default, Karma loads all sibling NPM modules which have a name starting with karma-*.
-             * Note: Just about all plugins in Karma require an additional library to be installed (via NPM).
-             */
-            plugins?: any[];
-            /**
-             * @default 9876
-             * @description The port where the web server will be listening.
-             */
-            port?: number;
-            /**
-             * @default {'**\/*.coffee': 'coffee'}
-             * @description A map of preprocessors to use.
-             *
-             * Preprocessors can be loaded through [plugins].
-             *
-             * Note: Just about all preprocessors in Karma (other than CoffeeScript and some other defaults)
-             * require an additional library to be installed (via NPM).
-             *
-             * Be aware that preprocessors may be transforming the files and file types that are available at run time. For instance,
-             * if you are using the "coverage" preprocessor on your source files, if you then attempt to interactively debug
-             * your tests, you'll discover that your expected source code is completely changed from what you expected.  Because
-             * of that, you'll want to engineer this so that your automated builds use the coverage entry in the "reporters" list,
-             * but your interactive debugging does not.
-             *
-             */
-            preprocessors?: { [name: string]: string|string[] }
-            /**
-             * @default 'http:'
-             * Possible Values:
-             * <ul>
-             *   <li>http:</li>
-             *   <li>https:</li>
-             * </ul>
-             * @description Protocol used for running the Karma webserver.
-             * Determines the use of the Node http or https class.
-             * Note: Using <code>'https:'</code> requires you to specify <code>httpsServerOptions</code>.
-             */
-            protocol?: string;
-            /**
-             * @default {}
-             * @description A map of path-proxy pairs.
-             */
-            proxies?: { [path: string]: string }
-            /**
-             * @default true
-             * @description Whether or not Karma or any browsers should raise an error when an inavlid SSL certificate is found.
-             */
-            proxyValidateSSL?: boolean;
-            /**
-             * @default 0
-             * @description Karma will report all the tests that are slower than given time limit (in ms).
-             * This is disabled by default (since the default value is 0).
-             */
-            reportSlowerThan?: number;
-            /**
-             * @default ['progress']
-             * Possible Values:
-             * <ul>
-             *   <li>dots</li>
-             *   <li>progress</li>
-             * </ul>
-             * @description A list of reporters to use.
-             * Additional reporters, such as growl, junit, teamcity or coverage can be loaded through plugins.
-             * Note: Just about all additional reporters in Karma (other than progress) require an additional library to be installed (via NPM).
-             */
-            reporters?: string[];
-            /**
-             * @default false
-             * @description Continuous Integration mode.
-             * If true, Karma will start and capture all configured browsers, run tests and then exit with an exit code of 0 or 1 depending
-             * on whether all tests passed or any tests failed.
-             */
-            singleRun?: boolean;
-            /**
-             * @default ['polling', 'websocket']
-             * @description An array of allowed transport methods between the browser and testing server. This configuration setting
-             * is handed off to [socket.io](http://socket.io/) (which manages the communication
-             * between browsers and the testing server).
-             */
-            transports?: string[];
-            /**
-             * @default '/'
-             * @description The base url, where Karma runs.
-             * All of Karma's urls get prefixed with the urlRoot. This is helpful when using proxies, as
-             * sometimes you might want to proxy a url that is already taken by Karma.
-             */
-            urlRoot?: string;
-        }
-
-        interface ClientOptions {
-            /**
-             * @default undefined
-             * @description When karma run is passed additional arguments on the command-line, they
-             * are passed through to the test adapter as karma.config.args (an array of strings).
-             * The client.args option allows you to set this value for actions other than run.
-             * How this value is used is up to your test adapter - you should check your adapter's
-             * documentation to see how (and if) it uses this value.
-             */
-            args?: string[];
-            /**
-             * @default true
-             * @description Run the tests inside an iFrame or a new window
-             * If true, Karma runs the tests inside an iFrame. If false, Karma runs the tests in a new window. Some tests may not run in an
-             * iFrame and may need a new window to run.
-             */
-            useIframe?: boolean;
-            /**
-             * @default true
-             * @description Capture all console output and pipe it to the terminal.
-             */
-            captureConsole?: boolean;
-        }
-
-        interface FilePattern {
-            /**
-             * The pattern to use for matching. This property is mandatory.
-             */
-            pattern: string;
-            /**
-             * @default true
-             * @description If <code>autoWatch</code> is true all files that have set watched to true will be watched
-             * for changes.
-             */
-            watched?: boolean;
-            /**
-             * @default true
-             * @description Should the files be included in the browser using <script> tag? Use false if you want to
-             * load them manually, eg. using Require.js.
-             */
-            included?: boolean;
-            /**
-             * @default true
-             * @description Should the files be served by Karma's webserver?
-             */
-            served?: boolean;
-            /**
-             * @default false
-             * @description Should the files be served from disk on each request by Karma's webserver?
-             */
-            nocache?: boolean;
-        }
+declare namespace karma {
+    interface Karma {
+        /**
+         * `start` method is deprecated since 0.13. It will be removed in 0.14.
+         * Please use
+         * <code>
+         *     server = new Server(config, [done])
+         *     server.start()
+         * </code>
+         * instead.
+         */
+        server: DeprecatedServer;
+        Server: Server;
+        runner: Runner;
+        launcher: Launcher;
+        VERSION: string;
     }
 
-    var karma: karma.Karma;
+    interface LauncherStatic {
+        generateId(): string;
+        //TODO: injector should be of type `di.Injector`
+        new (emitter: NodeJS.EventEmitter, injector: any): Launcher;
+    }
 
-    export = karma;
+    interface Launcher {
+        Launcher: LauncherStatic;
+        //TODO: Can this return value ever be typified?
+        launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
+        kill(id: string, callback: Function): boolean;
+        restart(id: string): boolean;
+        killAll(callback: Function): void;
+        areAllCaptured(): boolean;
+        markCaptured(id: string): void;
+    }
+
+    interface DeprecatedServer {
+        start(options?: any, callback?: ServerCallback): void;
+    }
+
+    interface Runner {
+        run(options?: ConfigOptions | ConfigFile, callback?: ServerCallback): void;
+    }
+
+    interface Server extends NodeJS.EventEmitter {
+        new (options?: ConfigOptions | ConfigFile, callback?: ServerCallback): Server;
+        /**
+         * Start the server
+         */
+        start(): void;
+        /**
+         * Get properties from the injector
+         * @param token
+         */
+        get(token: string): any;
+        /**
+         * Force a refresh of the file list
+         */
+        refreshFiles(): Promise<any>;
+
+        ///**
+        // * Backward-compatibility with karma-intellij bundled with WebStorm.
+        // * Deprecated since version 0.13, to be removed in 0.14
+        // */
+        //static start(): void;
+    }
+
+    interface ServerCallback {
+        (exitCode: number): void;
+    }
+
+    interface Config {
+        set: (config: ConfigOptions) => void;
+        LOG_DISABLE: string;
+        LOG_ERROR: string;
+        LOG_WARN: string;
+        LOG_INFO: string;
+        LOG_DEBUG: string;
+    }
+
+    interface ConfigFile {
+        configFile: string;
+    }
+
+    interface ConfigOptions {
+        /**
+         * @description Enable or disable watching files and executing the tests whenever one of these files changes.
+         * @default true
+         */
+        autoWatch?: boolean;
+        /**
+         * @description When Karma is watching the files for changes, it tries to batch multiple changes into a single run
+         * so that the test runner doesn't try to start and restart running tests more than it should.
+         * The configuration setting tells Karma how long to wait (in milliseconds) after any changes have occurred
+         * before starting the test process again.
+         * @default 250
+         */
+        autoWatchBatchDelay?: number;
+        /**
+         * @default ''
+         * @description The root path location that will be used to resolve all relative paths defined in <code>files</code> and <code>exclude</code>.
+         * If the basePath configuration is a relative path then it will be resolved to
+         * the <code>__dirname</code> of the configuration file.
+         */
+        basePath?: string;
+        /**
+         * @default 2000
+         * @description How long does Karma wait for a browser to reconnect (in ms).
+         * <p>
+         * With a flaky connection it is pretty common that the browser disconnects,
+         * but the actual test execution is still running without any problems. Karma does not treat a disconnection
+         * as immediate failure and will wait <code>browserDisconnectTimeout</code> (ms).
+         * If the browser reconnects during that time, everything is fine.
+         * </p>
+         */
+        browserDisconnectTimeout?: number;
+        /**
+         * @default 0
+         * @description The number of disconnections tolerated.
+         * <p>
+         * The <code>disconnectTolerance</code> value represents the maximum number of tries a browser will attempt
+         * in the case of a disconnection. Usually any disconnection is considered a failure,
+         * but this option allows you to define a tolerance level when there is a flaky network link between
+         * the Karma server and the browsers.
+         * </p>
+         */
+        browserDisconnectTolerance?: number;
+        /**
+         * @default 10000
+         * @description How long will Karma wait for a message from a browser before disconnecting from it (in ms).
+         * <p>
+         * If, during test execution, Karma does not receive any message from a browser within
+         * <code>browserNoActivityTimeout</code> (ms), it will disconnect from the browser
+         * </p>
+         */
+        browserNoActivityTimeout?: number;
+        /**
+         * @default []
+         * Possible Values:
+         * <ul>
+         *     <li>Chrome (launcher comes installed with Karma)</li>
+         *     <li>ChromeCanary (launcher comes installed with Karma)</li>
+         *     <li>PhantomJS (launcher comes installed with Karma)</li>
+         *     <li>Firefox (launcher requires karma-firefox-launcher plugin)</li>
+         *     <li>Opera (launcher requires karma-opera-launcher plugin)</li>
+         *     <li>Internet Explorer (launcher requires karma-ie-launcher plugin)</li>
+         *     <li>Safari (launcher requires karma-safari-launcher plugin)</li>
+         * </ul>
+         * @description A list of browsers to launch and capture. When Karma starts up, it will also start up each browser
+         * which is placed within this setting. Once Karma is shut down, it will shut down these browsers as well.
+         * You can capture any browser manually by opening the browser and visiting the URL where
+         * the Karma web server is listening (by default it is <code>http://localhost:9876/</code>).
+         */
+        browsers?: string[];
+        /**
+         * @default 60000
+         * @description Timeout for capturing a browser (in ms).
+         * <p>
+         * The <code>captureTimeout</code> value represents the maximum boot-up time allowed for a
+         * browser to start and connect to Karma. If any browser does not get captured within the timeout, Karma
+         * will kill it and try to launch it again and, after three attempts to capture it, Karma will give up.
+         * </p>
+         */
+        captureTimeout?: number;
+        client?: ClientOptions;
+        /**
+         * @default true
+         * @description Enable or disable colors in the output (reporters and logs).
+         */
+        colors?: boolean;
+        /**
+         * @default []
+         * @description List of files/patterns to exclude from loaded files.
+         */
+        exclude?: string[];
+        /**
+         * @default []
+         * @description List of files/patterns to load in the browser.
+         */
+        files?: (FilePattern | string)[];
+        /**
+         * @default []
+         * @description List of test frameworks you want to use. Typically, you will set this to ['jasmine'], ['mocha'] or ['qunit']...
+         * Please note just about all frameworks in Karma require an additional plugin/framework library to be installed (via NPM).
+         */
+        frameworks?: string[];
+        /**
+         * @default 'localhost'
+         * @description Hostname to be used when capturing browsers.
+         */
+        hostname?: string;
+        /**
+         * @default {}
+         * @description Options object to be used by Node's https class.
+         * Object description can be found in the
+         * [NodeJS.org API docs](https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener)
+         */
+        httpsServerOptions?: https.ServerOptions;
+        /**
+         * @default config.LOG_INFO
+         * Possible values:
+         * <ul>
+         *   <li>config.LOG_DISABLE</li>
+         *   <li>config.LOG_ERROR</li>
+         *   <li>config.LOG_WARN</li>
+         *   <li>config.LOG_INFO</li>
+         *   <li>config.LOG_DEBUG</li>
+         * </ul>
+         * @description Level of logging.
+         */
+        logLevel?: string;
+        /**
+         * @default [{type: 'console'}]
+         * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
+         */
+        loggers?: log4js.AppenderConfigBase[];
+        /**
+         * @default ['karma-*']
+         * @description List of plugins to load. A plugin can be a string (in which case it will be required
+         * by Karma) or an inlined plugin - Object.
+         * By default, Karma loads all sibling NPM modules which have a name starting with karma-*.
+         * Note: Just about all plugins in Karma require an additional library to be installed (via NPM).
+         */
+        plugins?: any[];
+        /**
+         * @default 9876
+         * @description The port where the web server will be listening.
+         */
+        port?: number;
+        /**
+         * @default {'**\/*.coffee': 'coffee'}
+         * @description A map of preprocessors to use.
+         *
+         * Preprocessors can be loaded through [plugins].
+         *
+         * Note: Just about all preprocessors in Karma (other than CoffeeScript and some other defaults)
+         * require an additional library to be installed (via NPM).
+         *
+         * Be aware that preprocessors may be transforming the files and file types that are available at run time. For instance,
+         * if you are using the "coverage" preprocessor on your source files, if you then attempt to interactively debug
+         * your tests, you'll discover that your expected source code is completely changed from what you expected.  Because
+         * of that, you'll want to engineer this so that your automated builds use the coverage entry in the "reporters" list,
+         * but your interactive debugging does not.
+         *
+         */
+        preprocessors?: { [name: string]: string | string[] }
+        /**
+         * @default 'http:'
+         * Possible Values:
+         * <ul>
+         *   <li>http:</li>
+         *   <li>https:</li>
+         * </ul>
+         * @description Protocol used for running the Karma webserver.
+         * Determines the use of the Node http or https class.
+         * Note: Using <code>'https:'</code> requires you to specify <code>httpsServerOptions</code>.
+         */
+        protocol?: string;
+        /**
+         * @default {}
+         * @description A map of path-proxy pairs.
+         */
+        proxies?: { [path: string]: string }
+        /**
+         * @default true
+         * @description Whether or not Karma or any browsers should raise an error when an inavlid SSL certificate is found.
+         */
+        proxyValidateSSL?: boolean;
+        /**
+         * @default 0
+         * @description Karma will report all the tests that are slower than given time limit (in ms).
+         * This is disabled by default (since the default value is 0).
+         */
+        reportSlowerThan?: number;
+        /**
+         * @default ['progress']
+         * Possible Values:
+         * <ul>
+         *   <li>dots</li>
+         *   <li>progress</li>
+         * </ul>
+         * @description A list of reporters to use.
+         * Additional reporters, such as growl, junit, teamcity or coverage can be loaded through plugins.
+         * Note: Just about all additional reporters in Karma (other than progress) require an additional library to be installed (via NPM).
+         */
+        reporters?: string[];
+        /**
+         * @default false
+         * @description Continuous Integration mode.
+         * If true, Karma will start and capture all configured browsers, run tests and then exit with an exit code of 0 or 1 depending
+         * on whether all tests passed or any tests failed.
+         */
+        singleRun?: boolean;
+        /**
+         * @default ['polling', 'websocket']
+         * @description An array of allowed transport methods between the browser and testing server. This configuration setting
+         * is handed off to [socket.io](http://socket.io/) (which manages the communication
+         * between browsers and the testing server).
+         */
+        transports?: string[];
+        /**
+         * @default '/'
+         * @description The base url, where Karma runs.
+         * All of Karma's urls get prefixed with the urlRoot. This is helpful when using proxies, as
+         * sometimes you might want to proxy a url that is already taken by Karma.
+         */
+        urlRoot?: string;
+    }
+
+    interface ClientOptions {
+        /**
+         * @default undefined
+         * @description When karma run is passed additional arguments on the command-line, they
+         * are passed through to the test adapter as karma.config.args (an array of strings).
+         * The client.args option allows you to set this value for actions other than run.
+         * How this value is used is up to your test adapter - you should check your adapter's
+         * documentation to see how (and if) it uses this value.
+         */
+        args?: string[];
+        /**
+         * @default true
+         * @description Run the tests inside an iFrame or a new window
+         * If true, Karma runs the tests inside an iFrame. If false, Karma runs the tests in a new window. Some tests may not run in an
+         * iFrame and may need a new window to run.
+         */
+        useIframe?: boolean;
+        /**
+         * @default true
+         * @description Capture all console output and pipe it to the terminal.
+         */
+        captureConsole?: boolean;
+    }
+
+    interface FilePattern {
+        /**
+         * The pattern to use for matching. This property is mandatory.
+         */
+        pattern: string;
+        /**
+         * @default true
+         * @description If <code>autoWatch</code> is true all files that have set watched to true will be watched
+         * for changes.
+         */
+        watched?: boolean;
+        /**
+         * @default true
+         * @description Should the files be included in the browser using <script> tag? Use false if you want to
+         * load them manually, eg. using Require.js.
+         */
+        included?: boolean;
+        /**
+         * @default true
+         * @description Should the files be served by Karma's webserver?
+         */
+        served?: boolean;
+        /**
+         * @default false
+         * @description Should the files be served from disk on each request by Karma's webserver?
+         */
+        nocache?: boolean;
+    }
 }
+
+declare var karma: karma.Karma;
+
+export = karma;
diff --git a/katex/katex.d.ts b/katex/katex.d.ts
index 1251a141fc..601624eddd 100644
--- a/katex/katex.d.ts
+++ b/katex/katex.d.ts
@@ -3,31 +3,30 @@
 // Definitions by: Michael Randolph <https://github.com/mrand01>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "katex" {
-	interface KatexOptions {
-		displayMode?: boolean;
-		breakOnUnsupportedCmds?: boolean;
-		errorColor?: string;
-	}
 
-	class ParseError implements Error {
-		constructor(message: string, lexer: any, position: number);
-		name: string;
-		message: string;
-		position: number;
-	}
-	
-	/**
-	 * Renders a TeX expression into the specified DOM element
-	 * @param tex A TeX expression
-	 * @param element The DOM element to render into
-	 * @param options KaTeX options
-	 */
-	function render(tex: string, element: HTMLElement, options?:KatexOptions): void;
-	/**
-	 * Renders a TeX expression into an HTML string
-	 * @param tex A TeX expression
-	 * @param options KaTeX options
-	 */
-	function renderToString(tex: string, options?:KatexOptions): string;
-}
\ No newline at end of file
+interface KatexOptions {
+    displayMode?: boolean;
+    breakOnUnsupportedCmds?: boolean;
+    errorColor?: string;
+}
+
+declare class ParseError implements Error {
+    constructor(message: string, lexer: any, position: number);
+    name: string;
+    message: string;
+    position: number;
+}
+
+/**
+ * Renders a TeX expression into the specified DOM element
+ * @param tex A TeX expression
+ * @param element The DOM element to render into
+ * @param options KaTeX options
+ */
+declare function render(tex: string, element: HTMLElement, options?: KatexOptions): void;
+/**
+ * Renders a TeX expression into an HTML string
+ * @param tex A TeX expression
+ * @param options KaTeX options
+ */
+declare function renderToString(tex: string, options?: KatexOptions): string;
diff --git a/kefir/kefir.d.ts b/kefir/kefir.d.ts
index e726dba915..80123bc490 100644
--- a/kefir/kefir.d.ts
+++ b/kefir/kefir.d.ts
@@ -5,178 +5,177 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "kefir" {
 
-	export interface Observable<T, S> {
-		// Subscribe / add side effects
-		onValue(callback: (value: T) => void): void;
-		offValue(callback: (value: T) => void): void;
-		onError(callback: (error: S) => void): void;
-		offError(callback: (error: S) => void): void;
-		onEnd(callback: () => void): void;
-		offEnd(callback: () => void): void;
-		onAny(callback: (event: Event<T | S>) => void): void;
-		offAny(callback: (event: Event<T | S>) => void): void;
-		log(name?: string): void;
-		offLog(name?: string): void;
-		flatten<U>(transformer?: (value: T) => U[]): Stream<U, S>;
-		toPromise(PromiseConstructor?: any): any;
-		toESObservable(): any;
-	}
 
-	export interface Stream<T, S> extends Observable<T, S> {
-		toProperty(getCurrent?: () => T): Property<T, S>;
-
-		// Modify an stream
-		map<U>(fn: (value: T) => U): Stream<U, S>;
-		filter(predicate?: (value: T) => boolean): Stream<T, S>;
-		take(n: number): Stream<T, S>;
-		takeWhile(predicate?: (value: T) => boolean): Stream<T, S>;
-		last(): Stream<T, S>;
-		skip(n: number): Stream<T, S>;
-		skipWhile(predicate?: (value: T) => boolean): Stream<T, S>;
-		skipDuplicates(comparator?: (a: T, b: T) => boolean): Stream<T, S>;
-		diff(fn?: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
-		scan(fn: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
-		delay(wait: number): Stream<T, S>;
-		throttle(wait: number, options?: {leading?: boolean, trailing?: boolean}): Stream<T, S>;
-		debounce(wait: number, options?: {immediate: boolean}): Stream<T, S>;
-		valuesToErrors<U>(handler?: (value: T) => {convert: boolean, error: U}): Stream<void, S | U>;
-		errorsToValues<U>(handler?: (error: S) => {convert: boolean, value: U}): Stream<T | U, void>;
-		mapErrors<U>(fn: (error: S) => U): Stream<T, U>;
-		filterErrors(predicate?: (error: S) => boolean): Stream<T, S>;
-		endOnError(): Stream<T, S>;
-		takeErrors(n: number): Stream<T, S>;
-		ignoreValues(): Stream<void, S>;
-		ignoreErrors(): Stream<T, void>;
-		ignoreEnd(): Stream<T, S>;
-		beforeEnd<U>(fn: () => U): Stream<T | U, S>;
-		slidingWindow(max: number, mix?: number): Stream<T[], S>;
-		bufferWhile(predicate: (value: T) => boolean): Stream<T[], S>;
-		bufferWithCount(count: number, options?: {flushOnEnd: boolean}): Stream<T[], S>;
-		bufferWithTimeOrCount(interval: number, count: number, options?: {flushOnEnd: boolean}): Stream<T[], S>;
-		transduce<U>(transducer: any): Stream<U, S>;
-		withHandler<U, V>(handler: (emitter: Emitter<U, S>, event: Event<T | S>) => void): Stream<U, S>;
-
-		// Combine streams
-		combine<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
-		zip<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
-		merge<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
-		concat<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
-		flatMap<U, V>(transform: (value: T) => Stream<U, V>): Stream<U, V>;
-		flatMapLatest<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
-		flatMapFirst<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
-		flatMapConcat<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
-		flatMapConcurLimit<U, V>(fn: (value: T) => Stream<U, V>, limit: number): Stream<U, V>;
-		flatMapErrors<U, V>(transform: (error: S) => Stream<U, V>): Stream<U, V>;
-
-		// Combine two streams
-		filterBy<U>(otherObs: Observable<boolean, U>): Stream<T, S>;
-		sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Stream<W, S>;
-		skipUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
-		takeUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
-		bufferBy<U, V>(otherObs: Observable<U, V>, options?: {flushOnEnd: boolean}): Stream<T[], S>;
-		bufferWhileBy<U>(otherObs: Observable<boolean, U>, options?: {flushOnEnd?: boolean, flushOnChange?: boolean}): Stream<T[], S>;
-		awaiting<U, V>(otherObs: Observable<U, V>): Stream<boolean, S>;
-	}
-
-	export interface Property<T, S> extends Observable<T, S> {
-		changes(): Stream<T, S>;
-
-		// Modify an property
-		map<U>(fn: (value: T) => U): Property<U, S>;
-		filter(predicate?: (value: T) => boolean): Property<T, S>;
-		take(n: number): Property<T, S>;
-		takeWhile(predicate?: (value: T) => boolean): Property<T, S>;
-		last(): Property<T, S>;
-		skip(n: number): Property<T, S>;
-		skipWhile(predicate?: (value: T) => boolean): Property<T, S>;
-		skipDuplicates(comparator?: (a: T, b: T) => boolean): Property<T, S>;
-		diff(fn?: (prev: T, next: T) => T, seed?: T): Property<T, S>;
-		scan(fn: (prev: T, next: T) => T, seed?: T): Property<T, S>;
-		delay(wait: number): Property<T, S>;
-		throttle(wait: number, options?: {leading?: boolean, trailing?: boolean}): Property<T, S>;
-		debounce(wait: number, options?: {immediate: boolean}): Property<T, S>;
-		valuesToErrors<U>(handler?: (value: T) => {convert: boolean, error: U}): Property<void, S | U>;
-		errorsToValues<U>(handler?: (error: S) => {convert: boolean, value: U}): Property<T | U, void>;
-		mapErrors<U>(fn: (error: S) => U): Property<T, U>;
-		filterErrors(predicate?: (error: S) => boolean): Property<T, S>;
-		endOnError(): Property<T, S>;
-		takeErrors(n: number): Stream<T, S>;
-		ignoreValues(): Property<void, S>;
-		ignoreErrors(): Property<T, void>;
-		ignoreEnd(): Property<T, S>;
-		beforeEnd<U>(fn: () => U): Property<T | U, S>;
-		slidingWindow(max: number, mix?: number): Property<T[], S>;
-		bufferWhile(predicate: (value: T) => boolean): Property<T[], S>;
-		bufferWithCount(count: number, options?: {flushOnEnd: boolean}): Property<T[], S>;
-		bufferWithTimeOrCount(interval: number, count: number, options?: {flushOnEnd: boolean}): Property<T[], S>;
-		transduce<U>(transducer: any): Property<U, S>;
-		withHandler<U, V>(handler: (emitter: Emitter<T, S>, event: Event<T | S>) => void): Property<U, S>;
-
-		// Combine properties
-		combine<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
-		zip<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
-		merge<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
-		concat<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
-		flatMap<U, V>(transform: (value: T) => Property<U, V>): Property<U, V>;
-		flatMapLatest<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
-		flatMapFirst<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
-		flatMapConcat<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
-		flatMapConcurLimit<U, V>(fn: (value: T) => Property<U, V>, limit: number): Property<U, V>;
-		flatMapErrors<U, V>(transform: (error: S) => Property<U, V>): Property<U, V>;
-
-		// Combine two properties
-		filterBy<U>(otherObs: Observable<boolean, U>): Property<T, S>;
-		sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Property<W, S>;
-		skipUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
-		takeUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
-		bufferBy<U, V>(otherObs: Observable<U, V>, options?: {flushOnEnd: boolean}): Property<T[], S>;
-		bufferWhileBy<U>(otherObs: Observable<boolean, U>, options?: {flushOnEnd?: boolean, flushOnChange?: boolean}): Property<T[], S>;
-		awaiting<U, V>(otherObs: Observable<U, V>): Property<boolean, S>;
-	}
-
-	export interface ObservablePool<T, S> extends Observable<T, S> {
-		plug(obs: Observable<T, S>): void;
-		unPlug(obs: Observable<T, S>): void;
-	}
-
-	export interface Event<T> {
-		type: string;
-		value: T;
-	}
-
-	export interface Emitter<T, S> {
-		emit(value: T): void;
-		error(error: S): void;
-		end(): void;
-		emitEvent(event: {type: string, value: T | S}): void;
-	}
-
-	// Create a stream
-	export function never(): Stream<void, void>;
-	export function later<T>(wait: number, value: T): Stream<T, void>;
-	export function interval<T>(interval: number, value: T): Stream<T, void>;
-	export function sequentially<T>(interval: number, values: T[]): Stream<T, void>;
-	export function fromPoll<T>(interval: number, fn: () => T): Stream<T, void>;
-	export function withInterval<T, S>(interval: number, handler: (emitter: Emitter<T, S>) => void): Stream<T, S>;
-	export function fromCallback<T>(fn: (callback: (value: T) => void) => void): Stream<T, void>;
-	export function fromNodeCallback<T, S>(fn: (callback: (error: S, result: T) => void) => void): Stream<T, S>;
-	export function fromEvents<T, S>(target: EventTarget | NodeJS.EventEmitter | { on: Function, off: Function }, eventName: string, transform?: (value: T) => S): Stream<T, S>;
-	export function stream<T, S>(subscribe: (emitter: Emitter<T, S>) => Function | void): Stream<T, S>;
-	export function fromESObservable<T, S>(observable: any): Stream<T, S>
-
-	// Create a property
-	export function constant<T>(value: T): Property<T, void>;
-	export function constantError<T>(error: T): Property<void, T>;
-	export function fromPromise<T, S>(promise: any): Property<T, S>;
-
-	// Combine observables
-	export function combine<T, S, U>(obss: Observable<T, S>[], passiveObss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
-	export function combine<T, S, U>(obss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
-	export function zip<T, S, U>(obss: Observable<T, S>[], passiveObss?: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
-	export function merge<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
-	export function concat<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
-	export function pool<T, S>(): ObservablePool<T, S>;
-	export function repeat<T, S>(generator: (i: number) => Observable<T, S> | boolean): Observable<T, S>;
+export interface Observable<T, S> {
+    // Subscribe / add side effects
+    onValue(callback: (value: T) => void): void;
+    offValue(callback: (value: T) => void): void;
+    onError(callback: (error: S) => void): void;
+    offError(callback: (error: S) => void): void;
+    onEnd(callback: () => void): void;
+    offEnd(callback: () => void): void;
+    onAny(callback: (event: Event<T | S>) => void): void;
+    offAny(callback: (event: Event<T | S>) => void): void;
+    log(name?: string): void;
+    offLog(name?: string): void;
+    flatten<U>(transformer?: (value: T) => U[]): Stream<U, S>;
+    toPromise(PromiseConstructor?: any): any;
+    toESObservable(): any;
 }
+
+export interface Stream<T, S> extends Observable<T, S> {
+    toProperty(getCurrent?: () => T): Property<T, S>;
+
+    // Modify an stream
+    map<U>(fn: (value: T) => U): Stream<U, S>;
+    filter(predicate?: (value: T) => boolean): Stream<T, S>;
+    take(n: number): Stream<T, S>;
+    takeWhile(predicate?: (value: T) => boolean): Stream<T, S>;
+    last(): Stream<T, S>;
+    skip(n: number): Stream<T, S>;
+    skipWhile(predicate?: (value: T) => boolean): Stream<T, S>;
+    skipDuplicates(comparator?: (a: T, b: T) => boolean): Stream<T, S>;
+    diff(fn?: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
+    scan(fn: (prev: T, next: T) => T, seed?: T): Stream<T, S>;
+    delay(wait: number): Stream<T, S>;
+    throttle(wait: number, options?: { leading?: boolean, trailing?: boolean }): Stream<T, S>;
+    debounce(wait: number, options?: { immediate: boolean }): Stream<T, S>;
+    valuesToErrors<U>(handler?: (value: T) => { convert: boolean, error: U }): Stream<void, S | U>;
+    errorsToValues<U>(handler?: (error: S) => { convert: boolean, value: U }): Stream<T | U, void>;
+    mapErrors<U>(fn: (error: S) => U): Stream<T, U>;
+    filterErrors(predicate?: (error: S) => boolean): Stream<T, S>;
+    endOnError(): Stream<T, S>;
+    takeErrors(n: number): Stream<T, S>;
+    ignoreValues(): Stream<void, S>;
+    ignoreErrors(): Stream<T, void>;
+    ignoreEnd(): Stream<T, S>;
+    beforeEnd<U>(fn: () => U): Stream<T | U, S>;
+    slidingWindow(max: number, mix?: number): Stream<T[], S>;
+    bufferWhile(predicate: (value: T) => boolean): Stream<T[], S>;
+    bufferWithCount(count: number, options?: { flushOnEnd: boolean }): Stream<T[], S>;
+    bufferWithTimeOrCount(interval: number, count: number, options?: { flushOnEnd: boolean }): Stream<T[], S>;
+    transduce<U>(transducer: any): Stream<U, S>;
+    withHandler<U, V>(handler: (emitter: Emitter<U, S>, event: Event<T | S>) => void): Stream<U, S>;
+
+    // Combine streams
+    combine<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
+    zip<U, V, W>(otherObs: Stream<U, V>, combinator?: (value: T, ...values: U[]) => W): Stream<W, S | V>;
+    merge<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
+    concat<U, V>(otherObs: Stream<U, V>): Stream<T | U, S | V>;
+    flatMap<U, V>(transform: (value: T) => Stream<U, V>): Stream<U, V>;
+    flatMapLatest<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+    flatMapFirst<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+    flatMapConcat<U, V>(fn: (value: T) => Stream<U, V>): Stream<U, V>;
+    flatMapConcurLimit<U, V>(fn: (value: T) => Stream<U, V>, limit: number): Stream<U, V>;
+    flatMapErrors<U, V>(transform: (error: S) => Stream<U, V>): Stream<U, V>;
+
+    // Combine two streams
+    filterBy<U>(otherObs: Observable<boolean, U>): Stream<T, S>;
+    sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Stream<W, S>;
+    skipUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
+    takeUntilBy<U, V>(otherObs: Observable<U, V>): Stream<U, V>;
+    bufferBy<U, V>(otherObs: Observable<U, V>, options?: { flushOnEnd: boolean }): Stream<T[], S>;
+    bufferWhileBy<U>(otherObs: Observable<boolean, U>, options?: { flushOnEnd?: boolean, flushOnChange?: boolean }): Stream<T[], S>;
+    awaiting<U, V>(otherObs: Observable<U, V>): Stream<boolean, S>;
+}
+
+export interface Property<T, S> extends Observable<T, S> {
+    changes(): Stream<T, S>;
+
+    // Modify an property
+    map<U>(fn: (value: T) => U): Property<U, S>;
+    filter(predicate?: (value: T) => boolean): Property<T, S>;
+    take(n: number): Property<T, S>;
+    takeWhile(predicate?: (value: T) => boolean): Property<T, S>;
+    last(): Property<T, S>;
+    skip(n: number): Property<T, S>;
+    skipWhile(predicate?: (value: T) => boolean): Property<T, S>;
+    skipDuplicates(comparator?: (a: T, b: T) => boolean): Property<T, S>;
+    diff(fn?: (prev: T, next: T) => T, seed?: T): Property<T, S>;
+    scan(fn: (prev: T, next: T) => T, seed?: T): Property<T, S>;
+    delay(wait: number): Property<T, S>;
+    throttle(wait: number, options?: { leading?: boolean, trailing?: boolean }): Property<T, S>;
+    debounce(wait: number, options?: { immediate: boolean }): Property<T, S>;
+    valuesToErrors<U>(handler?: (value: T) => { convert: boolean, error: U }): Property<void, S | U>;
+    errorsToValues<U>(handler?: (error: S) => { convert: boolean, value: U }): Property<T | U, void>;
+    mapErrors<U>(fn: (error: S) => U): Property<T, U>;
+    filterErrors(predicate?: (error: S) => boolean): Property<T, S>;
+    endOnError(): Property<T, S>;
+    takeErrors(n: number): Stream<T, S>;
+    ignoreValues(): Property<void, S>;
+    ignoreErrors(): Property<T, void>;
+    ignoreEnd(): Property<T, S>;
+    beforeEnd<U>(fn: () => U): Property<T | U, S>;
+    slidingWindow(max: number, mix?: number): Property<T[], S>;
+    bufferWhile(predicate: (value: T) => boolean): Property<T[], S>;
+    bufferWithCount(count: number, options?: { flushOnEnd: boolean }): Property<T[], S>;
+    bufferWithTimeOrCount(interval: number, count: number, options?: { flushOnEnd: boolean }): Property<T[], S>;
+    transduce<U>(transducer: any): Property<U, S>;
+    withHandler<U, V>(handler: (emitter: Emitter<T, S>, event: Event<T | S>) => void): Property<U, S>;
+
+    // Combine properties
+    combine<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
+    zip<U, V, W>(otherObs: Property<U, V>, combinator?: (value: T, ...values: U[]) => W): Property<W, S | V>;
+    merge<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
+    concat<U, V>(otherObs: Property<U, V>): Property<T | U, S | V>;
+    flatMap<U, V>(transform: (value: T) => Property<U, V>): Property<U, V>;
+    flatMapLatest<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+    flatMapFirst<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+    flatMapConcat<U, V>(fn: (value: T) => Property<U, V>): Property<U, V>;
+    flatMapConcurLimit<U, V>(fn: (value: T) => Property<U, V>, limit: number): Property<U, V>;
+    flatMapErrors<U, V>(transform: (error: S) => Property<U, V>): Property<U, V>;
+
+    // Combine two properties
+    filterBy<U>(otherObs: Observable<boolean, U>): Property<T, S>;
+    sampledBy<U, V, W>(otherObs: Observable<U, V>, combinator?: (a: T, b: U) => W): Property<W, S>;
+    skipUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
+    takeUntilBy<U, V>(otherObs: Observable<U, V>): Property<U, V>;
+    bufferBy<U, V>(otherObs: Observable<U, V>, options?: { flushOnEnd: boolean }): Property<T[], S>;
+    bufferWhileBy<U>(otherObs: Observable<boolean, U>, options?: { flushOnEnd?: boolean, flushOnChange?: boolean }): Property<T[], S>;
+    awaiting<U, V>(otherObs: Observable<U, V>): Property<boolean, S>;
+}
+
+export interface ObservablePool<T, S> extends Observable<T, S> {
+    plug(obs: Observable<T, S>): void;
+    unPlug(obs: Observable<T, S>): void;
+}
+
+export interface Event<T> {
+    type: string;
+    value: T;
+}
+
+export interface Emitter<T, S> {
+    emit(value: T): void;
+    error(error: S): void;
+    end(): void;
+    emitEvent(event: { type: string, value: T | S }): void;
+}
+
+// Create a stream
+declare export function never(): Stream<void, void>;
+declare export function later<T>(wait: number, value: T): Stream<T, void>;
+declare export function interval<T>(interval: number, value: T): Stream<T, void>;
+declare export function sequentially<T>(interval: number, values: T[]): Stream<T, void>;
+declare export function fromPoll<T>(interval: number, fn: () => T): Stream<T, void>;
+declare export function withInterval<T, S>(interval: number, handler: (emitter: Emitter<T, S>) => void): Stream<T, S>;
+declare export function fromCallback<T>(fn: (callback: (value: T) => void) => void): Stream<T, void>;
+declare export function fromNodeCallback<T, S>(fn: (callback: (error: S, result: T) => void) => void): Stream<T, S>;
+declare export function fromEvents<T, S>(target: EventTarget | NodeJS.EventEmitter | { on: Function, off: Function }, eventName: string, transform?: (value: T) => S): Stream<T, S>;
+declare export function stream<T, S>(subscribe: (emitter: Emitter<T, S>) => Function | void): Stream<T, S>;
+declare export function fromESObservable<T, S>(observable: any): Stream<T, S>
+
+// Create a property
+declare export function constant<T>(value: T): Property<T, void>;
+declare export function constantError<T>(error: T): Property<void, T>;
+declare export function fromPromise<T, S>(promise: any): Property<T, S>;
+
+// Combine observables
+declare export function combine<T, S, U>(obss: Observable<T, S>[], passiveObss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+declare export function combine<T, S, U>(obss: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+declare export function zip<T, S, U>(obss: Observable<T, S>[], passiveObss?: Observable<T, S>[], combinator?: (...values: T[]) => U): Observable<U, S>;
+declare export function merge<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
+declare export function concat<T, S>(obss: Observable<T, S>[]): Observable<T, S>;
+declare export function pool<T, S>(): ObservablePool<T, S>;
+declare export function repeat<T, S>(generator: (i: number) => Observable<T, S> | boolean): Observable<T, S>;
diff --git a/keytar/keytar.d.ts b/keytar/keytar.d.ts
index 85b444754d..d23e4a0d80 100644
--- a/keytar/keytar.d.ts
+++ b/keytar/keytar.d.ts
@@ -3,58 +3,57 @@
 // Definitions by: Milan Burda <https://github.com/miniak/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'keytar' {
-    /**
-     * Get the stored password for the service and account.
-     *
-     * @param service The string service name.
-     * @param account The string account name.
-     *
-     * @returns the string password or null on failures.
-     */
-    export function getPassword(service: string, account: string): string;
 
-    /**
-     * Add the password for the service and account to the keychain.
-     *
-     * @param service The string service name.
-     * @param account The string account name.
-     * @param password The string password.
-     *
-     * @returns true on success, false on failure.
-     */
-    export function addPassword(service: string, account: string, password: string): boolean;
+/**
+ * Get the stored password for the service and account.
+ *
+ * @param service The string service name.
+ * @param account The string account name.
+ *
+ * @returns the string password or null on failures.
+ */
+declare export function getPassword(service: string, account: string): string;
 
-    /**
-     * Delete the stored password for the service and account.
-     *
-     * @param service The string service name.
-     * @param account The string account name.
-     *
-     * @returns the string password or null on failures.
-     */
-    export function deletePassword(service: string, account: string): string;
+/**
+ * Add the password for the service and account to the keychain.
+ *
+ * @param service The string service name.
+ * @param account The string account name.
+ * @param password The string password.
+ *
+ * @returns true on success, false on failure.
+ */
+declare export function addPassword(service: string, account: string, password: string): boolean;
 
-    /**
-     * Replace the password for the service and account in the keychain.
-     *
-     * This is a simple convenience function that internally calls deletePassword(service, account)
-     * followed by addPassword(service, account, password).
-     *
-     * @param service The string service name.
-     * @param account The string account name.
-     * @param password The string password.
-     *
-     * @returns true on success, false on failure.
-     */
-    export function replacePassword(service: string, account: string, password: string): boolean;
+/**
+ * Delete the stored password for the service and account.
+ *
+ * @param service The string service name.
+ * @param account The string account name.
+ *
+ * @returns the string password or null on failures.
+ */
+declare export function deletePassword(service: string, account: string): string;
 
-    /**
-     * Find a password for the service in the keychain.
-     *
-     * @param service The string service name.
-     *
-     * @returns the string password or null on failures.
-     */
-    export function findPassword(service: string): string;
-}
+/**
+ * Replace the password for the service and account in the keychain.
+ *
+ * This is a simple convenience function that internally calls deletePassword(service, account)
+ * followed by addPassword(service, account, password).
+ *
+ * @param service The string service name.
+ * @param account The string account name.
+ * @param password The string password.
+ *
+ * @returns true on success, false on failure.
+ */
+declare export function replacePassword(service: string, account: string, password: string): boolean;
+
+/**
+ * Find a password for the service in the keychain.
+ *
+ * @param service The string service name.
+ *
+ * @returns the string password or null on failures.
+ */
+declare export function findPassword(service: string): string;
diff --git a/knex/knex.d.ts b/knex/knex.d.ts
index 52740662c8..4ee8df3b0f 100644
--- a/knex/knex.d.ts
+++ b/knex/knex.d.ts
@@ -6,16 +6,16 @@
 // <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path="../node/node.d.ts" />
 
-declare module "knex" {
-  // import Promise = require("bluebird");
-  import * as events from "events";
 
-  type Callback = Function;
-  type Client = Function;
-  type Value = string|number|boolean|Date;
-  type ColumnName = string|Knex.Raw|Knex.QueryBuilder;
+// import Promise = require("bluebird");
+import * as events from "events";
 
-  interface Knex extends Knex.QueryInterface {
+type Callback = Function;
+type Client = Function;
+type Value = string | number | boolean | Date;
+type ColumnName = string | Knex.Raw | Knex.QueryBuilder;
+
+interface Knex extends Knex.QueryInterface {
     (tableName?: string): Knex.QueryBuilder;
     VERSION: string;
     __knex__: string;
@@ -31,224 +31,224 @@ declare module "knex" {
     migrate: any;
     seed: any;
     fn: any;
-  }
+}
 
-  function Knex(config: Knex.Config) : Knex;
+declare function Knex(config: Knex.Config): Knex;
 
-  namespace Knex {
+declare namespace Knex {
     //
     // QueryInterface
     //
 
     interface QueryInterface {
-      select: Select;
-      as: As;
-      columns: Select;
-      column: Select;
-      from: Table;
-      into: Table;
-      table: Table;
-      distinct: Distinct;
+        select: Select;
+        as: As;
+        columns: Select;
+        column: Select;
+        from: Table;
+        into: Table;
+        table: Table;
+        distinct: Distinct;
 
-      // Joins
-      join: Join;
-      joinRaw: JoinRaw;
-      innerJoin: Join;
-      leftJoin: Join;
-      leftOuterJoin: Join;
-      rightJoin: Join;
-      rightOuterJoin: Join;
-      outerJoin: Join;
-      fullOuterJoin: Join;
-      crossJoin: Join;
+        // Joins
+        join: Join;
+        joinRaw: JoinRaw;
+        innerJoin: Join;
+        leftJoin: Join;
+        leftOuterJoin: Join;
+        rightJoin: Join;
+        rightOuterJoin: Join;
+        outerJoin: Join;
+        fullOuterJoin: Join;
+        crossJoin: Join;
 
-      // Wheres
-      where: Where;
-      andWhere: Where;
-      orWhere: Where;
-      whereRaw: WhereRaw;
-      whereWrapped: WhereWrapped;
-      havingWrapped: WhereWrapped;
-      orWhereRaw: WhereRaw;
-      whereExists: WhereExists;
-      orWhereExists: WhereExists;
-      whereNotExists: WhereExists;
-      orWhereNotExists: WhereExists;
-      whereIn: WhereIn;
-      orWhereIn: WhereIn;
-      whereNotIn: WhereIn;
-      orWhereNotIn: WhereIn;
-      whereNull: WhereNull;
-      orWhereNull: WhereNull;
-      whereNotNull: WhereNull;
-      orWhereNotNull: WhereNull;
-      whereBetween: WhereBetween;
-      whereNotBetween: WhereBetween;
-      orWhereBetween: WhereBetween;
-      orWhereNotBetween: WhereBetween;
+        // Wheres
+        where: Where;
+        andWhere: Where;
+        orWhere: Where;
+        whereRaw: WhereRaw;
+        whereWrapped: WhereWrapped;
+        havingWrapped: WhereWrapped;
+        orWhereRaw: WhereRaw;
+        whereExists: WhereExists;
+        orWhereExists: WhereExists;
+        whereNotExists: WhereExists;
+        orWhereNotExists: WhereExists;
+        whereIn: WhereIn;
+        orWhereIn: WhereIn;
+        whereNotIn: WhereIn;
+        orWhereNotIn: WhereIn;
+        whereNull: WhereNull;
+        orWhereNull: WhereNull;
+        whereNotNull: WhereNull;
+        orWhereNotNull: WhereNull;
+        whereBetween: WhereBetween;
+        whereNotBetween: WhereBetween;
+        orWhereBetween: WhereBetween;
+        orWhereNotBetween: WhereBetween;
 
-      // Group by
-      groupBy: GroupBy;
-      groupByRaw: RawQueryBuilder;
+        // Group by
+        groupBy: GroupBy;
+        groupByRaw: RawQueryBuilder;
 
-      // Order by
-      orderBy: OrderBy;
-      orderByRaw: RawQueryBuilder;
+        // Order by
+        orderBy: OrderBy;
+        orderByRaw: RawQueryBuilder;
 
-      // Union
-      union: Union;
-      unionAll(callback: Function): QueryBuilder;
+        // Union
+        union: Union;
+        unionAll(callback: Function): QueryBuilder;
 
-      // Having
-      having: Having;
-      havingRaw: RawQueryBuilder;
-      orHaving: Having;
-      orHavingRaw: RawQueryBuilder;
+        // Having
+        having: Having;
+        havingRaw: RawQueryBuilder;
+        orHaving: Having;
+        orHavingRaw: RawQueryBuilder;
 
-      // Paging
-      offset(offset: number): QueryBuilder;
-      limit(limit: number): QueryBuilder;
+        // Paging
+        offset(offset: number): QueryBuilder;
+        limit(limit: number): QueryBuilder;
 
-      // Aggregation
-      count(columnName?: string): QueryBuilder;
-      min(columnName: string): QueryBuilder;
-      max(columnName: string): QueryBuilder;
-      sum(columnName: string): QueryBuilder;
-      avg(columnName: string): QueryBuilder;
-      increment(columnName: string, amount?: number): QueryBuilder;
-      decrement(columnName: string, amount?: number): QueryBuilder;
+        // Aggregation
+        count(columnName?: string): QueryBuilder;
+        min(columnName: string): QueryBuilder;
+        max(columnName: string): QueryBuilder;
+        sum(columnName: string): QueryBuilder;
+        avg(columnName: string): QueryBuilder;
+        increment(columnName: string, amount?: number): QueryBuilder;
+        decrement(columnName: string, amount?: number): QueryBuilder;
 
-      // Others
-      first(...columns: string[]): QueryBuilder;
+        // Others
+        first(...columns: string[]): QueryBuilder;
 
-      debug(enabled?: boolean): QueryBuilder;
-      pluck(column: string): QueryBuilder;
+        debug(enabled?: boolean): QueryBuilder;
+        pluck(column: string): QueryBuilder;
 
-      insert(data: any, returning?: string | string[]): QueryBuilder;
-      update(data: any, returning?: string | string[]): QueryBuilder;
-      update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
-      returning(column: string): QueryBuilder;
+        insert(data: any, returning?: string | string[]): QueryBuilder;
+        update(data: any, returning?: string | string[]): QueryBuilder;
+        update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
+        returning(column: string): QueryBuilder;
 
-      del(returning?: string | string[]): QueryBuilder;
-      delete(returning?: string | string[]): QueryBuilder;
-      truncate(): QueryBuilder;
+        del(returning?: string | string[]): QueryBuilder;
+        delete(returning?: string | string[]): QueryBuilder;
+        truncate(): QueryBuilder;
 
-      transacting(trx: Transaction): QueryBuilder;
-      connection(connection: any): QueryBuilder;
+        transacting(trx: Transaction): QueryBuilder;
+        connection(connection: any): QueryBuilder;
 
-      clone(): QueryBuilder;
+        clone(): QueryBuilder;
     }
 
     interface As {
-      (columnName: string): QueryBuilder;
+        (columnName: string): QueryBuilder;
     }
 
     interface Select extends ColumnNameQueryBuilder {
     }
 
     interface Table {
-      (tableName: string): QueryBuilder;
-      (callback: Function): QueryBuilder;
+        (tableName: string): QueryBuilder;
+        (callback: Function): QueryBuilder;
     }
 
     interface Distinct extends ColumnNameQueryBuilder {
     }
 
     interface Join {
-      (raw: Raw): QueryBuilder;
-      (tableName: string, callback: Function): QueryBuilder;
-      (tableName: string, column1: string, column2: string): QueryBuilder;
-      (tableName: string, column1: string, raw: Raw): QueryBuilder;
-      (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
+        (raw: Raw): QueryBuilder;
+        (tableName: string, callback: Function): QueryBuilder;
+        (tableName: string, column1: string, column2: string): QueryBuilder;
+        (tableName: string, column1: string, raw: Raw): QueryBuilder;
+        (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
     }
 
     interface JoinRaw {
-      (tableName: string, binding?: Value): QueryBuilder;
+        (tableName: string, binding?: Value): QueryBuilder;
     }
 
     interface Where extends WhereRaw, WhereWrapped, WhereNull {
-      (object: Object): QueryBuilder;
-      (columnName: string, value: Value): QueryBuilder;
-      (columnName: string, operator: string, value: Value): QueryBuilder;
-      (columnName: string, operator: string, query: QueryBuilder): QueryBuilder;
+        (object: Object): QueryBuilder;
+        (columnName: string, value: Value): QueryBuilder;
+        (columnName: string, operator: string, value: Value): QueryBuilder;
+        (columnName: string, operator: string, query: QueryBuilder): QueryBuilder;
     }
 
     interface WhereRaw extends RawQueryBuilder {
-      (condition: boolean): QueryBuilder;
+        (condition: boolean): QueryBuilder;
     }
 
     interface WhereWrapped {
-      (callback: Function): QueryBuilder;
+        (callback: Function): QueryBuilder;
     }
 
     interface WhereNull {
-      (columnName: string): QueryBuilder;
+        (columnName: string): QueryBuilder;
     }
 
     interface WhereIn {
-      (columnName: string, values: Value[]): QueryBuilder;
-      (columnName: string, callback: Function): QueryBuilder;
-      (columnName: string, query: QueryBuilder): QueryBuilder;
+        (columnName: string, values: Value[]): QueryBuilder;
+        (columnName: string, callback: Function): QueryBuilder;
+        (columnName: string, query: QueryBuilder): QueryBuilder;
     }
 
     interface WhereBetween {
-      (columnName: string, range: [Value, Value]): QueryBuilder;
+        (columnName: string, range: [Value, Value]): QueryBuilder;
     }
 
     interface WhereExists {
-      (callback: Function): QueryBuilder;
-      (query: QueryBuilder): QueryBuilder;
+        (callback: Function): QueryBuilder;
+        (query: QueryBuilder): QueryBuilder;
     }
 
     interface WhereNull {
-      (columnName: string): QueryBuilder;
+        (columnName: string): QueryBuilder;
     }
 
     interface WhereIn {
-      (columnName: string, values: Value[]): QueryBuilder;
+        (columnName: string, values: Value[]): QueryBuilder;
     }
 
     interface GroupBy extends RawQueryBuilder, ColumnNameQueryBuilder {
     }
 
     interface OrderBy {
-      (columnName: string, direction?: string): QueryBuilder;
+        (columnName: string, direction?: string): QueryBuilder;
     }
 
     interface Union {
-      (callback: Function, wrap?: boolean): QueryBuilder;
-      (callbacks: Function[], wrap?: boolean): QueryBuilder;
-      (...callbacks: Function[]): QueryBuilder;
-      // (...callbacks: Function[], wrap?: boolean): QueryInterface;
+        (callback: Function, wrap?: boolean): QueryBuilder;
+        (callbacks: Function[], wrap?: boolean): QueryBuilder;
+        (...callbacks: Function[]): QueryBuilder;
+        // (...callbacks: Function[], wrap?: boolean): QueryInterface;
     }
 
     interface Having extends RawQueryBuilder, WhereWrapped {
-      (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
+        (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
     }
 
     // commons
 
     interface ColumnNameQueryBuilder {
-      (...columnNames: ColumnName[]): QueryBuilder;
-      (columnNames: ColumnName[]): QueryBuilder;
+        (...columnNames: ColumnName[]): QueryBuilder;
+        (columnNames: ColumnName[]): QueryBuilder;
     }
 
     interface RawQueryBuilder {
-      (sql: string, ...bindings: Value[]): QueryBuilder;
-      (sql: string, bindings: Value[]): QueryBuilder;
-      (raw: Raw): QueryBuilder;
+        (sql: string, ...bindings: Value[]): QueryBuilder;
+        (sql: string, bindings: Value[]): QueryBuilder;
+        (raw: Raw): QueryBuilder;
     }
 
     // Raw
 
     interface Raw extends events.EventEmitter, ChainableInterface {
-      wrap(before: string, after: string): Raw;
+        wrap(before: string, after: string): Raw;
     }
 
     interface RawBuilder {
-      (value: Value): Raw;
-      (sql: string, ...bindings: Value[]): Raw;
-      (sql: string, bindings: Value[]): Raw;
+        (value: Value): Raw;
+        (sql: string, ...bindings: Value[]): Raw;
+        (sql: string, bindings: Value[]): Raw;
     }
 
     //
@@ -256,25 +256,25 @@ declare module "knex" {
     //
 
     interface QueryBuilder extends QueryInterface, ChainableInterface {
-      or: QueryBuilder;
-      and: QueryBuilder;
+        or: QueryBuilder;
+        and: QueryBuilder;
 
-      //TODO: Promise?
-      columnInfo(column?: string): Promise<ColumnInfo>;
+        //TODO: Promise?
+        columnInfo(column?: string): Promise<ColumnInfo>;
 
-      forUpdate(): QueryBuilder;
-      forShare(): QueryBuilder;
+        forUpdate(): QueryBuilder;
+        forShare(): QueryBuilder;
 
-      toSQL(): Sql;
+        toSQL(): Sql;
 
-      on(event: string, callback: Function): QueryBuilder;
+        on(event: string, callback: Function): QueryBuilder;
     }
 
     interface Sql {
-      method: string;
-      options: any;
-      bindings: Value[];
-      sql: string;
+        method: string;
+        options: any;
+        bindings: Value[];
+        sql: string;
     }
 
     //
@@ -282,17 +282,17 @@ declare module "knex" {
     //
 
     interface ChainableInterface extends Promise<any> {
-      toQuery(): string;
-      options(options: any): QueryBuilder;
-      stream(options?: any, callback?: (builder: QueryBuilder) => any): QueryBuilder;
-      stream(callback?: (builder: QueryBuilder) => any): QueryBuilder;
-      pipe(writable: any): QueryBuilder;
-      exec(callback: Function): QueryBuilder;
+        toQuery(): string;
+        options(options: any): QueryBuilder;
+        stream(options?: any, callback?: (builder: QueryBuilder) => any): QueryBuilder;
+        stream(callback?: (builder: QueryBuilder) => any): QueryBuilder;
+        pipe(writable: any): QueryBuilder;
+        exec(callback: Function): QueryBuilder;
     }
 
     interface Transaction extends QueryBuilder {
-      commit: any;
-      rollback: any;
+        commit: any;
+        rollback: any;
     }
 
     //
@@ -300,54 +300,54 @@ declare module "knex" {
     //
 
     interface SchemaBuilder {
-      createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): Promise<void>;
-      renameTable(oldTableName: string, newTableName: string): Promise<void>;
-      dropTable(tableName: string): Promise<void>;
-      hasTable(tableName: string): Promise<boolean>;
-      hasColumn(tableName: string, columnName: string): Promise<boolean>;
-      table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): Promise<void>;
-      dropTableIfExists(tableName: string): Promise<void>;
-      raw(statement: string): SchemaBuilder;
+        createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): Promise<void>;
+        renameTable(oldTableName: string, newTableName: string): Promise<void>;
+        dropTable(tableName: string): Promise<void>;
+        hasTable(tableName: string): Promise<boolean>;
+        hasColumn(tableName: string, columnName: string): Promise<boolean>;
+        table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): Promise<void>;
+        dropTableIfExists(tableName: string): Promise<void>;
+        raw(statement: string): SchemaBuilder;
     }
 
     interface TableBuilder {
-      increments(columnName?: string): ColumnBuilder;
-      dropColumn(columnName: string): TableBuilder;
-      dropColumns(...columnNames: string[]): TableBuilder;
-      renameColumn(from: string, to: string): ColumnBuilder;
-      integer(columnName: string): ColumnBuilder;
-      bigInteger(columnName: string): ColumnBuilder;
-      text(columnName: string, textType?: string): ColumnBuilder;
-      string(columnName: string, length?: number): ColumnBuilder;
-      float(columnName: string, precision?: number, scale?: number): ColumnBuilder;
-      decimal(columnName: string, precision?: number, scale?: number): ColumnBuilder;
-      boolean(columnName: string): ColumnBuilder;
-      date(columnName: string): ColumnBuilder;
-      dateTime(columnName: string): ColumnBuilder;
-      time(columnName: string): ColumnBuilder;
-      timestamp(columnName: string): ColumnBuilder;
-      timestamps(): ColumnBuilder;
-      binary(columnName: string): ColumnBuilder;
-      enum(columnName: string, values: Value[]): ColumnBuilder;
-      enu(columnName: string, values: Value[]): ColumnBuilder;
-      json(columnName: string): ColumnBuilder;
-      uuid(columnName: string): ColumnBuilder;
-      comment(val: string): TableBuilder;
-      specificType(columnName: string, type: string): ColumnBuilder;
-      primary(columnNames: string[]) : TableBuilder;
-      index(columnNames: string[], indexName?: string, indexType?: string) : TableBuilder;
-      unique(columnNames: string[], indexName?: string) : TableBuilder;
-      foreign(column: string): ForeignConstraintBuilder;
-      foreign(columns: string[]): MultikeyForeignConstraintBuilder;
+        increments(columnName?: string): ColumnBuilder;
+        dropColumn(columnName: string): TableBuilder;
+        dropColumns(...columnNames: string[]): TableBuilder;
+        renameColumn(from: string, to: string): ColumnBuilder;
+        integer(columnName: string): ColumnBuilder;
+        bigInteger(columnName: string): ColumnBuilder;
+        text(columnName: string, textType?: string): ColumnBuilder;
+        string(columnName: string, length?: number): ColumnBuilder;
+        float(columnName: string, precision?: number, scale?: number): ColumnBuilder;
+        decimal(columnName: string, precision?: number, scale?: number): ColumnBuilder;
+        boolean(columnName: string): ColumnBuilder;
+        date(columnName: string): ColumnBuilder;
+        dateTime(columnName: string): ColumnBuilder;
+        time(columnName: string): ColumnBuilder;
+        timestamp(columnName: string): ColumnBuilder;
+        timestamps(): ColumnBuilder;
+        binary(columnName: string): ColumnBuilder;
+        enum(columnName: string, values: Value[]): ColumnBuilder;
+        enu(columnName: string, values: Value[]): ColumnBuilder;
+        json(columnName: string): ColumnBuilder;
+        uuid(columnName: string): ColumnBuilder;
+        comment(val: string): TableBuilder;
+        specificType(columnName: string, type: string): ColumnBuilder;
+        primary(columnNames: string[]): TableBuilder;
+        index(columnNames: string[], indexName?: string, indexType?: string): TableBuilder;
+        unique(columnNames: string[], indexName?: string): TableBuilder;
+        foreign(column: string): ForeignConstraintBuilder;
+        foreign(columns: string[]): MultikeyForeignConstraintBuilder;
     }
 
     interface CreateTableBuilder extends TableBuilder {
     }
 
     interface MySqlTableBuilder extends CreateTableBuilder {
-      engine(val: string): CreateTableBuilder;
-      charset(val: string): CreateTableBuilder;
-      collate(val: string): CreateTableBuilder;
+        engine(val: string): CreateTableBuilder;
+        charset(val: string): CreateTableBuilder;
+        collate(val: string): CreateTableBuilder;
     }
 
     interface AlterTableBuilder extends TableBuilder {
@@ -357,41 +357,41 @@ declare module "knex" {
     }
 
     interface ColumnBuilder {
-      index(indexName?: string): ColumnBuilder;
-      primary(): ColumnBuilder;
-      unique(): ColumnBuilder;
-      references(columnName: string): ReferencingColumnBuilder;
-      onDelete(command: string): ColumnBuilder;
-      onUpdate(command: string): ColumnBuilder;
-      defaultTo(value: Value): ColumnBuilder;
-      unsigned(): ColumnBuilder;
-      notNullable(): ColumnBuilder;
-      nullable(): ColumnBuilder;
-      comment(value: string): ColumnBuilder;
+        index(indexName?: string): ColumnBuilder;
+        primary(): ColumnBuilder;
+        unique(): ColumnBuilder;
+        references(columnName: string): ReferencingColumnBuilder;
+        onDelete(command: string): ColumnBuilder;
+        onUpdate(command: string): ColumnBuilder;
+        defaultTo(value: Value): ColumnBuilder;
+        unsigned(): ColumnBuilder;
+        notNullable(): ColumnBuilder;
+        nullable(): ColumnBuilder;
+        comment(value: string): ColumnBuilder;
     }
-    
+
     interface ForeignConstraintBuilder {
         references(columnName: string): ReferencingColumnBuilder;
     }
-    
+
     interface MultikeyForeignConstraintBuilder {
         references(columnNames: string[]): ReferencingColumnBuilder;
     }
-    
+
     interface PostgreSqlColumnBuilder extends ColumnBuilder {
-      index(indexName?: string, indexType?: string): ColumnBuilder;
+        index(indexName?: string, indexType?: string): ColumnBuilder;
     }
 
     interface ReferencingColumnBuilder {
-      inTable(tableName: string): ColumnBuilder;
+        inTable(tableName: string): ColumnBuilder;
     }
 
     interface AlterColumnBuilder extends ColumnBuilder {
     }
 
     interface MySqlAlterColumnBuilder extends AlterColumnBuilder {
-      first(): AlterColumnBuilder;
-      after(columnName: string): AlterColumnBuilder;
+        first(): AlterColumnBuilder;
+        after(columnName: string): AlterColumnBuilder;
     }
 
     //
@@ -399,100 +399,99 @@ declare module "knex" {
     //
 
     interface ColumnInfo {
-      defaultValue: Value;
-      type: string;
-      maxLength: number;
-      nullable: boolean;
+        defaultValue: Value;
+        type: string;
+        maxLength: number;
+        nullable: boolean;
     }
 
     interface Config {
-      debug?: boolean;
-      client?: string;
-      dialect?: string;
-      connection?: string|ConnectionConfig|MariaSqlConnectionConfig|
-        Sqlite3ConnectionConfig|SocketConnectionConfig;
-      pool?: PoolConfig;
-      migrations?: MigrationConfig;
+        debug?: boolean;
+        client?: string;
+        dialect?: string;
+        connection?: string | ConnectionConfig | MariaSqlConnectionConfig |
+        Sqlite3ConnectionConfig | SocketConnectionConfig;
+        pool?: PoolConfig;
+        migrations?: MigrationConfig;
     }
 
     interface ConnectionConfig {
-      host: string;
-      user: string;
-      password: string;
-      database: string;
-      debug?: boolean;
+        host: string;
+        user: string;
+        password: string;
+        database: string;
+        debug?: boolean;
     }
 
     // Config object for mariasql: https://github.com/mscdex/node-mariasql#client-methods
     interface MariaSqlConnectionConfig {
-      user?: string;
-      password?: string;
-      host?: string;
-      port?: number;
-      unixSocket?: string;
-      protocol?: string;
-      db?: string;
-      keepQueries?: boolean;
-      multiStatements?: boolean;
-      connTimeout?: number;
-      pingInterval?: number;
-      secureAuth?: boolean;
-      compress?: boolean;
-      ssl?: boolean|MariaSslConfiguration;
-      local_infile?: boolean;
-      read_default_file?: string;
-      read_default_group?: string;
-      charset?: string;
-      streamHWM?: number;
+        user?: string;
+        password?: string;
+        host?: string;
+        port?: number;
+        unixSocket?: string;
+        protocol?: string;
+        db?: string;
+        keepQueries?: boolean;
+        multiStatements?: boolean;
+        connTimeout?: number;
+        pingInterval?: number;
+        secureAuth?: boolean;
+        compress?: boolean;
+        ssl?: boolean | MariaSslConfiguration;
+        local_infile?: boolean;
+        read_default_file?: string;
+        read_default_group?: string;
+        charset?: string;
+        streamHWM?: number;
     }
 
     interface MariaSslConfiguration {
-      key?: string;
-      cert?: string;
-      ca?: string;
-      capath?: string;
-      cipher?: string;
-      rejectUnauthorized?: boolean;
+        key?: string;
+        cert?: string;
+        ca?: string;
+        capath?: string;
+        cipher?: string;
+        rejectUnauthorized?: boolean;
     }
 
     /** Used with SQLite3 adapter */
     interface Sqlite3ConnectionConfig {
-      filename: string;
-      debug?: boolean;
+        filename: string;
+        debug?: boolean;
     }
 
     interface SocketConnectionConfig {
-      socketPath: string;
-      user: string;
-      password: string;
-      database: string;
-      debug?: boolean;
+        socketPath: string;
+        user: string;
+        password: string;
+        database: string;
+        debug?: boolean;
     }
 
     interface PoolConfig {
-      name?: string;
-      create?: Function;
-      afterCreate?: Function;
-      destroy?: Function;
-      beforeDestroy?: Function;
-      min?: number;
-      max?: number;
-      refreshIdle?: boolean;
-      idleTimeoutMillis?: number;
-      reapIntervalMillis?: number;
-      returnToHead?: boolean;
-      priorityRange?: number;
-      validate?: Function;
-      log?: boolean;
+        name?: string;
+        create?: Function;
+        afterCreate?: Function;
+        destroy?: Function;
+        beforeDestroy?: Function;
+        min?: number;
+        max?: number;
+        refreshIdle?: boolean;
+        idleTimeoutMillis?: number;
+        reapIntervalMillis?: number;
+        returnToHead?: boolean;
+        priorityRange?: number;
+        validate?: Function;
+        log?: boolean;
     }
 
     interface MigrationConfig {
-      database?: string;
-      directory?: string;
-      extension?: string;
-      tableName?: string;
+        database?: string;
+        directory?: string;
+        extension?: string;
+        tableName?: string;
     }
-  }
-
-  export = Knex;
 }
+
+export = Knex;
diff --git a/koa-bodyparser/koa-bodyparser.d.ts b/koa-bodyparser/koa-bodyparser.d.ts
index f8e1b25aae..0c60dd1dbf 100644
--- a/koa-bodyparser/koa-bodyparser.d.ts
+++ b/koa-bodyparser/koa-bodyparser.d.ts
@@ -15,51 +15,50 @@
 
 /// <reference path="../koa/koa.d.ts" />
 
-declare module "koa-bodyparser" {
 
-    import * as Koa from "koa";
 
-    function bodyParser(opts?: {
-        /**
-         * requested encoding. Default is utf-8 by co-body
-         */
-        encode?: string;
+import * as Koa from "koa";
 
-        /**
-         * limit of the urlencoded body. If the body ends up being larger than this limit
-         * a 413 error code is returned. Default is 56kb
-         */
-        formLimit?: string;
+declare function bodyParser(opts?: {
+    /**
+     * requested encoding. Default is utf-8 by co-body
+     */
+    encode?: string;
 
-        /**
-         * limit of the json body. Default is 1mb
-         */
-        jsonLimit?: string;
+    /**
+     * limit of the urlencoded body. If the body ends up being larger than this limit
+     * a 413 error code is returned. Default is 56kb
+     */
+    formLimit?: string;
 
-        /**
-         * when set to true, JSON parser will only accept arrays and objects. Default is true
-         */
-        strict?: boolean;
+    /**
+     * limit of the json body. Default is 1mb
+     */
+    jsonLimit?: string;
 
-        /**
-         * custom json request detect function. Default is null
-         */
-        detectJSON?: (ctx: Koa.Context) => boolean;
+    /**
+     * when set to true, JSON parser will only accept arrays and objects. Default is true
+     */
+    strict?: boolean;
 
-        /**
-         * support extend types
-         */
-        extendTypes?: {
-            json?: string[];
-            form?: string[];
-        }
+    /**
+     * custom json request detect function. Default is null
+     */
+    detectJSON?: (ctx: Koa.Context) => boolean;
 
-        /**
-         * support custom error handle
-         */
-        onerror?: (err: Error, ctx: Koa.Context) => void;
-    }): { (ctx: Koa.Context, next?: () => any): any };
+    /**
+     * support extend types
+     */
+    extendTypes?: {
+        json?: string[];
+        form?: string[];
+    }
 
-    namespace bodyParser {}
-    export = bodyParser;
-}
+    /**
+     * support custom error handle
+     */
+    onerror?: (err: Error, ctx: Koa.Context) => void;
+}): { (ctx: Koa.Context, next?: () => any): any };
+
+declare namespace bodyParser { }
+export = bodyParser;
diff --git a/koa-compose/koa-compose-2.3.1.d.ts b/koa-compose/koa-compose-2.3.1.d.ts
index 9d94f1a2dd..be6c16498d 100644
--- a/koa-compose/koa-compose-2.3.1.d.ts
+++ b/koa-compose/koa-compose-2.3.1.d.ts
@@ -3,18 +3,17 @@
 // Definitions by: jKey Lu <https://github.com/jkeylu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "koa-compose" {
-    function compose(middleware: compose.Middleware[]): compose.ComposedMiddleware;
 
-    namespace compose {
-        interface Middleware {
-            (next?: void): IterableIterator<any>;
-        }
+declare function compose(middleware: compose.Middleware[]): compose.ComposedMiddleware;
 
-        interface ComposedMiddleware {
-            (): IterableIterator<any>;
-        }
+declare namespace compose {
+    interface Middleware {
+        (next?: void): IterableIterator<any>;
     }
 
-    export = compose;
+    interface ComposedMiddleware {
+        (): IterableIterator<any>;
+    }
 }
+
+export = compose;
diff --git a/koa-compose/koa-compose.d.ts b/koa-compose/koa-compose.d.ts
index dcf0565e80..c27bc3f328 100644
--- a/koa-compose/koa-compose.d.ts
+++ b/koa-compose/koa-compose.d.ts
@@ -3,18 +3,17 @@
 // Definitions by: jKey Lu <https://github.com/jkeylu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "koa-compose" {
-    function compose(middleware: compose.Middleware[]): compose.ComposedMiddleware;
 
-    namespace compose {
-        interface Middleware {
-            (context: any, next?: () => Promise<void>): Promise<any>;
-        }
+declare function compose(middleware: compose.Middleware[]): compose.ComposedMiddleware;
 
-        interface ComposedMiddleware {
-            (context: any): Promise<void>;
-        }
+declare namespace compose {
+    interface Middleware {
+        (context: any, next?: () => Promise<void>): Promise<any>;
     }
 
-    export = compose;
+    interface ComposedMiddleware {
+        (context: any): Promise<void>;
+    }
 }
+
+export = compose;
diff --git a/koa-favicon/koa-favicon.d.ts b/koa-favicon/koa-favicon.d.ts
index 618683fc76..cd95a3a151 100644
--- a/koa-favicon/koa-favicon.d.ts
+++ b/koa-favicon/koa-favicon.d.ts
@@ -15,21 +15,20 @@
 
 /// <reference path="../koa/koa.d.ts" />
 
-declare module "koa-favicon" {
 
-    import * as Koa from "koa";
+
+import * as Koa from "koa";
+
+/**
+ * Returns a middleware serving the favicon found on the given path.
+ */
+declare function favicon(path: string, options?: {
 
     /**
-     * Returns a middleware serving the favicon found on the given path.
+     * cache-control max-age directive in ms, defaulting to 1 day.
      */
-    function favicon(path: string, options?: {
+    maxage?: number;
 
-        /**
-         * cache-control max-age directive in ms, defaulting to 1 day.
-         */
-        maxage?: number;
+}): { (ctx: Koa.Context, next?: () => any): any };
 
-    }): { (ctx: Koa.Context, next?: () => any): any };
-
-    export = favicon;
-}
+export = favicon;
diff --git a/koa-json/koa-json.d.ts b/koa-json/koa-json.d.ts
index 24c87a8100..9ef264c405 100644
--- a/koa-json/koa-json.d.ts
+++ b/koa-json/koa-json.d.ts
@@ -14,27 +14,26 @@
  =============================================== */
 /// <reference path="../koa/koa.d.ts" />
 
-declare module "koa-json" {
-    
-    import * as Koa from "koa";
-    
-    function json(opts?:{
-        
-        /** 
-         * default to pretty response [true]
-        */
-        pretty?: boolean,
-        
-        /**
-         * optional query-string param for pretty responses [none]
-         */
-        param?: string,
-        
-        /**
-         * JSON spaces [2]
-         */
-        spaces?: number
-    }) : { (ctx: Koa.Context, next?: () => any): any } ;
-    namespace json {}
-    export = json;
-}
\ No newline at end of file
+
+
+import * as Koa from "koa";
+
+declare function json(opts?: {
+
+    /** 
+     * default to pretty response [true]
+    */
+    pretty?: boolean,
+
+    /**
+     * optional query-string param for pretty responses [none]
+     */
+    param?: string,
+
+    /**
+     * JSON spaces [2]
+     */
+    spaces?: number
+}): { (ctx: Koa.Context, next?: () => any): any };
+declare namespace json { }
+export = json;
diff --git a/koa-router/koa-router.d.ts b/koa-router/koa-router.d.ts
index d289657c84..822735ef3f 100644
--- a/koa-router/koa-router.d.ts
+++ b/koa-router/koa-router.d.ts
@@ -12,246 +12,245 @@
 
 /// <reference path="../koa/koa.d.ts" />
 
-declare module "koa-router" {
 
-    import * as Koa from "koa";
 
-    module Layer {
+import * as Koa from "koa";
 
-        export interface ILayerOptions {
-            name: string;
-            sensitive?: boolean;
-            strict?: boolean;
-        }
+declare module Layer {
 
-    }
-
-    module Router {
-
-        export interface IRouterOptions {
-            /**
-             * Router prefixes 
-             */
-            prefix?: string;
-            /**
-             * HTTP verbs
-             */
-            methods?: string[];
-            routerPath?: string;
-            sensitive?: boolean;
-        }
-
-        export interface IRouterContext extends Koa.Context {
-            /**
-             * url params
-             */
-            params: any;
-        }
-
-        export interface IMiddleware {
-            (ctx: Router.IRouterContext, next?: () => any): any;
-        }
-
-        export interface IRouterAllowedMethodsOptions {
-            /**
-             * throw error instead of setting status and header
-             */
-            throw?: boolean;
-            /**
-             * throw the returned value in place of the default NotImplemented error
-             */
-            notImplemented?: () => any;
-            /**
-             * throw the returned value in place of the default MethodNotAllowed error
-             */
-            methodNotAllowed?: () => any;
-        }
-
-    }
-
-    class Layer {
-
-        opts: Layer.ILayerOptions;
+    export interface ILayerOptions {
         name: string;
-        methods: string[];
-        paramNames: string[];
-        stack: Router.IMiddleware[];
-        regexp: RegExp;
-        path: string;
-
-        constructor(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
-        constructor(path: string, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
-        constructor(path: RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
-        constructor(path: RegExp, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
-
-        /**
-         * Returns whether request `path` matches route.
-         */
-        match(path: string): boolean;
-
-        /**
-         * Returns map of URL parameters for given `path` and `paramNames`.
-         */
-        params(path: string, captures: string[], existingParams?: Object): Object;
-
-        /**
-         * Returns array of regexp url path captures.
-         */
-        captures(path: string): string[];
-
-        /**
-         * Generate URL for route using given `params`.
-         */
-        url(params: Object): string;
-
-        /**
-         * Run validations on route named parameters.
-         */
-        param(param: string, fn: Router.IMiddleware): Layer;
-
-        /**
-         * Prefix route path.
-         */
-        setPrefix(prefix: string): Layer;
+        sensitive?: boolean;
+        strict?: boolean;
     }
 
-    class Router {
-
-        params: Object;
-
-        stack: Array<Layer>;
-
-        /**
-         * Create a new router.
-         */
-        constructor(opt?: Router.IRouterOptions);
-
-        /**
-         * Use given middleware.
-         *
-         * Middleware run in the order they are defined by `.use()`. They are invoked
-         * sequentially, requests start at the first middleware and work their way
-         * "down" the middleware stack.
-         */
-        use(...middleware: Array<Router.IMiddleware>): Router;
-        use(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP get method
-         */
-        get(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        get(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        
-        /**
-         * HTTP post method
-         */
-        post(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        post(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        
-        /**
-         * HTTP put method
-         */
-        put(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        put(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP delete method
-         */
-        delete(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        delete(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * Alias for `router.delete()` because delete is a reserved word
-         */
-        del(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        del(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP head method
-         */
-        head(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        head(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP options method
-         */
-        options(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        options(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * HTTP path method
-         */
-        patch(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        patch(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * Register route with all methods.
-         */
-        all(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
-        all(path: string, ...middleware: Array<Router.IMiddleware>): Router;
-
-        /**
-         * Set the path prefix for a Router instance that was already initialized.
-         */
-        prefix(prefix: string): Router;
-
-        /**
-         * Returns router middleware which dispatches a route matching the request.
-         */
-        routes(): Router.IMiddleware;
-
-        /**
-         * Returns router middleware which dispatches a route matching the request.
-         */
-        middlewares(): Router.IMiddleware;
-
-        /**
-         * Returns separate middleware for responding to `OPTIONS` requests with
-         * an `Allow` header containing the allowed methods, as well as responding
-         * with `405 Method Not Allowed` and `501 Not Implemented` as appropriate.
-         */
-        allowedMethods(options?: Router.IRouterAllowedMethodsOptions): Router.IMiddleware;
-
-        /**
-         * Redirect `source` to `destination` URL with optional 30x status `code`.
-         * 
-         * Both `source` and `destination` can be route names.
-         */
-        redirect(source: string, destination: string, code?: number): Router;
-
-        /**
-         * Create and register a route.
-         */
-        register(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Object): Layer;
-
-        /**
-         * Lookup route with given `name`.
-         */
-        route(name: string): Layer;
-        route(name: string): boolean;
-
-        /**
-         * Generate URL for route. Takes either map of named `params` or series of
-         * arguments (for regular expression routes)
-         */
-        url(name: string, params: Object): string;
-        url(name: string, params: Object): Error;
-
-        /**
-         * Match given `path` and return corresponding routes.
-         */
-        match(name: string, method: string): Object;
-
-        /**
-         * Run middleware for named route parameters. Useful for auto-loading or validation.
-         */
-        param(param: string, middleware: Router.IMiddleware): Router;
-
-        /**
-         * Generate URL from url pattern and given `params`.
-         */
-        static url(path: string, params: Object): string;
-    }
-
-    export = Router;
 }
+
+declare module Router {
+
+    export interface IRouterOptions {
+        /**
+         * Router prefixes 
+         */
+        prefix?: string;
+        /**
+         * HTTP verbs
+         */
+        methods?: string[];
+        routerPath?: string;
+        sensitive?: boolean;
+    }
+
+    export interface IRouterContext extends Koa.Context {
+        /**
+         * url params
+         */
+        params: any;
+    }
+
+    export interface IMiddleware {
+        (ctx: Router.IRouterContext, next?: () => any): any;
+    }
+
+    export interface IRouterAllowedMethodsOptions {
+        /**
+         * throw error instead of setting status and header
+         */
+        throw?: boolean;
+        /**
+         * throw the returned value in place of the default NotImplemented error
+         */
+        notImplemented?: () => any;
+        /**
+         * throw the returned value in place of the default MethodNotAllowed error
+         */
+        methodNotAllowed?: () => any;
+    }
+
+}
+
+declare class Layer {
+
+    opts: Layer.ILayerOptions;
+    name: string;
+    methods: string[];
+    paramNames: string[];
+    stack: Router.IMiddleware[];
+    regexp: RegExp;
+    path: string;
+
+    constructor(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
+    constructor(path: string, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
+    constructor(path: RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
+    constructor(path: RegExp, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
+
+    /**
+     * Returns whether request `path` matches route.
+     */
+    match(path: string): boolean;
+
+    /**
+     * Returns map of URL parameters for given `path` and `paramNames`.
+     */
+    params(path: string, captures: string[], existingParams?: Object): Object;
+
+    /**
+     * Returns array of regexp url path captures.
+     */
+    captures(path: string): string[];
+
+    /**
+     * Generate URL for route using given `params`.
+     */
+    url(params: Object): string;
+
+    /**
+     * Run validations on route named parameters.
+     */
+    param(param: string, fn: Router.IMiddleware): Layer;
+
+    /**
+     * Prefix route path.
+     */
+    setPrefix(prefix: string): Layer;
+}
+
+declare class Router {
+
+    params: Object;
+
+    stack: Array<Layer>;
+
+    /**
+     * Create a new router.
+     */
+    constructor(opt?: Router.IRouterOptions);
+
+    /**
+     * Use given middleware.
+     *
+     * Middleware run in the order they are defined by `.use()`. They are invoked
+     * sequentially, requests start at the first middleware and work their way
+     * "down" the middleware stack.
+     */
+    use(...middleware: Array<Router.IMiddleware>): Router;
+    use(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP get method
+     */
+    get(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    get(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP post method
+     */
+    post(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    post(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP put method
+     */
+    put(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    put(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP delete method
+     */
+    delete(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    delete(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * Alias for `router.delete()` because delete is a reserved word
+     */
+    del(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    del(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP head method
+     */
+    head(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    head(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP options method
+     */
+    options(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    options(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * HTTP path method
+     */
+    patch(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    patch(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * Register route with all methods.
+     */
+    all(name: string, path: string, ...middleware: Array<Router.IMiddleware>): Router;
+    all(path: string, ...middleware: Array<Router.IMiddleware>): Router;
+
+    /**
+     * Set the path prefix for a Router instance that was already initialized.
+     */
+    prefix(prefix: string): Router;
+
+    /**
+     * Returns router middleware which dispatches a route matching the request.
+     */
+    routes(): Router.IMiddleware;
+
+    /**
+     * Returns router middleware which dispatches a route matching the request.
+     */
+    middlewares(): Router.IMiddleware;
+
+    /**
+     * Returns separate middleware for responding to `OPTIONS` requests with
+     * an `Allow` header containing the allowed methods, as well as responding
+     * with `405 Method Not Allowed` and `501 Not Implemented` as appropriate.
+     */
+    allowedMethods(options?: Router.IRouterAllowedMethodsOptions): Router.IMiddleware;
+
+    /**
+     * Redirect `source` to `destination` URL with optional 30x status `code`.
+     * 
+     * Both `source` and `destination` can be route names.
+     */
+    redirect(source: string, destination: string, code?: number): Router;
+
+    /**
+     * Create and register a route.
+     */
+    register(path: string, methods: string[], middleware: Router.IMiddleware, opts?: Object): Layer;
+
+    /**
+     * Lookup route with given `name`.
+     */
+    route(name: string): Layer;
+    route(name: string): boolean;
+
+    /**
+     * Generate URL for route. Takes either map of named `params` or series of
+     * arguments (for regular expression routes)
+     */
+    url(name: string, params: Object): string;
+    url(name: string, params: Object): Error;
+
+    /**
+     * Match given `path` and return corresponding routes.
+     */
+    match(name: string, method: string): Object;
+
+    /**
+     * Run middleware for named route parameters. Useful for auto-loading or validation.
+     */
+    param(param: string, middleware: Router.IMiddleware): Router;
+
+    /**
+     * Generate URL from url pattern and given `params`.
+     */
+    static url(path: string, params: Object): string;
+}
+
+export = Router;
diff --git a/koa-static/koa-static.d.ts b/koa-static/koa-static.d.ts
index 4b95eca3be..3e4d4ea8a6 100644
--- a/koa-static/koa-static.d.ts
+++ b/koa-static/koa-static.d.ts
@@ -15,37 +15,36 @@
 
 /// <reference path="../koa/koa.d.ts" />
 
-declare module "koa-static" {
 
-    import * as Koa from "koa";
 
-    function serve(root: string, opts?: {
-        
-        /**
-         * Default file name, defaults to 'index.html'
-         */
-        index?: boolean | string;
-        
-        /**
-         * If true, serves after return next(),allowing any downstream middleware to respond first.
-         */
-        defer?: boolean;
-        
-        /**
-         * Browser cache max-age in milliseconds. defaults to 0
-         */
-        maxage?: number;
-        
-        /**
-         * Allow transfer of hidden files. defaults to false
-         */
-        hidden?: boolean;
-        
-        /**
-         * Try to serve the gzipped version of a file automatically when gzip is supported by a client and if the requested file with .gz extension exists. defaults to true.
-         */
-        gzip?: boolean;
-    }): { (ctx: Koa.Context, next?: () => any): any };
+import * as Koa from "koa";
 
-    export = serve;
-}
+declare function serve(root: string, opts?: {
+
+    /**
+     * Default file name, defaults to 'index.html'
+     */
+    index?: boolean | string;
+
+    /**
+     * If true, serves after return next(),allowing any downstream middleware to respond first.
+     */
+    defer?: boolean;
+
+    /**
+     * Browser cache max-age in milliseconds. defaults to 0
+     */
+    maxage?: number;
+
+    /**
+     * Allow transfer of hidden files. defaults to false
+     */
+    hidden?: boolean;
+
+    /**
+     * Try to serve the gzipped version of a file automatically when gzip is supported by a client and if the requested file with .gz extension exists. defaults to true.
+     */
+    gzip?: boolean;
+}): { (ctx: Koa.Context, next?: () => any): any };
+
+export = serve;
diff --git a/koa/koa-1.1.2.d.ts b/koa/koa-1.1.2.d.ts
index 35ad65c74f..25361cf4d7 100644
--- a/koa/koa-1.1.2.d.ts
+++ b/koa/koa-1.1.2.d.ts
@@ -1,615 +1,592 @@
-// Type definitions for koa v1.1.2
-// Project: https://github.com/koajs/koa
-// Definitions by: jKey Lu <https://github.com/jkeylu>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/* =================== USAGE ===================
 
-    import * as Koa from 'koa;
-    var app = new Koa();
 
- =============================================== */
+import * as net from 'net';
+import * as http from 'http';
+import * as events from 'events';
+import * as Cookies from 'cookies';
 
-/// <reference path="../node/node.d.ts" />
-/// <reference path="../cookies/cookies.d.ts" />
-
-declare namespace Koa {
-
-    // These open interfaces may be extended in an application-specific manner via declaration merging.
-    // See for example method-override.d.ts (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/method-override/method-override.d.ts)
-    export interface Request { }
-    export interface Response { }
-    export interface Application { }
+interface IRequest extends Koa.Request {
+    /**
+     * Return request header.
+     *
+     * @readonly
+     */
+    header: any;
+    /**
+     * Return request header, alias as request.header
+     *
+     * @readonly
+     */
+    headers: any;
+    /**
+     * Get/Set request URL.
+     */
+    url: string;
+    /**
+     * Get origin of URL.
+     */
+    origin: string;
+    /**
+     * Get full request URL.
+     *
+     * @readonly
+     */
+    href: string;
+    /**
+     * Get/Set request method.
+     */
+    method: string;
+    /**
+     * Get request pathname.
+     * Set pathname, retaining the query-string when present.
+     */
+    path: string;
+    /**
+     * Get parsed query-string.
+     * Set query-string as an object.
+     */
+    query: any;
+    /**
+     * Get/Set query string.
+     */
+    querystring: string;
+    /**
+     * Get the search string. Same as the querystring except it includes the leading ?.
+     * Set the search string. Same as response.querystring= but included for ubiquity.
+     */
+    search: string;
+    /**
+     * Parse the "Host" header field host and support X-Forwarded-Host when a proxy is enabled.
+     *
+     * @readonly
+     */
+    host: string;
+    /**
+     * Parse the "Host" header field hostname and support X-Forwarded-Host when a proxy is enabled.
+     *
+     * @readonly
+     */
+    hostname: string;
+    /**
+     * Check if the request is fresh, aka
+     * Last-Modified and/or the ETag
+     * still match.
+     *
+     * @readonly
+     */
+    fresh: boolean;
+    /**
+     * Check if the request is stale, aka
+     * "Last-Modified" and / or the "ETag" for the
+     * resource has changed.
+     *
+     * @readonly
+     */
+    stale: boolean;
+    /**
+     * Check if the request is idempotent.
+     *
+     * @readonly
+     */
+    idempotent: boolean;
+    /**
+     * Return the request socket.
+     *
+     * @readonly
+     */
+    socket: net.Socket;
+    /**
+     * Return the protocol string "http" or "https"
+     * when requested with TLS. When the proxy setting
+     * is enabled the "X-Forwarded-Proto" header
+     * field will be trusted. If you're running behind
+     * a reverse proxy that supplies https for you this
+     * may be enabled.
+     *
+     * @readonly
+     */
+    protocol: string;
+    /**
+     * Short-hand for:
+     *
+     *    this.protocol == 'https'
+     *
+     * @readonly
+     */
+    secure: boolean;
+    /**
+     * Return the remote address, or when
+     * `app.proxy` is `true` return
+     * the upstream addr.
+     *
+     * @readonly
+     */
+    ip: string;
+    /**
+     * When `app.proxy` is `true`, parse
+     * the "X-Forwarded-For" ip address list.
+     *
+     * For example if the value were "client, proxy1, proxy2"
+     * you would receive the array `["client", "proxy1", "proxy2"]`
+     * where "proxy2" is the furthest down-stream.
+     *
+     * @readonly
+     */
+    ips: string[];
+    /**
+     * Return subdomains as an array.
+     *
+     * Subdomains are the dot-separated parts of the host before the main domain of
+     * the app. By default, the domain of the app is assumed to be the last two
+     * parts of the host. This can be changed by setting `app.subdomainOffset`.
+     *
+     * For example, if the domain is "tobi.ferrets.example.com":
+     * If `app.subdomainOffset` is not set, this.subdomains is `["ferrets", "tobi"]`.
+     * If `app.subdomainOffset` is 3, this.subdomains is `["tobi"]`.
+     *
+     * @readonly
+     */
+    subdomains: string[];
+    /**
+     * Check if the given `type(s)` is acceptable, returning
+     * the best match when true, otherwise `undefined`, in which
+     * case you should respond with 406 "Not Acceptable".
+     *
+     * The `type` value may be a single mime type string
+     * such as "application/json", the extension name
+     * such as "json" or an array `["json", "html", "text/plain"]`. When a list
+     * or array is given the _best_ match, if any is returned.
+     *
+     * Examples:
+     *
+     *     // Accept: text/html
+     *     this.accepts('html');
+     *     // => "html"
+     *
+     *     // Accept: text/*, application/json
+     *     this.accepts('html');
+     *     // => "html"
+     *     this.accepts('text/html');
+     *     // => "text/html"
+     *     this.accepts('json', 'text');
+     *     // => "json"
+     *     this.accepts('application/json');
+     *     // => "application/json"
+     *
+     *     // Accept: text/*, application/json
+     *     this.accepts('image/png');
+     *     this.accepts('png');
+     *     // => undefined
+     *
+     *     // Accept: text/*;q=.5, application/json
+     *     this.accepts(['html', 'json']);
+     *     this.accepts('html', 'json');
+     *     // => "json"
+     */
+    accepts(...types: string[]): string | boolean | string[];
+    accepts(types: string[]): string | boolean | string[];
+    /**
+     * Return accepted encodings or best fit based on `encodings`.
+     *
+     * Given `Accept-Encoding: gzip, deflate`
+     * an array sorted by quality is returned:
+     *
+     *     ['gzip', 'deflate']
+     */
+    acceptsEncodings(...encodings: string[]): string | string[];
+    acceptsEncodings(encodings: string[]): string | string[];
+    /**
+     * Return accepted charsets or best fit based on `charsets`.
+     *
+     * Given `Accept-Charset: utf-8, iso-8859-1;q=0.2, utf-7;q=0.5`
+     * an array sorted by quality is returned:
+     *
+     *     ['utf-8', 'utf-7', 'iso-8859-1']
+     */
+    acceptsCharsets(...charsets: string[]): string | string[];
+    acceptsCharsets(charsets: string[]): string | string[];
+    /**
+     * Return accepted languages or best fit based on `langs`.
+     *
+     * Given `Accept-Language: en;q=0.8, es, pt`
+     * an array sorted by quality is returned:
+     *
+     *     ['es', 'pt', 'en']
+     */
+    acceptsLanguages(...langs: string[]): string | string[];
+    acceptsLanguages(langs: string[]): string | string[];
+    /**
+     * Check if the incoming request contains the "Content-Type"
+     * header field, and it contains any of the give mime `type`s.
+     * If there is no request body, `null` is returned.
+     * If there is no content type, `false` is returned.
+     * Otherwise, it returns the first `type` that matches.
+     *
+     * Examples:
+     *
+     *     // With Content-Type: text/html; charset=utf-8
+     *     this.is('html'); // => 'html'
+     *     this.is('text/html'); // => 'text/html'
+     *     this.is('text/*', 'application/json'); // => 'text/html'
+     *
+     *     // When Content-Type is application/json
+     *     this.is('json', 'urlencoded'); // => 'json'
+     *     this.is('application/json'); // => 'application/json'
+     *     this.is('html', 'application/*'); // => 'application/json'
+     *
+     *     this.is('html'); // => false
+     */
+    is(type: string): string | boolean;
+    is(types: string[]): string | boolean;
+    /**
+     * Return request header.
+     *
+     * The `Referrer` header field is special-cased,
+     * both `Referrer` and `Referer` are interchangeable.
+     *
+     * Examples:
+     *
+     *     this.get('Content-Type');
+     *     // => "text/plain"
+     *
+     *     this.get('content-type');
+     *     // => "text/plain"
+     *
+     *     this.get('Something');
+     *     // => undefined
+     */
+    get(field: string): string;
 }
 
-declare module "koa" {
-    import * as net from 'net';
-    import * as http from 'http';
-    import * as events from 'events';
-    import * as Cookies from 'cookies';
-
-    interface IRequest extends Koa.Request {
-            /**
-             * Return request header.
-             *
-             * @readonly
-             */
-            header: any;
-            /**
-             * Return request header, alias as request.header
-             *
-             * @readonly
-             */
-            headers: any;
-            /**
-             * Get/Set request URL.
-             */
-            url: string;
-            /**
-             * Get origin of URL.
-             */
-            origin: string;
-            /**
-             * Get full request URL.
-             *
-             * @readonly
-             */
-            href: string;
-            /**
-             * Get/Set request method.
-             */
-            method: string;
-            /**
-             * Get request pathname.
-             * Set pathname, retaining the query-string when present.
-             */
-            path: string;
-            /**
-             * Get parsed query-string.
-             * Set query-string as an object.
-             */
-            query: any;
-            /**
-             * Get/Set query string.
-             */
-            querystring: string;
-            /**
-             * Get the search string. Same as the querystring except it includes the leading ?.
-             * Set the search string. Same as response.querystring= but included for ubiquity.
-             */
-            search: string;
-            /**
-             * Parse the "Host" header field host and support X-Forwarded-Host when a proxy is enabled.
-             *
-             * @readonly
-             */
-            host: string;
-            /**
-             * Parse the "Host" header field hostname and support X-Forwarded-Host when a proxy is enabled.
-             *
-             * @readonly
-             */
-            hostname: string;
-            /**
-             * Check if the request is fresh, aka
-             * Last-Modified and/or the ETag
-             * still match.
-             *
-             * @readonly
-             */
-            fresh: boolean;
-            /**
-             * Check if the request is stale, aka
-             * "Last-Modified" and / or the "ETag" for the
-             * resource has changed.
-             *
-             * @readonly
-             */
-            stale: boolean;
-            /**
-             * Check if the request is idempotent.
-             *
-             * @readonly
-             */
-            idempotent: boolean;
-            /**
-             * Return the request socket.
-             *
-             * @readonly
-             */
-            socket: net.Socket;
-            /**
-             * Return the protocol string "http" or "https"
-             * when requested with TLS. When the proxy setting
-             * is enabled the "X-Forwarded-Proto" header
-             * field will be trusted. If you're running behind
-             * a reverse proxy that supplies https for you this
-             * may be enabled.
-             *
-             * @readonly
-             */
-            protocol: string;
-            /**
-             * Short-hand for:
-             *
-             *    this.protocol == 'https'
-             *
-             * @readonly
-             */
-            secure: boolean;
-            /**
-             * Return the remote address, or when
-             * `app.proxy` is `true` return
-             * the upstream addr.
-             *
-             * @readonly
-             */
-            ip: string;
-            /**
-             * When `app.proxy` is `true`, parse
-             * the "X-Forwarded-For" ip address list.
-             *
-             * For example if the value were "client, proxy1, proxy2"
-             * you would receive the array `["client", "proxy1", "proxy2"]`
-             * where "proxy2" is the furthest down-stream.
-             *
-             * @readonly
-             */
-            ips: string[];
-            /**
-             * Return subdomains as an array.
-             *
-             * Subdomains are the dot-separated parts of the host before the main domain of
-             * the app. By default, the domain of the app is assumed to be the last two
-             * parts of the host. This can be changed by setting `app.subdomainOffset`.
-             *
-             * For example, if the domain is "tobi.ferrets.example.com":
-             * If `app.subdomainOffset` is not set, this.subdomains is `["ferrets", "tobi"]`.
-             * If `app.subdomainOffset` is 3, this.subdomains is `["tobi"]`.
-             *
-             * @readonly
-             */
-            subdomains: string[];
-            /**
-             * Check if the given `type(s)` is acceptable, returning
-             * the best match when true, otherwise `undefined`, in which
-             * case you should respond with 406 "Not Acceptable".
-             *
-             * The `type` value may be a single mime type string
-             * such as "application/json", the extension name
-             * such as "json" or an array `["json", "html", "text/plain"]`. When a list
-             * or array is given the _best_ match, if any is returned.
-             *
-             * Examples:
-             *
-             *     // Accept: text/html
-             *     this.accepts('html');
-             *     // => "html"
-             *
-             *     // Accept: text/*, application/json
-             *     this.accepts('html');
-             *     // => "html"
-             *     this.accepts('text/html');
-             *     // => "text/html"
-             *     this.accepts('json', 'text');
-             *     // => "json"
-             *     this.accepts('application/json');
-             *     // => "application/json"
-             *
-             *     // Accept: text/*, application/json
-             *     this.accepts('image/png');
-             *     this.accepts('png');
-             *     // => undefined
-             *
-             *     // Accept: text/*;q=.5, application/json
-             *     this.accepts(['html', 'json']);
-             *     this.accepts('html', 'json');
-             *     // => "json"
-             */
-            accepts(...types: string[]): string|boolean|string[];
-            accepts(types: string[]): string|boolean|string[];
-            /**
-             * Return accepted encodings or best fit based on `encodings`.
-             *
-             * Given `Accept-Encoding: gzip, deflate`
-             * an array sorted by quality is returned:
-             *
-             *     ['gzip', 'deflate']
-             */
-            acceptsEncodings(...encodings: string[]): string|string[];
-            acceptsEncodings(encodings: string[]): string|string[];
-            /**
-             * Return accepted charsets or best fit based on `charsets`.
-             *
-             * Given `Accept-Charset: utf-8, iso-8859-1;q=0.2, utf-7;q=0.5`
-             * an array sorted by quality is returned:
-             *
-             *     ['utf-8', 'utf-7', 'iso-8859-1']
-             */
-            acceptsCharsets(...charsets: string[]): string|string[];
-            acceptsCharsets(charsets: string[]): string|string[];
-            /**
-             * Return accepted languages or best fit based on `langs`.
-             *
-             * Given `Accept-Language: en;q=0.8, es, pt`
-             * an array sorted by quality is returned:
-             *
-             *     ['es', 'pt', 'en']
-             */
-            acceptsLanguages(...langs: string[]): string|string[];
-            acceptsLanguages(langs: string[]): string|string[];
-            /**
-             * Check if the incoming request contains the "Content-Type"
-             * header field, and it contains any of the give mime `type`s.
-             * If there is no request body, `null` is returned.
-             * If there is no content type, `false` is returned.
-             * Otherwise, it returns the first `type` that matches.
-             *
-             * Examples:
-             *
-             *     // With Content-Type: text/html; charset=utf-8
-             *     this.is('html'); // => 'html'
-             *     this.is('text/html'); // => 'text/html'
-             *     this.is('text/*', 'application/json'); // => 'text/html'
-             *
-             *     // When Content-Type is application/json
-             *     this.is('json', 'urlencoded'); // => 'json'
-             *     this.is('application/json'); // => 'application/json'
-             *     this.is('html', 'application/*'); // => 'application/json'
-             *
-             *     this.is('html'); // => false
-             */
-            is(type: string): string|boolean;
-            is(types: string[]): string|boolean;
-            /**
-             * Return request header.
-             *
-             * The `Referrer` header field is special-cased,
-             * both `Referrer` and `Referer` are interchangeable.
-             *
-             * Examples:
-             *
-             *     this.get('Content-Type');
-             *     // => "text/plain"
-             *
-             *     this.get('content-type');
-             *     // => "text/plain"
-             *
-             *     this.get('Something');
-             *     // => undefined
-             */
-            get(field: string): string;
-    }
-
-    interface IResponse extends Koa.Response{
-            /**
-             * Get/Set response status code.
-             */
-            status: number;
-            /**
-             * Get/Set response status message
-             */
-            message: string;
-            /**
-             * Get/Set response body.
-             */
-            body: any;
-            /**
-             * Return parsed response Content-Length when present.
-             * Set Content-Length field to `n`.
-             */
-            length: number;
-            /**
-             * Check if a header has been written to the socket.
-             *
-             * @readonly
-             */
-            headerSent: boolean;
-            /**
-             * Vary on `field`.
-             */
-            vary(field: string): void;
-            /**
-             * Perform a 302 redirect to `url`.
-             *
-             * The string "back" is special-cased
-             * to provide Referrer support, when Referrer
-             * is not present `alt` or "/" is used.
-             *
-             * Examples:
-             *
-             *    this.redirect('back');
-             *    this.redirect('back', '/index.html');
-             *    this.redirect('/login');
-             *    this.redirect('http://google.com');
-             */
-            redirect(url: string): void;
-            redirect(url: string, alt: string): void;
-            /**
-             * Set Content-Disposition header to "attachment" with optional `filename`.
-             */
-            attachment(filename: string): void;
-            /**
-             * Return the response mime type void of
-             * parameters such as "charset".
-             *
-             * Set Content-Type response header with `type` through `mime.lookup()`
-             * when it does not contain a charset.
-             *
-             * Examples:
-             *
-             *     this.type = '.html';
-             *     this.type = 'html';
-             *     this.type = 'json';
-             *     this.type = 'application/json';
-             *     this.type = 'png';
-             */
-            type: string;
-            /**
-             * Get the Last-Modified date in Date form, if it exists.
-             * Set the Last-Modified date using a string or a Date.
-             *
-             *     this.response.lastModified = new Date();
-             *     this.response.lastModified = '2013-09-13';
-             */
-            lastModified: Date;
-            /**
-             * Get the ETag of a response.
-             * Set the ETag of a response.
-             * This will normalize the quotes if necessary.
-             *
-             *     this.response.etag = 'md5hashsum';
-             *     this.response.etag = '"md5hashsum"';
-             *     this.response.etag = 'W/"123456789"';
-             */
-            etag: string;
-            /**
-             * Set header `field` to `val`, or pass
-             * an object of header fields.
-             *
-             * Examples:
-             *
-             *    this.set('Foo', ['bar', 'baz']);
-             *    this.set('Accept', 'application/json');
-             *    this.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
-             */
-            set(field: any): void;
-            set(field: string, val: string): void;
-            set(field: string, val: any[]): void;
-            /**
-             * Append additional header `field` with value `val`.
-             *
-             * Examples:
-             *
-             *    this.append('Link', ['<http://localhost/>', '<http://localhost:3000/>']);
-             *    this.append('Set-Cookie', 'foo=bar; Path=/; HttpOnly');
-             *    this.append('Warning', '199 Miscellaneous warning');
-             */
-            append(field: string, val: string): void;
-            append(field: string, val: any[]): void;
-            /**
-             * Remove header `field`.
-             */
-            remove(field: string): void;
-            /**
-             * Checks if the request is writable.
-             * Tests for the existence of the socket
-             * as node sometimes does not set it.
-             *
-             * @readonly
-             * @private
-             */
-            writable: boolean;
-    }
-
-    namespace koa {
-        interface BaseRequest extends IRequest {
-            /**
-             * Get the charset when present or undefined.
-             *
-             * @readonly
-             */
-            charset: string;
-            /**
-             * Return parsed Content-Length when present.
-             *
-             * @readonly
-             */
-            length: number;
-            /**
-             * Return the request mime type void of
-             * parameters such as "charset".
-             *
-             * @readonly
-             */
-            type: string;
-            /**
-             * Inspect implementation.
-             */
-            inspect(): any;
-            /**
-             * Return JSON representation.
-             */
-            toJSON(): any;
-        }
-
-        interface BaseResponse extends IResponse {
-            /**
-             * Return the request socket.
-             *
-             * @readonly
-             */
-            socket: net.Socket;
-            /**
-             * Return response header.
-             *
-             * @readonly
-             */
-            header: any;
-            /**
-             * Return response header, alias as response.header
-             */
-            headers: any;
-            /**
-             * Check whether the response is one of the listed types.
-             * Pretty much the same as `this.request.is()`.
-             */
-            is(type: string): string|boolean;
-            is(types: string[]): string|boolean;
-            /**
-             * Return response header.
-             *
-             * Examples:
-             *
-             *     this.get('Content-Type');
-             *     // => "text/plain"
-             *
-             *     this.get('content-type');
-             *     // => "text/plain"
-             */
-            get(field: string): string;
-            /**
-             * Inspect implementation.
-             */
-            inspect(): any;
-            /**
-             * Return JSON representation.
-             */
-            toJSON(): any;
-        }
-
-        interface BaseContext extends IRequest, IResponse {
-            /**
-             * util.inspect() implementation, which
-             * just returns the JSON output.
-             */
-            inspect(): any;
-            /**
-             * Return JSON representation.
-             *
-             * Here we explicitly invoke .toJSON() on each
-             * object, as iteration will otherwise fail due
-             * to the getters and cause utilities such as
-             * clone() to fail.
-             */
-            toJSON(): any;
-            /**
-             * Similar to .throw(), adds assertion.
-             *
-             *    this.assert(this.user, 401, 'Please login!');
-             *
-             * See: https://github.com/jshttp/http-assert
-             */
-            assert(test: any, status: number, message: string): void;
-            /**
-             * Throw an error with `msg` and optional `status`
-             * defaulting to 500. Note that these are user-level
-             * errors, and the message may be exposed to the client.
-             *
-             *    this.throw(403)
-             *    this.throw('name required', 400)
-             *    this.throw(400, 'name required')
-             *    this.throw('something exploded')
-             *    this.throw(new Error('invalid'), 400);
-             *    this.throw(400, new Error('invalid'));
-             *
-             * See: https://github.com/jshttp/http-errors
-             */
-            throw(...args: any[]): void;
-            /**
-             * Default error handling.
-             *
-             * @private
-             */
-            onerror(err: Error): void;
-        }
-
-        interface Request extends BaseRequest {
-            app: Application;
-            ctx: Context;
-            response: Response;
-            req: http.IncomingMessage;
-            res: http.ServerResponse;
-        }
-
-        interface Response extends BaseResponse {
-            app: Application;
-            ctx: Context;
-            request: Request;
-            req: http.IncomingMessage;
-            res: http.ServerResponse;
-        }
-
-        interface Context extends BaseContext {
-            request: Request;
-            response: Response;
-            app: Application;
-            req: http.IncomingMessage;
-            res: http.ServerResponse;
-            originalUrl: string;
-            cookies: Cookies.ICookies;
-            accept: any;
-            state: any;
-        }
-
-        interface Application extends events.EventEmitter , Koa.Application{
-            env: string;
-            subdomainOffset: number;
-            middleware: any[];
-            proxy: boolean;
-            context: BaseContext;
-            request: BaseRequest;
-            response: BaseResponse;
-            /**
-             * Shorthand for:
-             *
-             *    http.createServer(app.callback()).listen(...)
-             */
-            listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
-            listen(port: number, hostname?: string, callback?: Function): http.Server;
-            listen(path: string, callback?: Function): http.Server;
-            listen(handle: any, listeningListener?: Function): http.Server;
-            listen(): http.Server;
-            /**
-             * Return JSON representation.
-             * We only bother showing settings.
-             */
-            inspect(): any;
-            /**
-             * Return JSON representation.
-             * We only bother showing settings.
-             */
-            toJSON(): any;
-            /**
-             * Use the given middleware `fn`.
-             */
-            use(fn: Function): Application;
-            /**
-             * Return a request handler callback
-             * for node's native http server.
-             */
-            callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
-            /**
-             * Initialize a new context.
-             *
-             * @private
-             */
-            createContext(req: http.IncomingMessage, res: http.ServerResponse): Context;
-            /**
-             * Default error handler.
-             *
-             * @private
-             */
-            onerror(err: Error): void;
-        }
-    }
-
-    interface KoaStatic {
-        new (): koa.Application;
-        (): koa.Application;
-    }
-
-    var koa: KoaStatic;
-
-    export = koa;
+interface IResponse extends Koa.Response {
+    /**
+     * Get/Set response status code.
+     */
+    status: number;
+    /**
+     * Get/Set response status message
+     */
+    message: string;
+    /**
+     * Get/Set response body.
+     */
+    body: any;
+    /**
+     * Return parsed response Content-Length when present.
+     * Set Content-Length field to `n`.
+     */
+    length: number;
+    /**
+     * Check if a header has been written to the socket.
+     *
+     * @readonly
+     */
+    headerSent: boolean;
+    /**
+     * Vary on `field`.
+     */
+    vary(field: string): void;
+    /**
+     * Perform a 302 redirect to `url`.
+     *
+     * The string "back" is special-cased
+     * to provide Referrer support, when Referrer
+     * is not present `alt` or "/" is used.
+     *
+     * Examples:
+     *
+     *    this.redirect('back');
+     *    this.redirect('back', '/index.html');
+     *    this.redirect('/login');
+     *    this.redirect('http://google.com');
+     */
+    redirect(url: string): void;
+    redirect(url: string, alt: string): void;
+    /**
+     * Set Content-Disposition header to "attachment" with optional `filename`.
+     */
+    attachment(filename: string): void;
+    /**
+     * Return the response mime type void of
+     * parameters such as "charset".
+     *
+     * Set Content-Type response header with `type` through `mime.lookup()`
+     * when it does not contain a charset.
+     *
+     * Examples:
+     *
+     *     this.type = '.html';
+     *     this.type = 'html';
+     *     this.type = 'json';
+     *     this.type = 'application/json';
+     *     this.type = 'png';
+     */
+    type: string;
+    /**
+     * Get the Last-Modified date in Date form, if it exists.
+     * Set the Last-Modified date using a string or a Date.
+     *
+     *     this.response.lastModified = new Date();
+     *     this.response.lastModified = '2013-09-13';
+     */
+    lastModified: Date;
+    /**
+     * Get the ETag of a response.
+     * Set the ETag of a response.
+     * This will normalize the quotes if necessary.
+     *
+     *     this.response.etag = 'md5hashsum';
+     *     this.response.etag = '"md5hashsum"';
+     *     this.response.etag = 'W/"123456789"';
+     */
+    etag: string;
+    /**
+     * Set header `field` to `val`, or pass
+     * an object of header fields.
+     *
+     * Examples:
+     *
+     *    this.set('Foo', ['bar', 'baz']);
+     *    this.set('Accept', 'application/json');
+     *    this.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
+     */
+    set(field: any): void;
+    set(field: string, val: string): void;
+    set(field: string, val: any[]): void;
+    /**
+     * Append additional header `field` with value `val`.
+     *
+     * Examples:
+     *
+     *    this.append('Link', ['<http://localhost/>', '<http://localhost:3000/>']);
+     *    this.append('Set-Cookie', 'foo=bar; Path=/; HttpOnly');
+     *    this.append('Warning', '199 Miscellaneous warning');
+     */
+    append(field: string, val: string): void;
+    append(field: string, val: any[]): void;
+    /**
+     * Remove header `field`.
+     */
+    remove(field: string): void;
+    /**
+     * Checks if the request is writable.
+     * Tests for the existence of the socket
+     * as node sometimes does not set it.
+     *
+     * @readonly
+     * @private
+     */
+    writable: boolean;
 }
+
+declare namespace koa {
+    interface BaseRequest extends IRequest {
+        /**
+         * Get the charset when present or undefined.
+         *
+         * @readonly
+         */
+        charset: string;
+        /**
+         * Return parsed Content-Length when present.
+         *
+         * @readonly
+         */
+        length: number;
+        /**
+         * Return the request mime type void of
+         * parameters such as "charset".
+         *
+         * @readonly
+         */
+        type: string;
+        /**
+         * Inspect implementation.
+         */
+        inspect(): any;
+        /**
+         * Return JSON representation.
+         */
+        toJSON(): any;
+    }
+
+    interface BaseResponse extends IResponse {
+        /**
+         * Return the request socket.
+         *
+         * @readonly
+         */
+        socket: net.Socket;
+        /**
+         * Return response header.
+         *
+         * @readonly
+         */
+        header: any;
+        /**
+         * Return response header, alias as response.header
+         */
+        headers: any;
+        /**
+         * Check whether the response is one of the listed types.
+         * Pretty much the same as `this.request.is()`.
+         */
+        is(type: string): string | boolean;
+        is(types: string[]): string | boolean;
+        /**
+         * Return response header.
+         *
+         * Examples:
+         *
+         *     this.get('Content-Type');
+         *     // => "text/plain"
+         *
+         *     this.get('content-type');
+         *     // => "text/plain"
+         */
+        get(field: string): string;
+        /**
+         * Inspect implementation.
+         */
+        inspect(): any;
+        /**
+         * Return JSON representation.
+         */
+        toJSON(): any;
+    }
+
+    interface BaseContext extends IRequest, IResponse {
+        /**
+         * util.inspect() implementation, which
+         * just returns the JSON output.
+         */
+        inspect(): any;
+        /**
+         * Return JSON representation.
+         *
+         * Here we explicitly invoke .toJSON() on each
+         * object, as iteration will otherwise fail due
+         * to the getters and cause utilities such as
+         * clone() to fail.
+         */
+        toJSON(): any;
+        /**
+         * Similar to .throw(), adds assertion.
+         *
+         *    this.assert(this.user, 401, 'Please login!');
+         *
+         * See: https://github.com/jshttp/http-assert
+         */
+        assert(test: any, status: number, message: string): void;
+        /**
+         * Throw an error with `msg` and optional `status`
+         * defaulting to 500. Note that these are user-level
+         * errors, and the message may be exposed to the client.
+         *
+         *    this.throw(403)
+         *    this.throw('name required', 400)
+         *    this.throw(400, 'name required')
+         *    this.throw('something exploded')
+         *    this.throw(new Error('invalid'), 400);
+         *    this.throw(400, new Error('invalid'));
+         *
+         * See: https://github.com/jshttp/http-errors
+         */
+        throw(...args: any[]): void;
+        /**
+         * Default error handling.
+         *
+         * @private
+         */
+        onerror(err: Error): void;
+    }
+
+    interface Request extends BaseRequest {
+        app: Application;
+        ctx: Context;
+        response: Response;
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+    }
+
+    interface Response extends BaseResponse {
+        app: Application;
+        ctx: Context;
+        request: Request;
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+    }
+
+    interface Context extends BaseContext {
+        request: Request;
+        response: Response;
+        app: Application;
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+        originalUrl: string;
+        cookies: Cookies.ICookies;
+        accept: any;
+        state: any;
+    }
+
+    interface Application extends events.EventEmitter, Koa.Application {
+        env: string;
+        subdomainOffset: number;
+        middleware: any[];
+        proxy: boolean;
+        context: BaseContext;
+        request: BaseRequest;
+        response: BaseResponse;
+        /**
+         * Shorthand for:
+         *
+         *    http.createServer(app.callback()).listen(...)
+         */
+        listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
+        listen(port: number, hostname?: string, callback?: Function): http.Server;
+        listen(path: string, callback?: Function): http.Server;
+        listen(handle: any, listeningListener?: Function): http.Server;
+        listen(): http.Server;
+        /**
+         * Return JSON representation.
+         * We only bother showing settings.
+         */
+        inspect(): any;
+        /**
+         * Return JSON representation.
+         * We only bother showing settings.
+         */
+        toJSON(): any;
+        /**
+         * Use the given middleware `fn`.
+         */
+        use(fn: Function): Application;
+        /**
+         * Return a request handler callback
+         * for node's native http server.
+         */
+        callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
+        /**
+         * Initialize a new context.
+         *
+         * @private
+         */
+        createContext(req: http.IncomingMessage, res: http.ServerResponse): Context;
+        /**
+         * Default error handler.
+         *
+         * @private
+         */
+        onerror(err: Error): void;
+    }
+}
+
+interface KoaStatic {
+    new (): koa.Application;
+    (): koa.Application;
+}
+
+declare var koa: KoaStatic;
+
+export = koa;
diff --git a/koa/koa.d.ts b/koa/koa.d.ts
index 922b243511..1f500f1f49 100644
--- a/koa/koa.d.ts
+++ b/koa/koa.d.ts
@@ -15,12 +15,12 @@
  =============================================== */
 /// <reference path="../node/node.d.ts" />
 
-declare module "koa" {
-  import { EventEmitter } from "events";
-  import * as http from "http";
-  import * as net from "net";
 
-  namespace Koa {
+import { EventEmitter } from "events";
+import * as http from "http";
+import * as net from "net";
+
+declare namespace Koa {
     export interface Context extends Request, Response {
         body?: any;
         request?: Request;
@@ -115,27 +115,26 @@ declare module "koa" {
         toJSON?: () => any;
         inspect?: () => any;
     }
-  }
-
-  class Koa extends EventEmitter {
-      keys: Array<string>;
-      subdomainOffset: number;
-      proxy: Boolean;
-      server: http.Server;
-      env: string;
-      context: Koa.Context;
-      request: Koa.Request;
-      response: Koa.Response;
-      silent: Boolean;
-      constructor();
-      use(middleware: (ctx: Koa.Context, next: Function) => any): Koa;
-      callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
-      listen(port: number, callback?: Function): http.Server;
-      toJSON(): any;
-      inspect(): any;
-      onerror(err: any): void;
-  }
-
-  namespace Koa {}
-  export = Koa;
 }
+
+declare class Koa extends EventEmitter {
+    keys: Array<string>;
+    subdomainOffset: number;
+    proxy: Boolean;
+    server: http.Server;
+    env: string;
+    context: Koa.Context;
+    request: Koa.Request;
+    response: Koa.Response;
+    silent: Boolean;
+    constructor();
+    use(middleware: (ctx: Koa.Context, next: Function) => any): Koa;
+    callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
+    listen(port: number, callback?: Function): http.Server;
+    toJSON(): any;
+    inspect(): any;
+    onerror(err: any): void;
+}
+
+declare namespace Koa { }
+export = Koa;
diff --git a/kue/kue.d.ts b/kue/kue.d.ts
index 653f3992aa..aa0be0bab7 100644
--- a/kue/kue.d.ts
+++ b/kue/kue.d.ts
@@ -7,12 +7,12 @@
 /// <reference path="../redis/redis.d.ts" />
 /// <reference path="../express/express.d.ts" />
 
-declare module "kue" {
-  import events = require('events');
-  import express = require('express');
-  import redis = require('redis');
 
-  export class Queue extends events.EventEmitter {
+import events = require('events');
+import express = require('express');
+import redis = require('redis');
+
+declare export class Queue extends events.EventEmitter {
     name: string;
     id: string;
     promoter: any;
@@ -49,17 +49,17 @@ declare module "kue" {
     inactiveCount(type: string, fn: Function): Queue;
     activeCount(type: string, fn: Function): Queue;
     delayedCount(type: string, fn: Function): Queue;
-  }
+}
 
-  interface Priorities {
+interface Priorities {
     low: number;
     normal: number;
     medium: number;
     high: number;
     critical: number;
-  }
+}
 
-  export class Job extends events.EventEmitter {
+declare export class Job extends events.EventEmitter {
     public id: number;
     public type: string;
     public data: any;
@@ -83,16 +83,16 @@ declare module "kue" {
     set(key: string, val: string, fn?: Function): Job;
     get(key: string, fn?: Function): Job;
     progress(complete: number, total: number, data?: any): Job;
-    delay(ms:number|Date): Job;
+    delay(ms: number | Date): Job;
     removeOnComplete(param: any): void;
     backoff(param: any): void;
     ttl(param: any): void;
     private _getBackoffImpl(): void;
-    priority(level: string|number): Job;
+    priority(level: string | number): Job;
     attempt(fn: Function): Job;
     reattempt(attempt: number, fn?: Function): void;
     attempts(n: number): Job;
-    searchKeys(keys: string[]|string): Job;
+    searchKeys(keys: string[] | string): Job;
     remove(fn?: Function): Job;
     state(state: string, fn?: Function): Job;
     error(err: Error): Job;
@@ -104,9 +104,9 @@ declare module "kue" {
     save(fn?: Function): Job;
     update(fn?: Function): Job;
     subscribe(fn?: Function): Job;
-  }
+}
 
-  class Worker extends events.EventEmitter {
+declare class Worker extends events.EventEmitter {
     queue: Queue;
     type: string;
     client: redis.RedisClient;
@@ -123,27 +123,26 @@ declare module "kue" {
     shutdown(timeout: number, fn: Function): void;
     emitJobEvent(event: Object, job: Job, arg1: any, arg2: any): void;
     resume(): boolean;
-  }
+}
 
-  interface Redis {
+interface Redis {
     configureFactory(options: Object, queue: Queue): void;
     createClient(): redis.RedisClient;
     createClientFactory(options: Object): redis.RedisClient;
     client(): redis.RedisClient;
     pubsubClient(): redis.RedisClient;
     reset(): void;
-  }
+}
 
-  interface TestMode {
+interface TestMode {
     jobs: Job[];
     enter(): void;
     exit(): void;
     clear(): void;
-  }
+}
 
-  export var app: express.Application;
-  export var redis: Redis;
-  export var workers: Worker[];
+declare export var app: express.Application;
+declare export var redis: Redis;
+declare export var workers: Worker[];
 
-  export function createQueue(options?: Object): Queue;
-}
\ No newline at end of file
+declare export function createQueue(options?: Object): Queue;
diff --git a/lazypipe/lazypipe.d.ts b/lazypipe/lazypipe.d.ts
index 1a38e7de6b..b832957eca 100644
--- a/lazypipe/lazypipe.d.ts
+++ b/lazypipe/lazypipe.d.ts
@@ -5,27 +5,24 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "lazypipe"
-{
-    interface IPipelineBuilder
-    {
-        /**
-         * Returns a stream where all the internal steps are processed sequentially
-         * and the final result is passed on.
-         */
-        (): NodeJS.ReadWriteStream;
 
-        /**
-         * Creates a new lazy pipeline with all the previous steps, and the new step added to the end.
-         * @param fn A stream creation function to call when the pipeline is created later.
-         * @param args Any remaining arguments are saved and passed into fn when the pipeline is created.
-         */
-        pipe(fn: Function, ...args: any[]): IPipelineBuilder;
-    }
+interface IPipelineBuilder {
+    /**
+     * Returns a stream where all the internal steps are processed sequentially
+     * and the final result is passed on.
+     */
+    (): NodeJS.ReadWriteStream;
 
     /**
-     * Initializes a lazypipe.
+     * Creates a new lazy pipeline with all the previous steps, and the new step added to the end.
+     * @param fn A stream creation function to call when the pipeline is created later.
+     * @param args Any remaining arguments are saved and passed into fn when the pipeline is created.
      */
-    function lazypipe(): IPipelineBuilder;
-    export = lazypipe;
+    pipe(fn: Function, ...args: any[]): IPipelineBuilder;
 }
+
+/**
+ * Initializes a lazypipe.
+ */
+declare function lazypipe(): IPipelineBuilder;
+export = lazypipe;
diff --git a/less-middleware/less-middleware.d.ts b/less-middleware/less-middleware.d.ts
index f9d12a6f19..1eac3f0fbb 100644
--- a/less-middleware/less-middleware.d.ts
+++ b/less-middleware/less-middleware.d.ts
@@ -12,97 +12,96 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "less-middleware" {
-    import express = require('express');
+
+import express = require('express');
+
+/**
+ * Middleware created to allow processing of Less files for Connect JS framework
+ * and by extension the Express JS framework
+ */
+declare function lessMiddleware(source: string, options?: {
+    /**
+    * Show more verbose logging?
+    */
+    debug?: boolean;
 
     /**
-     * Middleware created to allow processing of Less files for Connect JS framework
-     * and by extension the Express JS framework
+    * Destination directory to output the compiled .css files.
+    */
+    dest?: string;
+
+    /**
+     * Always re-compile less files on each request.
      */
-    function lessMiddleware(source: string, options?: {
-        /**
-        * Show more verbose logging?
-        */
-        debug?: boolean;
+    force?: boolean;
+
+    /**
+     * Only recompile once after each server restart.
+     * Useful for reducing disk i/o on production.
+     */
+    once?: boolean;
+
+    /**
+     * Common root of the source and destination.
+     * It is prepended to both the source and destination before being used.
+     */
+    pathRoot?: string;
+
+    /**
+     * Object containing functions relevant to preprocessing data.
+     */
+    postprocess?: {
 
         /**
-        * Destination directory to output the compiled .css files.
-        */
-        dest?: string;
-
-        /**
-         * Always re-compile less files on each request.
+         * Function that modifies the compiled css output before being stored.
          */
-        force?: boolean;
+        css?(css: string, req: express.Request): string;
+    };
+
+    /**
+     * Object containing functions relevant to preprocessing data.
+     */
+    preprocess?: {
 
         /**
-         * Only recompile once after each server restart.
-         * Useful for reducing disk i/o on production.
+         * Function that modifies the raw less output before being parsed and compiled.
          */
-        once?: boolean;
+        less?(css: string, req: express.Request): string;
 
         /**
-         * Common root of the source and destination.
-         * It is prepended to both the source and destination before being used.
+         * Function that modifies the less pathname before being loaded from the filesystem.
          */
-        pathRoot?: string;
+        path?(pathname: string, req: express.Request): string;
 
         /**
-         * Object containing functions relevant to preprocessing data.
+         * Function that modifies the import paths used by the less parser per request.
          */
-        postprocess?: {
+        importPaths?(paths: string[], req: express.Request): string[];
+    };
 
-          /**
-           * Function that modifies the compiled css output before being stored.
-           */
-          css?(css: string, req: express.Request): string;
-        };
+    /**
+     * Options for the less render.
+     */
+    render?: {
 
-        /**
-         * Object containing functions relevant to preprocessing data.
-         */
-        preprocess?: {
+        compress?: string;
+        yuicompress?: boolean;
+        paths?: string[];
+    };
 
-            /**
-             * Function that modifies the raw less output before being parsed and compiled.
-             */
-            less?(css: string, req: express.Request): string;
+    /**
+     * Function that is in charge of storing the css in the filesystem.
+     */
+    storeCss?(pathname: string, css: string, req: express.Request, next: Function): void;
 
-            /**
-             * Function that modifies the less pathname before being loaded from the filesystem.
-             */
-            path?(pathname: string, req: express.Request): string;
+    /**
+     * Path to a JSON file that will be used to cache less data across server restarts.
+     * This can greatly speed up initial load time after a server restart - if the less
+     * files haven't changed and the css files still exist, specifying this option will
+     * mean that the less files don't need to be recompiled after a server restart.  
+     */
+    cacheFile?: string;
 
-            /**
-             * Function that modifies the import paths used by the less parser per request.
-             */
-            importPaths?(paths: string[], req: express.Request): string[];
-        };
+}): express.RequestHandler;
 
-        /**
-         * Options for the less render.
-         */
-        render?: {
-
-            compress?: string;
-            yuicompress?: boolean;
-            paths?: string[];
-        };
-
-        /**
-         * Function that is in charge of storing the css in the filesystem.
-         */
-        storeCss?(pathname: string, css: string, req: express.Request, next: Function): void;
-
-        /**
-         * Path to a JSON file that will be used to cache less data across server restarts.
-         * This can greatly speed up initial load time after a server restart - if the less
-         * files haven't changed and the css files still exist, specifying this option will
-         * mean that the less files don't need to be recompiled after a server restart.  
-         */
-        cacheFile?: string;
-
-    }): express.RequestHandler;
-
-    export = lessMiddleware;
-}
+export = lessMiddleware;
diff --git a/libxmljs/libxmljs.d.ts b/libxmljs/libxmljs.d.ts
index 8cd4720b32..d76cdbf79e 100644
--- a/libxmljs/libxmljs.d.ts
+++ b/libxmljs/libxmljs.d.ts
@@ -5,111 +5,110 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "libxmljs" {
 
-    import events = require('events');
 
-    export function parseXml(source:string):XMLDocument;
-    export function parseHtml(source:string):HTMLDocument;
-    export function parseXmlString(source:string):XMLDocument;
-    export function parseHtmlString(source:string):HTMLDocument;
- 
- 
-    export class XMLDocument {
-        constructor(version:number, encoding:string);
-        child(idx:number):Element;
-        childNodes():Element[];
-        errors():SyntaxError[];
-        encoding():string;
-        encoding(enc:string):void;
-        find(xpath:string):Element[];
-        get(xpath:string):Element;
-        node(name:string, content:string):Element;
-        root():Element;
-        toString():string;
-        validate(xsdDoc:XMLDocument): boolean;
-        validationErrors: XmlError[];
-        version():Number;
-    }
- 
-    export class HTMLDocument extends XMLDocument {
- 
-    }
- 
- 
-    export class Element {
-        constructor(doc:XMLDocument, name:string, content?:string);
-        name():string;
-        name(newName:string):void;
-        text():string;
-        attr(name:string):Attribute;
-        attr(attr:Attribute):void;
-        attr(attrObject:{[key:string]:string;}):void;
-        attrs():Attribute[];
-        parent():Element;
-        doc():XMLDocument;
-        child(idx:number):Element;
-        childNodes():Element[];
-        addChild(child:Element):Element;
-        nextSibling():Element;
-        nextElement():Element;
-        addNextSibling(siblingNode:Element):Element;
-        prevSibling():Element;
-        prevElement():Element;
-        addPrevSibling(siblingNode:Element):Element;
-        find(xpath:string):Element[];
-        find(xpath:string, ns_uri:string):Element[];
-        find(xpath:string, namespaces:{[key:string]:string;}):Element[];
-        get(xpath:string):Element;
-        get(xpath:string, ns_uri:string):Element;
-        get(xpath:string, ns_uri:{[key:string]:string;}):Element;
-        defineNamespace(href:string):Namespace;
-        defineNamespace(prefix:string, href:string):Namespace;
-        namespace():Namespace;
-        namespace(ns:Namespace):void;
-        namespace(href:string):void;
-        namespace(prefix:string, href:string):void;
-        remove():void;
-        path():string;
-        type():string;
-    }
- 
- 
-    export class Attribute {
-        constructor(node:Element, name:string, value:string);
-        constructor(node:Element, name:string, value:string, ns:Namespace);
-        name():string;
-        namespace():Namespace;
-        namespace(ns:Namespace):Namespace;
-        nextSibling():Attribute;
-        node():Element;
-        prevSibling():Attribute;
-        remove():void;
-        value():string;
-    }
- 
-    export class Namespace {
-        constructor(node:Element, prefix:string, href:string);
-        href():string;
-        prefix():string;
-    }
- 
-    export class SaxParser extends events.EventEmitter {
-        parseString(source:string):boolean;
-    }
- 
- 
-    export class SaxPushParser extends events.EventEmitter {
-        push(source:string):boolean;
-    }
+import events = require('events');
 
-    export interface XmlError {
-        domain: number;
-        code: number;
-        message: string;
-        level: number;
-        file?: string;
-        column: number;
-        line: number;
-    }
+declare export function parseXml(source: string): XMLDocument;
+declare export function parseHtml(source: string): HTMLDocument;
+declare export function parseXmlString(source: string): XMLDocument;
+declare export function parseHtmlString(source: string): HTMLDocument;
+
+
+declare export class XMLDocument {
+    constructor(version: number, encoding: string);
+    child(idx: number): Element;
+    childNodes(): Element[];
+    errors(): SyntaxError[];
+    encoding(): string;
+    encoding(enc: string): void;
+    find(xpath: string): Element[];
+    get(xpath: string): Element;
+    node(name: string, content: string): Element;
+    root(): Element;
+    toString(): string;
+    validate(xsdDoc: XMLDocument): boolean;
+    validationErrors: XmlError[];
+    version(): Number;
+}
+
+declare export class HTMLDocument extends XMLDocument {
+
+}
+
+
+declare export class Element {
+    constructor(doc: XMLDocument, name: string, content?: string);
+    name(): string;
+    name(newName: string): void;
+    text(): string;
+    attr(name: string): Attribute;
+    attr(attr: Attribute): void;
+    attr(attrObject: { [key: string]: string; }): void;
+    attrs(): Attribute[];
+    parent(): Element;
+    doc(): XMLDocument;
+    child(idx: number): Element;
+    childNodes(): Element[];
+    addChild(child: Element): Element;
+    nextSibling(): Element;
+    nextElement(): Element;
+    addNextSibling(siblingNode: Element): Element;
+    prevSibling(): Element;
+    prevElement(): Element;
+    addPrevSibling(siblingNode: Element): Element;
+    find(xpath: string): Element[];
+    find(xpath: string, ns_uri: string): Element[];
+    find(xpath: string, namespaces: { [key: string]: string; }): Element[];
+    get(xpath: string): Element;
+    get(xpath: string, ns_uri: string): Element;
+    get(xpath: string, ns_uri: { [key: string]: string; }): Element;
+    defineNamespace(href: string): Namespace;
+    defineNamespace(prefix: string, href: string): Namespace;
+    namespace(): Namespace;
+    namespace(ns: Namespace): void;
+    namespace(href: string): void;
+    namespace(prefix: string, href: string): void;
+    remove(): void;
+    path(): string;
+    type(): string;
+}
+
+
+declare export class Attribute {
+    constructor(node: Element, name: string, value: string);
+    constructor(node: Element, name: string, value: string, ns: Namespace);
+    name(): string;
+    namespace(): Namespace;
+    namespace(ns: Namespace): Namespace;
+    nextSibling(): Attribute;
+    node(): Element;
+    prevSibling(): Attribute;
+    remove(): void;
+    value(): string;
+}
+
+declare export class Namespace {
+    constructor(node: Element, prefix: string, href: string);
+    href(): string;
+    prefix(): string;
+}
+
+declare export class SaxParser extends events.EventEmitter {
+    parseString(source: string): boolean;
+}
+
+
+declare export class SaxPushParser extends events.EventEmitter {
+    push(source: string): boolean;
+}
+
+export interface XmlError {
+    domain: number;
+    code: number;
+    message: string;
+    level: number;
+    file?: string;
+    column: number;
+    line: number;
 }
diff --git a/linqsharp/linqsharp.d.ts b/linqsharp/linqsharp.d.ts
index 5076701bdc..a8ba0a0124 100644
--- a/linqsharp/linqsharp.d.ts
+++ b/linqsharp/linqsharp.d.ts
@@ -11,490 +11,488 @@
  *
  * @module linqsharp
  */
-declare module "linqsharp"
-{
-    export namespace LinqSharp {
-        /**
-         * Defines methods to support the comparison of objects for equality.
-         *
-         * {T} The type of objects to compare.
-         */
-        export interface IEqualityComparer<T> {
-            Equals(x: T, y: T): boolean;
-            GetHashCode(obj: T): number;
-        }
 
-        /**
-         * Represents a collection of objects that have a common key.
-         *
-         * {TKey} The type of the key.
-         * {T} The type of the values.
-         */
-        export interface IGrouping<TKey, T> {
-            Key: TKey;
-            Elements: T[];
-        }
-
-        /**
-         * Gets the HashCode of the object.
-         *
-         * @param e Object to compute hash.
-         * @returns A computed HashCode for the object.
-         */
-        export function GetHashCode(e: any): any;
-
-        /**
-         * Transforms a object into a string replacing circular
-         * references by reference tokens.
-         *
-         * @param obj Object to convert to string.
-         * @returns String representation of the object.
-         */
-        export function StringifyNonCircular(obj: any): string;
+declare export namespace LinqSharp {
+    /**
+     * Defines methods to support the comparison of objects for equality.
+     *
+     * {T} The type of objects to compare.
+     */
+    export interface IEqualityComparer<T> {
+        Equals(x: T, y: T): boolean;
+        GetHashCode(obj: T): number;
     }
 
     /**
-     * Wrapper class for an array that provides Linq functionallity.
+     * Represents a collection of objects that have a common key.
      *
-     * @class Linq<T>
+     * {TKey} The type of the key.
+     * {T} The type of the values.
      */
-    class Linq<T> {
-        /** {T[]} Internal array reference. */
-        private a: T[];
-
-        /**
-         * Creates a new instance holding an array of <T>.
-         * @constructor
-         *
-         * @param {Array} a Array.
-         */
-        constructor(a?: T[]);
-
-        /**
-         * Applies an accumulator function over a sequence.
-         *
-         * @param func An accumulator function to be
-         * invoked on each element.
-         * @param {T} [initialValue] The initial accumulator value.
-         *
-         * @throws Error if array is empty.
-         *
-         * @returns {T} The final accumulator value.
-         */
-        Aggregate<TResult>(func: (previous: T, next: T) => TResult, initialValue?: T): T;
-
-        /**
-         * Determines whether all elements of a sequence satisfy a condition.
-         *
-         * @param predicate A function to test each element for a condition.
-         *
-         * @returns true if every element of the source sequence passes the test in the specified
-         * predicate, or if the sequence is empty; otherwise, false.
-         */
-        All(predicate: (value: T) => boolean): boolean;
-
-        /**
-         * Determines whether a sequence contains any elements.
-         *
-         * @param [predicate] A function to test each element for a condition.
-         *
-         * @returns true if any elements in the source sequence pass the test in the specified predicate;
-         * otherwise, false. If no predicate is specified return true if the source sequence contains any elements;
-         * otherwise, false.
-         */
-        Any(predicate?: (value: T) => boolean): boolean;
-
-        /**
-         * Computes the average of a sequence of {number} values.
-         *
-         * @param [selector] A transform function to apply to each element.
-         *
-         * @returns The average of the sequence of values.
-         */
-        Average(selector?: (value: T) => number): number;
-
-        /**
-         * Concatenates two sequences.
-         *
-         * @param array The sequence to concatenate to the first sequence.
-         *
-         * @returns An array that contains the concatenated elements of the two input sequences.
-         */
-        Concat(array: T[]): Linq<T>;
-
-        /**
-         * Determines whether a sequence contains a specified element by using a specified comparer.
-         *
-         * @param value The value to locate in the sequence.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns true if the source sequence contains an element that has the specified value;
-         * otherwise, false.
-         */
-        Contains(value: T, comparer?: LinqSharp.IEqualityComparer<T>): boolean;
-
-        /**
-         * Returns a number that represents how many elements in the specified sequence satisfy a condition.
-         *
-         * @param [selector] A function to test each element for a condition.
-         *
-         * @returns A number that represents how many elements in the sequence satisfy the condition
-         * in the predicate function.
-         */
-        Count(selector?: (value: T) => boolean): number;
-
-        /**
-         * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
-         * to compare values.
-         *
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns An array that contains distinct elements from the source sequence.
-         */
-        Distinct(comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
-         * to compare values.
-         *
-         * @param selector A function to test each element for a condition.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns An array that contains distinct elements from the source sequence.
-         */
-        DistinctBy<U>(selector: (e: T) => U, comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Returns the element at a specified index in a sequence.
-         *
-         * @param index The zero-based index of the element to retrieve.
-         *
-         * @throws index is less than 0 or greater than or equal to the number of elements in source.
-         *
-         * @returns The element at the specified position in the source sequence.
-         */
-        ElementAt(index: number): T;
-
-        /**
-         * Returns the element at a specified index in a sequence or a default value if
-         * the index is out of range.
-         *
-         * @param index The zero-based index of the element to retrieve.
-         * @param defaultValue A default value if no element is found.
-         *
-         * @returns defaultValue if the index is outside the bounds of the source sequence;
-         * otherwise, the element at the specified position in the source sequence.
-         */
-        ElementAtOrDefault(index: number, defaultValue: T): T;
-
-        /**
-         * Produces the set difference of two sequences by using the specified IEqualityComparer<T>
-         * to compare values.
-         *
-         * @param except An array whose elements that also occur in the first sequence will cause
-         * those elements to be removed from the returned sequence.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns A sequence that contains the set difference of the elements of two sequences.
-         */
-        Except(except: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Returns the first element in a sequence that satisfies a specified condition.
-         *
-         * @param [selector] A function to test each element for a condition.
-         *
-         * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
-         *
-         * @returns The first element in the sequence that passes the test in the specified predicate function.
-         */
-        First(selector?: (e: T) => boolean): T;
-
-        /**
-         * Returns the first element of the sequence that satisfies a condition or a default
-         * value if no such element is found.
-         *
-         * @param [selector] A function to test each element for a condition.
-         * @param [defaultValue] A default value to return if no element is found.
-         *
-         * @returns defaultValue if source is empty or if no element passes the test specified by predicate;
-         * otherwise, the first element in source that passes the test specified by predicate.
-         */
-        FirstOrDefault(selector?: (e: T) => boolean, defaultValue?: T): T;
-
-        /**
-         * Performs the specified action on each element of the array.
-         *
-         * @param callback The function delegate to perform on each element of the array.
-         */
-        ForEach(callback: (e: T, index: number) => any): void;
-
-        /**
-         * Groups the elements of a sequence according to a specified key selector function.
-         *
-         * @param keySelector A function to extract the key for each element.
-         * @param [elementSelector] A function to create a result value from each group.
-         * @param [comparer] An IEqualityComparer<TKey> to compare keys with.
-         *
-         * @returns A collection of elements of type TResult where each element represents a projection
-         * over a group and its key.
-         */
-        GroupBy<TKey, TElement>(keySelector: (e: T) => TKey, elementSelector?: (e: T) => TElement, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<any>;
-
-        /**
-         * Searches for the specified object and returns the zero-based index of the first
-         * occurrence within the entire array.
-         *
-         * @param e The object to locate in the array.
-         * @param [comparer] An IEqualityComparer<T> to compare elements with.
-         *
-         * @returns The zero-based index of the first occurrence of item within the entire array, if found;
-         * otherwise, –1.
-         */
-        IndexOf(e: T, comparer?: LinqSharp.IEqualityComparer<T>): number;
-
-        /**
-         * Produces the set intersection of two sequences by using the specified IEqualityComparer<T>
-         * to compare values.
-         *
-         * @param array An array whose distinct elements that also appear in the first sequence will be returned.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns A sequence that contains the elements that form the set intersection of two sequences.
-         */
-        Intersect(array: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Correlates the elements of two sequences based on matching keys. A specified IEqualityComparer<T> is used to compare keys.
-         *
-         * @param array The sequence to join to the first sequence.
-         * @param outerKeySelector A function to extract the join key from each element of the first sequence.
-         * @param innerKeySelector A function to extract the join key from each element of the second sequence.
-         * @param resultSelector A function to create a result element from two matching elements.
-         * @param [comparer] An IEqualityComparer<T> to hash and compare keys.
-         *
-         * @returns An array that has elements of type TResult that are obtained by performing an inner join on two sequences.
-         */
-        Join<TInner, TKey, TResult>(array: TInner[], outerKeySelector: (e: T) => TKey, innerKeySelector: (e: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<TResult>;
-
-        /**
-         * Returns the last element of a sequence that satisfies a specified condition.
-         *
-         * @param [predicate] A function to test each element for a condition.
-         *
-         * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
-         *
-         * @returns The last element in the sequence that passes the test in the specified predicate function.
-         */
-        Last(predicate?: (e: T) => boolean): T;
-
-        /**
-         * Returns the last element of a sequence that satisfies a condition or a default
-         * value if no such element is found.
-         *
-         * @param [predicate] A function to test each element for a condition.
-         * @param [defaultValue] A default value to return if no element is found.
-         *
-         * @returns defaultValue if the sequence is empty or if no elements pass the test in
-         * the predicate function; otherwise, the last element that passes the test in the
-         * predicate function.
-         */
-        LastOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
-
-        /**
-         * Returns the maximum value in a sequence of System.Double values.
-         *
-         * @param [selector] A transform function to apply to each element.
-         *
-         * @returns The maximum value in the sequence.
-         */
-        Max(): T;
-        Max<TResult>(selector?: (e: T) => TResult): TResult;
-
-        /**
-         * Returns the minimum value in a sequence of System.Int64 values.
-         *
-         * @param [selector] A transform function to apply to each element.
-         *
-         * @returns The minimum value in the sequence.
-         */
-        Min(): T;
-        Min<TResult>(selector?: (e: T) => TResult): TResult;
-
-        /**
-         * Sorts the elements of a sequence in ascending order according to a key.
-         *
-         * @param keySelector A function to extract a key from an element.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns An array whose elements are sorted according to a key.
-         */
-        OrderBy<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
-
-        /**
-         * Sorts the elements of a sequence in descending order according to a key.
-         *
-         * @param keySelector A function to extract a key from an element.
-         * @param [comparer] An IEqualityComparer<T> to compare values.
-         *
-         * @returns An array whose elements are sorted in descending order according to a key.
-         */
-        OrderByDescending<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
-
-        /**
-         * Inverts the order of the elements in a sequence.
-         *
-         * @returns A sequence whose elements correspond to those of the input sequence in reverse order.
-         */
-        Reverse(): Linq<T>;
-
-        /**
-         * Projects each element of a sequence into a new form.
-         *
-         * @param selector A transform function to apply to each element.
-         *
-         * @returns An array whose elements are the result of invoking the transform function on each element of source.
-         */
-        Select<TResult>(selector: (e: T, i?: number) => TResult): Linq<TResult>;
-
-        /**
-         * Projects each element of a sequence to an array flattens the resulting sequences into one sequence,
-         * and invokes a result selector function on each element therein.
-         *
-         * @param selector A transform function to apply to each element of the input sequence.
-         * @param [resultSelector] A transform function to apply to each element of the intermediate sequence.
-         *
-         * @returns An array whose elements are the result of invoking the one-to-many transform function
-         * selector on each element of source and then mapping each of those sequence elements and
-         * their corresponding source element to a result element.
-         */
-        SelectMany<TResult>(selector: (e: T) => T[], resultSelector?: (e: T) => TResult): Linq<TResult>;
-
-        /**
-         * Determines whether two sequences are equal by comparing their elements by using
-         * a specified IEqualityComparer<T>.
-         *
-         * @param second An array to compare to the first sequence.
-         * @param [comparer] An equality comparer to compare values.
-         *
-         * @returns true if the two source sequences are of equal length and their corresponding
-         * elements compare equal according to comparer; otherwise, false.
-         */
-        SequenceEqual(second: T[], comparer?: (a: T, b: T) => boolean): boolean;
-
-        /**
-         * Returns the only element of a sequence that satisfies a specified condition,
-         * and throws an exception if more than one such element exists.
-         *
-         * @param [predicate] A function to test an element for a condition.
-         *
-         * @returns The single element of the input sequence that satisfies a condition.
-         */
-        Single(predicate?: (e: T) => boolean): T;
-
-        /**
-         * Returns the only element of a sequence that satisfies a specified condition or
-         * a default value if no such element exists; this method throws an exception if
-         * more than one element satisfies the condition.
-         *
-         * @param [predicate] A function to test an element for a condition.
-         * @param [defaultValue] A default value if no element is found.
-         *
-         * @returns The single element of the input sequence that satisfies the condition,
-         * or defaultValue if no such element is found.
-         */
-        SingleOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
-
-        /**
-         * Bypasses a specified number of elements in a sequence and then returns the remaining
-         * elements.
-         *
-         * @param count The number of elements to skip before returning the remaining elements.
-         *
-         * @returns An array that contains the elements that occur
-         * after the specified index in the input sequence.
-         */
-        Skip(count: number): Linq<T>;
-
-        /**
-         * Bypasses elements in a sequence as long as a specified condition is true and
-         * then returns the remaining elements.
-         *
-         * @param predicate A function to test an element for a condition.
-         *
-         * @returns An array that contains the elements from the
-         * input sequence starting at the first element in the linear series that does not
-         * pass the test specified by predicate.
-         */
-        SkipWhile(predicate: (e: T) => boolean): Linq<T>;
-
-        /**
-         * Computes the sum of a sequence values.
-         *
-         * @param [selector] A transform function to apply to each element.
-         *
-         * @returns The sum of the values in the sequence.
-         */
-        Sum(selector?: (value: T) => number): number;
-
-        /**
-         * Returns a specified number of contiguous elements from the start of a sequence.
-         *
-         * @param count The number of elements to skip before returning the remaining elements.
-         *
-         * @returns An array that contains the specified number of elements from the start
-         * of the input sequence.
-         */
-        Take(count: number): Linq<T>;
-
-        /**
-         * Returns elements from a sequence as long as a specified condition is true.
-         *
-         * @param predicate A function to test an element for a condition.
-         *
-         * @returns An array that contains the elements from the
-         * input sequence that occur before the element at which the test no longer passes.
-         */
-        TakeWhile(predicate: (e: T) => boolean): Linq<T>;
-
-        /**
-         * Produces the set union of two sequences by using a specified IEqualityComparer<T>.
-         *
-         * @param second An array whose distinct elements form the second set for the union.
-         * @param [comparer] An equality comparer to compare values.
-         *
-         * @returns An array that contains the elements from both
-         * input sequences, excluding duplicates.
-         */
-        Union(second: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-        /**
-         * Filters a sequence of values based on a predicate.
-         *
-         * @param selector A transform function to apply to each element.
-         *
-         * @returns  An array that contains elements from the input sequence
-         * that satisfy the condition.
-         */
-        Where(selector: (value: T) => boolean): Linq<T>;
-
-        /**
-         * Applies a specified function to the corresponding elements of two sequences,
-         * producing a sequence of the results.
-         *
-         * @param array The second sequence to merge.
-         * @param resultSelector A function that specifies how to merge the elements from the two sequences.
-         *
-         * @returns An array that contains merged elements of two input sequences.
-         */
-        Zip<TInner, TResult>(array: TInner[], resultSelector: (o: T, i: TInner) => TResult): Linq<TResult>;
-
-        /**
-         * Retrieves the internal array.
-         *
-         * @returns Internal array.
-         */
-        ToArray(): T[];
+    export interface IGrouping<TKey, T> {
+        Key: TKey;
+        Elements: T[];
     }
-    export default Linq;
+
+    /**
+     * Gets the HashCode of the object.
+     *
+     * @param e Object to compute hash.
+     * @returns A computed HashCode for the object.
+     */
+    export function GetHashCode(e: any): any;
+
+    /**
+     * Transforms a object into a string replacing circular
+     * references by reference tokens.
+     *
+     * @param obj Object to convert to string.
+     * @returns String representation of the object.
+     */
+    export function StringifyNonCircular(obj: any): string;
 }
+
+/**
+ * Wrapper class for an array that provides Linq functionallity.
+ *
+ * @class Linq<T>
+ */
+declare class Linq<T> {
+    /** {T[]} Internal array reference. */
+    private a: T[];
+
+    /**
+     * Creates a new instance holding an array of <T>.
+     * @constructor
+     *
+     * @param {Array} a Array.
+     */
+    constructor(a?: T[]);
+
+    /**
+     * Applies an accumulator function over a sequence.
+     *
+     * @param func An accumulator function to be
+     * invoked on each element.
+     * @param {T} [initialValue] The initial accumulator value.
+     *
+     * @throws Error if array is empty.
+     *
+     * @returns {T} The final accumulator value.
+     */
+    Aggregate<TResult>(func: (previous: T, next: T) => TResult, initialValue?: T): T;
+
+    /**
+     * Determines whether all elements of a sequence satisfy a condition.
+     *
+     * @param predicate A function to test each element for a condition.
+     *
+     * @returns true if every element of the source sequence passes the test in the specified
+     * predicate, or if the sequence is empty; otherwise, false.
+     */
+    All(predicate: (value: T) => boolean): boolean;
+
+    /**
+     * Determines whether a sequence contains any elements.
+     *
+     * @param [predicate] A function to test each element for a condition.
+     *
+     * @returns true if any elements in the source sequence pass the test in the specified predicate;
+     * otherwise, false. If no predicate is specified return true if the source sequence contains any elements;
+     * otherwise, false.
+     */
+    Any(predicate?: (value: T) => boolean): boolean;
+
+    /**
+     * Computes the average of a sequence of {number} values.
+     *
+     * @param [selector] A transform function to apply to each element.
+     *
+     * @returns The average of the sequence of values.
+     */
+    Average(selector?: (value: T) => number): number;
+
+    /**
+     * Concatenates two sequences.
+     *
+     * @param array The sequence to concatenate to the first sequence.
+     *
+     * @returns An array that contains the concatenated elements of the two input sequences.
+     */
+    Concat(array: T[]): Linq<T>;
+
+    /**
+     * Determines whether a sequence contains a specified element by using a specified comparer.
+     *
+     * @param value The value to locate in the sequence.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns true if the source sequence contains an element that has the specified value;
+     * otherwise, false.
+     */
+    Contains(value: T, comparer?: LinqSharp.IEqualityComparer<T>): boolean;
+
+    /**
+     * Returns a number that represents how many elements in the specified sequence satisfy a condition.
+     *
+     * @param [selector] A function to test each element for a condition.
+     *
+     * @returns A number that represents how many elements in the sequence satisfy the condition
+     * in the predicate function.
+     */
+    Count(selector?: (value: T) => boolean): number;
+
+    /**
+     * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
+     * to compare values.
+     *
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns An array that contains distinct elements from the source sequence.
+     */
+    Distinct(comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
+     * to compare values.
+     *
+     * @param selector A function to test each element for a condition.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns An array that contains distinct elements from the source sequence.
+     */
+    DistinctBy<U>(selector: (e: T) => U, comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Returns the element at a specified index in a sequence.
+     *
+     * @param index The zero-based index of the element to retrieve.
+     *
+     * @throws index is less than 0 or greater than or equal to the number of elements in source.
+     *
+     * @returns The element at the specified position in the source sequence.
+     */
+    ElementAt(index: number): T;
+
+    /**
+     * Returns the element at a specified index in a sequence or a default value if
+     * the index is out of range.
+     *
+     * @param index The zero-based index of the element to retrieve.
+     * @param defaultValue A default value if no element is found.
+     *
+     * @returns defaultValue if the index is outside the bounds of the source sequence;
+     * otherwise, the element at the specified position in the source sequence.
+     */
+    ElementAtOrDefault(index: number, defaultValue: T): T;
+
+    /**
+     * Produces the set difference of two sequences by using the specified IEqualityComparer<T>
+     * to compare values.
+     *
+     * @param except An array whose elements that also occur in the first sequence will cause
+     * those elements to be removed from the returned sequence.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns A sequence that contains the set difference of the elements of two sequences.
+     */
+    Except(except: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Returns the first element in a sequence that satisfies a specified condition.
+     *
+     * @param [selector] A function to test each element for a condition.
+     *
+     * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
+     *
+     * @returns The first element in the sequence that passes the test in the specified predicate function.
+     */
+    First(selector?: (e: T) => boolean): T;
+
+    /**
+     * Returns the first element of the sequence that satisfies a condition or a default
+     * value if no such element is found.
+     *
+     * @param [selector] A function to test each element for a condition.
+     * @param [defaultValue] A default value to return if no element is found.
+     *
+     * @returns defaultValue if source is empty or if no element passes the test specified by predicate;
+     * otherwise, the first element in source that passes the test specified by predicate.
+     */
+    FirstOrDefault(selector?: (e: T) => boolean, defaultValue?: T): T;
+
+    /**
+     * Performs the specified action on each element of the array.
+     *
+     * @param callback The function delegate to perform on each element of the array.
+     */
+    ForEach(callback: (e: T, index: number) => any): void;
+
+    /**
+     * Groups the elements of a sequence according to a specified key selector function.
+     *
+     * @param keySelector A function to extract the key for each element.
+     * @param [elementSelector] A function to create a result value from each group.
+     * @param [comparer] An IEqualityComparer<TKey> to compare keys with.
+     *
+     * @returns A collection of elements of type TResult where each element represents a projection
+     * over a group and its key.
+     */
+    GroupBy<TKey, TElement>(keySelector: (e: T) => TKey, elementSelector?: (e: T) => TElement, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<any>;
+
+    /**
+     * Searches for the specified object and returns the zero-based index of the first
+     * occurrence within the entire array.
+     *
+     * @param e The object to locate in the array.
+     * @param [comparer] An IEqualityComparer<T> to compare elements with.
+     *
+     * @returns The zero-based index of the first occurrence of item within the entire array, if found;
+     * otherwise, –1.
+     */
+    IndexOf(e: T, comparer?: LinqSharp.IEqualityComparer<T>): number;
+
+    /**
+     * Produces the set intersection of two sequences by using the specified IEqualityComparer<T>
+     * to compare values.
+     *
+     * @param array An array whose distinct elements that also appear in the first sequence will be returned.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns A sequence that contains the elements that form the set intersection of two sequences.
+     */
+    Intersect(array: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Correlates the elements of two sequences based on matching keys. A specified IEqualityComparer<T> is used to compare keys.
+     *
+     * @param array The sequence to join to the first sequence.
+     * @param outerKeySelector A function to extract the join key from each element of the first sequence.
+     * @param innerKeySelector A function to extract the join key from each element of the second sequence.
+     * @param resultSelector A function to create a result element from two matching elements.
+     * @param [comparer] An IEqualityComparer<T> to hash and compare keys.
+     *
+     * @returns An array that has elements of type TResult that are obtained by performing an inner join on two sequences.
+     */
+    Join<TInner, TKey, TResult>(array: TInner[], outerKeySelector: (e: T) => TKey, innerKeySelector: (e: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<TResult>;
+
+    /**
+     * Returns the last element of a sequence that satisfies a specified condition.
+     *
+     * @param [predicate] A function to test each element for a condition.
+     *
+     * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
+     *
+     * @returns The last element in the sequence that passes the test in the specified predicate function.
+     */
+    Last(predicate?: (e: T) => boolean): T;
+
+    /**
+     * Returns the last element of a sequence that satisfies a condition or a default
+     * value if no such element is found.
+     *
+     * @param [predicate] A function to test each element for a condition.
+     * @param [defaultValue] A default value to return if no element is found.
+     *
+     * @returns defaultValue if the sequence is empty or if no elements pass the test in
+     * the predicate function; otherwise, the last element that passes the test in the
+     * predicate function.
+     */
+    LastOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
+
+    /**
+     * Returns the maximum value in a sequence of System.Double values.
+     *
+     * @param [selector] A transform function to apply to each element.
+     *
+     * @returns The maximum value in the sequence.
+     */
+    Max(): T;
+    Max<TResult>(selector?: (e: T) => TResult): TResult;
+
+    /**
+     * Returns the minimum value in a sequence of System.Int64 values.
+     *
+     * @param [selector] A transform function to apply to each element.
+     *
+     * @returns The minimum value in the sequence.
+     */
+    Min(): T;
+    Min<TResult>(selector?: (e: T) => TResult): TResult;
+
+    /**
+     * Sorts the elements of a sequence in ascending order according to a key.
+     *
+     * @param keySelector A function to extract a key from an element.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns An array whose elements are sorted according to a key.
+     */
+    OrderBy<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
+
+    /**
+     * Sorts the elements of a sequence in descending order according to a key.
+     *
+     * @param keySelector A function to extract a key from an element.
+     * @param [comparer] An IEqualityComparer<T> to compare values.
+     *
+     * @returns An array whose elements are sorted in descending order according to a key.
+     */
+    OrderByDescending<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
+
+    /**
+     * Inverts the order of the elements in a sequence.
+     *
+     * @returns A sequence whose elements correspond to those of the input sequence in reverse order.
+     */
+    Reverse(): Linq<T>;
+
+    /**
+     * Projects each element of a sequence into a new form.
+     *
+     * @param selector A transform function to apply to each element.
+     *
+     * @returns An array whose elements are the result of invoking the transform function on each element of source.
+     */
+    Select<TResult>(selector: (e: T, i?: number) => TResult): Linq<TResult>;
+
+    /**
+     * Projects each element of a sequence to an array flattens the resulting sequences into one sequence,
+     * and invokes a result selector function on each element therein.
+     *
+     * @param selector A transform function to apply to each element of the input sequence.
+     * @param [resultSelector] A transform function to apply to each element of the intermediate sequence.
+     *
+     * @returns An array whose elements are the result of invoking the one-to-many transform function
+     * selector on each element of source and then mapping each of those sequence elements and
+     * their corresponding source element to a result element.
+     */
+    SelectMany<TResult>(selector: (e: T) => T[], resultSelector?: (e: T) => TResult): Linq<TResult>;
+
+    /**
+     * Determines whether two sequences are equal by comparing their elements by using
+     * a specified IEqualityComparer<T>.
+     *
+     * @param second An array to compare to the first sequence.
+     * @param [comparer] An equality comparer to compare values.
+     *
+     * @returns true if the two source sequences are of equal length and their corresponding
+     * elements compare equal according to comparer; otherwise, false.
+     */
+    SequenceEqual(second: T[], comparer?: (a: T, b: T) => boolean): boolean;
+
+    /**
+     * Returns the only element of a sequence that satisfies a specified condition,
+     * and throws an exception if more than one such element exists.
+     *
+     * @param [predicate] A function to test an element for a condition.
+     *
+     * @returns The single element of the input sequence that satisfies a condition.
+     */
+    Single(predicate?: (e: T) => boolean): T;
+
+    /**
+     * Returns the only element of a sequence that satisfies a specified condition or
+     * a default value if no such element exists; this method throws an exception if
+     * more than one element satisfies the condition.
+     *
+     * @param [predicate] A function to test an element for a condition.
+     * @param [defaultValue] A default value if no element is found.
+     *
+     * @returns The single element of the input sequence that satisfies the condition,
+     * or defaultValue if no such element is found.
+     */
+    SingleOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
+
+    /**
+     * Bypasses a specified number of elements in a sequence and then returns the remaining
+     * elements.
+     *
+     * @param count The number of elements to skip before returning the remaining elements.
+     *
+     * @returns An array that contains the elements that occur
+     * after the specified index in the input sequence.
+     */
+    Skip(count: number): Linq<T>;
+
+    /**
+     * Bypasses elements in a sequence as long as a specified condition is true and
+     * then returns the remaining elements.
+     *
+     * @param predicate A function to test an element for a condition.
+     *
+     * @returns An array that contains the elements from the
+     * input sequence starting at the first element in the linear series that does not
+     * pass the test specified by predicate.
+     */
+    SkipWhile(predicate: (e: T) => boolean): Linq<T>;
+
+    /**
+     * Computes the sum of a sequence values.
+     *
+     * @param [selector] A transform function to apply to each element.
+     *
+     * @returns The sum of the values in the sequence.
+     */
+    Sum(selector?: (value: T) => number): number;
+
+    /**
+     * Returns a specified number of contiguous elements from the start of a sequence.
+     *
+     * @param count The number of elements to skip before returning the remaining elements.
+     *
+     * @returns An array that contains the specified number of elements from the start
+     * of the input sequence.
+     */
+    Take(count: number): Linq<T>;
+
+    /**
+     * Returns elements from a sequence as long as a specified condition is true.
+     *
+     * @param predicate A function to test an element for a condition.
+     *
+     * @returns An array that contains the elements from the
+     * input sequence that occur before the element at which the test no longer passes.
+     */
+    TakeWhile(predicate: (e: T) => boolean): Linq<T>;
+
+    /**
+     * Produces the set union of two sequences by using a specified IEqualityComparer<T>.
+     *
+     * @param second An array whose distinct elements form the second set for the union.
+     * @param [comparer] An equality comparer to compare values.
+     *
+     * @returns An array that contains the elements from both
+     * input sequences, excluding duplicates.
+     */
+    Union(second: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
+
+    /**
+     * Filters a sequence of values based on a predicate.
+     *
+     * @param selector A transform function to apply to each element.
+     *
+     * @returns  An array that contains elements from the input sequence
+     * that satisfy the condition.
+     */
+    Where(selector: (value: T) => boolean): Linq<T>;
+
+    /**
+     * Applies a specified function to the corresponding elements of two sequences,
+     * producing a sequence of the results.
+     *
+     * @param array The second sequence to merge.
+     * @param resultSelector A function that specifies how to merge the elements from the two sequences.
+     *
+     * @returns An array that contains merged elements of two input sequences.
+     */
+    Zip<TInner, TResult>(array: TInner[], resultSelector: (o: T, i: TInner) => TResult): Linq<TResult>;
+
+    /**
+     * Retrieves the internal array.
+     *
+     * @returns Internal array.
+     */
+    ToArray(): T[];
+}
+export default Linq;
diff --git a/lockfile/lockfile.d.ts b/lockfile/lockfile.d.ts
index c6084a8433..fdf9352bab 100644
--- a/lockfile/lockfile.d.ts
+++ b/lockfile/lockfile.d.ts
@@ -3,22 +3,21 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'lockfile' {
-	export interface Options {
-		wait?: number;
-		stale?: number;
-		retries?: number;
-		retryWait?: number;
-	}
 
-	export function lock(path: string, opts: Options, callback: (err: Error) => void): void;
-	export function lock(path: string, callback: (err: Error) => void): void;
-	export function lockSync(path: string, opts: Options):void;
-
-	export function unlock(path: string, callback: (err: Error) => void): void;
-	export function unlockSync(path: string):void;
-
-	export function check(path: string, opts: Options, callback: (err: Error, isLocked: boolean) => void): void;
-	export function check(path: string, callback: (err: Error, isLocked: boolean) => void): void;
-	export function checkSync(path: string, opts: Options): boolean;
+export interface Options {
+    wait?: number;
+    stale?: number;
+    retries?: number;
+    retryWait?: number;
 }
+
+declare export function lock(path: string, opts: Options, callback: (err: Error) => void): void;
+declare export function lock(path: string, callback: (err: Error) => void): void;
+declare export function lockSync(path: string, opts: Options): void;
+
+declare export function unlock(path: string, callback: (err: Error) => void): void;
+declare export function unlockSync(path: string): void;
+
+declare export function check(path: string, opts: Options, callback: (err: Error, isLocked: boolean) => void): void;
+declare export function check(path: string, callback: (err: Error, isLocked: boolean) => void): void;
+declare export function checkSync(path: string, opts: Options): boolean;
diff --git a/log4js/log4js.d.ts b/log4js/log4js.d.ts
index c79fd60818..fc5521e1f1 100644
--- a/log4js/log4js.d.ts
+++ b/log4js/log4js.d.ts
@@ -5,97 +5,97 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "log4js" {
-  import express = require('express');
 
-  /**
-   * Replaces the console
-   * @param logger
-   * @returns void
-   */
-  export function replaceConsole(logger?: Logger): void;
+import express = require('express');
 
-  /**
-   * Restores the console
-   * @returns void
-   */
-  export function restoreConsole(): void;
+/**
+ * Replaces the console
+ * @param logger
+ * @returns void
+ */
+declare export function replaceConsole(logger?: Logger): void;
 
-  /**
-   * Get a logger instance. Instance is cached on categoryName level.
-   *
-   * @param   {String} [categoryName] name of category to log to.
-   * @returns {Logger} instance of logger for the category
-   * @static
-   */
-  export function getLogger(categoryName?: string): Logger;
-  export function getBufferedLogger(categoryName?: string): Logger;
+/**
+ * Restores the console
+ * @returns void
+ */
+declare export function restoreConsole(): void;
 
-  /**
-   * Has a logger instance cached on categoryName.
-   *
-   * @param   {String} [categoryName] name of category to log to.
-   * @returns {boolean} contains logger for the category
-   * @static
-   */
-  export function hasLogger(categoryName: string): boolean;
+/**
+ * Get a logger instance. Instance is cached on categoryName level.
+ *
+ * @param   {String} [categoryName] name of category to log to.
+ * @returns {Logger} instance of logger for the category
+ * @static
+ */
+declare export function getLogger(categoryName?: string): Logger;
+declare export function getBufferedLogger(categoryName?: string): Logger;
 
-  /**
-   * Get the default logger instance.
-   *
-   * @returns {Logger} instance of default logger
-   * @static
-   */
-  export function getDefaultLogger(): Logger;
+/**
+ * Has a logger instance cached on categoryName.
+ *
+ * @param   {String} [categoryName] name of category to log to.
+ * @returns {boolean} contains logger for the category
+ * @static
+ */
+declare export function hasLogger(categoryName: string): boolean;
 
-  /**
-   * args are appender, then zero or more categories
-   *
-   * @param   {*[]} appenders
-   * @returns {void}
-   * @static
-   */
-  export function addAppender(...appenders: any[]): void;
+/**
+ * Get the default logger instance.
+ *
+ * @returns {Logger} instance of default logger
+ * @static
+ */
+declare export function getDefaultLogger(): Logger;
 
-  /**
-   * Claer configured appenders
-   *
-   * @returns {void}
-   * @static
-   */
-  export function clearAppenders(): void;
+/**
+ * args are appender, then zero or more categories
+ *
+ * @param   {*[]} appenders
+ * @returns {void}
+ * @static
+ */
+declare export function addAppender(...appenders: any[]): void;
 
-  /**
-   * Shutdown all log appenders. This will first disable all writing to appenders
-   * and then call the shutdown function each appender.
-   *
-   * @params  {Function} cb - The callback to be invoked once all appenders have
-   *  shutdown. If an error occurs, the callback will be given the error object
-   *  as the first argument.
-   * @returns {void}
-   */
-  export function shutdown(cb: Function): void;
+/**
+ * Claer configured appenders
+ *
+ * @returns {void}
+ * @static
+ */
+declare export function clearAppenders(): void;
 
-  export function configure(filename: string, options?: any): void;
-  export function configure(config: IConfig, options?: any): void;
+/**
+ * Shutdown all log appenders. This will first disable all writing to appenders
+ * and then call the shutdown function each appender.
+ *
+ * @params  {Function} cb - The callback to be invoked once all appenders have
+ *  shutdown. If an error occurs, the callback will be given the error object
+ *  as the first argument.
+ * @returns {void}
+ */
+declare export function shutdown(cb: Function): void;
 
-  export function setGlobalLogLevel(level: string): void;
-  export function setGlobalLogLevel(level: Level): void;
+declare export function configure(filename: string, options?: any): void;
+declare export function configure(config: IConfig, options?: any): void;
+
+declare export function setGlobalLogLevel(level: string): void;
+declare export function setGlobalLogLevel(level: Level): void;
 
 
-  /**
-   * Create logger for connect middleware.
-   *
-   *
-   * @returns {express.Handler} Instance of middleware.
-   * @static
-   */
-  export function connectLogger(logger: Logger, options: { format?: string; level?: string; nolog?: any; }): express.Handler;
-  export function connectLogger(logger: Logger, options: { format?: string; level?: Level; nolog?: any; }): express.Handler;
+/**
+ * Create logger for connect middleware.
+ *
+ *
+ * @returns {express.Handler} Instance of middleware.
+ * @static
+ */
+declare export function connectLogger(logger: Logger, options: { format?: string; level?: string; nolog?: any; }): express.Handler;
+declare export function connectLogger(logger: Logger, options: { format?: string; level?: Level; nolog?: any; }): express.Handler;
 
 
-  export var appenders: any;
-  export var levels: {
+declare export var appenders: any;
+declare export var levels: {
     ALL: Level;
     TRACE: Level;
     DEBUG: Level;
@@ -107,9 +107,9 @@ declare module "log4js" {
 
     toLevel(level: string, defaultLevel?: Level): Level;
     toLevel(level: Level, defaultLevel?: Level): Level;
-  };
+};
 
-  export interface Logger {
+export interface Logger {
     setLevel(level: string): void;
     setLevel(level: Level): void;
 
@@ -127,34 +127,34 @@ declare module "log4js" {
     warn(message: string, ...args: any[]): void;
     error(message: string, ...args: any[]): void;
     fatal(message: string, ...args: any[]): void;
-  }
+}
 
-  export interface Level {
+export interface Level {
     isEqualTo(other: string): boolean;
     isEqualTo(otherLevel: Level): boolean;
     isLessThanOrEqualTo(other: string): boolean;
     isLessThanOrEqualTo(otherLevel: Level): boolean;
     isGreaterThanOrEqualTo(other: string): boolean;
     isGreaterThanOrEqualTo(otherLevel: Level): boolean;
-  }
+}
 
-  export interface IConfig {
+export interface IConfig {
     appenders: AppenderConfig[];
     levels?: { [category: string]: string };
     replaceConsole?: boolean;
-  }
+}
 
-  export interface AppenderConfigBase {
+export interface AppenderConfigBase {
     type: string;
     category?: string;
-  }
+}
 
-  export interface ConsoleAppenderConfig extends AppenderConfigBase {}
+export interface ConsoleAppenderConfig extends AppenderConfigBase { }
 
-  export interface FileAppenderConfig extends AppenderConfigBase {
+export interface FileAppenderConfig extends AppenderConfigBase {
     filename: string;
-  }
-  export interface DateFileAppenderConfig extends FileAppenderConfig {
+}
+export interface DateFileAppenderConfig extends FileAppenderConfig {
     /**
      * The following strings are recognised in the pattern:
      *  - yyyy : the full year, use yy for just the last two digits
@@ -168,9 +168,9 @@ declare module "log4js" {
      */
     pattern: string;
     alwaysIncludePattern: boolean;
-  }
+}
 
-  export interface SmtpAppenderConfig extends AppenderConfigBase {
+export interface SmtpAppenderConfig extends AppenderConfigBase {
     /** Comma separated list of email recipients */
     recipients: string;
 
@@ -188,38 +188,38 @@ declare module "log4js" {
     sendInterval: number;
 
     SMTP: {
-      host: string;
-      secure: boolean;
-      port: number;
-      auth: {
-          user: string;
-          pass: string;
-      }
+        host: string;
+        secure: boolean;
+        port: number;
+        auth: {
+            user: string;
+            pass: string;
+        }
     }
-  }
+}
 
-  export interface HookIoAppenderConfig extends FileAppenderConfig {
+export interface HookIoAppenderConfig extends FileAppenderConfig {
     maxLogSize: number;
     backup: number;
     pollInterval: number;
-  }
+}
 
-  export interface GelfAppenderConfig extends AppenderConfigBase {
+export interface GelfAppenderConfig extends AppenderConfigBase {
     host: string;
     hostname: string;
     port: string;
     facility: string;
-  }
+}
 
-  export interface MultiprocessAppenderConfig extends AppenderConfigBase {
+export interface MultiprocessAppenderConfig extends AppenderConfigBase {
     mode: string;
     loggerPort: number;
     loggerHost: string;
     facility: string;
     appender?: AppenderConfig;
-  }
+}
 
-  export interface LogglyAppenderConfig extends AppenderConfigBase {
+export interface LogglyAppenderConfig extends AppenderConfigBase {
     /** Loggly customer token - https://www.loggly.com/docs/api-sending-data/ */
     token: string;
 
@@ -231,25 +231,24 @@ declare module "log4js" {
 
     /** Enable JSON logging by setting to 'true' */
     json: boolean;
-  }
-
-  export interface ClusteredAppenderConfig extends AppenderConfigBase {
-    appenders?: AppenderConfig[];
-  }
-
-  type CoreAppenderConfig = ConsoleAppenderConfig
-                          | FileAppenderConfig
-                          | DateFileAppenderConfig
-                          | SmtpAppenderConfig
-                          | HookIoAppenderConfig
-                          | GelfAppenderConfig
-                          | MultiprocessAppenderConfig
-                          | LogglyAppenderConfig
-                          | ClusteredAppenderConfig
-
-  interface CustomAppenderConfig extends AppenderConfigBase {
-    [prop: string]: any;
-  }
-
-  type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
 }
+
+export interface ClusteredAppenderConfig extends AppenderConfigBase {
+    appenders?: AppenderConfig[];
+}
+
+type CoreAppenderConfig = ConsoleAppenderConfig
+    | FileAppenderConfig
+    | DateFileAppenderConfig
+    | SmtpAppenderConfig
+    | HookIoAppenderConfig
+    | GelfAppenderConfig
+    | MultiprocessAppenderConfig
+    | LogglyAppenderConfig
+    | ClusteredAppenderConfig
+
+interface CustomAppenderConfig extends AppenderConfigBase {
+    [prop: string]: any;
+}
+
+type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
diff --git a/loggly/loggly.d.ts b/loggly/loggly.d.ts
index e2e6c4d14c..ec10031ae4 100644
--- a/loggly/loggly.d.ts
+++ b/loggly/loggly.d.ts
@@ -2,24 +2,23 @@
 // Project: https://github.com/nodejitsu/node-loggly
 // Definitions by: Ray Martone <https://github.com/rmartone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "loggly" {
 
-    interface LogglyOptions {
-        token: string;
-        subdomain: string;
-        tags?: string[];
-        json?: boolean;
-        host?: string;
-        auth?: {
-            username: string;
-            password: string;
-        }
+
+interface LogglyOptions {
+    token: string;
+    subdomain: string;
+    tags?: string[];
+    json?: boolean;
+    host?: string;
+    auth?: {
+        username: string;
+        password: string;
     }
-
-    interface Loggly {
-        log(message: any, tags?: string[], callback?: (err: any, results: any) => void): void;
-        log(message: any, callback?: (err: any, results: any) => void): void;
-    }
-
-    function createClient(options: LogglyOptions): Loggly;
 }
+
+interface Loggly {
+    log(message: any, tags?: string[], callback?: (err: any, results: any) => void): void;
+    log(message: any, callback?: (err: any, results: any) => void): void;
+}
+
+declare function createClient(options: LogglyOptions): Loggly;
diff --git a/logrotate-stream/logrotate-stream.d.ts b/logrotate-stream/logrotate-stream.d.ts
index 85acf5887c..9074eceb45 100644
--- a/logrotate-stream/logrotate-stream.d.ts
+++ b/logrotate-stream/logrotate-stream.d.ts
@@ -4,43 +4,41 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-declare module "logrotate-stream" {
-	import stream = require("stream");
 
-	// wrapper to be able to use "export =" while also exporting the Options interface
-	namespace logrotateStream {
+import stream = require("stream");
 
-		/**
-		 * Options object for the exported function.
-		 */
-		export interface Options {
-			/**
-			 * The file log file to write data to.
-			 */
-			file: string;
-			/**
-			 * The max file size of a log before rotation occurs. Supports 1024, 1k, 1m, 1g
-			 */
-			size: string;
-			/**
-			 * The number of rotated log files to keep (including the primary log file). Additional logs are deleted no rotation.
-			 */
-			keep: number;
-			/**
-			 * Optionally compress rotated files with gzip.
-			 */
-			compress?: boolean;
-		}
+// wrapper to be able to use "export =" while also exporting the Options interface
+declare namespace logrotateStream {
 
-	}
+    /**
+     * Options object for the exported function.
+     */
+    export interface Options {
+        /**
+         * The file log file to write data to.
+         */
+        file: string;
+        /**
+         * The max file size of a log before rotation occurs. Supports 1024, 1k, 1m, 1g
+         */
+        size: string;
+        /**
+         * The number of rotated log files to keep (including the primary log file). Additional logs are deleted no rotation.
+         */
+        keep: number;
+        /**
+         * Optionally compress rotated files with gzip.
+         */
+        compress?: boolean;
+    }
 
-	/**
-	 * Create a rotating log stream.
-	 * @returns a writable stream to a rotating log file
-	 */
-	function logrotateStream(opts: logrotateStream.Options): stream.Writable;
-
-
-	export = logrotateStream;
 }
 
+/**
+ * Create a rotating log stream.
+ * @returns a writable stream to a rotating log file
+ */
+declare function logrotateStream(opts: logrotateStream.Options): stream.Writable;
+
+
+export = logrotateStream;
diff --git a/lolex/lolex.d.ts b/lolex/lolex.d.ts
index 84e65a6016..c54e613f7a 100644
--- a/lolex/lolex.d.ts
+++ b/lolex/lolex.d.ts
@@ -3,22 +3,21 @@
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'lolex' {
-	export interface Clock {
-		setTimeout(callback: () => any, timeout: number): number;
-		setInterval(callback: () => any, timeout: number): number;
-		setImmediate(callback: () => any): number;
 
-		clearTimeout(id: number): void;
-		clearInterval(id: number): void;
-		clearImmediate(id: number): void;
+export interface Clock {
+    setTimeout(callback: () => any, timeout: number): number;
+    setInterval(callback: () => any, timeout: number): number;
+    setImmediate(callback: () => any): number;
 
-		tick(ms: number): void;
-		uninstall(): void;
-	}
+    clearTimeout(id: number): void;
+    clearInterval(id: number): void;
+    clearImmediate(id: number): void;
 
-	export function createClock(now?: number): Clock;
-
-	export function install(now?: number, toFake?: string[]): Clock;
-	export function install(context?: any, now?: number, toFake?: string[]): Clock;
+    tick(ms: number): void;
+    uninstall(): void;
 }
+
+declare export function createClock(now?: number): Clock;
+
+declare export function install(now?: number, toFake?: string[]): Clock;
+declare export function install(context?: any, now?: number, toFake?: string[]): Clock;
diff --git a/lower-case-first/lower-case-first.d.ts b/lower-case-first/lower-case-first.d.ts
index 586be8f5e8..1ceb7f1ea9 100644
--- a/lower-case-first/lower-case-first.d.ts
+++ b/lower-case-first/lower-case-first.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "lower-case-first" {
-	function lowerCaseFirst(string: string, locale?: string): string;
-	export = lowerCaseFirst;
-}
\ No newline at end of file
+
+declare function lowerCaseFirst(string: string, locale?: string): string;
+export = lowerCaseFirst;
diff --git a/lower-case/lower-case.d.ts b/lower-case/lower-case.d.ts
index ee1bb16538..7c210bfc7d 100644
--- a/lower-case/lower-case.d.ts
+++ b/lower-case/lower-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "lower-case" {
-	function lowerCase(string: any, locale?: string): string;
-	export = lowerCase;
-}
\ No newline at end of file
+
+declare function lowerCase(string: any, locale?: string): string;
+export = lowerCase;
diff --git a/lru-cache/lru-cache.d.ts b/lru-cache/lru-cache.d.ts
index 25b9b8cf52..c65a7af875 100644
--- a/lru-cache/lru-cache.d.ts
+++ b/lru-cache/lru-cache.d.ts
@@ -3,32 +3,31 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'lru-cache' {
-	function LRU<T>(opts: LRU.Options<T>): LRU.Cache<T>;
-	function LRU<T>(max: number): LRU.Cache<T>;
 
-	namespace LRU {
-		interface Options<T> {
-			max?: number;
-			maxAge?: number;
-			length?: (value: T) => number;
-			dispose?: (key: string, value: T) => void;
-			stale?: boolean;
-		}
+declare function LRU<T>(opts: LRU.Options<T>): LRU.Cache<T>;
+declare function LRU<T>(max: number): LRU.Cache<T>;
 
-		interface Cache<T> {
-			set(key: string, value: T): void;
-			get(key: string): T;
-			peek(key: string): T;
-			has(key: string): boolean
-			del(key: string): void;
-			reset(): void;
-			forEach(iter: (value: T, key: string, cache: Cache<T>) => void, thisp?: any): void;
+declare namespace LRU {
+    interface Options<T> {
+        max?: number;
+        maxAge?: number;
+        length?: (value: T) => number;
+        dispose?: (key: string, value: T) => void;
+        stale?: boolean;
+    }
 
-			keys(): string[];
-			values(): T[];
-		}
-	}
+    interface Cache<T> {
+        set(key: string, value: T): void;
+        get(key: string): T;
+        peek(key: string): T;
+        has(key: string): boolean
+        del(key: string): void;
+        reset(): void;
+        forEach(iter: (value: T, key: string, cache: Cache<T>) => void, thisp?: any): void;
 
-	export = LRU;
+        keys(): string[];
+        values(): T[];
+    }
 }
+
+export = LRU;
diff --git a/luaparse/luaparse.d.ts b/luaparse/luaparse.d.ts
index b0e78962bb..e53dd979ba 100644
--- a/luaparse/luaparse.d.ts
+++ b/luaparse/luaparse.d.ts
@@ -3,6 +3,5 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "luaparse" {
-	export function parse(code: string, options?: Object): Object;
-}
+
+declare export function parse(code: string, options?: Object): Object;
diff --git a/lwip/lwip.d.ts b/lwip/lwip.d.ts
index 0f40c63d25..eef732d734 100644
--- a/lwip/lwip.d.ts
+++ b/lwip/lwip.d.ts
@@ -5,1003 +5,1002 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "lwip" {
-	type ColorObject = {r: number, g: number, b: number, a?: number};
-	type Color = string | [number, number, number, number] | ColorObject;
 
-	interface ImageCallback {
-		(err: any, image: Image): void;
-	}
-    
-    interface BufferCallback {
-		(err: any, buffer: Buffer): void;
-	}
+type ColorObject = { r: number, g: number, b: number, a?: number };
+type Color = string | [number, number, number, number] | ColorObject;
 
-	/**
-	 * Open an image
-	 * @param source The path to the image on disk.
-	 */
-	function open(source: string, callback: ImageCallback): void;
-
-	/**
-	 * Open an image
-	 * @param source The path to the image on disk.
-	 * @param type Optional type of the image. If omitted, the type will be inferred from the file extension. Type must be a string of the image type (i.e. "jpg").
-	 */
-	function open(source: string, type: string, callback: ImageCallback): void;
-
-	/**
-	 * Open an image
-	 * @param source The path to the image on disk or an image buffer.
-	 * @param type Type of the image. If source is an encoded image buffer, type must be a string of the image type (i.e. "jpg"). If source is a raw pixels buffer type must be an object with type.width and type.height properties. 
-	 */
-	function open(source: Buffer, type: string | {width: number, height: number}, callback: ImageCallback): any;
-
-	/**
-	 * Create a new image
-	 * @param width The width of the new image.
-	 * @param height The height of the new image.
-	 */
-	function create(width: number, height: number, callback: ImageCallback): void;
-
-	/**
-	 * Create a new image
-	 * @param width The width of the new image.
-	 * @param height The height of the new image.
-	 * @param color Optional Color of the canvas.
-	 */
-	function create(width: number, height: number, color: Color, callback: ImageCallback): void;
-
-	type JpegBufferParams = {
-		quality?: number;
-	};
-
-	type PngBufferParams = {
-		compression?: string;
-		interlaced?: boolean;
-		transparency?: boolean | string;
-	};
-	
-	type GifBufferParams = {
-		colors?: number;
-		interlaced?: boolean;
-		transparency?: boolean | string;
-		threshold: number;
-	}
-
-	interface Image {
-		// Image operations
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 */
-		resize(width: number, callback: ImageCallback): void;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Interpolation method.
-		 */
-		resize(width: number, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Height in pixels.
-		 */
-		resize(width: number, height: number, callback: ImageCallback): void;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Height in pixels.
-		 * @param Interpolation method.
-		 */
-		resize(width: number, height: number, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 */
-		scale(wRatio: number, callback: ImageCallback): void;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param inter Interpolation method.
-		 */
-		scale(wRatio: number, inter: string, callback: ImageCallback): void;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param hRatio Height scale ratio.
-		 */
-		scale(wRatio: number, hRatio: number, callback: ImageCallback): void;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param hRatio Height scale ratio.
-		 * @param inter Interpolation method.
-		 */
-		scale(wRatio: number, hRatio: number, inter: string, callback: ImageCallback): void;
-		
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 */
-		contain(width: number, height: number, callback: ImageCallback): void;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param color Color of the canvas.
-		 */
-		contain(width: number, height: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param inter Interpolation method.
-		 */
-		contain(width: number, height: number, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param color Color of the canvas.
-		 * @param inter Interpolation method.
-		 */
-		contain(width: number, height: number, color: Color, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 */
-		cover(width: number, height: number, callback: ImageCallback): void;
-
-		/**
-		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param inter Interpolation method.
-		 */
-		cover(width: number, height: number, inter: string, callback: ImageCallback): void;
-
-		/**
-		 * Rotate
-		 * @param degs Clockwise rotation degrees.
-		 */
-		rotate(degs: number, callback: ImageCallback): void;
-
-		/**
-		 * Rotate
-		 * @param degs Clockwise rotation degrees.
-		 * @param color Color of the canvas.
-		 */
-		rotate(degs: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Crop with rectangle coordinates
-		 */
-		crop(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
-		
-		/**
-		 * Crop a rectangle from center
-		 * @param width Width of the rectangle to crop from the center of the image.
-		 * @param height Height of the rectangle to crop from the center of the image.
-		 */
-		crop(width: number, height: number, callback: ImageCallback): void;
-
-		/**
-		 * Gaussian blur.
-		 * @param sigma Standard deviation of the Gaussian filter.
-		 */
-		blur(sigma: number, callback: ImageCallback): void;
-
-		/**
-		 * Inverse diffusion shapren.
-		 * @param amplitude Sharpening amplitude.
-		 */
-		sharpen(amplitude: number, callback: ImageCallback): void;
-
-		/**
-		 * Mirror an image along the 'x' axis, 'y' axis or both.
-		 * @param axes 'x', 'y' or 'xy' (case sensitive).
-		 */
-		mirror(axes: string, callback: ImageCallback): void;
-
-		/**
-		 * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
-		 * @param axes 'x', 'y' or 'xy' (case sensitive).
-		 */
-		flip(axes: string, callback: ImageCallback): void;
-
-		/**
-		 * Add a colored border to the image.
-		 * @param width Border width in pixels.
-		 */
-		border(width: number, callback: ImageCallback): void;
-
-		/**
-		 * Add a colored border to the image.
-		 * @param width Border width in pixels.
-		 * @param color Color of the border.
-		 */
-		border(width: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Pad image edges with colored pixels.
-		 * @param left Number of pixels to add to left edge.
-		 * @param top Number of pixels to add to top edge.
-		 * @param right Number of pixels to add to right edge.
-		 * @param bottom Number of pixels to add to bottom edge.
-		 */
-		pad(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
-
-		/**
-		 * Pad image edges with colored pixels.
-		 * @param left Number of pixels to add to left edge.
-		 * @param top Number of pixels to add to top edge.
-		 * @param right Number of pixels to add to right edge.
-		 * @param bottom Number of pixels to add to bottom edge.
-		 * @param color Color of the padding.
-		 */
-		pad(left: number, top: number, right: number, bottom: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image saturation.
-		 * 
-		 * Examples:
-		 * 1. image.saturate(0, ...) will have no effect on the image.
-		 * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
-		 * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
-		 * 
-		 * @param delta By how much to increase / decrease the saturation.
-		 */
-		saturate(delta: number, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image lightness.
-		 * 
-		 * Examples:
-		 * 1. image.lighten(0, ...) will have no effect on the image.
-		 * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
-		 * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
-		 * 
-		 * @param delta By how much to increase / decrease the lightness.
-		 */
-		lighten(delta: number, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
-		 * @param delta By how much to increase / decrease the lightness.
-		 */
-		darken(delta: number, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image hue.
-		 * 
-		 * Examples:
-		 * 1. image.hue(0, ...) will have no effect on the image.
-		 * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
-		 * 
-		 * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
-		 * 
-		 * @param shift By how many degrees to shift each pixel's hue.
-		 */
-		hue(shift: number, callback: ImageCallback): void;
-
-		/**
-		 * Adjust image transperancy.
-		 * 
-		 * Examples:
-		 * 1. image.fade(0, ...) will have no effect on the image.
-		 * 2. image.fade(0.5, ...) will increase the transparency by 50%.
-		 * 3. image.fade(1, ...) will make the image completely transparent.
-		 * 
-		 * Note: The transparency is adjusted independently for each pixel.
-		 * 
-		 * @param delta By how much to increase / decrease the transperancy.
-		 */
-		fade(delta: number, callback: ImageCallback): void;
-
-		/**
-		 * Make image completely opaque.
-		 */
-		opacity(callback: ImageCallback): void;
-
-		/**
-		 * Paste an image on top of this image.
-		 * 
-		 * Notes:
-		 * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
-		 * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
-		 * 3. For transparent images, alpha blending is done according to the equations described here.
-		 * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
-		 * 
-		 * @param left Coordinates of the left corner of the pasted image.
-		 * @param top Coordinates of the top corner of the pasted image.
-		 * @param img The image to paste.
-		 */
-		paste(left: number, top: number, img: Image, callback: ImageCallback): void;
-
-		/**
-		 * Set the color of a pixel.
-		 * 
-		 * Notes:
-		 * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
-		 * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
-		 * 
-		 * @param left Coordinates of the pixel from the left corner of the image.
-		 * @param top Coordinates of the pixel from the top corner of the image.
-		 * @param color Color of the pixel to set.
-		 */
-		setPixel(left: number, top: number, color: Color, callback: ImageCallback): void;
-
-		/**
-		 * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
-		 * @param metadata A string of arbitrary length, or null.
-		 */
-		setMetaData(metadata: string): void;
-
-		// Getters
-
-		/**
-		 * Return the image's width in pixels.
-		 */
-		width(): number;
-
-		/**
-		 * Return the image's height in pixels.
-		 */
-		height(): number;
-
-		/**
-		 * Return the color of the pixel at the (left, top) coordinate.
-		 */
-		getPixel(left: number, top: number): ColorObject;
-
-		/**
-		 * Clone the image into a new image object.
-		 * 
-		 * Note: The image is cloned to the state it was at the time image.clone( ... ) was called, eventhough callback is called asynchronously.
-		 */
-		clone(callback: ImageCallback): void;
-
-		/**
-		 * Copy an area of the image into a new image object.
-		 * 
-		 * Note: The sub-image is extracted from the original image in the state it was at the time image.extract( ... ) was called, eventhough callback is called asynchronously.
-		 */
-		extract(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "jpg", callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "jpg", params: JpegBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "png", callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "png", params: PngBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "gif", callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "gif", params: GifBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: string, callback: BufferCallback): void;
-
-		/**
-		 * Get encoded binary image data as a NodeJS Buffer.
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 */
-		writeFile(path: string, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "jpg", callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "png", callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "gif", callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: string, callback: ImageCallback): void;
-
-		/**
-		 * Write encoded binary image data directly to a file.
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Get the textual metadata from an image. This is currently only supported for tEXt chunks in PNG images, and will get the first tEXt chunk found with the key lwip_data. If none is found, returns null.
-		 */
-		getMetaData<T>(): T;
-
-		// Obtaining a batch object
-
-		/**
-		 * Obtain a batch object from the image
-		 */
-		batch(): Batch;
-	}
-
-	interface Batch {
-		// Using a batch object
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 */
-		resize(width: number): Batch;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Interpolation method.
-		 */
-		resize(width: number, inter: string): Batch;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Height in pixels.
-		 */
-		resize(width: number, height: number): Batch;
-
-		/**
-		 * Resize
-		 * @param Width in pixels.
-		 * @param Height in pixels.
-		 * @param Interpolation method.
-		 */
-		resize(width: number, height: number, inter: string): Batch;
-
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 */
-		scale(wRatio: number): Batch;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param inter Interpolation method.
-		 */
-		scale(wRatio: number, inter: string): Batch;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param hRatio Height scale ratio.
-		 */
-		scale(wRatio: number, hRatio: number): Batch;
-		
-		/**
-		 * Scale
-		 * @param wRatio Width scale ratio.
-		 * @param hRatio Height scale ratio.
-		 * @param inter Interpolation method.
-		 */
-		scale(wRatio: number, hRatio: number, inter: string): Batch;
-		
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 */
-		contain(width: number, height: number): Batch;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param color Color of the canvas.
-		 */
-		contain(width: number, height: number, color: Color): Batch;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param inter Interpolation method.
-		 */
-		contain(width: number, height: number, inter: string): Batch;
-
-		/**
-		 * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param color Color of the canvas.
-		 * @param inter Interpolation method.
-		 */
-		contain(width: number, height: number, color: Color, inter: string): Batch;
-
-		/**
-		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 */
-		cover(width: number, height: number): Batch;
-
-		/**
-		 * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
-		 * @param width Canvas' width in pixels.
-		 * @param height Canvas' height in pixels.
-		 * @param inter Interpolation method.
-		 */
-		cover(width: number, height: number, inter: string): Batch;
-
-		/**
-		 * Rotate
-		 * @param degs Clockwise rotation degrees.
-		 */
-		rotate(degs: number): Batch;
-
-		/**
-		 * Rotate
-		 * @param degs Clockwise rotation degrees.
-		 * @param color Color of the canvas.
-		 */
-		rotate(degs: number, color: Color): Batch;
-
-		/**
-		 * Crop with rectangle coordinates
-		 */
-		crop(left: number, top: number, right: number, bottom: number): Batch;
-		
-		/**
-		 * Crop a rectangle from center
-		 * @param width Width of the rectangle to crop from the center of the image.
-		 * @param height Height of the rectangle to crop from the center of the image.
-		 */
-		crop(width: number, height: number): Batch;
-
-		/**
-		 * Gaussian blur.
-		 * @param sigma Standard deviation of the Gaussian filter.
-		 */
-		blur(sigma: number): Batch;
-
-		/**
-		 * Inverse diffusion shapren.
-		 * @param amplitude Sharpening amplitude.
-		 */
-		sharpen(amplitude: number): Batch;
-
-		/**
-		 * Mirror an image along the 'x' axis, 'y' axis or both.
-		 * @param axes 'x', 'y' or 'xy' (case sensitive).
-		 */
-		mirror(axes: string): Batch;
-
-		/**
-		 * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
-		 * @param axes 'x', 'y' or 'xy' (case sensitive).
-		 */
-		flip(axes: string): Batch;
-
-		/**
-		 * Add a colored border to the image.
-		 * @param width Border width in pixels.
-		 */
-		border(width: number): Batch;
-
-		/**
-		 * Add a colored border to the image.
-		 * @param width Border width in pixels.
-		 * @param color Color of the border.
-		 */
-		border(width: number, color: Color): Batch;
-
-		/**
-		 * Pad image edges with colored pixels.
-		 * @param left Number of pixels to add to left edge.
-		 * @param top Number of pixels to add to top edge.
-		 * @param right Number of pixels to add to right edge.
-		 * @param bottom Number of pixels to add to bottom edge.
-		 */
-		pad(left: number, top: number, right: number, bottom: number): Batch;
-
-		/**
-		 * Pad image edges with colored pixels.
-		 * @param left Number of pixels to add to left edge.
-		 * @param top Number of pixels to add to top edge.
-		 * @param right Number of pixels to add to right edge.
-		 * @param bottom Number of pixels to add to bottom edge.
-		 * @param color Color of the padding.
-		 */
-		pad(left: number, top: number, right: number, bottom: number, color: Color): Batch;
-
-		/**
-		 * Adjust image saturation.
-		 * 
-		 * Examples:
-		 * 1. image.saturate(0, ...) will have no effect on the image.
-		 * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
-		 * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
-		 * 
-		 * @param delta By how much to increase / decrease the saturation.
-		 */
-		saturate(delta: number): Batch;
-
-		/**
-		 * Adjust image lightness.
-		 * 
-		 * Examples:
-		 * 1. image.lighten(0, ...) will have no effect on the image.
-		 * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
-		 * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
-		 * 
-		 * @param delta By how much to increase / decrease the lightness.
-		 */
-		lighten(delta: number): Batch;
-
-		/**
-		 * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
-		 * @param delta By how much to increase / decrease the lightness.
-		 */
-		darken(delta: number): Batch;
-
-		/**
-		 * Adjust image hue.
-		 * 
-		 * Examples:
-		 * 1. image.hue(0, ...) will have no effect on the image.
-		 * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
-		 * 
-		 * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
-		 * 
-		 * @param shift By how many degrees to shift each pixel's hue.
-		 */
-		hue(shift: number): Batch;
-
-		/**
-		 * Adjust image transperancy.
-		 * 
-		 * Examples:
-		 * 1. image.fade(0, ...) will have no effect on the image.
-		 * 2. image.fade(0.5, ...) will increase the transparency by 50%.
-		 * 3. image.fade(1, ...) will make the image completely transparent.
-		 * 
-		 * Note: The transparency is adjusted independently for each pixel.
-		 * 
-		 * @param delta By how much to increase / decrease the transperancy.
-		 */
-		fade(delta: number): Batch;
-
-		/**
-		 * Make image completely opaque.
-		 */
-		opacity(callback: ImageCallback): void;
-
-		/**
-		 * Paste an image on top of this image.
-		 * 
-		 * Notes:
-		 * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
-		 * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
-		 * 3. For transparent images, alpha blending is done according to the equations described here.
-		 * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
-		 * 
-		 * @param left Coordinates of the left corner of the pasted image.
-		 * @param top Coordinates of the top corner of the pasted image.
-		 * @param img The image to paste.
-		 */
-		paste(left: number, top: number, img: Image): Batch;
-
-		/**
-		 * Set the color of a pixel.
-		 * 
-		 * Notes:
-		 * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
-		 * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
-		 * 
-		 * @param left Coordinates of the pixel from the left corner of the image.
-		 * @param top Coordinates of the pixel from the top corner of the image.
-		 * @param color Color of the pixel to set.
-		 */
-		setPixel(left: number, top: number, color: Color): Batch;
-
-		/**
-		 * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
-		 * @param metadata A string of arbitrary length, or null.
-		 */
-		setMetaData(metadata: string): void;
-
-		// Executing a batch
-
-		/**
-		 * Execute batch and obtain the manipulated image object
-		 */
-		exec(callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "jpg", callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "jpg", params: JpegBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "png", callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "png", params: PngBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: "gif", callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: "gif", params: GifBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 */
-		toBuffer(format: string, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and obtain a Buffer object
-		 * 
-		 * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
-		 * 
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: BufferCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 */
-		writeFile(path: string, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "jpg", callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "png", callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: "gif", callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 */
-		writeFile(path: string, format: string, callback: ImageCallback): void;
-
-		/**
-		 * Execute batch and write to file
-		 * 
-		 * @param path Path of file to write.
-		 * @param format Encoding format.
-		 * @param params Format-specific parameters.
-		 */
-		writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
-	}
+interface ImageCallback {
+    (err: any, image: Image): void;
+}
+
+interface BufferCallback {
+    (err: any, buffer: Buffer): void;
+}
+
+/**
+ * Open an image
+ * @param source The path to the image on disk.
+ */
+declare function open(source: string, callback: ImageCallback): void;
+
+/**
+ * Open an image
+ * @param source The path to the image on disk.
+ * @param type Optional type of the image. If omitted, the type will be inferred from the file extension. Type must be a string of the image type (i.e. "jpg").
+ */
+declare function open(source: string, type: string, callback: ImageCallback): void;
+
+/**
+ * Open an image
+ * @param source The path to the image on disk or an image buffer.
+ * @param type Type of the image. If source is an encoded image buffer, type must be a string of the image type (i.e. "jpg"). If source is a raw pixels buffer type must be an object with type.width and type.height properties. 
+ */
+declare function open(source: Buffer, type: string | { width: number, height: number }, callback: ImageCallback): any;
+
+/**
+ * Create a new image
+ * @param width The width of the new image.
+ * @param height The height of the new image.
+ */
+declare function create(width: number, height: number, callback: ImageCallback): void;
+
+/**
+ * Create a new image
+ * @param width The width of the new image.
+ * @param height The height of the new image.
+ * @param color Optional Color of the canvas.
+ */
+declare function create(width: number, height: number, color: Color, callback: ImageCallback): void;
+
+type JpegBufferParams = {
+    quality?: number;
+};
+
+type PngBufferParams = {
+    compression?: string;
+    interlaced?: boolean;
+    transparency?: boolean | string;
+};
+
+type GifBufferParams = {
+    colors?: number;
+    interlaced?: boolean;
+    transparency?: boolean | string;
+    threshold: number;
+}
+
+interface Image {
+    // Image operations
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     */
+    resize(width: number, callback: ImageCallback): void;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Interpolation method.
+     */
+    resize(width: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Height in pixels.
+     */
+    resize(width: number, height: number, callback: ImageCallback): void;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Height in pixels.
+     * @param Interpolation method.
+     */
+    resize(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     */
+    scale(wRatio: number, callback: ImageCallback): void;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param inter Interpolation method.
+     */
+    scale(wRatio: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param hRatio Height scale ratio.
+     */
+    scale(wRatio: number, hRatio: number, callback: ImageCallback): void;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param hRatio Height scale ratio.
+     * @param inter Interpolation method.
+     */
+    scale(wRatio: number, hRatio: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     */
+    contain(width: number, height: number, callback: ImageCallback): void;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param color Color of the canvas.
+     */
+    contain(width: number, height: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param inter Interpolation method.
+     */
+    contain(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param color Color of the canvas.
+     * @param inter Interpolation method.
+     */
+    contain(width: number, height: number, color: Color, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     */
+    cover(width: number, height: number, callback: ImageCallback): void;
+
+    /**
+     * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param inter Interpolation method.
+     */
+    cover(width: number, height: number, inter: string, callback: ImageCallback): void;
+
+    /**
+     * Rotate
+     * @param degs Clockwise rotation degrees.
+     */
+    rotate(degs: number, callback: ImageCallback): void;
+
+    /**
+     * Rotate
+     * @param degs Clockwise rotation degrees.
+     * @param color Color of the canvas.
+     */
+    rotate(degs: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Crop with rectangle coordinates
+     */
+    crop(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+
+    /**
+     * Crop a rectangle from center
+     * @param width Width of the rectangle to crop from the center of the image.
+     * @param height Height of the rectangle to crop from the center of the image.
+     */
+    crop(width: number, height: number, callback: ImageCallback): void;
+
+    /**
+     * Gaussian blur.
+     * @param sigma Standard deviation of the Gaussian filter.
+     */
+    blur(sigma: number, callback: ImageCallback): void;
+
+    /**
+     * Inverse diffusion shapren.
+     * @param amplitude Sharpening amplitude.
+     */
+    sharpen(amplitude: number, callback: ImageCallback): void;
+
+    /**
+     * Mirror an image along the 'x' axis, 'y' axis or both.
+     * @param axes 'x', 'y' or 'xy' (case sensitive).
+     */
+    mirror(axes: string, callback: ImageCallback): void;
+
+    /**
+     * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
+     * @param axes 'x', 'y' or 'xy' (case sensitive).
+     */
+    flip(axes: string, callback: ImageCallback): void;
+
+    /**
+     * Add a colored border to the image.
+     * @param width Border width in pixels.
+     */
+    border(width: number, callback: ImageCallback): void;
+
+    /**
+     * Add a colored border to the image.
+     * @param width Border width in pixels.
+     * @param color Color of the border.
+     */
+    border(width: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Pad image edges with colored pixels.
+     * @param left Number of pixels to add to left edge.
+     * @param top Number of pixels to add to top edge.
+     * @param right Number of pixels to add to right edge.
+     * @param bottom Number of pixels to add to bottom edge.
+     */
+    pad(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+
+    /**
+     * Pad image edges with colored pixels.
+     * @param left Number of pixels to add to left edge.
+     * @param top Number of pixels to add to top edge.
+     * @param right Number of pixels to add to right edge.
+     * @param bottom Number of pixels to add to bottom edge.
+     * @param color Color of the padding.
+     */
+    pad(left: number, top: number, right: number, bottom: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Adjust image saturation.
+     * 
+     * Examples:
+     * 1. image.saturate(0, ...) will have no effect on the image.
+     * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
+     * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
+     * 
+     * @param delta By how much to increase / decrease the saturation.
+     */
+    saturate(delta: number, callback: ImageCallback): void;
+
+    /**
+     * Adjust image lightness.
+     * 
+     * Examples:
+     * 1. image.lighten(0, ...) will have no effect on the image.
+     * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
+     * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
+     * 
+     * @param delta By how much to increase / decrease the lightness.
+     */
+    lighten(delta: number, callback: ImageCallback): void;
+
+    /**
+     * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
+     * @param delta By how much to increase / decrease the lightness.
+     */
+    darken(delta: number, callback: ImageCallback): void;
+
+    /**
+     * Adjust image hue.
+     * 
+     * Examples:
+     * 1. image.hue(0, ...) will have no effect on the image.
+     * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
+     * 
+     * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
+     * 
+     * @param shift By how many degrees to shift each pixel's hue.
+     */
+    hue(shift: number, callback: ImageCallback): void;
+
+    /**
+     * Adjust image transperancy.
+     * 
+     * Examples:
+     * 1. image.fade(0, ...) will have no effect on the image.
+     * 2. image.fade(0.5, ...) will increase the transparency by 50%.
+     * 3. image.fade(1, ...) will make the image completely transparent.
+     * 
+     * Note: The transparency is adjusted independently for each pixel.
+     * 
+     * @param delta By how much to increase / decrease the transperancy.
+     */
+    fade(delta: number, callback: ImageCallback): void;
+
+    /**
+     * Make image completely opaque.
+     */
+    opacity(callback: ImageCallback): void;
+
+    /**
+     * Paste an image on top of this image.
+     * 
+     * Notes:
+     * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
+     * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
+     * 3. For transparent images, alpha blending is done according to the equations described here.
+     * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
+     * 
+     * @param left Coordinates of the left corner of the pasted image.
+     * @param top Coordinates of the top corner of the pasted image.
+     * @param img The image to paste.
+     */
+    paste(left: number, top: number, img: Image, callback: ImageCallback): void;
+
+    /**
+     * Set the color of a pixel.
+     * 
+     * Notes:
+     * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
+     * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
+     * 
+     * @param left Coordinates of the pixel from the left corner of the image.
+     * @param top Coordinates of the pixel from the top corner of the image.
+     * @param color Color of the pixel to set.
+     */
+    setPixel(left: number, top: number, color: Color, callback: ImageCallback): void;
+
+    /**
+     * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
+     * @param metadata A string of arbitrary length, or null.
+     */
+    setMetaData(metadata: string): void;
+
+    // Getters
+
+    /**
+     * Return the image's width in pixels.
+     */
+    width(): number;
+
+    /**
+     * Return the image's height in pixels.
+     */
+    height(): number;
+
+    /**
+     * Return the color of the pixel at the (left, top) coordinate.
+     */
+    getPixel(left: number, top: number): ColorObject;
+
+    /**
+     * Clone the image into a new image object.
+     * 
+     * Note: The image is cloned to the state it was at the time image.clone( ... ) was called, eventhough callback is called asynchronously.
+     */
+    clone(callback: ImageCallback): void;
+
+    /**
+     * Copy an area of the image into a new image object.
+     * 
+     * Note: The sub-image is extracted from the original image in the state it was at the time image.extract( ... ) was called, eventhough callback is called asynchronously.
+     */
+    extract(left: number, top: number, right: number, bottom: number, callback: ImageCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "jpg", callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "jpg", params: JpegBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "png", callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "png", params: PngBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "gif", callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "gif", params: GifBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: string, callback: BufferCallback): void;
+
+    /**
+     * Get encoded binary image data as a NodeJS Buffer.
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     */
+    writeFile(path: string, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "jpg", callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "png", callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "gif", callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: string, callback: ImageCallback): void;
+
+    /**
+     * Write encoded binary image data directly to a file.
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Get the textual metadata from an image. This is currently only supported for tEXt chunks in PNG images, and will get the first tEXt chunk found with the key lwip_data. If none is found, returns null.
+     */
+    getMetaData<T>(): T;
+
+    // Obtaining a batch object
+
+    /**
+     * Obtain a batch object from the image
+     */
+    batch(): Batch;
+}
+
+interface Batch {
+    // Using a batch object
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     */
+    resize(width: number): Batch;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Interpolation method.
+     */
+    resize(width: number, inter: string): Batch;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Height in pixels.
+     */
+    resize(width: number, height: number): Batch;
+
+    /**
+     * Resize
+     * @param Width in pixels.
+     * @param Height in pixels.
+     * @param Interpolation method.
+     */
+    resize(width: number, height: number, inter: string): Batch;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     */
+    scale(wRatio: number): Batch;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param inter Interpolation method.
+     */
+    scale(wRatio: number, inter: string): Batch;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param hRatio Height scale ratio.
+     */
+    scale(wRatio: number, hRatio: number): Batch;
+
+    /**
+     * Scale
+     * @param wRatio Width scale ratio.
+     * @param hRatio Height scale ratio.
+     * @param inter Interpolation method.
+     */
+    scale(wRatio: number, hRatio: number, inter: string): Batch;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     */
+    contain(width: number, height: number): Batch;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param color Color of the canvas.
+     */
+    contain(width: number, height: number, color: Color): Batch;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param inter Interpolation method.
+     */
+    contain(width: number, height: number, inter: string): Batch;
+
+    /**
+     * Contain the image in a colored canvas. The image will be resized to the largest possible size such that it's fully contained inside the canvas.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param color Color of the canvas.
+     * @param inter Interpolation method.
+     */
+    contain(width: number, height: number, color: Color, inter: string): Batch;
+
+    /**
+     * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     */
+    cover(width: number, height: number): Batch;
+
+    /**
+     * Cover a canvas with the image. The image will be resized to the smallest possible size such that both its dimensions are bigger than the canvas's dimensions. Margins of the image exceeding the canvas will be discarded.
+     * @param width Canvas' width in pixels.
+     * @param height Canvas' height in pixels.
+     * @param inter Interpolation method.
+     */
+    cover(width: number, height: number, inter: string): Batch;
+
+    /**
+     * Rotate
+     * @param degs Clockwise rotation degrees.
+     */
+    rotate(degs: number): Batch;
+
+    /**
+     * Rotate
+     * @param degs Clockwise rotation degrees.
+     * @param color Color of the canvas.
+     */
+    rotate(degs: number, color: Color): Batch;
+
+    /**
+     * Crop with rectangle coordinates
+     */
+    crop(left: number, top: number, right: number, bottom: number): Batch;
+
+    /**
+     * Crop a rectangle from center
+     * @param width Width of the rectangle to crop from the center of the image.
+     * @param height Height of the rectangle to crop from the center of the image.
+     */
+    crop(width: number, height: number): Batch;
+
+    /**
+     * Gaussian blur.
+     * @param sigma Standard deviation of the Gaussian filter.
+     */
+    blur(sigma: number): Batch;
+
+    /**
+     * Inverse diffusion shapren.
+     * @param amplitude Sharpening amplitude.
+     */
+    sharpen(amplitude: number): Batch;
+
+    /**
+     * Mirror an image along the 'x' axis, 'y' axis or both.
+     * @param axes 'x', 'y' or 'xy' (case sensitive).
+     */
+    mirror(axes: string): Batch;
+
+    /**
+     * Alias of mirror. Mirror an image along the 'x' axis, 'y' axis or both.
+     * @param axes 'x', 'y' or 'xy' (case sensitive).
+     */
+    flip(axes: string): Batch;
+
+    /**
+     * Add a colored border to the image.
+     * @param width Border width in pixels.
+     */
+    border(width: number): Batch;
+
+    /**
+     * Add a colored border to the image.
+     * @param width Border width in pixels.
+     * @param color Color of the border.
+     */
+    border(width: number, color: Color): Batch;
+
+    /**
+     * Pad image edges with colored pixels.
+     * @param left Number of pixels to add to left edge.
+     * @param top Number of pixels to add to top edge.
+     * @param right Number of pixels to add to right edge.
+     * @param bottom Number of pixels to add to bottom edge.
+     */
+    pad(left: number, top: number, right: number, bottom: number): Batch;
+
+    /**
+     * Pad image edges with colored pixels.
+     * @param left Number of pixels to add to left edge.
+     * @param top Number of pixels to add to top edge.
+     * @param right Number of pixels to add to right edge.
+     * @param bottom Number of pixels to add to bottom edge.
+     * @param color Color of the padding.
+     */
+    pad(left: number, top: number, right: number, bottom: number, color: Color): Batch;
+
+    /**
+     * Adjust image saturation.
+     * 
+     * Examples:
+     * 1. image.saturate(0, ...) will have no effect on the image.
+     * 2. image.saturate(0.5, ...) will increase the saturation by 50%.
+     * 3. image.saturate(-1, ...) will decrease the saturation by 100%, effectively desaturating the image.
+     * 
+     * @param delta By how much to increase / decrease the saturation.
+     */
+    saturate(delta: number): Batch;
+
+    /**
+     * Adjust image lightness.
+     * 
+     * Examples:
+     * 1. image.lighten(0, ...) will have no effect on the image.
+     * 2. image.lighten(0.5, ...) will increase the lightness by 50%.
+     * 3. image.lighten(-1, ...) will decrease the lightness by 100%, effectively making the image black.
+     * 
+     * @param delta By how much to increase / decrease the lightness.
+     */
+    lighten(delta: number): Batch;
+
+    /**
+     * Adjust image lightness. Equivalent to image.lighten(-delta, callback).
+     * @param delta By how much to increase / decrease the lightness.
+     */
+    darken(delta: number): Batch;
+
+    /**
+     * Adjust image hue.
+     * 
+     * Examples:
+     * 1. image.hue(0, ...) will have no effect on the image.
+     * 2. image.hue(100, ...) will shift pixels' hue by 100 degrees.
+     * 
+     * Note: The hue is shifted in a circular manner in the range [0,360] for each pixel individually.
+     * 
+     * @param shift By how many degrees to shift each pixel's hue.
+     */
+    hue(shift: number): Batch;
+
+    /**
+     * Adjust image transperancy.
+     * 
+     * Examples:
+     * 1. image.fade(0, ...) will have no effect on the image.
+     * 2. image.fade(0.5, ...) will increase the transparency by 50%.
+     * 3. image.fade(1, ...) will make the image completely transparent.
+     * 
+     * Note: The transparency is adjusted independently for each pixel.
+     * 
+     * @param delta By how much to increase / decrease the transperancy.
+     */
+    fade(delta: number): Batch;
+
+    /**
+     * Make image completely opaque.
+     */
+    opacity(callback: ImageCallback): void;
+
+    /**
+     * Paste an image on top of this image.
+     * 
+     * Notes:
+     * 1. If the pasted image exceeds the bounds of the base image, an exception is thrown.
+     * 2. img is pasted in the state it was at the time image.paste( ... ) was called, eventhough callback is called asynchronously.
+     * 3. For transparent images, alpha blending is done according to the equations described here.
+     * 4. Extra caution is required when using this method in batch mode, as the images may change by the time this operation is called.
+     * 
+     * @param left Coordinates of the left corner of the pasted image.
+     * @param top Coordinates of the top corner of the pasted image.
+     * @param img The image to paste.
+     */
+    paste(left: number, top: number, img: Image): Batch;
+
+    /**
+     * Set the color of a pixel.
+     * 
+     * Notes:
+     * 1. If the coordinates exceed the bounds of the image, an exception is thrown.
+     * 2. Extra caution is required when using this method in batch mode, as the dimensions of the image may change by the time this operation is called.
+     * 
+     * @param left Coordinates of the pixel from the left corner of the image.
+     * @param top Coordinates of the pixel from the top corner of the image.
+     * @param color Color of the pixel to set.
+     */
+    setPixel(left: number, top: number, color: Color): Batch;
+
+    /**
+     * Set the metadata in an image. This is currently only supported for PNG files. Sets a tEXt chunk with the key lwip_data and comment as the given string. If called with a null parameter, removes existing metadata from the image, if present.
+     * @param metadata A string of arbitrary length, or null.
+     */
+    setMetaData(metadata: string): void;
+
+    // Executing a batch
+
+    /**
+     * Execute batch and obtain the manipulated image object
+     */
+    exec(callback: ImageCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "jpg", callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "jpg", params: JpegBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "png", callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "png", params: PngBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: "gif", callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: "gif", params: GifBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     */
+    toBuffer(format: string, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and obtain a Buffer object
+     * 
+     * When opening an image, it is decoded and stored in memory as an uncompressed image. All manipulations are done on the uncompressed data in memory. This method allows to encode the image to one of the specified formats and get the encoded data as a NodeJS Buffer object.
+     * 
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    toBuffer(format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: BufferCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     */
+    writeFile(path: string, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "jpg", callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "jpg", params: JpegBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "png", callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "png", params: PngBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: "gif", callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: "gif", params: GifBufferParams, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     */
+    writeFile(path: string, format: string, callback: ImageCallback): void;
+
+    /**
+     * Execute batch and write to file
+     * 
+     * @param path Path of file to write.
+     * @param format Encoding format.
+     * @param params Format-specific parameters.
+     */
+    writeFile(path: string, format: string, params: JpegBufferParams | PngBufferParams | GifBufferParams, callback: ImageCallback): void;
 }
diff --git a/magic-number/magic-number.d.ts b/magic-number/magic-number.d.ts
index 001b47c70b..dcde25f919 100644
--- a/magic-number/magic-number.d.ts
+++ b/magic-number/magic-number.d.ts
@@ -3,6 +3,5 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "magic-number" {
-    export function detectFile(file: string): string;
-}
+
+declare export function detectFile(file: string): string;
diff --git a/mailparser/mailparser.d.ts b/mailparser/mailparser.d.ts
index 94e99308d9..d03efecf33 100644
--- a/mailparser/mailparser.d.ts
+++ b/mailparser/mailparser.d.ts
@@ -7,81 +7,80 @@
 /// <reference path='../node/node.d.ts' />
 
 
-declare module 'mailparser' {
-    import WritableStream = NodeJS.WritableStream;
-    import EventEmitter = NodeJS.EventEmitter;
 
-    interface Options {
-        debug?: boolean;    // if set to true print all incoming lines to console
-        streamAttachments?: boolean;   // if set to true, stream attachments instead of including them
-        unescapeSMTP?: boolean;   // if set to true replace double dots in the beginning of the file
-        defaultCharset?: string;   // the default charset for text/plain and text/html content, if not set reverts to Latin-1
-        showAttachmentLinks?: boolean;    // if set to true, show inlined attachment links <a href="cid:...">filename</a>
-    }
-    
-    
-    interface EmailAddress {
-        address: string;
-        name: string;
-    }
-    
-    
-    interface Attachment {
-        contentType: string;
-        fileName: string;
-        contentDisposition: string;    // e.g. 'attachment'
-        contentId: string;   // e.g. '5.1321281380971@localhost'
-        transferEncoding: string;   // e.g. 'base64'
-        length: number;   // length of the attachment in bytes
-        generatedFileName: string;   // e.g. 'image.png'
-        checksum: string;  // the md5 hash of the file, e.g. 'e4cef4c6e26037bcf8166905207ea09b'
-        content: Buffer;   // possibly a SlowBuffer
-    }
-    
-    // emitted with the 'end' event
-    interface ParsedMail {
-        headers: any;  // unprocessed headers in the form of - {key: value} - if there were multiple fields with the same key then the value is an array
-        from: EmailAddress[];  // should be only one though)
-        to: EmailAddress[];
-        cc?: EmailAddress[];
-        bcc?: EmailAddress[];
-        subject: string;  // the subject line
-        references?: string[];  // an array of reference message id values (not set if no reference values present)
-        inReplyTo?: string[];  // an array of In-Reply-To message id values (not set if no in-reply-to values present)
-        priority?: string;   // priority of the e-mail, always one of the following: normal (default), high, low
-        text: string;    // text body
-        html: string;    // html body
-        date?: Date; // If date could not be resolved or is not found this field is not set. Check the original date string from headers.date
-        attachments?: Attachment[];
-    }
-    
+import WritableStream = NodeJS.WritableStream;
+import EventEmitter = NodeJS.EventEmitter;
 
-
-    class MailParser implements WritableStream {
-        constructor(options?: Options);
-        on(event: string, callback: (any: any) => void): this;
-
-        // from WritableStream
-        writable: boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-
-        // from EventEmitter
-        static listenerCount(emitter: EventEmitter, event: string): number;
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-    }
+interface Options {
+    debug?: boolean;    // if set to true print all incoming lines to console
+    streamAttachments?: boolean;   // if set to true, stream attachments instead of including them
+    unescapeSMTP?: boolean;   // if set to true replace double dots in the beginning of the file
+    defaultCharset?: string;   // the default charset for text/plain and text/html content, if not set reverts to Latin-1
+    showAttachmentLinks?: boolean;    // if set to true, show inlined attachment links <a href="cid:...">filename</a>
+}
+
+
+interface EmailAddress {
+    address: string;
+    name: string;
+}
+
+
+interface Attachment {
+    contentType: string;
+    fileName: string;
+    contentDisposition: string;    // e.g. 'attachment'
+    contentId: string;   // e.g. '5.1321281380971@localhost'
+    transferEncoding: string;   // e.g. 'base64'
+    length: number;   // length of the attachment in bytes
+    generatedFileName: string;   // e.g. 'image.png'
+    checksum: string;  // the md5 hash of the file, e.g. 'e4cef4c6e26037bcf8166905207ea09b'
+    content: Buffer;   // possibly a SlowBuffer
+}
+
+// emitted with the 'end' event
+interface ParsedMail {
+    headers: any;  // unprocessed headers in the form of - {key: value} - if there were multiple fields with the same key then the value is an array
+    from: EmailAddress[];  // should be only one though)
+    to: EmailAddress[];
+    cc?: EmailAddress[];
+    bcc?: EmailAddress[];
+    subject: string;  // the subject line
+    references?: string[];  // an array of reference message id values (not set if no reference values present)
+    inReplyTo?: string[];  // an array of In-Reply-To message id values (not set if no in-reply-to values present)
+    priority?: string;   // priority of the e-mail, always one of the following: normal (default), high, low
+    text: string;    // text body
+    html: string;    // html body
+    date?: Date; // If date could not be resolved or is not found this field is not set. Check the original date string from headers.date
+    attachments?: Attachment[];
+}
+
+
+
+declare class MailParser implements WritableStream {
+    constructor(options?: Options);
+    on(event: string, callback: (any: any) => void): this;
+
+    // from WritableStream
+    writable: boolean;
+    write(buffer: Buffer, cb?: Function): boolean;
+    write(str: string, cb?: Function): boolean;
+    write(str: string, encoding?: string, cb?: Function): boolean;
+    end(): void;
+    end(buffer: Buffer, cb?: Function): void;
+    end(str: string, cb?: Function): void;
+    end(str: string, encoding?: string, cb?: Function): void;
+
+    // from EventEmitter
+    static listenerCount(emitter: EventEmitter, event: string): number;
+    addListener(event: string, listener: Function): this;
+    on(event: string, listener: Function): this;
+    once(event: string, listener: Function): this;
+    removeListener(event: string, listener: Function): this;
+    removeAllListeners(event?: string): this;
+    setMaxListeners(n: number): this;
+    getMaxListeners(): number;
+    listeners(event: string): Function[];
+    emit(event: string, ...args: any[]): boolean;
+    listenerCount(type: string): number;
 }
diff --git a/main-bower-files/main-bower-files.d.ts b/main-bower-files/main-bower-files.d.ts
index 28696f5084..9d92f7fbe4 100644
--- a/main-bower-files/main-bower-files.d.ts
+++ b/main-bower-files/main-bower-files.d.ts
@@ -5,30 +5,29 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "main-bower-files" {
 
-    interface IPaths {
-        bowerDirectory?: string;
-        bowerrc?: string;
-        bowerJson?: string;
-    }
 
-    interface IFilterFunction {
-        (filepath: string): boolean;
-    }
-
-    interface IOptions {
-        debugging?: boolean;
-        main?: string | string[] | Object;
-        env?: string;
-        paths?: IPaths | string;
-        checkExistence?: boolean;
-        includeDev?: boolean | string;
-        includeSelf?: boolean;
-        filter?: RegExp | IFilterFunction | string | string[];
-    }
-
-    function mainBowerFiles(options?: IOptions): string[];
-
-    export = mainBowerFiles;
+interface IPaths {
+    bowerDirectory?: string;
+    bowerrc?: string;
+    bowerJson?: string;
 }
+
+interface IFilterFunction {
+    (filepath: string): boolean;
+}
+
+interface IOptions {
+    debugging?: boolean;
+    main?: string | string[] | Object;
+    env?: string;
+    paths?: IPaths | string;
+    checkExistence?: boolean;
+    includeDev?: boolean | string;
+    includeSelf?: boolean;
+    filter?: RegExp | IFilterFunction | string | string[];
+}
+
+declare function mainBowerFiles(options?: IOptions): string[];
+
+export = mainBowerFiles;
diff --git a/mandrill-api/mandrill-api.d.ts b/mandrill-api/mandrill-api.d.ts
index 7192271952..ca94a97b50 100644
--- a/mandrill-api/mandrill-api.d.ts
+++ b/mandrill-api/mandrill-api.d.ts
@@ -11,1172 +11,1171 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'mandrill-api' {
-
-    export interface ICallback {
-        (json: Object): void;
-    }
-
-    export interface IErrorCallback {
-        (err: Error): void;
-    }
-
-    export class Mandrill {
-        apikey: string;
-        debug: boolean;
-        templates: Templates;
-        exports: Exports;
-        users: Users;
-        rejects: Rejects;
-        inbound: Inbound;
-        tags: Tags;
-        messages: Messages;
-        whitelists: Whitelists;
-        ips: Ips;
-        internal: Internal;
-        subaccounts: Subaccounts;
-        urls: Urls;
-        webhooks: Webhooks;
-        senders: Senders;
-        metadata: Metadata;
-        onerror: IErrorCallback;
-        constructor(apikey: string, debug?: boolean);
-        call(uri: string, params: any, onresult?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Templates {
-        constructor(master: Mandrill);
-
-        /**
-         * Add a new template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the name for the new template - must be unique
-         * @option params {String} from_email a default sending address for emails sent using this template
-         * @option params {String} from_name a default from name to be used
-         * @option params {String} subject a default subject line to be used
-         * @option params {String} code the HTML code for the template with mc:edit attributes for the editable elements
-         * @option params {String} text a default text part to be used when sending with this template
-         * @option params {Boolean} publish set to false to add a draft template without publishing
-         * @option params {Array} labels an optional array of up to 10 labels to use for filtering templates
-         *    - labels[] {String} a single label
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Get the information for an existing template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the immutable name of an existing template
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Update the code for an existing template. If null is provided for any fields, the values will remain unchanged.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the immutable name of an existing template
-         * @option params {String} from_email the new default sending address
-         * @option params {String} from_name the new default from name
-         * @option params {String} subject the new default subject line
-         * @option params {String} code the new code for the template
-         * @option params {String} text the new default text part to be used
-         * @option params {Boolean} publish set to false to update the draft version of the template without publishing
-         * @option params {Array} labels an optional array of up to 10 labels to use for filtering templates
-         *    - labels[] {String} a single label
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Publish the content for the template. Any new messages sent using this template will start using the content that was previously in draft.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the immutable name of an existing template
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        publish(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Delete a template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the immutable name of an existing template
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return a list of all the templates available to this user
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} label an optional label to filter the templates
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for a template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the name of an existing template
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Inject content and optionally merge fields into a template, returning the HTML that results
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} template_name the immutable name of a template that exists in the user's account
-         * @option params {Array} template_content an array of template content to render.  Each item in the array should be a struct with two keys - name: the name of the content block to set the content for, and content: the actual content to put into the block
-         *    - template_content[] {Object} the injection of a single piece of content into a single editable region
-         *        - name {String} the name of the mc:edit editable region to inject into
-         *        - content {String} the content to inject
-         * @option params {Array} merge_vars optional merge variables to use for injecting merge field content.  If this is not provided, no merge fields will be replaced.
-         *    - merge_vars[] {Object} a single merge variable
-         *        - name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *        - content {String} the merge variable's content
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        render(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Exports {
-        constructor(master: Mandrill);
-
-        /**
-         * Returns information about an export job. If the export job's state is 'complete',
-         * the returned data will include a URL you can use to fetch the results. Every export
-         * job produces a zip archive, but the format of the archive is distinct for each job
-         * type. The api calls that initiate exports include more details about the output format
-         * for that job type.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id an export job identifier
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Returns a list of your exports.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Begins an export of your rejection blacklist. The blacklist will be exported to a zip archive
-         * containing a single file named rejects.csv that includes the following fields: email,
-         * reason, detail, created_at, expires_at, last_event_at, expires_at.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} notify_email an optional email address to notify when the export job has finished.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        rejects(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Begins an export of your rejection whitelist. The whitelist will be exported to a zip archive
-         * containing a single file named whitelist.csv that includes the following fields:
-         * email, detail, created_at.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} notify_email an optional email address to notify when the export job has finished.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        whitelist(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Begins an export of your activity history. The activity will be exported to a zip archive
-         * containing a single file named activity.csv in the same format as you would be able to export
-         * from your account's activity view. It includes the following fields: Date, Email Address,
-         * Sender, Subject, Status, Tags, Opens, Clicks, Bounce Detail. If you have configured any custom
-         * metadata fields, they will be included in the exported data.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} notify_email an optional email address to notify when the export job has finished
-         * @option params {String} date_from start date as a UTC string in YYYY-MM-DD HH:MM:SS format
-         * @option params {String} date_to end date as a UTC string in YYYY-MM-DD HH:MM:SS format
-         * @option params {Array} tags an array of tag names to narrow the export to; will match messages that contain ANY of the tags
-         *      - tags[] {String} a tag name
-         * @option params {Array} senders an array of senders to narrow the export to
-         *      - senders[] {String} a sender address
-         * @option params {Array} states an array of states to narrow the export to; messages with ANY of the states will be included
-         *      - states[] {String} a message state
-         * @option params {Array} api_keys an array of api keys to narrow the export to; messsagse sent with ANY of the keys will be included
-         *      - api_keys[] {String} an API key associated with your account
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        activity(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Users {
-        constructor(master: Mandrill);
-
-        /**
-         * Return the information about the API-connected user
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Validate an API key and respond to a ping
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        ping(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Validate an API key and respond to a ping (anal JSON parser version)
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        ping2(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the senders that have tried to use this account, both verified and unverified
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        senders(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Rejects {
-        constructor(master: Mandrill);
-
-        /**
-         * Adds an email to your email rejection blacklist. Addresses that you
-         * add manually will never expire and there is no reputation penalty
-         * for removing them from your blacklist. Attempting to blacklist an
-         * address that has been whitelisted will have no effect.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an email address to block
-         * @option params {String} comment an optional comment describing the rejection
-         * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist entry
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Retrieves your email rejection blacklist. You can provide an email
-         * address to limit the results. Returns up to 1000 results. By default,
-         * entries that have expired are excluded from the results; set
-         * include_expired to true to include them.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an optional email address to search by
-         * @option params {Boolean} include_expired whether to include rejections that have already expired.
-         * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Deletes an email rejection. There is no limit to how many rejections
-         * you can remove from your blacklist, but keep in mind that each deletion
-         * has an affect on your reputation.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an email address
-         * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist deletion
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Inbound {
-        constructor(master: Mandrill);
-
-        /**
-         * List the domains that have been configured for inbound delivery
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        domains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Add an inbound domain to your account
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        addDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Check the MX settings for an inbound domain. The domain must have already been added with the add-domain call
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain an existing inbound domain
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        checkDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Delete an inbound domain from the account. All mail will stop routing for this domain immediately.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain an existing inbound domain
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        deleteDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * List the mailbox routes defined for an inbound domain
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain the domain to check
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        routes(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Add a new mailbox route to an inbound domain
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain an existing inbound domain
-         * @option params {String} pattern the search pattern that the mailbox name should match
-         * @option params {String} url the webhook URL where the inbound messages will be published
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        addRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Update the pattern or webhook of an existing inbound mailbox route. If null is provided for any fields, the values will remain unchanged.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of an existing mailbox route
-         * @option params {String} pattern the search pattern that the mailbox name should match
-         * @option params {String} url the webhook URL where the inbound messages will be published
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        updateRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Delete an existing inbound mailbox route
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of an existing route
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        deleteRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Take a raw MIME document destined for a domain with inbound domains set up, and send it to the inbound hook exactly as if it had been sent over SMTP
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} raw_message the full MIME document of an email message
-         * @option params {Array|null} to optionally define the recipients to receive the message - otherwise we'll use the To, Cc, and Bcc headers provided in the document
-         *      - to[] {String} the email address of the recipient
-         * @option params {String} mail_from the address specified in the MAIL FROM stage of the SMTP conversation. Required for the SPF check.
-         * @option params {String} helo the identification provided by the client mta in the MTA state of the SMTP conversation. Required for the SPF check.
-         * @option params {String} client_address the remote MTA's ip address. Optional; required for the SPF check.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        sendRaw(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Tags {
-        constructor(master: Mandrill);
-
-        /**
-         * Return all of the user-defined tag information
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Deletes a tag permanently. Deleting a tag removes the tag from any messages
-         * that have been sent, and also deletes the tag's stats. There is no way to
-         * undo this operation, so use it carefully.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} tag a tag name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Return more detailed information about a single tag, including aggregates of recent stats
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} tag an existing tag name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for a tag
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} tag an existing tag name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for all tags
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        allTimeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Messages {
-        constructor(master: Mandrill);
-
-        /**
-         * Send a new transactional message through Mandrill
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Struct} message the information on the message to send
-         * -html {String} the full HTML content to be sent
-         * -text {String} optional full text content to be sent
-         * -subject {String} the message subject
-         * -from_email {String} the sender email address.
-         * -from_name {String} optional from name to be used
-         * -to {Array} an array of recipient information.
-         *      -to[] {Object} a single recipient's information.
-         *      -email {String} the email address of the recipient
-         *      -name {String} the optional display name to use for the recipient
-         *      -type {String} the header type to use for the recipient, defaults to "to" if not provided
-         * -headers {Object} optional extra headers to add to the message (most headers are allowed)
-         * -important {Boolean} whether or not this message is important, and should be delivered ahead of non-important messages
-         * -track_opens {Boolean} whether or not to turn on open tracking for the message
-         * -track_clicks {Boolean} whether or not to turn on click tracking for the message
-         * -auto_text {Boolean} whether or not to automatically generate a text part for messages that are not given text
-         * -auto_html {Boolean} whether or not to automatically generate an HTML part for messages that are not given HTML
-         * -inline_css {Boolean} whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size
-         * -url_strip_qs {Boolean} whether or not to strip the query string from URLs when aggregating tracked URL data
-         * -preserve_recipients {Boolean} whether or not to expose all recipients in to "To" header for each email
-         * -view_content_link {Boolean} set to false to remove content logging for sensitive emails
-         * -bcc_address {String} an optional address to receive an exact copy of each recipient's email
-         * -tracking_domain {String} a custom domain to use for tracking opens and clicks instead of mandrillapp.com
-         * -signing_domain {String} a custom domain to use for SPF/DKIM signing instead of mandrill (for "via" or "on behalf of" in email clients)
-         * -return_path_domain {String} a custom domain to use for the messages's return-path
-         * -merge {Boolean} whether to evaluate merge tags in the message. Will automatically be set to true if either merge_vars or global_merge_vars are provided.
-         * -merge_language {String} the merge tag language to use when evaluating merge tags, either mailchimp or handlebars
-         * -global_merge_vars {Array} global merge variables to use for all recipients. You can override these per recipient.
-         *      -global_merge_vars[] {Object} a single global merge variable
-         *      -name {String} the global merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *      -content {Mixed} the global merge variable's content
-         * -merge_vars {Array} per-recipient merge variables, which override global merge variables with the same name.
-         *   -merge_vars[] {Object} per-recipient merge variables
-         *      -rcpt {String} the email address of the recipient that the merge variables should apply to
-         *      -vars {Array} the recipient's merge variables
-         *          -vars[] {Object} a single merge variable
-         *          -name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *          -content {Mixed} the merge variable's content
-         * -tags {Array} an array of string to tag the message with.  Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently.  Tags should be 50 characters or less.  Any tags starting with an underscore are reserved for internal use and will cause errors.
-         *      -tags[] {String} a single tag - must not start with an underscore
-         * -subaccount {String} the unique id of a subaccount for this message - must already exist or will fail with an error
-         * -google_analytics_domains {Array} an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
-         * -google_analytics_campaign {Array|string} optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
-         * -metadata {Array} metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
-         * -recipient_metadata {Array} Per-recipient metadata that will override the global values specified in the metadata parameter.
-         *      -recipient_metadata[] {Object} metadata for a single recipient
-         *          -rcpt {String} the email address of the recipient that the metadata is associated with
-         *          -values {Array} an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
-         * -attachments {Array} an array of supported attachments to add to the message
-         *      -attachments[] {Object} a single supported attachment
-         *          -type {String} the MIME type of the attachment
-         *          -name {String} the file name of the attachment
-         *          -content {String} the content of the attachment as a base64-encoded string
-         * -images {Array} an array of embedded images to add to the message
-         *      -images[] {Object} a single embedded image
-         *          -type {String} the MIME type of the image - must start with "image/"
-         *          -name {String} the Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
-         *          -content {String} the content of the image as a base64-encoded string
-         * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
-         * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
-         * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        send(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Send a new transactional message through Mandrill using a template
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} template_name the immutable name or slug of a template that exists in the user's account. For backwards-compatibility, the template name may also be used but the immutable slug is preferred.
-         * @option params {Array} template_content an array of template content to send.  Each item in the array should be a struct with two keys - name: the name of the content block to set the content for, and content: the actual content to put into the block
-         * -template_content[] {Object} the injection of a single piece of content into a single editable region
-         *     -name {String} the name of the mc:edit editable region to inject into
-         *     -content {String} the content to inject
-         * @option params {Struct} message the other information on the message to send - same as /messages/send, but without the html content
-         * -html {String} optional full HTML content to be sent if not in template
-         * -text {String} optional full text content to be sent
-         * -subject {String} the message subject
-         * -from_email {String} the sender email address.
-         * -from_name {String} optional from name to be used
-         * -to {Array} an array of recipient information.
-         *      -to[] {Object} a single recipient's information.
-         *         -email {String} the email address of the recipient
-         *         -name {String} the optional display name to use for the recipient
-         *         -type {String} the header type to use for the recipient, defaults to "to" if not provided
-         * -headers {Object} optional extra headers to add to the message (most headers are allowed)
-         * -important {Boolean} whether or not this message is important, and should be delivered ahead of non-important messages
-         * -track_opens {Boolean} whether or not to turn on open tracking for the message
-         * -track_clicks {Boolean} whether or not to turn on click tracking for the message
-         * -auto_text {Boolean} whether or not to automatically generate a text part for messages that are not given text
-         * -auto_html {Boolean} whether or not to automatically generate an HTML part for messages that are not given HTML
-         * -inline_css {Boolean} whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size
-         * -url_strip_qs {Boolean} whether or not to strip the query string from URLs when aggregating tracked URL data
-         * -preserve_recipients {Boolean} whether or not to expose all recipients in to "To" header for each email
-         * -view_content_link {Boolean} set to false to remove content logging for sensitive emails
-         * -bcc_address {String} an optional address to receive an exact copy of each recipient's email
-         * -tracking_domain {String} a custom domain to use for tracking opens and clicks instead of mandrillapp.com
-         * -signing_domain {String} a custom domain to use for SPF/DKIM signing instead of mandrill (for "via" or "on behalf of" in email clients)
-         * -return_path_domain {String} a custom domain to use for the messages's return-path
-         * -merge {Boolean} whether to evaluate merge tags in the message. Will automatically be set to true if either merge_vars or global_merge_vars are provided.
-         * -merge_language {String} the merge tag language to use when evaluating merge tags, either mailchimp or handlebars
-         * -global_merge_vars {Array} global merge variables to use for all recipients. You can override these per recipient.
-         *      -global_merge_vars[] {Object} a single global merge variable
-         *          -name {String} the global merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *          -content {Mixed} the global merge variable's content
-         * -merge_vars {Array} per-recipient merge variables, which override global merge variables with the same name.
-         *      -merge_vars[] {Object} per-recipient merge variables
-         *          -rcpt {String} the email address of the recipient that the merge variables should apply to
-         *          -vars {Array} the recipient's merge variables
-         *              -vars[] {Object} a single merge variable
-         *                  -name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
-         *                  -content {Mixed} the merge variable's content
-         * -tags {Array} an array of string to tag the message with.  Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently.  Tags should be 50 characters or less.  Any tags starting with an underscore are reserved for internal use and will cause errors.
-         *      -tags[] {String} a single tag - must not start with an underscore
-         * -subaccount {String} the unique id of a subaccount for this message - must already exist or will fail with an error
-         * -google_analytics_domains {Array} an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
-         * -google_analytics_campaign {Array|string} optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
-         * -metadata {Array} metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
-         * -recipient_metadata {Array} Per-recipient metadata that will override the global values specified in the metadata parameter.
-         *       -recipient_metadata[] {Object} metadata for a single recipient
-         *           -rcpt {String} the email address of the recipient that the metadata is associated with
-         *           -values {Array} an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
-         * -attachments {Array} an array of supported attachments to add to the message
-         *      -attachments[] {Object} a single supported attachment
-         *          -type {String} the MIME type of the attachment
-         *          -name {String} the file name of the attachment
-         *          -content {String} the content of the attachment as a base64-encoded string
-         * -images {Array} an array of embedded images to add to the message
-         *      -images[] {Object} a single embedded image
-         *          -type {String} the MIME type of the image - must start with "image/"
-         *          -name {String} the Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
-         *          -content {String} the content of the image as a base64-encoded string
-         * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
-         * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
-         * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        sendTemplate(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Search recently sent messages and optionally narrow by date range, tags, senders, and API keys. If no date range is specified, results within the last 7 days are returned. This method may be called up to 20 times per minute. If you need the data more often, you can use <a href="/api/docs/messages.html#method=info">/messages/info.json</a> to get the information for a single message, or <a href="http://help.mandrill.com/entries/21738186-Introduction-to-Webhooks">webhooks</a> to push activity to your own application for querying.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} query <a href="http://help.mandrill.com/entries/22211902">search terms</a> to find matching messages
-         * @option params {String} date_from start date
-         * @option params {String} date_to end date
-         * @option params {Array} tags an array of tag names to narrow the search to, will return messages that contain ANY of the tags
-         * @option params {Array} senders an array of sender addresses to narrow the search to, will return messages sent by ANY of the senders
-         * @option params {Array} api_keys an array of API keys to narrow the search to, will return messages sent by ANY of the keys
-         * @option params {Integer} limit the maximum number of results to return, defaults to 100, 1000 is the maximum
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        search(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Search the content of recently sent messages and return the aggregated hourly stats for matching messages
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} query the search terms to find matching messages for
-         * @option params {String} date_from start date
-         * @option params {String} date_to end date
-         * @option params {Array} tags an array of tag names to narrow the search to, will return messages that contain ANY of the tags
-         * @option params {Array} senders an array of sender addresses to narrow the search to, will return messages sent by ANY of the senders
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        searchTimeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Get the information for a single recently sent message
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique id of the message to get - passed as the "_id" field in webhooks, send calls, or search calls
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Get the full content of a recently sent message
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique id of the message to get - passed as the "_id" field in webhooks, send calls, or search calls
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        content(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Parse the full MIME document for an email message, returning the content of the message broken into its constituent pieces
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} raw_message the full MIME document of an email message
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        parse(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Take a raw MIME document for a message, and send it exactly as if it were sent through Mandrill's SMTP servers
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} raw_message the full MIME document of an email message
-         * @option params {String|null} from_email optionally define the sender address - otherwise we'll use the address found in the provided headers
-         * @option params {String|null} from_name optionally define the sender alias
-         * @option params {Array|null} to optionally define the recipients to receive the message - otherwise we'll use the To, Cc, and Bcc headers provided in the document
-         * -to[] {String} the email address of the recipient
-         * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/sendRaw will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
-         * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
-         * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately.
-         * @option params {String} return_path_domain a custom domain to use for the messages's return-path
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        sendRaw(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Queries your scheduled emails by sender or recipient, or both.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} to an optional recipient address to restrict results to
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        listScheduled(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Cancels a scheduled email.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id a scheduled email id, as returned by any of the messages/send calls or messages/list-scheduled
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        cancelScheduled(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Reschedules a scheduled email.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id a scheduled email id, as returned by any of the messages/send calls or messages/list-scheduled
-         * @option params {String} send_at the new UTC timestamp when the message should sent. Mandrill can't time travel, so if you specify a time in past the message will be sent immediately
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        reschedule(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Whitelists {
-        constructor(master: Mandrill);
-
-        /**
-         * Adds an email to your email rejection whitelist. If the address is
-         * currently on your blacklist, that blacklist entry will be removed
-         * automatically.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an email address to add to the whitelist
-         * @option params {String} comment an optional description of why the email was whitelisted
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Retrieves your email rejection whitelist. You can provide an email
-         * address or search prefix to limit the results. Returns up to 1000 results.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email an optional email address or prefix to search by
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Removes an email address from the whitelist.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} email the email address to remove from the whitelist
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Ips {
-        constructor(master: Mandrill);
-
-        /**
-         * Lists your dedicated IPs.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Retrieves information about a single dedicated ip.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated IP address
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Requests an additional dedicated IP for your account. Accounts may
-         * have one outstanding request at any time, and provisioning requests
-         * are processed within 24 hours.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Boolean} warmup whether to enable warmup mode for the ip
-         * @option params {String} pool the id of the pool to add the dedicated ip to, or null to use your account's default pool
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        provision(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Begins the warmup process for a dedicated IP. During the warmup process,
-         * Mandrill will gradually increase the percentage of your mail that is sent over
-         * the warming-up IP, over a period of roughly 30 days. The rest of your mail
-         * will be sent over shared IPs or other dedicated IPs in the same pool.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        startWarmup(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Cancels the warmup process for a dedicated IP.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        cancelWarmup(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Moves a dedicated IP to a different pool.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @option params {String} pool the name of the new pool to add the dedicated ip to
-         * @option params {Boolean} create_pool whether to create the pool if it does not exist; if false and the pool does not exist, an Unknown_Pool will be thrown.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        setPool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Deletes a dedicated IP. This is permanent and cannot be undone.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip the dedicated ip to remove from your account
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Lists your dedicated IP pools.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        listPools(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Describes a single dedicated IP pool.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} pool a pool name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        poolInfo(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Creates a pool and returns it. If a pool already exists with this
-         * name, no action will be performed.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} pool the name of a pool to create
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        createPool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Deletes a pool. A pool must be empty before you can delete it, and you cannot delete your default pool.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} pool the name of the pool to delete
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        deletePool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Tests whether a domain name is valid for use as the custom reverse
-         * DNS for a dedicated IP.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @option params {String} domain the domain name to test
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        checkCustomDns(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Configures the custom DNS name for a dedicated IP.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} ip a dedicated ip address
-         * @option params {String} domain a domain name to set as the dedicated IP's custom dns name.
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        setCustomDns(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Internal {
-        constructor(master: Mandrill);
-    }
-
-    export class Subaccounts {
-        constructor(master: Mandrill);
-
-        /**
-         * Get the list of subaccounts defined for the account, optionally filtered by a prefix
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} q an optional prefix to filter the subaccounts' ids and names
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Add a new subaccount
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id a unique identifier for the subaccount to be used in sending calls
-         * @option params {String} name an optional display name to further identify the subaccount
-         * @option params {String} notes optional extra text to associate with the subaccount
-         * @option params {Integer} custom_quota an optional manual hourly quota for the subaccount. If not specified, Mandrill will manage this based on reputation
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Given the ID of an existing subaccount, return the data about it
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to query
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Update an existing subaccount
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to update
-         * @option params {String} name an optional display name to further identify the subaccount
-         * @option params {String} notes optional extra text to associate with the subaccount
-         * @option params {Integer} custom_quota an optional manual hourly quota for the subaccount. If not specified, Mandrill will manage this based on reputation
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Delete an existing subaccount. Any email related to the subaccount will be saved, but stats will be removed and any future sending calls to this subaccount will fail.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to delete
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-
-        /**
-         * Pause a subaccount's sending. Any future emails delivered to this subaccount will be queued for a maximum of 3 days until the subaccount is resumed.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to pause
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        pause(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Resume a paused subaccount's sending
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} id the unique identifier of the subaccount to resume
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        resume(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Urls {
-        constructor(master: Mandrill);
-
-        /**
-         * Get the 100 most clicked URLs
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the 100 most clicked URLs that match the search query given
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} q a search query
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        search(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for a url
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} url an existing URL
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Get the list of tracking domains set up for this account
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        trackingDomains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Add a tracking domain to your account
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        addTrackingDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Checks the CNAME settings for a tracking domain. The domain must have been added already with the add-tracking-domain call
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain an existing tracking domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        checkTrackingDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Webhooks {
-        constructor(master: Mandrill);
-
-        /**
-         * Get the list of all webhooks defined on the account
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Add a new webhook
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} url the URL to POST batches of events
-         * @option params {String} description an optional description of the webhook
-         * @option params {Array} events an optional list of events that will be posted to the webhook
-         *    - events[] {String} the individual event to listen for
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Given the ID of an existing webhook, return the data about it
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Integer} id the unique identifier of a webhook belonging to this account
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Update an existing webhook
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Integer} id the unique identifier of a webhook belonging to this account
-         * @option params {String} url the URL to POST batches of events
-         * @option params {String} description an optional description of the webhook
-         * @option params {Array} events an optional list of events that will be posted to the webhook
-         *    - events[] {String} the individual event to listen for
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Delete an existing webhook
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {Integer} id the unique identifier of a webhook belonging to this account
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: {id: number}, onsuccess?: ICallback, onerror?: ICallback): void;
-
-    }
-
-    export class Senders {
-        constructor(master: Mandrill);
-
-        /**
-         * Return the senders that have tried to use this account.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Returns the sender domains that have been added to this account.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        domains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Adds a sender domain to your account. Sender domains are added automatically as you
-         * send, but you can use this call to add them ahead of time.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        addDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Checks the SPF and DKIM settings for a domain. If you haven't already added this domain to your
-         * account, it will be added automatically.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        checkDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Sends a verification email in order to verify ownership of a domain.
-         * Domain verification is an optional step to confirm ownership of a domain. Once a
-         * domain has been verified in a Mandrill account, other accounts may not have their
-         * messages signed by that domain unless they also verify the domain. This prevents
-         * other Mandrill accounts from sending mail signed by your domain.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} domain a domain name at which you can receive email
-         * @option params {String} mailbox a mailbox at the domain where the verification email should be sent
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        verifyDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return more detailed information about a single sender, including aggregates of recent stats
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} address the email address of the sender
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-
-        /**
-         * Return the recent history (hourly stats for the last 30 days) for a sender
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} address the email address of the sender
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-
-    export class Metadata {
-        constructor(master: Mandrill);
-        /**
-         * Get the list of custom metadata fields indexed for the account.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-        /**
-         * Add a new custom metadata field to be indexed for the account.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name a unique identifier for the metadata field
-         * @option params {String} view_template optional Mustache template to control how the metadata is rendered in your activity log
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-        /**
-         * Update an existing custom metadata field.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the unique identifier of the metadata field to update
-         * @option params {String} view_template optional Mustache template to control how the metadata is rendered in your activity log
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-        /**
-         * Delete an existing custom metadata field. Deletion isn't instataneous, and /metadata/list will continue to return the field until the asynchronous deletion process is complete.
-         * @param {Object} params the hash of the parameters to pass to the request
-         * @option params {String} name the unique identifier of the metadata field to update
-         * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
-         * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
-         */
-        delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
-    }
-}
\ No newline at end of file
+
+
+export interface ICallback {
+    (json: Object): void;
+}
+
+export interface IErrorCallback {
+    (err: Error): void;
+}
+
+declare export class Mandrill {
+    apikey: string;
+    debug: boolean;
+    templates: Templates;
+    exports: Exports;
+    users: Users;
+    rejects: Rejects;
+    inbound: Inbound;
+    tags: Tags;
+    messages: Messages;
+    whitelists: Whitelists;
+    ips: Ips;
+    internal: Internal;
+    subaccounts: Subaccounts;
+    urls: Urls;
+    webhooks: Webhooks;
+    senders: Senders;
+    metadata: Metadata;
+    onerror: IErrorCallback;
+    constructor(apikey: string, debug?: boolean);
+    call(uri: string, params: any, onresult?: ICallback, onerror?: ICallback): void;
+}
+
+declare export class Templates {
+    constructor(master: Mandrill);
+
+    /**
+     * Add a new template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the name for the new template - must be unique
+     * @option params {String} from_email a default sending address for emails sent using this template
+     * @option params {String} from_name a default from name to be used
+     * @option params {String} subject a default subject line to be used
+     * @option params {String} code the HTML code for the template with mc:edit attributes for the editable elements
+     * @option params {String} text a default text part to be used when sending with this template
+     * @option params {Boolean} publish set to false to add a draft template without publishing
+     * @option params {Array} labels an optional array of up to 10 labels to use for filtering templates
+     *    - labels[] {String} a single label
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Get the information for an existing template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the immutable name of an existing template
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Update the code for an existing template. If null is provided for any fields, the values will remain unchanged.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the immutable name of an existing template
+     * @option params {String} from_email the new default sending address
+     * @option params {String} from_name the new default from name
+     * @option params {String} subject the new default subject line
+     * @option params {String} code the new code for the template
+     * @option params {String} text the new default text part to be used
+     * @option params {Boolean} publish set to false to update the draft version of the template without publishing
+     * @option params {Array} labels an optional array of up to 10 labels to use for filtering templates
+     *    - labels[] {String} a single label
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Publish the content for the template. Any new messages sent using this template will start using the content that was previously in draft.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the immutable name of an existing template
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    publish(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Delete a template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the immutable name of an existing template
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return a list of all the templates available to this user
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} label an optional label to filter the templates
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for a template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the name of an existing template
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Inject content and optionally merge fields into a template, returning the HTML that results
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} template_name the immutable name of a template that exists in the user's account
+     * @option params {Array} template_content an array of template content to render.  Each item in the array should be a struct with two keys - name: the name of the content block to set the content for, and content: the actual content to put into the block
+     *    - template_content[] {Object} the injection of a single piece of content into a single editable region
+     *        - name {String} the name of the mc:edit editable region to inject into
+     *        - content {String} the content to inject
+     * @option params {Array} merge_vars optional merge variables to use for injecting merge field content.  If this is not provided, no merge fields will be replaced.
+     *    - merge_vars[] {Object} a single merge variable
+     *        - name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *        - content {String} the merge variable's content
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    render(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+declare export class Exports {
+    constructor(master: Mandrill);
+
+    /**
+     * Returns information about an export job. If the export job's state is 'complete',
+     * the returned data will include a URL you can use to fetch the results. Every export
+     * job produces a zip archive, but the format of the archive is distinct for each job
+     * type. The api calls that initiate exports include more details about the output format
+     * for that job type.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id an export job identifier
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Returns a list of your exports.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Begins an export of your rejection blacklist. The blacklist will be exported to a zip archive
+     * containing a single file named rejects.csv that includes the following fields: email,
+     * reason, detail, created_at, expires_at, last_event_at, expires_at.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} notify_email an optional email address to notify when the export job has finished.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    rejects(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Begins an export of your rejection whitelist. The whitelist will be exported to a zip archive
+     * containing a single file named whitelist.csv that includes the following fields:
+     * email, detail, created_at.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} notify_email an optional email address to notify when the export job has finished.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    whitelist(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Begins an export of your activity history. The activity will be exported to a zip archive
+     * containing a single file named activity.csv in the same format as you would be able to export
+     * from your account's activity view. It includes the following fields: Date, Email Address,
+     * Sender, Subject, Status, Tags, Opens, Clicks, Bounce Detail. If you have configured any custom
+     * metadata fields, they will be included in the exported data.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} notify_email an optional email address to notify when the export job has finished
+     * @option params {String} date_from start date as a UTC string in YYYY-MM-DD HH:MM:SS format
+     * @option params {String} date_to end date as a UTC string in YYYY-MM-DD HH:MM:SS format
+     * @option params {Array} tags an array of tag names to narrow the export to; will match messages that contain ANY of the tags
+     *      - tags[] {String} a tag name
+     * @option params {Array} senders an array of senders to narrow the export to
+     *      - senders[] {String} a sender address
+     * @option params {Array} states an array of states to narrow the export to; messages with ANY of the states will be included
+     *      - states[] {String} a message state
+     * @option params {Array} api_keys an array of api keys to narrow the export to; messsagse sent with ANY of the keys will be included
+     *      - api_keys[] {String} an API key associated with your account
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    activity(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+declare export class Users {
+    constructor(master: Mandrill);
+
+    /**
+     * Return the information about the API-connected user
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Validate an API key and respond to a ping
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    ping(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Validate an API key and respond to a ping (anal JSON parser version)
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    ping2(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the senders that have tried to use this account, both verified and unverified
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    senders(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+declare export class Rejects {
+    constructor(master: Mandrill);
+
+    /**
+     * Adds an email to your email rejection blacklist. Addresses that you
+     * add manually will never expire and there is no reputation penalty
+     * for removing them from your blacklist. Attempting to blacklist an
+     * address that has been whitelisted will have no effect.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an email address to block
+     * @option params {String} comment an optional comment describing the rejection
+     * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist entry
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Retrieves your email rejection blacklist. You can provide an email
+     * address to limit the results. Returns up to 1000 results. By default,
+     * entries that have expired are excluded from the results; set
+     * include_expired to true to include them.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an optional email address to search by
+     * @option params {Boolean} include_expired whether to include rejections that have already expired.
+     * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Deletes an email rejection. There is no limit to how many rejections
+     * you can remove from your blacklist, but keep in mind that each deletion
+     * has an affect on your reputation.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an email address
+     * @option params {String} subaccount an optional unique identifier for the subaccount to limit the blacklist deletion
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+declare export class Inbound {
+    constructor(master: Mandrill);
+
+    /**
+     * List the domains that have been configured for inbound delivery
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    domains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Add an inbound domain to your account
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    addDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Check the MX settings for an inbound domain. The domain must have already been added with the add-domain call
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain an existing inbound domain
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    checkDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Delete an inbound domain from the account. All mail will stop routing for this domain immediately.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain an existing inbound domain
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    deleteDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * List the mailbox routes defined for an inbound domain
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain the domain to check
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    routes(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Add a new mailbox route to an inbound domain
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain an existing inbound domain
+     * @option params {String} pattern the search pattern that the mailbox name should match
+     * @option params {String} url the webhook URL where the inbound messages will be published
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    addRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Update the pattern or webhook of an existing inbound mailbox route. If null is provided for any fields, the values will remain unchanged.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of an existing mailbox route
+     * @option params {String} pattern the search pattern that the mailbox name should match
+     * @option params {String} url the webhook URL where the inbound messages will be published
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    updateRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Delete an existing inbound mailbox route
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of an existing route
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    deleteRoute(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Take a raw MIME document destined for a domain with inbound domains set up, and send it to the inbound hook exactly as if it had been sent over SMTP
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} raw_message the full MIME document of an email message
+     * @option params {Array|null} to optionally define the recipients to receive the message - otherwise we'll use the To, Cc, and Bcc headers provided in the document
+     *      - to[] {String} the email address of the recipient
+     * @option params {String} mail_from the address specified in the MAIL FROM stage of the SMTP conversation. Required for the SPF check.
+     * @option params {String} helo the identification provided by the client mta in the MTA state of the SMTP conversation. Required for the SPF check.
+     * @option params {String} client_address the remote MTA's ip address. Optional; required for the SPF check.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    sendRaw(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+declare export class Tags {
+    constructor(master: Mandrill);
+
+    /**
+     * Return all of the user-defined tag information
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Deletes a tag permanently. Deleting a tag removes the tag from any messages
+     * that have been sent, and also deletes the tag's stats. There is no way to
+     * undo this operation, so use it carefully.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} tag a tag name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Return more detailed information about a single tag, including aggregates of recent stats
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} tag an existing tag name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for a tag
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} tag an existing tag name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for all tags
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    allTimeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+declare export class Messages {
+    constructor(master: Mandrill);
+
+    /**
+     * Send a new transactional message through Mandrill
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Struct} message the information on the message to send
+     * -html {String} the full HTML content to be sent
+     * -text {String} optional full text content to be sent
+     * -subject {String} the message subject
+     * -from_email {String} the sender email address.
+     * -from_name {String} optional from name to be used
+     * -to {Array} an array of recipient information.
+     *      -to[] {Object} a single recipient's information.
+     *      -email {String} the email address of the recipient
+     *      -name {String} the optional display name to use for the recipient
+     *      -type {String} the header type to use for the recipient, defaults to "to" if not provided
+     * -headers {Object} optional extra headers to add to the message (most headers are allowed)
+     * -important {Boolean} whether or not this message is important, and should be delivered ahead of non-important messages
+     * -track_opens {Boolean} whether or not to turn on open tracking for the message
+     * -track_clicks {Boolean} whether or not to turn on click tracking for the message
+     * -auto_text {Boolean} whether or not to automatically generate a text part for messages that are not given text
+     * -auto_html {Boolean} whether or not to automatically generate an HTML part for messages that are not given HTML
+     * -inline_css {Boolean} whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size
+     * -url_strip_qs {Boolean} whether or not to strip the query string from URLs when aggregating tracked URL data
+     * -preserve_recipients {Boolean} whether or not to expose all recipients in to "To" header for each email
+     * -view_content_link {Boolean} set to false to remove content logging for sensitive emails
+     * -bcc_address {String} an optional address to receive an exact copy of each recipient's email
+     * -tracking_domain {String} a custom domain to use for tracking opens and clicks instead of mandrillapp.com
+     * -signing_domain {String} a custom domain to use for SPF/DKIM signing instead of mandrill (for "via" or "on behalf of" in email clients)
+     * -return_path_domain {String} a custom domain to use for the messages's return-path
+     * -merge {Boolean} whether to evaluate merge tags in the message. Will automatically be set to true if either merge_vars or global_merge_vars are provided.
+     * -merge_language {String} the merge tag language to use when evaluating merge tags, either mailchimp or handlebars
+     * -global_merge_vars {Array} global merge variables to use for all recipients. You can override these per recipient.
+     *      -global_merge_vars[] {Object} a single global merge variable
+     *      -name {String} the global merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *      -content {Mixed} the global merge variable's content
+     * -merge_vars {Array} per-recipient merge variables, which override global merge variables with the same name.
+     *   -merge_vars[] {Object} per-recipient merge variables
+     *      -rcpt {String} the email address of the recipient that the merge variables should apply to
+     *      -vars {Array} the recipient's merge variables
+     *          -vars[] {Object} a single merge variable
+     *          -name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *          -content {Mixed} the merge variable's content
+     * -tags {Array} an array of string to tag the message with.  Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently.  Tags should be 50 characters or less.  Any tags starting with an underscore are reserved for internal use and will cause errors.
+     *      -tags[] {String} a single tag - must not start with an underscore
+     * -subaccount {String} the unique id of a subaccount for this message - must already exist or will fail with an error
+     * -google_analytics_domains {Array} an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
+     * -google_analytics_campaign {Array|string} optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
+     * -metadata {Array} metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
+     * -recipient_metadata {Array} Per-recipient metadata that will override the global values specified in the metadata parameter.
+     *      -recipient_metadata[] {Object} metadata for a single recipient
+     *          -rcpt {String} the email address of the recipient that the metadata is associated with
+     *          -values {Array} an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
+     * -attachments {Array} an array of supported attachments to add to the message
+     *      -attachments[] {Object} a single supported attachment
+     *          -type {String} the MIME type of the attachment
+     *          -name {String} the file name of the attachment
+     *          -content {String} the content of the attachment as a base64-encoded string
+     * -images {Array} an array of embedded images to add to the message
+     *      -images[] {Object} a single embedded image
+     *          -type {String} the MIME type of the image - must start with "image/"
+     *          -name {String} the Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
+     *          -content {String} the content of the image as a base64-encoded string
+     * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
+     * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
+     * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    send(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Send a new transactional message through Mandrill using a template
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} template_name the immutable name or slug of a template that exists in the user's account. For backwards-compatibility, the template name may also be used but the immutable slug is preferred.
+     * @option params {Array} template_content an array of template content to send.  Each item in the array should be a struct with two keys - name: the name of the content block to set the content for, and content: the actual content to put into the block
+     * -template_content[] {Object} the injection of a single piece of content into a single editable region
+     *     -name {String} the name of the mc:edit editable region to inject into
+     *     -content {String} the content to inject
+     * @option params {Struct} message the other information on the message to send - same as /messages/send, but without the html content
+     * -html {String} optional full HTML content to be sent if not in template
+     * -text {String} optional full text content to be sent
+     * -subject {String} the message subject
+     * -from_email {String} the sender email address.
+     * -from_name {String} optional from name to be used
+     * -to {Array} an array of recipient information.
+     *      -to[] {Object} a single recipient's information.
+     *         -email {String} the email address of the recipient
+     *         -name {String} the optional display name to use for the recipient
+     *         -type {String} the header type to use for the recipient, defaults to "to" if not provided
+     * -headers {Object} optional extra headers to add to the message (most headers are allowed)
+     * -important {Boolean} whether or not this message is important, and should be delivered ahead of non-important messages
+     * -track_opens {Boolean} whether or not to turn on open tracking for the message
+     * -track_clicks {Boolean} whether or not to turn on click tracking for the message
+     * -auto_text {Boolean} whether or not to automatically generate a text part for messages that are not given text
+     * -auto_html {Boolean} whether or not to automatically generate an HTML part for messages that are not given HTML
+     * -inline_css {Boolean} whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size
+     * -url_strip_qs {Boolean} whether or not to strip the query string from URLs when aggregating tracked URL data
+     * -preserve_recipients {Boolean} whether or not to expose all recipients in to "To" header for each email
+     * -view_content_link {Boolean} set to false to remove content logging for sensitive emails
+     * -bcc_address {String} an optional address to receive an exact copy of each recipient's email
+     * -tracking_domain {String} a custom domain to use for tracking opens and clicks instead of mandrillapp.com
+     * -signing_domain {String} a custom domain to use for SPF/DKIM signing instead of mandrill (for "via" or "on behalf of" in email clients)
+     * -return_path_domain {String} a custom domain to use for the messages's return-path
+     * -merge {Boolean} whether to evaluate merge tags in the message. Will automatically be set to true if either merge_vars or global_merge_vars are provided.
+     * -merge_language {String} the merge tag language to use when evaluating merge tags, either mailchimp or handlebars
+     * -global_merge_vars {Array} global merge variables to use for all recipients. You can override these per recipient.
+     *      -global_merge_vars[] {Object} a single global merge variable
+     *          -name {String} the global merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *          -content {Mixed} the global merge variable's content
+     * -merge_vars {Array} per-recipient merge variables, which override global merge variables with the same name.
+     *      -merge_vars[] {Object} per-recipient merge variables
+     *          -rcpt {String} the email address of the recipient that the merge variables should apply to
+     *          -vars {Array} the recipient's merge variables
+     *              -vars[] {Object} a single merge variable
+     *                  -name {String} the merge variable's name. Merge variable names are case-insensitive and may not start with _
+     *                  -content {Mixed} the merge variable's content
+     * -tags {Array} an array of string to tag the message with.  Stats are accumulated using tags, though we only store the first 100 we see, so this should not be unique or change frequently.  Tags should be 50 characters or less.  Any tags starting with an underscore are reserved for internal use and will cause errors.
+     *      -tags[] {String} a single tag - must not start with an underscore
+     * -subaccount {String} the unique id of a subaccount for this message - must already exist or will fail with an error
+     * -google_analytics_domains {Array} an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
+     * -google_analytics_campaign {Array|string} optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
+     * -metadata {Array} metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
+     * -recipient_metadata {Array} Per-recipient metadata that will override the global values specified in the metadata parameter.
+     *       -recipient_metadata[] {Object} metadata for a single recipient
+     *           -rcpt {String} the email address of the recipient that the metadata is associated with
+     *           -values {Array} an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
+     * -attachments {Array} an array of supported attachments to add to the message
+     *      -attachments[] {Object} a single supported attachment
+     *          -type {String} the MIME type of the attachment
+     *          -name {String} the file name of the attachment
+     *          -content {String} the content of the attachment as a base64-encoded string
+     * -images {Array} an array of embedded images to add to the message
+     *      -images[] {Object} a single embedded image
+     *          -type {String} the MIME type of the image - must start with "image/"
+     *          -name {String} the Content ID of the image - use <img src="cid:THIS_VALUE"> to reference the image in your HTML content
+     *          -content {String} the content of the image as a base64-encoded string
+     * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/send will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
+     * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
+     * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately. An additional fee applies for scheduled email, and this feature is only available to accounts with a positive balance.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    sendTemplate(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Search recently sent messages and optionally narrow by date range, tags, senders, and API keys. If no date range is specified, results within the last 7 days are returned. This method may be called up to 20 times per minute. If you need the data more often, you can use <a href="/api/docs/messages.html#method=info">/messages/info.json</a> to get the information for a single message, or <a href="http://help.mandrill.com/entries/21738186-Introduction-to-Webhooks">webhooks</a> to push activity to your own application for querying.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} query <a href="http://help.mandrill.com/entries/22211902">search terms</a> to find matching messages
+     * @option params {String} date_from start date
+     * @option params {String} date_to end date
+     * @option params {Array} tags an array of tag names to narrow the search to, will return messages that contain ANY of the tags
+     * @option params {Array} senders an array of sender addresses to narrow the search to, will return messages sent by ANY of the senders
+     * @option params {Array} api_keys an array of API keys to narrow the search to, will return messages sent by ANY of the keys
+     * @option params {Integer} limit the maximum number of results to return, defaults to 100, 1000 is the maximum
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    search(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Search the content of recently sent messages and return the aggregated hourly stats for matching messages
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} query the search terms to find matching messages for
+     * @option params {String} date_from start date
+     * @option params {String} date_to end date
+     * @option params {Array} tags an array of tag names to narrow the search to, will return messages that contain ANY of the tags
+     * @option params {Array} senders an array of sender addresses to narrow the search to, will return messages sent by ANY of the senders
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    searchTimeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Get the information for a single recently sent message
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique id of the message to get - passed as the "_id" field in webhooks, send calls, or search calls
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Get the full content of a recently sent message
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique id of the message to get - passed as the "_id" field in webhooks, send calls, or search calls
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    content(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Parse the full MIME document for an email message, returning the content of the message broken into its constituent pieces
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} raw_message the full MIME document of an email message
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    parse(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Take a raw MIME document for a message, and send it exactly as if it were sent through Mandrill's SMTP servers
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} raw_message the full MIME document of an email message
+     * @option params {String|null} from_email optionally define the sender address - otherwise we'll use the address found in the provided headers
+     * @option params {String|null} from_name optionally define the sender alias
+     * @option params {Array|null} to optionally define the recipients to receive the message - otherwise we'll use the To, Cc, and Bcc headers provided in the document
+     * -to[] {String} the email address of the recipient
+     * @option params {Boolean} async enable a background sending mode that is optimized for bulk sending. In async mode, messages/sendRaw will immediately return a status of "queued" for every recipient. To handle rejections when sending in async mode, set up a webhook for the 'reject' event. Defaults to false for messages with no more than 10 recipients; messages with more than 10 recipients are always sent asynchronously, regardless of the value of async.
+     * @option params {String} ip_pool the name of the dedicated ip pool that should be used to send the message. If you do not have any dedicated IPs, this parameter has no effect. If you specify a pool that does not exist, your default pool will be used instead.
+     * @option params {String} send_at when this message should be sent as a UTC timestamp in YYYY-MM-DD HH:MM:SS format. If you specify a time in the past, the message will be sent immediately.
+     * @option params {String} return_path_domain a custom domain to use for the messages's return-path
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    sendRaw(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Queries your scheduled emails by sender or recipient, or both.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} to an optional recipient address to restrict results to
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    listScheduled(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Cancels a scheduled email.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id a scheduled email id, as returned by any of the messages/send calls or messages/list-scheduled
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    cancelScheduled(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Reschedules a scheduled email.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id a scheduled email id, as returned by any of the messages/send calls or messages/list-scheduled
+     * @option params {String} send_at the new UTC timestamp when the message should sent. Mandrill can't time travel, so if you specify a time in past the message will be sent immediately
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    reschedule(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+declare export class Whitelists {
+    constructor(master: Mandrill);
+
+    /**
+     * Adds an email to your email rejection whitelist. If the address is
+     * currently on your blacklist, that blacklist entry will be removed
+     * automatically.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an email address to add to the whitelist
+     * @option params {String} comment an optional description of why the email was whitelisted
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Retrieves your email rejection whitelist. You can provide an email
+     * address or search prefix to limit the results. Returns up to 1000 results.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email an optional email address or prefix to search by
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Removes an email address from the whitelist.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} email the email address to remove from the whitelist
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+declare export class Ips {
+    constructor(master: Mandrill);
+
+    /**
+     * Lists your dedicated IPs.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Retrieves information about a single dedicated ip.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated IP address
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Requests an additional dedicated IP for your account. Accounts may
+     * have one outstanding request at any time, and provisioning requests
+     * are processed within 24 hours.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Boolean} warmup whether to enable warmup mode for the ip
+     * @option params {String} pool the id of the pool to add the dedicated ip to, or null to use your account's default pool
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    provision(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Begins the warmup process for a dedicated IP. During the warmup process,
+     * Mandrill will gradually increase the percentage of your mail that is sent over
+     * the warming-up IP, over a period of roughly 30 days. The rest of your mail
+     * will be sent over shared IPs or other dedicated IPs in the same pool.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    startWarmup(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Cancels the warmup process for a dedicated IP.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    cancelWarmup(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Moves a dedicated IP to a different pool.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @option params {String} pool the name of the new pool to add the dedicated ip to
+     * @option params {Boolean} create_pool whether to create the pool if it does not exist; if false and the pool does not exist, an Unknown_Pool will be thrown.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    setPool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Deletes a dedicated IP. This is permanent and cannot be undone.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip the dedicated ip to remove from your account
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Lists your dedicated IP pools.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    listPools(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Describes a single dedicated IP pool.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} pool a pool name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    poolInfo(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Creates a pool and returns it. If a pool already exists with this
+     * name, no action will be performed.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} pool the name of a pool to create
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    createPool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Deletes a pool. A pool must be empty before you can delete it, and you cannot delete your default pool.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} pool the name of the pool to delete
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    deletePool(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Tests whether a domain name is valid for use as the custom reverse
+     * DNS for a dedicated IP.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @option params {String} domain the domain name to test
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    checkCustomDns(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Configures the custom DNS name for a dedicated IP.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} ip a dedicated ip address
+     * @option params {String} domain a domain name to set as the dedicated IP's custom dns name.
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    setCustomDns(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+declare export class Internal {
+    constructor(master: Mandrill);
+}
+
+declare export class Subaccounts {
+    constructor(master: Mandrill);
+
+    /**
+     * Get the list of subaccounts defined for the account, optionally filtered by a prefix
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} q an optional prefix to filter the subaccounts' ids and names
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Add a new subaccount
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id a unique identifier for the subaccount to be used in sending calls
+     * @option params {String} name an optional display name to further identify the subaccount
+     * @option params {String} notes optional extra text to associate with the subaccount
+     * @option params {Integer} custom_quota an optional manual hourly quota for the subaccount. If not specified, Mandrill will manage this based on reputation
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Given the ID of an existing subaccount, return the data about it
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to query
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Update an existing subaccount
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to update
+     * @option params {String} name an optional display name to further identify the subaccount
+     * @option params {String} notes optional extra text to associate with the subaccount
+     * @option params {Integer} custom_quota an optional manual hourly quota for the subaccount. If not specified, Mandrill will manage this based on reputation
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Delete an existing subaccount. Any email related to the subaccount will be saved, but stats will be removed and any future sending calls to this subaccount will fail.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to delete
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+
+    /**
+     * Pause a subaccount's sending. Any future emails delivered to this subaccount will be queued for a maximum of 3 days until the subaccount is resumed.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to pause
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    pause(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Resume a paused subaccount's sending
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} id the unique identifier of the subaccount to resume
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    resume(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+declare export class Urls {
+    constructor(master: Mandrill);
+
+    /**
+     * Get the 100 most clicked URLs
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the 100 most clicked URLs that match the search query given
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} q a search query
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    search(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for a url
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} url an existing URL
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Get the list of tracking domains set up for this account
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    trackingDomains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Add a tracking domain to your account
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    addTrackingDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Checks the CNAME settings for a tracking domain. The domain must have been added already with the add-tracking-domain call
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain an existing tracking domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    checkTrackingDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+declare export class Webhooks {
+    constructor(master: Mandrill);
+
+    /**
+     * Get the list of all webhooks defined on the account
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Add a new webhook
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} url the URL to POST batches of events
+     * @option params {String} description an optional description of the webhook
+     * @option params {Array} events an optional list of events that will be posted to the webhook
+     *    - events[] {String} the individual event to listen for
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Given the ID of an existing webhook, return the data about it
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Integer} id the unique identifier of a webhook belonging to this account
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Update an existing webhook
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Integer} id the unique identifier of a webhook belonging to this account
+     * @option params {String} url the URL to POST batches of events
+     * @option params {String} description an optional description of the webhook
+     * @option params {Array} events an optional list of events that will be posted to the webhook
+     *    - events[] {String} the individual event to listen for
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Delete an existing webhook
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {Integer} id the unique identifier of a webhook belonging to this account
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: { id: number }, onsuccess?: ICallback, onerror?: ICallback): void;
+
+}
+
+declare export class Senders {
+    constructor(master: Mandrill);
+
+    /**
+     * Return the senders that have tried to use this account.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Returns the sender domains that have been added to this account.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    domains(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Adds a sender domain to your account. Sender domains are added automatically as you
+     * send, but you can use this call to add them ahead of time.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    addDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Checks the SPF and DKIM settings for a domain. If you haven't already added this domain to your
+     * account, it will be added automatically.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    checkDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Sends a verification email in order to verify ownership of a domain.
+     * Domain verification is an optional step to confirm ownership of a domain. Once a
+     * domain has been verified in a Mandrill account, other accounts may not have their
+     * messages signed by that domain unless they also verify the domain. This prevents
+     * other Mandrill accounts from sending mail signed by your domain.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} domain a domain name at which you can receive email
+     * @option params {String} mailbox a mailbox at the domain where the verification email should be sent
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    verifyDomain(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return more detailed information about a single sender, including aggregates of recent stats
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} address the email address of the sender
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    info(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+
+    /**
+     * Return the recent history (hourly stats for the last 30 days) for a sender
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} address the email address of the sender
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    timeSeries(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
+
+declare export class Metadata {
+    constructor(master: Mandrill);
+    /**
+     * Get the list of custom metadata fields indexed for the account.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    list(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+    /**
+     * Add a new custom metadata field to be indexed for the account.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name a unique identifier for the metadata field
+     * @option params {String} view_template optional Mustache template to control how the metadata is rendered in your activity log
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    add(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+    /**
+     * Update an existing custom metadata field.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the unique identifier of the metadata field to update
+     * @option params {String} view_template optional Mustache template to control how the metadata is rendered in your activity log
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    update(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+    /**
+     * Delete an existing custom metadata field. Deletion isn't instataneous, and /metadata/list will continue to return the field until the asynchronous deletion process is complete.
+     * @param {Object} params the hash of the parameters to pass to the request
+     * @option params {String} name the unique identifier of the metadata field to update
+     * @param {Function} onsuccess an optional callback to execute when the API call is successfully made
+     * @param {Function} onerror an optional callback to execute when the API call errors out - defaults to throwing the error as an exception
+     */
+    delete(params: any, onsuccess?: ICallback, onerror?: ICallback): void;
+}
diff --git a/memory-cache/memory-cache.d.ts b/memory-cache/memory-cache.d.ts
index 09bcf1fad3..238c7f8b9e 100644
--- a/memory-cache/memory-cache.d.ts
+++ b/memory-cache/memory-cache.d.ts
@@ -5,17 +5,16 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/memory-cache.d.ts
 
-declare module "memory-cache" {
-	export function put(key: any, value: any, time?: number, timeoutCallback?: (key: any) => void): void;
-	export function get(key: any): any;
-	export function del(key: any): void;
-	export function clear(): void;
 
-	export function size(): number;
-	export function memsize(): number;
+declare export function put(key: any, value: any, time?: number, timeoutCallback?: (key: any) => void): void;
+declare export function get(key: any): any;
+declare export function del(key: any): void;
+declare export function clear(): void;
 
-	export function debug(bool: boolean): void;
-	export function hits(): number;
-	export function misses(): number;
-	export function keys() : any;
-}
+declare export function size(): number;
+declare export function memsize(): number;
+
+declare export function debug(bool: boolean): void;
+declare export function hits(): number;
+declare export function misses(): number;
+declare export function keys(): any;
diff --git a/merge-descriptors/merge-descriptors.d.ts b/merge-descriptors/merge-descriptors.d.ts
index 3c51300e9a..053659176a 100644
--- a/merge-descriptors/merge-descriptors.d.ts
+++ b/merge-descriptors/merge-descriptors.d.ts
@@ -3,11 +3,10 @@
 // Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'merge-descriptors' {
 
-    function merge(destination: Object, source: Object): Object;
 
-    function merge(destination: Object, source: Object, redefine: boolean): Object;
+declare function merge(destination: Object, source: Object): Object;
 
-    export = merge;
-}
\ No newline at end of file
+declare function merge(destination: Object, source: Object, redefine: boolean): Object;
+
+export = merge;
diff --git a/merge-stream/merge-stream.d.ts b/merge-stream/merge-stream.d.ts
index d2f8c756e6..77d09df17c 100644
--- a/merge-stream/merge-stream.d.ts
+++ b/merge-stream/merge-stream.d.ts
@@ -5,13 +5,12 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "merge-stream" {
-    interface IMergedStream extends NodeJS.ReadWriteStream {
-        add(source: NodeJS.ReadableStream): IMergedStream;
-        add(source: NodeJS.ReadableStream[]): IMergedStream;
-        isEmpty(): boolean;
-    }
 
-    function merge<T extends NodeJS.ReadableStream>(...streams: T[]): IMergedStream;
-    export = merge;
+interface IMergedStream extends NodeJS.ReadWriteStream {
+    add(source: NodeJS.ReadableStream): IMergedStream;
+    add(source: NodeJS.ReadableStream[]): IMergedStream;
+    isEmpty(): boolean;
 }
+
+declare function merge<T extends NodeJS.ReadableStream>(...streams: T[]): IMergedStream;
+export = merge;
diff --git a/merge2/merge2.d.ts b/merge2/merge2.d.ts
index 404b95bbf0..b830a90059 100644
--- a/merge2/merge2.d.ts
+++ b/merge2/merge2.d.ts
@@ -5,20 +5,19 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'merge2' {
-    interface IOptions {
-        end?: boolean;
-        objectMode?: boolean;
-    }
 
-    interface IMerge2Stream extends NodeJS.ReadWriteStream {
-        add(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream | IOptions>>): IMerge2Stream;
-    }
-
-    interface IMerge2 {
-        (...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream> | IOptions>): IMerge2Stream;
-    }
-
-    var _tmp: IMerge2;
-    export = _tmp;
+interface IOptions {
+    end?: boolean;
+    objectMode?: boolean;
 }
+
+interface IMerge2Stream extends NodeJS.ReadWriteStream {
+    add(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream | IOptions>>): IMerge2Stream;
+}
+
+interface IMerge2 {
+    (...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream> | IOptions>): IMerge2Stream;
+}
+
+declare var _tmp: IMerge2;
+export = _tmp;
diff --git a/mess/mess.d.ts b/mess/mess.d.ts
index 4935446393..9b60b9e124 100644
--- a/mess/mess.d.ts
+++ b/mess/mess.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "mess" {
-	function shuffle<T>(array: T[]): T[];
-	export = shuffle;
-}
+
+declare function shuffle<T>(array: T[]): T[];
+export = shuffle;
diff --git a/micromatch/micromatch.d.ts b/micromatch/micromatch.d.ts
index cea7098ecb..726c52d1cc 100644
--- a/micromatch/micromatch.d.ts
+++ b/micromatch/micromatch.d.ts
@@ -5,170 +5,169 @@
 
 /// <reference path="../parse-glob/parse-glob.d.ts" />
 
-declare module 'micromatch' {
-    import parseGlob = require('parse-glob');
 
-    namespace micromatch {
-        type MatchFunction<T> = ((value: T) => boolean);
-        type Pattern = (string | RegExp | MatchFunction<string>);
+import parseGlob = require('parse-glob');
 
-        interface Options {
-            /**
-             * Normalize slashes in file paths and glob patterns to forward slashes.
-             */
-            unixify?: boolean;
-            /**
-             * Match dotfiles. Same behavior as minimatch.
-             */
-            dot?: boolean;
-            /**
-             * Unescape slashes in glob patterns. Use cautiously, especially on windows.
-             */
-            unescape?: boolean;
-            /**
-             * Remove duplicate elements from the result array.
-             */
-            nodupes?: boolean;
-            /**
-             * Allow glob patterns without slashes to match a file path based on its basename. Same behavior as
-             * minimatch.
-             */
-            matchBase?: boolean;
-            /**
-             * Don't expand braces in glob patterns. Same behavior as minimatch nobrace.
-             */
-            nobraces?: boolean;
-            /**
-             * Don't expand POSIX bracket expressions.
-             */
-            nobrackets?: boolean;
-            /**
-             * Don't expand extended globs.
-             */
-            noextglob?: boolean;
-            /**
-             * Use a case-insensitive regex for matching files. Same behavior as minimatch.
-             */
-            nocase?: boolean;
-            /**
-             * If true, when no matches are found the actual (array-ified) glob pattern is returned instead of an empty
-             * array. Same behavior as minimatch.
-             */
-            nonull?: boolean;
-            /**
-             * Cache the platform (e.g. win32) to prevent this from being looked up for every file path.
-             */
-            cache?: boolean;
-        }
+declare namespace micromatch {
+    type MatchFunction<T> = ((value: T) => boolean);
+    type Pattern = (string | RegExp | MatchFunction<string>);
 
-        interface Glob {
-            options: micromatch.Options;
-            pattern: string;
-            history: {msg: any, pattern: string}[];
-            tokens: parseGlob.Result;
-            orig: string;
-            negated: boolean;
-
-            /**
-             * Initialize defaults.
-             */
-            init(pattern: string): void;
-
-            /**
-             * Push a change into `glob.history`. Useful for debugging.
-             */
-            track(msg: any): void;
-
-            /**
-             * Return true if `glob.pattern` was negated with `!`, also remove the `!` from the pattern.
-             */
-            isNegated(): boolean;
-
-            /**
-             * Expand braces in the given glob pattern.
-             */
-            braces(): void;
-
-            /**
-             * Expand bracket expressions in `glob.pattern`.
-             */
-            brackets(): void;
-
-            /**
-             * Expand extended globs in `glob.pattern`.
-             */
-            extglob(): void;
-
-            /**
-             * Parse the given pattern.
-             */
-            parse(pattern: string): parseGlob.Result;
-
-            /**
-             * Escape special characters in the given string.
-             */
-            escape(pattern: string): string;
-
-            /**
-             * Unescape special characters in the given string.
-             */
-            unescape(pattern: string): string;
-        }
-
-        interface GlobData {
-            pattern: string;
-            tokens: parseGlob.Result;
-            options: micromatch.Options;
-        }
+    interface Options {
+        /**
+         * Normalize slashes in file paths and glob patterns to forward slashes.
+         */
+        unixify?: boolean;
+        /**
+         * Match dotfiles. Same behavior as minimatch.
+         */
+        dot?: boolean;
+        /**
+         * Unescape slashes in glob patterns. Use cautiously, especially on windows.
+         */
+        unescape?: boolean;
+        /**
+         * Remove duplicate elements from the result array.
+         */
+        nodupes?: boolean;
+        /**
+         * Allow glob patterns without slashes to match a file path based on its basename. Same behavior as
+         * minimatch.
+         */
+        matchBase?: boolean;
+        /**
+         * Don't expand braces in glob patterns. Same behavior as minimatch nobrace.
+         */
+        nobraces?: boolean;
+        /**
+         * Don't expand POSIX bracket expressions.
+         */
+        nobrackets?: boolean;
+        /**
+         * Don't expand extended globs.
+         */
+        noextglob?: boolean;
+        /**
+         * Use a case-insensitive regex for matching files. Same behavior as minimatch.
+         */
+        nocase?: boolean;
+        /**
+         * If true, when no matches are found the actual (array-ified) glob pattern is returned instead of an empty
+         * array. Same behavior as minimatch.
+         */
+        nonull?: boolean;
+        /**
+         * Cache the platform (e.g. win32) to prevent this from being looked up for every file path.
+         */
+        cache?: boolean;
     }
 
-    interface Micromatch {
-        (files: string | string[], patterns: micromatch.Pattern | micromatch.Pattern[]): string[];
-
-        isMatch: {
-            /**
-             * Returns true if a file path matches the given pattern.
-             */
-            (filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
-            /**
-             * Returns a function for matching.
-             */
-            (filePath: string, opts?: micromatch.Options): micromatch.MatchFunction<string>;
-        };
+    interface Glob {
+        options: micromatch.Options;
+        pattern: string;
+        history: { msg: any, pattern: string }[];
+        tokens: parseGlob.Result;
+        orig: string;
+        negated: boolean;
 
         /**
-         * Returns true if any part of a file path matches the given pattern. Think of this as "has path" versus
-         * "is path".
+         * Initialize defaults.
          */
-        contains(filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
+        init(pattern: string): void;
 
         /**
-         * Returns a function for matching using the supplied pattern. e.g. create your own "matcher". The advantage of
-         * this method is that the pattern can be compiled outside of a loop.
+         * Push a change into `glob.history`. Useful for debugging.
          */
-        matcher(pattern: micromatch.Pattern): micromatch.MatchFunction<string>;
+        track(msg: any): void;
 
         /**
-         * Returns a function that can be passed to Array#filter().
+         * Return true if `glob.pattern` was negated with `!`, also remove the `!` from the pattern.
          */
-        filter(patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): micromatch.MatchFunction<any>;
+        isNegated(): boolean;
 
         /**
-         * Returns true if a file path matches any of the given patterns.
+         * Expand braces in the given glob pattern.
          */
-        any(filePath: string, patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): boolean;
+        braces(): void;
 
         /**
-         * Returns an object with a regex-compatible string and tokens.
+         * Expand bracket expressions in `glob.pattern`.
          */
-        expand(pattern: string, opts?: micromatch.Options): micromatch.Glob | micromatch.GlobData;
+        brackets(): void;
 
         /**
-         * Create a regular expression for matching file paths based on the given pattern.
+         * Expand extended globs in `glob.pattern`.
          */
-        makeRe(pattern: string, opts?: micromatch.Options): RegExp;
+        extglob(): void;
+
+        /**
+         * Parse the given pattern.
+         */
+        parse(pattern: string): parseGlob.Result;
+
+        /**
+         * Escape special characters in the given string.
+         */
+        escape(pattern: string): string;
+
+        /**
+         * Unescape special characters in the given string.
+         */
+        unescape(pattern: string): string;
     }
 
-    const micromatch: Micromatch;
-    export = micromatch;
+    interface GlobData {
+        pattern: string;
+        tokens: parseGlob.Result;
+        options: micromatch.Options;
+    }
 }
+
+interface Micromatch {
+    (files: string | string[], patterns: micromatch.Pattern | micromatch.Pattern[]): string[];
+
+    isMatch: {
+        /**
+         * Returns true if a file path matches the given pattern.
+         */
+        (filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
+        /**
+         * Returns a function for matching.
+         */
+        (filePath: string, opts?: micromatch.Options): micromatch.MatchFunction<string>;
+    };
+
+    /**
+     * Returns true if any part of a file path matches the given pattern. Think of this as "has path" versus
+     * "is path".
+     */
+    contains(filePath: string, pattern: micromatch.Pattern, opts?: micromatch.Options): boolean;
+
+    /**
+     * Returns a function for matching using the supplied pattern. e.g. create your own "matcher". The advantage of
+     * this method is that the pattern can be compiled outside of a loop.
+     */
+    matcher(pattern: micromatch.Pattern): micromatch.MatchFunction<string>;
+
+    /**
+     * Returns a function that can be passed to Array#filter().
+     */
+    filter(patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): micromatch.MatchFunction<any>;
+
+    /**
+     * Returns true if a file path matches any of the given patterns.
+     */
+    any(filePath: string, patterns: micromatch.Pattern | micromatch.Pattern[], opts?: micromatch.Options): boolean;
+
+    /**
+     * Returns an object with a regex-compatible string and tokens.
+     */
+    expand(pattern: string, opts?: micromatch.Options): micromatch.Glob | micromatch.GlobData;
+
+    /**
+     * Create a regular expression for matching file paths based on the given pattern.
+     */
+    makeRe(pattern: string, opts?: micromatch.Options): RegExp;
+}
+
+declare const micromatch: Micromatch;
+export = micromatch;
diff --git a/mime/mime.d.ts b/mime/mime.d.ts
index 42152e49d3..545373e935 100644
--- a/mime/mime.d.ts
+++ b/mime/mime.d.ts
@@ -5,16 +5,15 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/mime.d.ts
 
-declare module "mime" {
-	export function lookup(path: string): string;
-	export function extension(mime: string): string;
-	export function load(filepath: string): void;
-	export function define(mimes: Object): void;
 
-	interface Charsets {
-		lookup(mime: string): string;
-	}
+declare export function lookup(path: string): string;
+declare export function extension(mime: string): string;
+declare export function load(filepath: string): void;
+declare export function define(mimes: Object): void;
 
-	export var charsets: Charsets;
-	export var default_type: string;
+interface Charsets {
+    lookup(mime: string): string;
 }
+
+declare export var charsets: Charsets;
+declare export var default_type: string;
diff --git a/minimatch/minimatch.d.ts b/minimatch/minimatch.d.ts
index 5a6c7215ae..3700d9e237 100644
--- a/minimatch/minimatch.d.ts
+++ b/minimatch/minimatch.d.ts
@@ -3,62 +3,61 @@
 // Definitions by: vvakame <https://github.com/vvakame/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "minimatch" {
 
-	function M(target: string, pattern: string, options?: M.IOptions): boolean;
 
-	namespace M {
-		function match(list: string[], pattern: string, options?: IOptions): string[];
-		function filter(pattern: string, options?: IOptions): (element: string, indexed: number, array: string[]) => boolean;
-		function makeRe(pattern: string, options?: IOptions): RegExp;
+declare function M(target: string, pattern: string, options?: M.IOptions): boolean;
 
-		var Minimatch: IMinimatchStatic;
+declare namespace M {
+    function match(list: string[], pattern: string, options?: IOptions): string[];
+    function filter(pattern: string, options?: IOptions): (element: string, indexed: number, array: string[]) => boolean;
+    function makeRe(pattern: string, options?: IOptions): RegExp;
 
-		interface IOptions {
-			debug?: boolean;
-			nobrace?: boolean;
-			noglobstar?: boolean;
-			dot?: boolean;
-			noext?: boolean;
-			nocase?: boolean;
-			nonull?: boolean;
-			matchBase?: boolean;
-			nocomment?: boolean;
-			nonegate?: boolean;
-			flipNegate?: boolean;
-		}
+    var Minimatch: IMinimatchStatic;
 
-		interface IMinimatchStatic {
-			new (pattern: string, options?: IOptions): IMinimatch;
-			prototype: IMinimatch;
-		}
+    interface IOptions {
+        debug?: boolean;
+        nobrace?: boolean;
+        noglobstar?: boolean;
+        dot?: boolean;
+        noext?: boolean;
+        nocase?: boolean;
+        nonull?: boolean;
+        matchBase?: boolean;
+        nocomment?: boolean;
+        nonegate?: boolean;
+        flipNegate?: boolean;
+    }
 
-		interface IMinimatch {
-			pattern: string;
-			options: IOptions;
-			/** 2-dimensional array of regexp or string expressions. */
-			set: any[][]; // (RegExp | string)[][]
-			regexp: RegExp;
-			negate: boolean;
-			comment: boolean;
-			empty: boolean;
+    interface IMinimatchStatic {
+        new (pattern: string, options?: IOptions): IMinimatch;
+        prototype: IMinimatch;
+    }
 
-			makeRe(): RegExp; // regexp or boolean
-			match(fname: string): boolean;
-			matchOne(files: string[], pattern: string[], partial: boolean): boolean;
+    interface IMinimatch {
+        pattern: string;
+        options: IOptions;
+        /** 2-dimensional array of regexp or string expressions. */
+        set: any[][]; // (RegExp | string)[][]
+        regexp: RegExp;
+        negate: boolean;
+        comment: boolean;
+        empty: boolean;
 
-			/** Deprecated. For internal use. */
-			debug(): void;
-			/** Deprecated. For internal use. */
-			make(): void;
-			/** Deprecated. For internal use. */
-			parseNegate(): void;
-			/** Deprecated. For internal use. */
-			braceExpand(pattern: string, options: IOptions): void;
-			/** Deprecated. For internal use. */
-			parse(pattern: string, isSub?: boolean): void;
-		}
-	}
+        makeRe(): RegExp; // regexp or boolean
+        match(fname: string): boolean;
+        matchOne(files: string[], pattern: string[], partial: boolean): boolean;
 
-	export = M;
+        /** Deprecated. For internal use. */
+        debug(): void;
+        /** Deprecated. For internal use. */
+        make(): void;
+        /** Deprecated. For internal use. */
+        parseNegate(): void;
+        /** Deprecated. For internal use. */
+        braceExpand(pattern: string, options: IOptions): void;
+        /** Deprecated. For internal use. */
+        parse(pattern: string, isSub?: boolean): void;
+    }
 }
+
+export = M;
diff --git a/minimist/minimist.d.ts b/minimist/minimist.d.ts
index d455d1e755..4ab52d76ff 100644
--- a/minimist/minimist.d.ts
+++ b/minimist/minimist.d.ts
@@ -3,33 +3,32 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Necroskillz <https://github.com/Necroskillz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'minimist' {
-	function minimist(args?: string[], opts?: minimist.Opts): minimist.ParsedArgs;
 
-	namespace minimist {
-		export interface Opts {
-			// a string or array of strings argument names to always treat as strings
-			string?: string|string[];
-			// a string or array of strings to always treat as booleans
-			boolean?: boolean|string|string[];
-			// an object mapping string names to strings or arrays of string argument names to use
-			alias?: {[key:string]: string|string[]};
-			// an object mapping string argument names to default values
-			default?: {[key:string]: any};
-			// when true, populate argv._ with everything after the first non-option
-			stopEarly?: boolean;
-			// a function which is invoked with a command line parameter not defined in the opts configuration object.
-			// If the function returns false, the unknown option is not added to argv
-			unknown?: (arg: string) => boolean;
-			// when true, populate argv._ with everything before the -- and argv['--'] with everything after the --
-			'--'?: boolean;
-		}
+declare function minimist(args?: string[], opts?: minimist.Opts): minimist.ParsedArgs;
 
-		export interface ParsedArgs {
-			[arg: string]: any;
-			_: string[];
-		}
-	}
+declare namespace minimist {
+    export interface Opts {
+        // a string or array of strings argument names to always treat as strings
+        string?: string | string[];
+        // a string or array of strings to always treat as booleans
+        boolean?: boolean | string | string[];
+        // an object mapping string names to strings or arrays of string argument names to use
+        alias?: { [key: string]: string | string[] };
+        // an object mapping string argument names to default values
+        default?: { [key: string]: any };
+        // when true, populate argv._ with everything after the first non-option
+        stopEarly?: boolean;
+        // a function which is invoked with a command line parameter not defined in the opts configuration object.
+        // If the function returns false, the unknown option is not added to argv
+        unknown?: (arg: string) => boolean;
+        // when true, populate argv._ with everything before the -- and argv['--'] with everything after the --
+        '--'?: boolean;
+    }
 
-	export = minimist;
+    export interface ParsedArgs {
+        [arg: string]: any;
+        _: string[];
+    }
 }
+
+export = minimist;
diff --git a/mkdirp/mkdirp.d.ts b/mkdirp/mkdirp.d.ts
index cd635ab425..7cd860f69a 100644
--- a/mkdirp/mkdirp.d.ts
+++ b/mkdirp/mkdirp.d.ts
@@ -3,13 +3,12 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'mkdirp' {
 
-	function mkdirp(dir: string, cb: (err: any, made: string) => void): void;
-	function mkdirp(dir: string, flags: any, cb: (err: any, made: string) => void): void;
 
-	namespace mkdirp {
-		function sync(dir: string, flags?: any): string;
-	}
-	export = mkdirp;
+declare function mkdirp(dir: string, cb: (err: any, made: string) => void): void;
+declare function mkdirp(dir: string, flags: any, cb: (err: any, made: string) => void): void;
+
+declare namespace mkdirp {
+    function sync(dir: string, flags?: any): string;
 }
+export = mkdirp;
diff --git a/mkpath/mkpath.d.ts b/mkpath/mkpath.d.ts
index bad1051ce1..a5fc7bd93c 100644
--- a/mkpath/mkpath.d.ts
+++ b/mkpath/mkpath.d.ts
@@ -3,13 +3,12 @@
 // Definitions by: Jared Klopper <https://github.com/optical>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'mkpath' {
-  namespace mkpath {
+
+declare namespace mkpath {
     function sync(path: string, mode?: number): void;
-  }
-
-  function mkpath(path: string, callback?: (err: any) => void): void;
-  function mkpath(path: string, mode?: number, callback?: (err?: any) => void): void;
-
-  export = mkpath;
 }
+
+declare function mkpath(path: string, callback?: (err: any) => void): void;
+declare function mkpath(path: string, mode?: number, callback?: (err?: any) => void): void;
+
+export = mkpath;
diff --git a/mmmagic/mmmagic.d.ts b/mmmagic/mmmagic.d.ts
index 78e4929a8d..6fe486141e 100644
--- a/mmmagic/mmmagic.d.ts
+++ b/mmmagic/mmmagic.d.ts
@@ -5,33 +5,31 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "mmmagic" {
-    export type bitmask = number;
-    export class Magic  {
-        constructor(magicPath?: string, mask?: bitmask);
-        constructor(mask?: bitmask);
-        detectFile(path: string, callback: (err: Error, result: string) => void): void;
-        detect(data: Buffer, callback: (err: Error, result: string) => void): void;
-    }
-    export var MAGIC_NONE: bitmask; // no flags set
-    export var MAGIC_DEBUG: bitmask; // turn on debugging
-    export var MAGIC_SYMLINK: bitmask; // follow symlinks (default for non-Windows)
-    export var MAGIC_DEVICES: bitmask; // look at the contents of devices
-    export var MAGIC_MIME_TYPE: bitmask; // return the MIME type
-    export var MAGIC_CONTINUE: bitmask; // return all matches (returned as an array of strings)
-    export var MAGIC_CHECK: bitmask; // print warnings to stderr
-    export var MAGIC_PRESERVE_ATIME: bitmask; // restore access time on exit
-    export var MAGIC_RAW: bitmask; // don't translate unprintable chars
-    export var MAGIC_MIME_ENCODING: bitmask; // return the MIME encoding
-    export var MAGIC_MIME: bitmask; // (export var MAGIC_MIME_TYPE | export var MAGIC_MIME_ENCODING)
-    export var MAGIC_APPLE: bitmask; // return the Apple creator and type
-    export var MAGIC_NO_CHECK_TAR: bitmask; // don't check for tar files
-    export var MAGIC_NO_CHECK_SOFT: bitmask; // don't check magic entries
-    export var MAGIC_NO_CHECK_APPTYPE: bitmask; // don't check application type
-    export var MAGIC_NO_CHECK_ELF: bitmask; // don't check for elf details
-    export var MAGIC_NO_CHECK_TEXT: bitmask; // don't check for text files
-    export var MAGIC_NO_CHECK_CDF: bitmask; // don't check for cdf files
-    export var MAGIC_NO_CHECK_TOKENS: bitmask; // don't check tokens
-    export var MAGIC_NO_CHECK_ENCODING: bitmask // don't check text encodings
 
-}
\ No newline at end of file
+export type bitmask = number;
+declare export class Magic {
+    constructor(magicPath?: string, mask?: bitmask);
+    constructor(mask?: bitmask);
+    detectFile(path: string, callback: (err: Error, result: string) => void): void;
+    detect(data: Buffer, callback: (err: Error, result: string) => void): void;
+}
+declare export var MAGIC_NONE: bitmask; // no flags set
+declare export var MAGIC_DEBUG: bitmask; // turn on debugging
+declare export var MAGIC_SYMLINK: bitmask; // follow symlinks (default for non-Windows)
+declare export var MAGIC_DEVICES: bitmask; // look at the contents of devices
+declare export var MAGIC_MIME_TYPE: bitmask; // return the MIME type
+declare export var MAGIC_CONTINUE: bitmask; // return all matches (returned as an array of strings)
+declare export var MAGIC_CHECK: bitmask; // print warnings to stderr
+declare export var MAGIC_PRESERVE_ATIME: bitmask; // restore access time on exit
+declare export var MAGIC_RAW: bitmask; // don't translate unprintable chars
+declare export var MAGIC_MIME_ENCODING: bitmask; // return the MIME encoding
+declare export var MAGIC_MIME: bitmask; // (export var MAGIC_MIME_TYPE | export var MAGIC_MIME_ENCODING)
+declare export var MAGIC_APPLE: bitmask; // return the Apple creator and type
+declare export var MAGIC_NO_CHECK_TAR: bitmask; // don't check for tar files
+declare export var MAGIC_NO_CHECK_SOFT: bitmask; // don't check magic entries
+declare export var MAGIC_NO_CHECK_APPTYPE: bitmask; // don't check application type
+declare export var MAGIC_NO_CHECK_ELF: bitmask; // don't check for elf details
+declare export var MAGIC_NO_CHECK_TEXT: bitmask; // don't check for text files
+declare export var MAGIC_NO_CHECK_CDF: bitmask; // don't check for cdf files
+declare export var MAGIC_NO_CHECK_TOKENS: bitmask; // don't check tokens
+declare export var MAGIC_NO_CHECK_ENCODING: bitmask
diff --git a/mobservable-react/mobservable-react.d.ts b/mobservable-react/mobservable-react.d.ts
index 328a6047ce..43afb98261 100644
--- a/mobservable-react/mobservable-react.d.ts
+++ b/mobservable-react/mobservable-react.d.ts
@@ -5,12 +5,11 @@
 
 /// <reference path="../react/react-global.d.ts" />
 
-declare module "mobservable-react" {
-    /**
-     * Turns a React component or stateless render function into a reactive component.
-     */
-    export function reactiveComponent<P>(clazz: React.ClassicComponentClass<P>): React.ClassicComponentClass<P>;
-    export function reactiveComponent<TFunction extends React.ComponentClass<any>>(target: TFunction): void; // decorator signature
-    export function reactiveComponent<P>(clazz: React.ComponentClass<P>): React.ComponentClass<P>;
-    export function reactiveComponent<P>(renderFunction: (props: P) => React.ReactElement<any>): React.ClassicComponentClass<P>;
-}
\ No newline at end of file
+
+/**
+ * Turns a React component or stateless render function into a reactive component.
+ */
+declare export function reactiveComponent<P>(clazz: React.ClassicComponentClass<P>): React.ClassicComponentClass<P>;
+declare export function reactiveComponent<TFunction extends React.ComponentClass<any>>(target: TFunction): void; // decorator signature
+declare export function reactiveComponent<P>(clazz: React.ComponentClass<P>): React.ComponentClass<P>;
+declare export function reactiveComponent<P>(renderFunction: (props: P) => React.ReactElement<any>): React.ClassicComponentClass<P>;
diff --git a/mock-fs/mock-fs.d.ts b/mock-fs/mock-fs.d.ts
index baa42032f3..735bf76270 100644
--- a/mock-fs/mock-fs.d.ts
+++ b/mock-fs/mock-fs.d.ts
@@ -5,53 +5,52 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "mock-fs" {
-	import fs = require("fs");
 
-	function mock(config?: mock.Config, options?: mock.Options): void;
+import fs = require("fs");
 
-	namespace mock {
-		function file(config: FileConfig): File;
-		function directory(config: DirectoryConfig): Directory;
-		function symlink(config: SymlinkConfig): Symlink;
+declare function mock(config?: mock.Config, options?: mock.Options): void;
 
-		function restore(): void;
+declare namespace mock {
+    function file(config: FileConfig): File;
+    function directory(config: DirectoryConfig): Directory;
+    function symlink(config: SymlinkConfig): Symlink;
 
-		function fs(config?: Config, options?: Options): typeof fs;
+    function restore(): void;
 
-		interface Config {
-			[path: string]: string | Buffer | File | Directory | Symlink | Config;
-		}
+    function fs(config?: Config, options?: Options): typeof fs;
 
-		interface Options {
-			createCwd?: boolean;
-			createTmp?: boolean;
-		}
+    interface Config {
+        [path: string]: string | Buffer | File | Directory | Symlink | Config;
+    }
 
-		interface CommonConfig {
-			mode?: number;
-			uid?: number;
-			git?: number;
-			atime?: Date;
-			ctime?: Date;
-			mtime?: Date;
-			birthtime?: Date;
-		}
+    interface Options {
+        createCwd?: boolean;
+        createTmp?: boolean;
+    }
 
-		interface FileConfig extends CommonConfig {
-			content: string | Buffer;
-		}
-		interface DirectoryConfig extends CommonConfig {
-			items: Config;
-		}
-		interface SymlinkConfig extends CommonConfig {
-			path: string;
-		}
+    interface CommonConfig {
+        mode?: number;
+        uid?: number;
+        git?: number;
+        atime?: Date;
+        ctime?: Date;
+        mtime?: Date;
+        birthtime?: Date;
+    }
 
-		class File { private _file: any; }
-		class Directory { private _directory: any; }
-		class Symlink { private _symlink: any; }
-	}
+    interface FileConfig extends CommonConfig {
+        content: string | Buffer;
+    }
+    interface DirectoryConfig extends CommonConfig {
+        items: Config;
+    }
+    interface SymlinkConfig extends CommonConfig {
+        path: string;
+    }
 
-	export = mock;
+    class File { private _file: any; }
+    class Directory { private _directory: any; }
+    class Symlink { private _symlink: any; }
 }
+
+export = mock;
diff --git a/mockery/mockery.d.ts b/mockery/mockery.d.ts
index f6242839a8..c6ceeac22d 100644
--- a/mockery/mockery.d.ts
+++ b/mockery/mockery.d.ts
@@ -3,31 +3,30 @@
 // Definitions by: jt000 <https://github.com/jt000>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "mockery" {
 
-    interface MockeryEnableArgs {
-        useCleanCache?: boolean;
-        warnOnReplace?: boolean;
-        warnOnUnregistered?: boolean;
-    }
 
-    export function enable(args?: MockeryEnableArgs): void;
-    export function disable(): void;
+interface MockeryEnableArgs {
+    useCleanCache?: boolean;
+    warnOnReplace?: boolean;
+    warnOnUnregistered?: boolean;
+}
 
-    export function registerMock(name: string, mock: any): void;
-    export function deregisterMock(name: string): void;
+declare export function enable(args?: MockeryEnableArgs): void;
+declare export function disable(): void;
 
-    export function registerSubstitute(name: string, substitute: string): void;
-    export function deregisterSubstitute(name: string): void;
+declare export function registerMock(name: string, mock: any): void;
+declare export function deregisterMock(name: string): void;
 
-    export function registerAllowable(name: string, unhook?: boolean): void;
-    export function deregisterAllowable(name: string): void;
+declare export function registerSubstitute(name: string, substitute: string): void;
+declare export function deregisterSubstitute(name: string): void;
 
-    export function registerAllowables(names: string[]): void;
-    export function deregisterAllowables(names: string[]): void;
+declare export function registerAllowable(name: string, unhook?: boolean): void;
+declare export function deregisterAllowable(name: string): void;
 
-    export function deregisterAll(): void;
-    export function resetCache(): void;
-    export function warnOnUnregistered(value: boolean): void;
-    export function warnOnReplace(value: boolean): void;
-}
\ No newline at end of file
+declare export function registerAllowables(names: string[]): void;
+declare export function deregisterAllowables(names: string[]): void;
+
+declare export function deregisterAll(): void;
+declare export function resetCache(): void;
+declare export function warnOnUnregistered(value: boolean): void;
+declare export function warnOnReplace(value: boolean): void;
diff --git a/mongodb/mongodb-1.4.9.d.ts b/mongodb/mongodb-1.4.9.d.ts
index a843643c49..5a8c54722d 100644
--- a/mongodb/mongodb-1.4.9.d.ts
+++ b/mongodb/mongodb-1.4.9.d.ts
@@ -7,78 +7,78 @@
 
 /// <reference path='../node/node.d.ts' />
 
-declare module "mongodb" {
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/mongoclient.html
-  export class MongoClient{
+
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/mongoclient.html
+declare export class MongoClient {
     constructor(serverConfig: any, options: any);
 
     static connect(uri: string, callback?: (err: Error, db: Db) => void): void;
     static connect(uri: string, options: any, callback?: (err: Error, db: Db) => void): void;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/server.html
-  export class Server {
-    constructor (host: string, port: number, opts?: ServerOptions);
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/server.html
+declare export class Server {
+    constructor(host: string, port: number, opts?: ServerOptions);
 
     public connect(): any;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
-  export class Db {
-    constructor (databaseName: string, serverConfig: Server, dbOptions?: DbCreateOptions);
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
+declare export class Db {
+    constructor(databaseName: string, serverConfig: Server, dbOptions?: DbCreateOptions);
 
     public db(dbName: string): Db;
 
-    public open(callback?: (err : Error, db : Db) => void ): void;
-    public close(forceClose?: boolean, callback?: (err: Error, result: any) => void ): void;
-    public admin(callback?: (err: Error, result: any) => void ): any;
-    public collectionsInfo(collectionName: string, callback?: (err: Error, result: any) => void ): void;
-    public collectionNames(collectionName: string, options: any, callback?: (err: Error, result: any) => void ): void;
+    public open(callback?: (err: Error, db: Db) => void): void;
+    public close(forceClose?: boolean, callback?: (err: Error, result: any) => void): void;
+    public admin(callback?: (err: Error, result: any) => void): any;
+    public collectionsInfo(collectionName: string, callback?: (err: Error, result: any) => void): void;
+    public collectionNames(collectionName: string, options: any, callback?: (err: Error, result: any) => void): void;
 
     public collection(collectionName: string): Collection;
-    public collection(collectionName: string, callback?: (err: Error, collection: Collection) => void ): Collection;
-    public collection(collectionName: string, options: MongoCollectionOptions, callback?: (err: Error, collection: Collection) => void ): Collection;
+    public collection(collectionName: string, callback?: (err: Error, collection: Collection) => void): Collection;
+    public collection(collectionName: string, options: MongoCollectionOptions, callback?: (err: Error, collection: Collection) => void): Collection;
 
-    public collections(callback?: (err: Error, collections: Collection[]) => void ): void;
-    public eval(code: any, parameters: any[], options?: any, callback?: (err: Error, result: any) => void ): void;
+    public collections(callback?: (err: Error, collections: Collection[]) => void): void;
+    public eval(code: any, parameters: any[], options?: any, callback?: (err: Error, result: any) => void): void;
     //public dereference(dbRef: DbRef, callback?: (err: Error, result: any) => void): void;
 
-    public logout(callback?: (err: Error, result: any) => void ): void;
-    public logout(options: any, callback?: (err: Error, result: any) => void ): void;
+    public logout(callback?: (err: Error, result: any) => void): void;
+    public logout(options: any, callback?: (err: Error, result: any) => void): void;
 
-    public authenticate(userName: string, password: string, callback?: (err: Error, result: any) => void ): void;
-    public authenticate(userName: string, password: string, options: any, callback?: (err: Error, result: any) => void ): void;
+    public authenticate(userName: string, password: string, callback?: (err: Error, result: any) => void): void;
+    public authenticate(userName: string, password: string, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public addUser(username: string, password: string, callback?: (err: Error, result: any) => void ): void;
-    public addUser(username: string, password: string, options: any, callback?: (err: Error, result: any) => void ): void;
+    public addUser(username: string, password: string, callback?: (err: Error, result: any) => void): void;
+    public addUser(username: string, password: string, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public removeUser(username: string, callback?: (err: Error, result: any) => void ): void;
-    public removeUser(username: string, options: any, callback?: (err: Error, result: any) => void ): void;
+    public removeUser(username: string, callback?: (err: Error, result: any) => void): void;
+    public removeUser(username: string, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public createCollection(collectionName: string, callback?: (err: Error, result: Collection) => void ): void;
-    public createCollection(collectionName: string, options: CollectionCreateOptions, callback?: (err: Error, result: any) => void ): void;
+    public createCollection(collectionName: string, callback?: (err: Error, result: Collection) => void): void;
+    public createCollection(collectionName: string, options: CollectionCreateOptions, callback?: (err: Error, result: any) => void): void;
 
-    public command(selector: Object, callback?: (err: Error, result: any) => void ): void;
-    public command(selector: Object, options: any, callback?: (err: Error, result: any) => void ): void;
+    public command(selector: Object, callback?: (err: Error, result: any) => void): void;
+    public command(selector: Object, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public dropCollection(collectionName: string, callback?: (err: Error, result: any) => void ): void;
-    public renameCollection(fromCollection: string, toCollection: string, callback?: (err: Error, result: any) => void ): void;
+    public dropCollection(collectionName: string, callback?: (err: Error, result: any) => void): void;
+    public renameCollection(fromCollection: string, toCollection: string, callback?: (err: Error, result: any) => void): void;
 
-    public lastError(options: Object, connectionOptions: any, callback?: (err: Error, result: any) => void ): void;
-    public previousError(options: Object, callback?: (err: Error, result: any) => void ): void;
+    public lastError(options: Object, connectionOptions: any, callback?: (err: Error, result: any) => void): void;
+    public previousError(options: Object, callback?: (err: Error, result: any) => void): void;
 
     // error = lastError
     // lastStatus = lastError
 
-    public executeDbCommand(command_hash: any, callback?: (err: Error, result: any) => void ): void;
-    public executeDbCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void ): void;
+    public executeDbCommand(command_hash: any, callback?: (err: Error, result: any) => void): void;
+    public executeDbCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public executeDbAdminCommand(command_hash: any, callback?: (err: Error, result: any) => void ): void;
-    public executeDbAdminCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void ): void;
+    public executeDbAdminCommand(command_hash: any, callback?: (err: Error, result: any) => void): void;
+    public executeDbAdminCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void): void;
 
-    public resetErrorHistory(callback?: (err: Error, result: any) => void ): void;
-    public resetErrorHistory(options: any, callback?: (err: Error, result: any) => void ): void;
+    public resetErrorHistory(callback?: (err: Error, result: any) => void): void;
+    public resetErrorHistory(options: any, callback?: (err: Error, result: any) => void): void;
 
     public createIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback?: Function): void;
     public ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback?: Function): void;
@@ -88,7 +88,7 @@ declare module "mongodb" {
     public dropIndex(collectionName: string, indexName: string, callback?: Function): void;
     public reIndex(collectionName: string, callback?: Function): void;
     public indexInformation(collectionName: string, options: any, callback?: Function): void;
-    public dropDatabase(callback?: (err: Error, result: any) => void ): void;
+    public dropDatabase(callback?: (err: Error, result: any) => void): void;
 
     public stats(options: any, callback?: Function): void;
     public _registerHandler(db_command: any, raw: any, connection: any, exhaust: any, callback?: Function): void;
@@ -101,21 +101,21 @@ declare module "mongodb" {
 
     public DEFAULT_URL: string;
 
-    public connect(url: string, options: { uri_decode_auth?: boolean; }, callback?: (err: Error, result: any) => void ): void;
+    public connect(url: string, options: { uri_decode_auth?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
-    public addListener(event: string, handler:(param: any) => any): any;
-  }
+    public addListener(event: string, handler: (param: any) => any): any;
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/objectid.html
-  // Last update: doc. version 1.3.13 (28.08.2013)
-  export class ObjectID {
-    constructor (s?: string);
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/objectid.html
+// Last update: doc. version 1.3.13 (28.08.2013)
+declare export class ObjectID {
+    constructor(s?: string);
 
     // Returns the ObjectID id as a 24 byte hex string representation
-    public toHexString() : string;
+    public toHexString(): string;
 
     // Compares the equality of this ObjectID with otherID.
-    public equals(otherID: ObjectID) : boolean;
+    public equals(otherID: ObjectID): boolean;
 
     // Returns the generation date (accurate up to the second) that this ID was generated.
     public getTimestamp(): Date;
@@ -135,11 +135,11 @@ declare module "mongodb" {
     // Generate a 12 byte id string used in ObjectID's
     // time - optional parameter allowing to pass in a second based timestamp
     public generate(time?: number): string;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/binary.html
-  export class Binary {
-    constructor (buffer: Buffer, subType?: number);
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/binary.html
+declare export class Binary {
+    constructor(buffer: Buffer, subType?: number);
 
     // Updates this binary with byte_value
     put(byte_value: any): void;
@@ -155,9 +155,9 @@ declare module "mongodb" {
 
     // The length of the binary.
     length(): number;
-  }
+}
 
-  export interface SocketOptions {
+export interface SocketOptions {
     //= set seconds before connection times out default:0
     timeout?: number;
     //= Disables the Nagle algorithm default:true
@@ -166,25 +166,25 @@ declare module "mongodb" {
     keepAlive?: number;
     //= ‘ascii’|’utf8’|’base64’ default:null
     encoding?: string;
-  }
+}
 
-  export interface ServerOptions {
+export interface ServerOptions {
     // - to reconnect automatically, default:false
     auto_reconnect?: boolean;
     // - specify the number of connections in the pool default:1
     poolSize?: number;
     // - a collection of pr socket settings
     socketOptions?: any;
-  }
+}
 
-  export interface PKFactory {
+export interface PKFactory {
     counter: number;
     createPk: () => number;
-  }
+}
 
-  // See : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
-  // Current definition by documentation version 1.3.13 (28.08.2013)
-  export interface DbCreateOptions {
+// See : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
+// Current definition by documentation version 1.3.13 (28.08.2013)
+export interface DbCreateOptions {
     //  the write concern for the operation where < 1 is no acknowlegement of write and w >= 1, w = ‘majority’ or tag acknowledges the write.
     w?: any;
 
@@ -232,19 +232,19 @@ declare module "mongodb" {
 
     // when deserializing a Long will fit it into a Number if it’s smaller than 53 bits. default:true.
     promoteLongs?: boolean;
-  }
+}
 
-  export class ReadPreference {
+declare export class ReadPreference {
     public static PRIMARY: string;
     public static PRIMARY_PREFERRED: string;
     public static SECONDARY: string;
     public static SECONDARY_PREFERRED: string;
     public static NEAREST: string;
-  }
+}
 
-  // See : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
-  // Current definition by documentation version 1.3.13 (28.08.2013)
-  export interface CollectionCreateOptions {
+// See : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
+// Current definition by documentation version 1.3.13 (28.08.2013)
+export interface CollectionCreateOptions {
     // the prefered read preference. use 'ReadPreference' class.
     readPreference?: string;
 
@@ -259,10 +259,10 @@ declare module "mongodb" {
 
     // object overriding the basic ObjectID primary key generation.
     pkFactory?: PKFactory;
-  }
+}
 
-  // Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
-  export interface CollStats {
+// Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
+export interface CollStats {
     // Namespace.
     ns: string;
 
@@ -291,18 +291,18 @@ declare module "mongodb" {
     paddingFactor: number;
     flags: number;
 
-     // Total index size in bytes.
+    // Total index size in bytes.
     totalIndexSize: number;
 
     // Size of specific indexes in bytes.
     indexSizes: {
-            _id_: number;
-            username: number;
+        _id_: number;
+        username: number;
     };
-  }
+}
 
-  // Documentation : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
-  export interface Collection {
+// Documentation : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
+export interface Collection {
     new (db: Db, collectionName: string, pkFactory?: Object, options?: CollectionCreateOptions): Collection; // is this right?
     /**
      * @deprecated use insertOne or insertMany
@@ -312,7 +312,7 @@ declare module "mongodb" {
     insert(query: any, options: { safe?: any; continueOnError?: boolean; keepGoing?: boolean; serializeFunctions?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#insertOne
-    insertOne(doc:any, callback?: (err: Error, result: any) => void) :void;
+    insertOne(doc: any, callback?: (err: Error, result: any) => void): void;
     insertOne(doc: any, options: { w?: any; wtimeout?: number; j?: boolean; serializeFunctions?: boolean; forceServerObjectId?: boolean }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#insertMany
@@ -327,16 +327,16 @@ declare module "mongodb" {
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#deleteOne
     deleteOne(filter: any, callback?: (err: Error, result: any) => void): void;
-    deleteOne(filter: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+    deleteOne(filter: any, options: { w?: any; wtimeout?: number; j?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#deleteMany
     deleteMany(filter: any, callback?: (err: Error, result: any) => void): void;
-    deleteMany(filter: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+    deleteMany(filter: any, options: { w?: any; wtimeout?: number; j?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     rename(newName: String, callback?: (err: Error, result: any) => void): void;
 
-    save(doc: any, callback : (err: Error, result: any) => void): void;
-    save(doc: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback : (err: Error, result: any) => void): void;
+    save(doc: any, callback: (err: Error, result: any) => void): void;
+    save(doc: any, options: { w?: any; wtimeout?: number; j?: boolean; }, callback: (err: Error, result: any) => void): void;
     /**
      * @deprecated use updateOne or updateMany
      * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#update
@@ -346,11 +346,11 @@ declare module "mongodb" {
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#updateOne
     updateOne(filter: Object, update: any, callback?: (err: Error, result: any) => void): void;
-    updateOne(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+    updateOne(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#updateMany
     updateMany(filter: Object, update: any, callback?: (err: Error, result: any) => void): void;
-    updateMany(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+    updateMany(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean; }, callback?: (err: Error, result: any) => void): void;
 
     distinct(key: string, query: Object, callback?: (err: Error, result: any) => void): void;
     distinct(key: string, query: Object, options: { readPreference: string; }, callback?: (err: Error, result: any) => void): void;
@@ -370,8 +370,8 @@ declare module "mongodb" {
      * @deprecated use findOneAndDelete
      * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndRemove
      */
-    findAndRemove(query : Object, sort? : any[], callback?: (err: Error, result: any) => void): void;
-    findAndRemove(query : Object, sort? : any[], options?: { safe: any; }, callback?: (err: Error, result: any) => void): void;
+    findAndRemove(query: Object, sort?: any[], callback?: (err: Error, result: any) => void): void;
+    findAndRemove(query: Object, sort?: any[], options?: { safe: any; }, callback?: (err: Error, result: any) => void): void;
 
     // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findOneAndDelete
     findOneAndDelete(filter: any, callback?: (err: Error, result: any) => void): void;
@@ -414,7 +414,7 @@ declare module "mongodb" {
 
     reIndex(callback?: Function): void;
     mapReduce(map: Function, reduce: Function, options: MapReduceOptions, callback?: Function): void;
-    group(keys: Object, condition: Object, initial: Object, reduce: Function, finalize: Function, command: boolean, options: {readPreference: string}, callback?: Function): void;
+    group(keys: Object, condition: Object, initial: Object, reduce: Function, finalize: Function, command: boolean, options: { readPreference: string }, callback?: Function): void;
     options(callback?: Function): void;
     isCapped(callback?: Function): void;
     indexExists(indexes: string, callback?: Function): void;
@@ -424,14 +424,14 @@ declare module "mongodb" {
     geoHaystackSearch(x: number, y: number, options: Object, callback?: Function): void;
     indexes(callback?: Function): void;
     aggregate(pipeline: any[], callback?: (err: Error, results: any) => void): void;
-    aggregate(pipeline: any[], options: {readPreference: string}, callback?: (err: Error, results: any) => void): void;
+    aggregate(pipeline: any[], options: { readPreference: string }, callback?: (err: Error, results: any) => void): void;
     stats(callback?: (err: Error, results: CollStats) => void): void;
-    stats(options: {readPreference: string; scale: number}, callback?: (err: Error, results: CollStats) => void): void;
+    stats(options: { readPreference: string; scale: number }, callback?: (err: Error, results: CollStats) => void): void;
 
     hint: any;
-  }
+}
 
-  export interface MapReduceOptions {
+export interface MapReduceOptions {
     out?: Object;
     query?: Object;
     sort?: Object;
@@ -442,9 +442,9 @@ declare module "mongodb" {
     jsMode?: boolean;
     verbose?: boolean;
     readPreference?: string;
-  }
+}
 
-  export interface IndexOptions {
+export interface IndexOptions {
     w?: any;
     wtimeout?: number;
     fsync?: boolean;
@@ -458,54 +458,54 @@ declare module "mongodb" {
     v?: number;
     expireAfterSeconds?: number;
     name?: string;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursor.html
-  // Last update: doc. version 1.3.13 (29.08.2013)
-  export class Cursor {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursor.html
+// Last update: doc. version 1.3.13 (29.08.2013)
+declare export class Cursor {
     // INTERNAL TYPE
     // constructor (db: Db, collection: Collection, selector, fields, skip, limit, sort, hint, explain, snapshot, timeout, tailable, batchSize, slaveOk, raw, read, returnKey, maxScan, min, max, showDiskLoc, comment, awaitdata, numberOfRetries, dbName, tailableRetryInterval, exhaust, partial);
     // constructor(db: Db, collection: Collection, selector, fields, options);
 
-    rewind() : Cursor;
-    toArray(callback?: (err: Error, results: any[]) => any) : void;
-    each(callback?: (err: Error, item: any) => void) : void;
-    count(applySkipLimit: boolean, callback?: (err: Error, count: number) => void) : void;
+    rewind(): Cursor;
+    toArray(callback?: (err: Error, results: any[]) => any): void;
+    each(callback?: (err: Error, item: any) => void): void;
+    count(applySkipLimit: boolean, callback?: (err: Error, count: number) => void): void;
 
-    sort(keyOrList: any, callback? : (err: Error, result: any) => void): Cursor;
+    sort(keyOrList: any, callback?: (err: Error, result: any) => void): Cursor;
 
     // this determines how the results are sorted. "asc", "ascending" or 1 for asceding order while "desc", "desceding or -1 for descending order. Note that the strings are case insensitive.
-    sort(keyOrList: String, direction : string, callback : (err: Error, result: any) => void): Cursor;
+    sort(keyOrList: String, direction: string, callback: (err: Error, result: any) => void): Cursor;
     limit(limit: number, callback?: (err: Error, result: any) => void): Cursor;
     setReadPreference(preference: string, callback?: Function): Cursor;
     skip(skip: number, callback?: (err: Error, result: any) => void): Cursor;
     batchSize(batchSize: number, callback?: (err: Error, result: any) => void): Cursor;
 
-    nextObject(callback?: (err: Error, doc: any) => void) : void;
-    explain(callback?: (err: Error, result: any) => void) : void;
+    nextObject(callback?: (err: Error, doc: any) => void): void;
+    explain(callback?: (err: Error, result: any) => void): void;
 
     stream(): CursorStream;
 
-    close(callback?: (err: Error, result: any) => void) : void;
+    close(callback?: (err: Error, result: any) => void): void;
     isClosed(): boolean;
 
     public static INIT: number;
     public static OPEN: number;
     public static CLOSED: number;
     public static GET_MORE: number;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursorstream.html
-  // Last update: doc. version 1.3.13 (29.08.2013)
-  export class CursorStream {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursorstream.html
+// Last update: doc. version 1.3.13 (29.08.2013)
+declare export class CursorStream {
     constructor(cursor: Cursor);
 
     public pause(): any;
     public resume(): any;
     public destroy(): any;
-  }
+}
 
-  export interface CollectionFindOptions {
+export interface CollectionFindOptions {
     limit?: number;
     sort?: any;
     fields?: Object;
@@ -530,14 +530,13 @@ declare module "mongodb" {
     raw?: boolean;
     readPreference?: String;
     partial?: boolean;
-  }
+}
 
-  export interface MongoCollectionOptions {
+export interface MongoCollectionOptions {
     safe?: any;
     serializeFunctions?: any;
     strict?: boolean;
     raw?: boolean;
     pkFactory?: any;
     readPreference?: string;
-  }
 }
diff --git a/mongodb/mongodb.d.ts b/mongodb/mongodb.d.ts
index 6c9f8efe7f..b4c8bca2f9 100644
--- a/mongodb/mongodb.d.ts
+++ b/mongodb/mongodb.d.ts
@@ -7,12 +7,12 @@
 
 /// <reference path='../node/node.d.ts' />
 
-declare module "mongodb" {
-  import {EventEmitter} from 'events';
+
+import {EventEmitter} from 'events';
 
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
-  export class MongoClient {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
+declare export class MongoClient {
     constructor();
 
     static connect(uri: string, callback: MongoCallback<Db>): void;
@@ -22,30 +22,30 @@ declare module "mongodb" {
     connect(uri: string, callback: MongoCallback<Db>): void;
     connect(uri: string, options?: MongoClientOptions): Promise<Db>;
     connect(uri: string, options: MongoClientOptions, callback: MongoCallback<Db>): void;
-  }
+}
 
-  export interface MongoCallback<T> {
+export interface MongoCallback<T> {
     (error: MongoError, result: T): void;
-  }
+}
 
-  // http://mongodb.github.io/node-mongodb-native/2.1/api/MongoError.html
-  export class MongoError extends Error {
+// http://mongodb.github.io/node-mongodb-native/2.1/api/MongoError.html
+declare export class MongoError extends Error {
     constructor(message: string);
     static create(options: Object): MongoError;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html#.connect
-  export interface MongoClientOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html#.connect
+export interface MongoClientOptions {
     uri_decode_auth?: boolean;
     db?: DbCreateOptions;
     server?: ServerOptions;
     replSet?: ReplSetOptions;
     mongos?: MongosOptions;
     promiseLibrary?: Object;
-  }
+}
 
-  // See : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
-  export interface DbCreateOptions {
+// See : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
+export interface DbCreateOptions {
     authSource?: string;
     //  the write concern for the operation where < 1 is no acknowlegement of write and w >= 1, w = ‘majority’ or tag acknowledges the write.
     w?: number | string;
@@ -69,10 +69,10 @@ declare module "mongodb" {
     pkFactory?: Object;
     promiseLibrary?: Object;
     readConcern?: { level?: Object };
-  }
+}
 
-  // See http://mongodb.github.io/node-mongodb-native/2.1/api/ReadPreference.html
-  export class ReadPreference {
+// See http://mongodb.github.io/node-mongodb-native/2.1/api/ReadPreference.html
+declare export class ReadPreference {
     constructor(mode: string, tags: Object);
     mode: string;
     tags: any;
@@ -83,10 +83,10 @@ declare module "mongodb" {
     static NEAREST: string;
     isValid(mode: string): boolean;
     static isValid(mode: string): boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
-  export interface SocketOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+export interface SocketOptions {
     // Reconnect on error. default:false
     autoReconnect?: boolean;
     // TCP Socket NoDelay option. default:true
@@ -97,10 +97,10 @@ declare module "mongodb" {
     connectTimeoutMS?: number;
     // TCP Socket timeout setting. default 0
     socketTimeoutMS?: number;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
-  export interface ServerOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+export interface ServerOptions {
     // - specify the number of connections in the pool default:5
     poolSize?: number;
     ssl?: boolean;
@@ -113,10 +113,10 @@ declare module "mongodb" {
     socketOptions?: SocketOptions;
     reconnectTries?: number;
     reconnectInterval?: number;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
-  export interface ReplSetOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+export interface ReplSetOptions {
     ha?: boolean;
     haInterval?: number;
     replicaSet?: string;
@@ -132,10 +132,10 @@ declare module "mongodb" {
     sslKey?: Buffer | string;
     sslPass?: Buffer | string;
     socketOptions?: SocketOptions;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Mongos.html
-  export interface MongosOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Mongos.html
+export interface MongosOptions {
     ha?: boolean;
     haInterval?: number;
     // - specify the number of connections in the pool default:5
@@ -148,10 +148,10 @@ declare module "mongodb" {
     sslKey?: Buffer | string;
     sslPass?: Buffer | string;
     socketOptions?: SocketOptions;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
-  export class Db extends EventEmitter {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
+declare export class Db extends EventEmitter {
     constructor(databaseName: string, serverConfig: Server | ReplSet | Mongos, options?: DbCreateOptions);
 
     serverConfig: Server | ReplSet | Mongos;
@@ -239,31 +239,31 @@ declare module "mongodb" {
     stats(callback: MongoCallback<any>): void;
     stats(options?: { scale?: number }): Promise<any>;
     stats(options: { scale?: number }, callback: MongoCallback<any>): void;
-  }
+}
 
-  // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
-  export class Server extends EventEmitter {
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+declare export class Server extends EventEmitter {
     constructor(host: string, port: number, options?: ServerOptions);
 
     connections(): Array<any>;
-  }
+}
 
-  // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
-  export class ReplSet extends EventEmitter {
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+declare export class ReplSet extends EventEmitter {
     constructor(servers: Array<Server>, options?: ReplSetOptions);
 
     connections(): Array<any>;
-  }
+}
 
-  // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
-  export class Mongos extends EventEmitter {
+// Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+declare export class Mongos extends EventEmitter {
     constructor(servers: Array<Server>, options?: MongosOptions);
 
     connections(): Array<any>;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
-  export interface CollectionCreateOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
+export interface CollectionCreateOptions {
     w?: number | string;
     wtimeout?: number;
     j?: boolean;
@@ -276,10 +276,10 @@ declare module "mongodb" {
     size?: number;
     max?: number;
     autoIndexId?: boolean;
-  }
+}
 
-  // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
-  export interface DbCollectionOptions {
+// http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
+export interface DbCollectionOptions {
     w?: number | string;
     wtimeout?: number;
     j?: boolean;
@@ -289,10 +289,10 @@ declare module "mongodb" {
     serializeFunctions?: boolean;
     strict?: boolean;
     readConcern?: { level: Object };
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
-  export interface IndexOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
+export interface IndexOptions {
     // The write concern.
     w?: number | string;
     // The write concern timeout.
@@ -319,10 +319,10 @@ declare module "mongodb" {
     expireAfterSeconds?: number;
     // Override the auto generated index name (useful if the resulting name is larger than 128 bytes)
     name?: string;
-  }
+}
 
-  // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html
-  export interface Admin {
+// http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html
+export interface Admin {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
     addUser(username: string, password: string, callback: MongoCallback<any>): void;
     addUser(username: string, password: string, options?: AddUserOptions): Promise<any>;
@@ -373,28 +373,28 @@ declare module "mongodb" {
     validateCollection(collectionNme: string, callback: MongoCallback<any>): void;
     validateCollection(collectionNme: string, options?: Object): Promise<any>;
     validateCollection(collectionNme: string, options: Object, callback: MongoCallback<any>): void;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
-  export interface AddUserOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
+export interface AddUserOptions {
     w?: number | string;
     wtimeout?: number;
     j?: boolean;
     fsync: boolean;
     customData?: Object;
     roles?: Object[]
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
-  export interface FSyncOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
+export interface FSyncOptions {
     w?: number | string;
     wtimeout?: number;
     j?: boolean;
     fsync?: boolean
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/ObjectID.html
-  export class ObjectID {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/ObjectID.html
+declare export class ObjectID {
     constructor(s?: string | number);
 
     generationTime: number;
@@ -417,10 +417,10 @@ declare module "mongodb" {
     getTimestamp(): Date;
     // Returns the ObjectID id as a 24 byte hex string representation
     toHexString(): string;
-  }
+}
 
-  // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Binary.html
-  export class Binary {
+// Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Binary.html
+declare export class Binary {
     constructor(buffer: Buffer, subType?: number);
 
     static SUBTYPE_BYTE_ARRAY: number;
@@ -441,16 +441,16 @@ declare module "mongodb" {
     value(): string;
     // Writes a buffer or string to the binary
     write(buffer: Buffer | string, offset: number): void;
-  }
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Double.html
-  export class Double {
+}
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Double.html
+declare export class Double {
     constructor(value: number);
 
     valueOf(): number;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Long.html
-  export class Long {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Long.html
+declare export class Long {
     constructor(low: number, high: number);
 
     static MAX_VALUE: Long;
@@ -495,16 +495,16 @@ declare module "mongodb" {
     toNumber(): number;
     toString(radix?: number): string;
     xor(other: Long): Long;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/MaxKey.html
-  export class MaxKey { }
+//http://mongodb.github.io/node-mongodb-native/2.1/api/MaxKey.html
+declare export class MaxKey { }
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/MinKey.html
-  export class MinKey { }
+//http://mongodb.github.io/node-mongodb-native/2.1/api/MinKey.html
+declare export class MinKey { }
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Timestamp.html
-  export class Timestamp {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Timestamp.html
+declare export class Timestamp {
     constructor(low: number, high: number);
 
     static MAX_VALUE: Timestamp;
@@ -549,10 +549,10 @@ declare module "mongodb" {
     toNumber(): number;
     toString(radix?: number): string;
     xor(other: Timestamp): Timestamp;
-  }
+}
 
-  // Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html
-  export interface Collection {
+// Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html
+export interface Collection {
     // Get the collection name.
     collectionName: string;
     // Get the full collection namespace.
@@ -690,10 +690,10 @@ declare module "mongodb" {
     updateOne(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
     updateOne(filter: Object, update: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
     updateOne(filter: Object, update: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
-  }
+}
 
-  // Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
-  export interface CollStats {
+// Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
+export interface CollStats {
     // Namespace.
     ns: string;
     // Number of documents.
@@ -717,17 +717,17 @@ declare module "mongodb" {
     totalIndexSize: number;
     // Size of specific indexes in bytes.
     indexSizes: {
-      _id_: number;
-      username: number;
+        _id_: number;
+        username: number;
     };
     capped: boolean;
     maxSize: boolean;
     wiredTiger: any;
     indexDetails: any;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
-  export interface CollectionAggrigationOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
+export interface CollectionAggrigationOptions {
     readPreference?: ReadPreference | string;
     // Return the query as cursor, on 2.6 > it returns as a real cursor
     // on pre 2.6 it returns as an emulated cursor.
@@ -742,10 +742,10 @@ declare module "mongodb" {
     maxTimeMS?: boolean;
     // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
     bypassDocumentValidation?: boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertMany
-  export interface CollectionInsertManyOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertMany
+export interface CollectionInsertManyOptions {
     // The write concern.
     w?: number | string;
     // The write concern timeout.
@@ -756,10 +756,10 @@ declare module "mongodb" {
     serializeFunctions?: boolean;
     //Force server to assign _id values instead of driver.
     forceServerObjectId?: boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
-  export interface CollectionBluckWriteOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
+export interface CollectionBluckWriteOptions {
     // The write concern.
     w?: number | string;
     // The write concern timeout.
@@ -772,10 +772,10 @@ declare module "mongodb" {
     ordered?: boolean;
     // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
     bypassDocumentValidation?: boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~BulkWriteOpResult
-  export interface BulkWriteOpResultObject {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~BulkWriteOpResult
+export interface BulkWriteOpResultObject {
     insertedCount?: number;
     matchedCount?: number;
     modifiedCount?: number;
@@ -784,10 +784,10 @@ declare module "mongodb" {
     insertedIds?: any;
     upsertedIds?: any;
     result?: any;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#count
-  export interface MongoCountPreferences {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#count
+export interface MongoCountPreferences {
     // The limit of documents to count.
     limit?: number;
     // The number of documents to skip for the count.
@@ -796,52 +796,52 @@ declare module "mongodb" {
     hint?: string;
     // The preferred read preference
     readPreference?: ReadPreference | string;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~deleteWriteOpResult
-  export interface DeleteWriteOpResultObject {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~deleteWriteOpResult
+export interface DeleteWriteOpResultObject {
     //The raw result returned from MongoDB, field will vary depending on server version.
     result: {
-      //Is 1 if the command executed correctly.
-      ok?: number;
-      //The total count of documents deleted.
-      n?: number;
+        //Is 1 if the command executed correctly.
+        ok?: number;
+        //The total count of documents deleted.
+        n?: number;
     }
     //The connection object used for the operation.
     connection?: any;
     //The number of documents deleted.
     deletedCount?: number;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~findAndModifyWriteOpResult
-  export interface FindAndModifyWriteOpResultObject {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~findAndModifyWriteOpResult
+export interface FindAndModifyWriteOpResultObject {
     //Document returned from findAndModify command.
     value?: any;
     //The raw lastErrorObject returned from the command.
     lastErrorObject?: any;
     //Is 1 if the command executed correctly.
     ok?: number;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
-  export interface FindOneAndReplaceOption {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#findOneAndReplace
+export interface FindOneAndReplaceOption {
     projection?: Object;
     sort?: Object;
     maxTimeMS?: number;
     upsert?: boolean;
     returnOriginal?: boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
-  export interface GeoHaystackSearchOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoHaystackSearch
+export interface GeoHaystackSearchOptions {
     readPreference?: ReadPreference | string;
     maxDistance?: number;
     search?: Object;
     limit?: number;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
-  export interface GeoNearOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#geoNear
+export interface GeoNearOptions {
     readPreference?: ReadPreference | string;
     num?: number;
     minDistance?: number;
@@ -851,27 +851,27 @@ declare module "mongodb" {
     spherical?: boolean;
     uniqueDocs?: boolean;
     includeLocs?: boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Code.html
-  export class Code {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Code.html
+declare export class Code {
     constructor(code: string | Function, scope?: Object)
     code: string | Function;
     scope: any;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
-  export interface CollectionOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#deleteMany
+export interface CollectionOptions {
     //The write concern.
     w?: number | string;
     //The write concern timeout.
     wtimeout?: number;
     //Specify a journal write concern.
     j?: boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html
-  export interface OrderedBulkOperation {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html
+export interface OrderedBulkOperation {
     length: number;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#execute
     execute(callback: MongoCallback<BulkWriteResult>): void;
@@ -881,10 +881,10 @@ declare module "mongodb" {
     find(selector: Object): FindOperatorsOrdered;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/OrderedBulkOperation.html#insert
     insert(doc: Object): OrderedBulkOperation;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/BulkWriteResult.html
-  export interface BulkWriteResult {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/BulkWriteResult.html
+export interface BulkWriteResult {
     ok: boolean;
     nInserted: number;
     nUpdated: number;
@@ -902,38 +902,38 @@ declare module "mongodb" {
     getWriteErrorCount(): number;
     getWriteErrors(): Array<Object>;
     hasWriteErrors(): boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/WriteError.html
-  export interface WriteError {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/WriteError.html
+export interface WriteError {
     //Write concern error code.
     code: number;
     //Write concern error original bulk operation index.
     index: number;
     //Write concern error message.
     errmsg: string;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/WriteConcernError.html
-  export interface WriteConcernError {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/WriteConcernError.html
+export interface WriteConcernError {
     //Write concern error code.
     code: number;
     //Write concern error message.
     errmsg: string;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsOrdered.html
-  export interface FindOperatorsOrdered {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsOrdered.html
+export interface FindOperatorsOrdered {
     delete(): OrderedBulkOperation;
     deleteOne(): OrderedBulkOperation;
     replaceOne(doc: Object): OrderedBulkOperation;
     update(doc: Object): OrderedBulkOperation;
     updateOne(doc: Object): OrderedBulkOperation;
     upsert(): FindOperatorsOrdered;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html
-  export interface UnorderedBulkOperation {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html
+export interface UnorderedBulkOperation {
     //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#execute
     execute(callback: MongoCallback<BulkWriteResult>): void;
     execute(options: FSyncOptions): Promise<BulkWriteResult>;
@@ -942,10 +942,10 @@ declare module "mongodb" {
     find(selector: Object): FindOperatorsUnordered;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#insert
     insert(doc: Object): UnorderedBulkOperation;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsUnordered.html
-  export interface FindOperatorsUnordered {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/FindOperatorsUnordered.html
+export interface FindOperatorsUnordered {
     length: number;
     remove(): UnorderedBulkOperation;
     removeOne(): UnorderedBulkOperation;
@@ -953,19 +953,19 @@ declare module "mongodb" {
     update(doc: Object): UnorderedBulkOperation;
     updateOne(doc: Object): UnorderedBulkOperation;
     upsert(): FindOperatorsUnordered;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertWriteOpResult
-  export interface InsertWriteOpResult {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertWriteOpResult
+export interface InsertWriteOpResult {
     insertedCount: number;
     ops: Array<any>;
     insertedIds: Array<ObjectID>;
     connection: any;
     result: { ok: number, n: number }
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
-  export interface CollectionInsertOneOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#insertOne
+export interface CollectionInsertOneOptions {
     // The write concern.
     w?: number | string;
     // The write concern timeout.
@@ -978,46 +978,46 @@ declare module "mongodb" {
     forceServerObjectId?: boolean;
     //Allow driver to bypass schema validation in MongoDB 3.2 or higher.
     bypassDocumentValidation?: boolean
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertOneWriteOpResult
-  export interface InsertOneWriteOpResult {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~insertOneWriteOpResult
+export interface InsertOneWriteOpResult {
     insertedCount: number;
     ops: Array<any>;
     insertedId: ObjectID;
     connection: any;
     result: { ok: number, n: number }
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
-  export interface ParallelCollectionScanOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#parallelCollectionScan
+export interface ParallelCollectionScanOptions {
     readPreference?: ReadPreference | string;
     batchSize?: number;
     numCursors?: number;
     raw?: boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
-  export interface ReplaceOneOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
+export interface ReplaceOneOptions {
     upsert?: boolean;
     w?: number | string;
     wtimeout?: number;
     j?: boolean;
     bypassDocumentValidation?: boolean;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~updateWriteOpResult
-  export interface UpdateWriteOpResult {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#~updateWriteOpResult
+export interface UpdateWriteOpResult {
     result: { ok: number, n: number, nModified: number };
     connection: any;
     matchedCount: number;
     modifiedCount: number;
     upsertedCount: number;
     upsertedId: { _id: ObjectID };
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
-  export interface MapReduceOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#mapReduce
+export interface MapReduceOptions {
     readPreference?: ReadPreference | string;
     out?: Object;
     query?: Object;
@@ -1029,11 +1029,11 @@ declare module "mongodb" {
     jsMode?: boolean;
     verbose?: boolean;
     bypassDocumentValidation?: boolean
-  }
+}
 
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/external-Readable.html
-  export interface Readable {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/external-Readable.html
+export interface Readable {
     pause(): void;
     pipe(destination: Writable, options?: Object): void;
     read(size: number): string | Buffer | void;
@@ -1042,16 +1042,16 @@ declare module "mongodb" {
     unpipe(destination?: Writable): void;
     unshift(stream: Buffer | string): void;
     wrap(stream: Stream): void;
-  }
+}
 
-  export interface Writable { }
-  export interface Stream { }
+export interface Writable { }
+export interface Stream { }
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~resultCallback
-  export type CursorResult = any | void | boolean;
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~resultCallback
+export type CursorResult = any | void | boolean;
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
-  export interface Cursor extends Readable, NodeJS.EventEmitter {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
+export interface Cursor extends Readable, NodeJS.EventEmitter {
 
     sortValue: string;
     timeout: boolean;
@@ -1143,32 +1143,32 @@ declare module "mongodb" {
     unshift(stream: Buffer | string): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#wrap
     wrap(stream: Stream): void;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
-  export interface CursorCommentOptions {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
+export interface CursorCommentOptions {
     skip?: number;
     limit?: number;
     maxTimeMS?: number;
     hint?: string;
     readPreference?: ReadPreference | string;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~iteratorCallback
-  export interface IteratorCallback {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~iteratorCallback
+export interface IteratorCallback {
     (doc: any): void;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~endCallback
-  export interface EndCallback {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~endCallback
+export interface EndCallback {
     (error: MongoError): void;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#~resultCallback
-  export type AggregationCursorResult = any | void;
+//http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#~resultCallback
+export type AggregationCursorResult = any | void;
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html
-  export interface AggregationCursor extends Readable, NodeJS.EventEmitter {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html
+export interface AggregationCursor extends Readable, NodeJS.EventEmitter {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#batchSize
     batchSize(value: number): AggregationCursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#clone
@@ -1229,10 +1229,10 @@ declare module "mongodb" {
     unwind(field: string): AggregationCursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#wrap
     wrap(stream: Stream): void;
-  }
+}
 
-  //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html
-  export interface CommandCursor extends Readable, NodeJS.EventEmitter {
+//http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html
+export interface CommandCursor extends Readable, NodeJS.EventEmitter {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#batchSize
     batchSize(value: number): CommandCursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#clone
@@ -1272,5 +1272,4 @@ declare module "mongodb" {
     unshift(stream: Buffer | string): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#wrap
     wrap(stream: Stream): void;
-  }
 }
diff --git a/mongoose-auto-increment/mongoose-auto-increment.d.ts b/mongoose-auto-increment/mongoose-auto-increment.d.ts
index 34e7b5ddd6..23ff05b395 100644
--- a/mongoose-auto-increment/mongoose-auto-increment.d.ts
+++ b/mongoose-auto-increment/mongoose-auto-increment.d.ts
@@ -5,16 +5,15 @@
 
 /// <reference path="../mongoose/mongoose.d.ts" />
 
-declare module 'mongoose-auto-increment' {
-	import { Connection, Schema, Mongoose } from 'mongoose';
-	
-	/**
-	 * Initialize plugin by creating counter collection in database.
-	 */
-	function initialize(connection: Connection): void;
 
-	/**
-	 * The function to use when invoking the plugin on a custom schema.
-	 */
-	function plugin(schema: Schema, options: Object): void;
-}
+import { Connection, Schema, Mongoose } from 'mongoose';
+
+/**
+ * Initialize plugin by creating counter collection in database.
+ */
+declare function initialize(connection: Connection): void;
+
+/**
+ * The function to use when invoking the plugin on a custom schema.
+ */
+declare function plugin(schema: Schema, options: Object): void;
diff --git a/mongoose-deep-populate/mongoose-deep-populate.d.ts b/mongoose-deep-populate/mongoose-deep-populate.d.ts
index 247ba6b480..b1f75652f7 100644
--- a/mongoose-deep-populate/mongoose-deep-populate.d.ts
+++ b/mongoose-deep-populate/mongoose-deep-populate.d.ts
@@ -5,8 +5,7 @@
 
 /// <reference path="../mongoose/mongoose.d.ts" />
 
-declare module "mongoose-deep-populate" {
-	import { Mongoose, Schema } from 'mongoose';
 
-	export default function(mognoose: Mongoose): (schema: Schema, options: Object) => void;
-}
+import { Mongoose, Schema } from 'mongoose';
+
+declare export default function(mognoose: Mongoose): (schema: Schema, options: Object) => void;
diff --git a/mongoose-mock/mongoose-mock.d.ts b/mongoose-mock/mongoose-mock.d.ts
index 588062dd03..e5863610aa 100644
--- a/mongoose-mock/mongoose-mock.d.ts
+++ b/mongoose-mock/mongoose-mock.d.ts
@@ -5,9 +5,8 @@
 
 /// <reference path="../mongoose/mongoose.d.ts" />
 
-declare module "mongoose-mock" {
-    import mongoose = require('mongoose');
 
-    var mock: mongoose.Mongoose;
-    export = mock;
-}
\ No newline at end of file
+import mongoose = require('mongoose');
+
+declare var mock: mongoose.Mongoose;
+export = mock;
diff --git a/mongoose/mongoose.d.ts b/mongoose/mongoose.d.ts
index 7041acd282..08bfbb5531 100644
--- a/mongoose/mongoose.d.ts
+++ b/mongoose/mongoose.d.ts
@@ -5,26 +5,26 @@
 
 ///<reference path="../node/node.d.ts" />
 
-declare module "mongoose" {
-  function connect(uri: string, options?: ConnectionOptions , callback?: (err: any) => void): Mongoose;
-  function createConnection(): Connection;
-  function createConnection(uri: string, options?: ConnectionOptions): Connection;
-  function createConnection(host: string, database_name: string, port?: number, options?: ConnectionOptions): Connection;
-  function disconnect(callback?: (err?: any) => void): Mongoose;
 
-  function model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
-  function modelNames(): string[];
-  function plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Mongoose;
+declare function connect(uri: string, options?: ConnectionOptions, callback?: (err: any) => void): Mongoose;
+declare function createConnection(): Connection;
+declare function createConnection(uri: string, options?: ConnectionOptions): Connection;
+declare function createConnection(host: string, database_name: string, port?: number, options?: ConnectionOptions): Connection;
+declare function disconnect(callback?: (err?: any) => void): Mongoose;
 
-  function get(key: string): any;
-  function set(key: string, value: any): void;
+declare function model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
+declare function modelNames(): string[];
+declare function plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Mongoose;
 
-  var mongo: any;
-  var mquery: any;
-  var version: string;
-  var connection: Connection;
+declare function get(key: string): any;
+declare function set(key: string, value: any): void;
 
-  export class Mongoose {
+declare var mongo: any;
+declare var mquery: any;
+declare var version: string;
+declare var connection: Connection;
+
+declare export class Mongoose {
     connect(uri: string, options?: ConnectOpenOptionsBase, callback?: (err: any) => void): Mongoose;
     createConnection(): Connection;
     createConnection(uri: string, options?: Object): Connection;
@@ -40,9 +40,9 @@ declare module "mongoose" {
     mquery: any;
     version: string;
     connection: Connection;
-  }
+}
 
-  export interface Connection extends NodeJS.EventEmitter {
+export interface Connection extends NodeJS.EventEmitter {
     constructor(base: Mongoose): Connection;
 
     close(callback?: (err: any) => void): Connection;
@@ -53,11 +53,11 @@ declare module "mongoose" {
     openSet(uris: string, database?: string, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
 
     db: any;
-    collections: {[index: string]: Collection};
+    collections: { [index: string]: Collection };
     readyState: number;
-  }
+}
 
-  export interface ConnectOpenOptionsBase {
+export interface ConnectOpenOptionsBase {
     db?: any;
     server?: any;
     replset?: any;
@@ -67,77 +67,77 @@ declare module "mongoose" {
     pass?: string;
     /** Options for authentication */
     auth?: any;
-  }
+}
 
-  export interface ConnectionOptions extends ConnectOpenOptionsBase {
+export interface ConnectionOptions extends ConnectOpenOptionsBase {
     /** Passed to the underlying driver's Mongos instance. */
     mongos?: MongosOptions;
-  }
+}
 
-  interface OpenSetConnectionOptions extends ConnectOpenOptionsBase {
-      /** If true, enables High Availability support for mongos */
-      mongos?: boolean;
-  }
+interface OpenSetConnectionOptions extends ConnectOpenOptionsBase {
+    /** If true, enables High Availability support for mongos */
+    mongos?: boolean;
+}
 
-  interface MongosOptions {
-      /** Turn on high availability monitoring. (default: true) */
-      ha?: boolean;
-      /** Time between each replicaset status check. (default: 5000) */
-      haInterval?: number;
-      /**
-       * Number of connections in the connection pool for each
-       * server instance. (default: 5 (for legacy reasons)) */
-      poolSize?: number;
-      /**
-       * Use ssl connection (needs to have a mongod server with
-       * ssl support). (default: false).
-       */
-      ssl?: boolean;
-      /**
-       * Validate mongod server certificate against ca
-       * (needs to have a mongod server with ssl support, 2.4 or higher)
-       * (default: true)
-       */
-      sslValidate?: boolean;
-      /** Turn on high availability monitoring. */
-      sslCA?: (Buffer|string)[];
-      sslKey?: Buffer|string;
-      sslPass?: Buffer|string;
-      socketOptions?: {
-          noDelay?: boolean;
-          keepAlive?: number;
-          connectionTimeoutMS?: number;
-          socketTimeoutMS?: number;
-      };
-  }
+interface MongosOptions {
+    /** Turn on high availability monitoring. (default: true) */
+    ha?: boolean;
+    /** Time between each replicaset status check. (default: 5000) */
+    haInterval?: number;
+    /**
+     * Number of connections in the connection pool for each
+     * server instance. (default: 5 (for legacy reasons)) */
+    poolSize?: number;
+    /**
+     * Use ssl connection (needs to have a mongod server with
+     * ssl support). (default: false).
+     */
+    ssl?: boolean;
+    /**
+     * Validate mongod server certificate against ca
+     * (needs to have a mongod server with ssl support, 2.4 or higher)
+     * (default: true)
+     */
+    sslValidate?: boolean;
+    /** Turn on high availability monitoring. */
+    sslCA?: (Buffer | string)[];
+    sslKey?: Buffer | string;
+    sslPass?: Buffer | string;
+    socketOptions?: {
+        noDelay?: boolean;
+        keepAlive?: number;
+        connectionTimeoutMS?: number;
+        socketTimeoutMS?: number;
+    };
+}
 
-  export interface Collection {
-  }
+export interface Collection {
+}
 
 
-  export class SchemaType { }
-  export class VirtualType {
+declare export class SchemaType { }
+declare export class VirtualType {
     get(fn: Function): VirtualType;
     set(fn: Function): VirtualType;
-  }
-  export module Types {
+}
+declare export module Types {
     export class ObjectId {
-      constructor(id?: string|number);
-      toHexString(): string;
-      equals(other: ObjectId): boolean;
-      getTimestamp(): Date;
-      isValid(): boolean;
-      static createFromTime(time: number): ObjectId;
-      static createFromHexString(hexString: string): ObjectId;
+        constructor(id?: string | number);
+        toHexString(): string;
+        equals(other: ObjectId): boolean;
+        getTimestamp(): Date;
+        isValid(): boolean;
+        static createFromTime(time: number): ObjectId;
+        static createFromHexString(hexString: string): ObjectId;
     }
-  }
+}
 
-  export class Schema {
+declare export class Schema {
     static Types: {
-      String: String;
-      ObjectId: Types.ObjectId;
-      OId: Types.ObjectId;
-      Mixed: any;
+        String: String;
+        ObjectId: Types.ObjectId;
+        OId: Types.ObjectId;
+        Mixed: any;
     };
     constructor(schema?: Object, options?: Object);
 
@@ -159,8 +159,8 @@ declare module "mongoose" {
     static(name: string, fn: Function): Schema;
     virtual(name: string, options?: Object): VirtualType;
     virtualpath(name: string): VirtualType;
-  }
-  export interface SchemaOption {
+}
+export interface SchemaOption {
     autoIndex?: boolean;
     bufferCommands?: boolean;
     capped?: boolean;
@@ -175,10 +175,10 @@ declare module "mongoose" {
     toJSON?: Object;
     toObject?: Object;
     versionKey?: boolean;
-  }
+}
 
-  export interface Model<T extends Document> extends NodeJS.EventEmitter {
-    new(doc?: Object, fields?: Object, skipInit?: boolean): T;
+export interface Model<T extends Document> extends NodeJS.EventEmitter {
+    new (doc?: Object, fields?: Object, skipInit?: boolean): T;
 
     aggregate(...aggregations: Object[]): Aggregate<T[]>;
     aggregate(aggregation: Object, callback: (err: any, res: T[]) => void): Promise<T[]>;
@@ -237,20 +237,20 @@ declare module "mongoose" {
     discriminators: any;
     modelName: string;
     schema: Schema;
-  }
-  export interface FindAndUpdateOption {
+}
+export interface FindAndUpdateOption {
     new?: boolean;
     upsert?: boolean;
     sort?: Object;
     select?: Object;
-  }
-  export interface GeoSearchOption {
+}
+export interface GeoSearchOption {
     near: number[];
     maxDistance: number;
     limit?: number;
     lean?: boolean;
-  }
-  export interface MapReduceOption<T extends Document, Key, Val> {
+}
+export interface MapReduceOption<T extends Document, Key, Val> {
     map: () => void;
     reduce: (key: Key, vals: T[]) => Val;
     query?: Object;
@@ -261,13 +261,13 @@ declare module "mongoose" {
     jsMode?: boolean;
     verbose?: boolean;
     out?: {
-      inline?: number;
-      replace?: string;
-      reduce?: string;
-      merge?: string;
+        inline?: number;
+        replace?: string;
+        reduce?: string;
+        merge?: string;
     };
-  }
-  export interface MapReduceOption2<T extends Document, Key, Val> {
+}
+export interface MapReduceOption2<T extends Document, Key, Val> {
     map: string;
     reduce: (key: Key, vals: T[]) => Val;
     query?: Object;
@@ -278,18 +278,18 @@ declare module "mongoose" {
     jsMode?: boolean;
     verbose?: boolean;
     out?: {
-      inline?: number;
-      replace?: string;
-      reduce?: string;
-      merge?: string;
+        inline?: number;
+        replace?: string;
+        reduce?: string;
+        merge?: string;
     };
-  }
-  export interface MapReduceResult<Key, Val> {
+}
+export interface MapReduceResult<Key, Val> {
     _id: Key;
     value: Val;
-  }
+}
 
-  export class Query<T> {
+declare export class Query<T> {
     exec(callback?: (err: any, res: T) => void): Promise<T>;
     exec(operation: string, callback?: (err: any, res: T) => void): Promise<T>;
     exec(operation: Function, callback?: (err: any, res: T) => void): Promise<T>;
@@ -402,31 +402,31 @@ declare module "mongoose" {
     $where(argument: Function): Query<T>;
 
     static use$geoWithin: boolean;
-  }
+}
 
-  export interface PopulateOption {
+export interface PopulateOption {
     path: string;
     select?: string;
     model?: string;
     match?: Object;
     options?: Object;
-  }
+}
 
-  export interface QueryStream extends NodeJS.EventEmitter {
+export interface QueryStream extends NodeJS.EventEmitter {
     destory(err?: any): void;
     pause(): void;
     resume(): void;
     pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
     paused: number;
     readable: boolean;
-  }
+}
 
-  export interface Document {
+export interface Document {
     id?: string;
     _id: any;
 
     equals(doc: Document): boolean;
-    get(path: string, type?: new(...args: any[]) => any): any;
+    get(path: string, type?: new (...args: any[]) => any): any;
     inspect(options?: Object): string;
     invalidate(path: string, errorMsg: string, value: any): void;
     invalidate(path: string, error: Error, value: any): void;
@@ -442,7 +442,7 @@ declare module "mongoose" {
     populated(path: string): any;
     remove<T>(callback?: (err: any) => void): Query<T>;
     save<T>(callback?: (err: any, res: T) => void): void;
-    set(path: string, val: any, type?: new(...args: any[]) => any, options?: Object): void;
+    set(path: string, val: any, type?: new (...args: any[]) => any, options?: Object): void;
     set(path: string, val: any, options?: Object): void;
     set(value: Object): void;
     toJSON(options?: Object): Object;
@@ -454,10 +454,10 @@ declare module "mongoose" {
     isNew: boolean;
     errors: Object;
     schema: Object;
-  }
+}
 
 
-  export class Aggregate<T> {
+declare export class Aggregate<T> {
     constructor(...options: Object[]);
 
     append(...options: Object[]): Aggregate<T>;
@@ -475,9 +475,9 @@ declare module "mongoose" {
 
     exec(callback?: (err: any, result: T) => void): Promise<T>;
     read(pref: string, ...tags: Object[]): Aggregate<T>;
-  }
+}
 
-  export class Promise<T> {
+declare export class Promise<T> {
     constructor(fn?: (err: any, result: T) => void);
 
     then<U>(onFulFill: (result: T) => void, onReject?: (err: any) => void): Promise<U>;
@@ -498,6 +498,4 @@ declare module "mongoose" {
     addErrback(listener: (err: any) => void): Promise<T>;
     complete(result: T): Promise<T>;
     error(err: any): Promise<T>;
-  }
-
 }
diff --git a/morgan/morgan.d.ts b/morgan/morgan.d.ts
index bf1e840956..84f26d3617 100644
--- a/morgan/morgan.d.ts
+++ b/morgan/morgan.d.ts
@@ -4,97 +4,96 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../express/express.d.ts" />
-declare module "morgan" {
 
-    import express = require('express');
 
-    namespace morgan {
+import express = require('express');
 
-        export function token<T>(name: string, callback: (req: express.Request, res: express.Response) => T): express.RequestHandler;
+declare namespace morgan {
 
-        export interface StreamOptions {
-            /**
-             * Output stream for writing log lines
-             */
-            write: (str: string) => void;
-        }
+    export function token<T>(name: string, callback: (req: express.Request, res: express.Response) => T): express.RequestHandler;
 
-        /***
-         * Morgan accepts these properties in the options object.
+    export interface StreamOptions {
+        /**
+         * Output stream for writing log lines
          */
-        export interface Options {
-
-            /***
-             * Buffer duration before writing logs to the stream, defaults to false. When set to true, defaults to 1000 ms.
-             */
-            buffer?: boolean;
-
-            /***
-             * Write log line on request instead of response. This means that a requests will be logged even if the server crashes, but data from the response cannot be logged (like the response code).
-             */
-            immediate?: boolean;
-
-            /***
-             * Function to determine if logging is skipped, defaults to false. This function will be called as skip(req, res).
-             */
-            skip?: (req: express.Request, res: express.Response) => boolean;
-
-            /***
-             * Output stream for writing log lines, defaults to process.stdout.
-             * @param str
-             */
-            stream?: StreamOptions;
-        }
+        write: (str: string) => void;
     }
 
     /***
-     * Create a new morgan logger middleware function using the given format and options. The format argument may be a string of a predefined name (see below for the names), a string of a format string, or a function that will produce a log entry.
-     * @param format
-     * @param options
+     * Morgan accepts these properties in the options object.
      */
-    function morgan(format: string, options?: morgan.Options): express.RequestHandler;
+    export interface Options {
 
-    /***
-     * Standard Apache combined log output.
-     * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'combined', options?: morgan.Options): express.RequestHandler;
+        /***
+         * Buffer duration before writing logs to the stream, defaults to false. When set to true, defaults to 1000 ms.
+         */
+        buffer?: boolean;
 
-    /***
-     * Standard Apache common log output.
-     * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length]
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'common', options?: morgan.Options): express.RequestHandler;
+        /***
+         * Write log line on request instead of response. This means that a requests will be logged even if the server crashes, but data from the response cannot be logged (like the response code).
+         */
+        immediate?: boolean;
 
-    /***
-     * Concise output colored by response status for development use. The :status token will be colored red for server error codes, yellow for client error codes, cyan for redirection codes, and uncolored for all other codes.
-     * :method :url :status :response-time ms - :res[content-length]
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'dev', options?: morgan.Options): express.RequestHandler;
+        /***
+         * Function to determine if logging is skipped, defaults to false. This function will be called as skip(req, res).
+         */
+        skip?: (req: express.Request, res: express.Response) => boolean;
 
-    /***
-     * Shorter than default, also including response time.
-     * :remote-addr :remote-user :method :url HTTP/:http-version :status :res[content-length] - :response-time ms
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'short', options?: morgan.Options): express.RequestHandler;
-
-    /***
-     * The minimal output.
-     * :method :url :status :res[content-length] - :response-time ms
-     * @param format
-     * @param options
-     */
-    function morgan(format: 'tiny', options?: morgan.Options): express.RequestHandler;
-
-    function morgan(custom: (req: express.Request, res: express.Response) => string): express.RequestHandler
-
-    export = morgan;
+        /***
+         * Output stream for writing log lines, defaults to process.stdout.
+         * @param str
+         */
+        stream?: StreamOptions;
+    }
 }
+
+/***
+ * Create a new morgan logger middleware function using the given format and options. The format argument may be a string of a predefined name (see below for the names), a string of a format string, or a function that will produce a log entry.
+ * @param format
+ * @param options
+ */
+declare function morgan(format: string, options?: morgan.Options): express.RequestHandler;
+
+/***
+ * Standard Apache combined log output.
+ * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'combined', options?: morgan.Options): express.RequestHandler;
+
+/***
+ * Standard Apache common log output.
+ * :remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length]
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'common', options?: morgan.Options): express.RequestHandler;
+
+/***
+ * Concise output colored by response status for development use. The :status token will be colored red for server error codes, yellow for client error codes, cyan for redirection codes, and uncolored for all other codes.
+ * :method :url :status :response-time ms - :res[content-length]
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'dev', options?: morgan.Options): express.RequestHandler;
+
+/***
+ * Shorter than default, also including response time.
+ * :remote-addr :remote-user :method :url HTTP/:http-version :status :res[content-length] - :response-time ms
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'short', options?: morgan.Options): express.RequestHandler;
+
+/***
+ * The minimal output.
+ * :method :url :status :res[content-length] - :response-time ms
+ * @param format
+ * @param options
+ */
+declare function morgan(format: 'tiny', options?: morgan.Options): express.RequestHandler;
+
+declare function morgan(custom: (req: express.Request, res: express.Response) => string): express.RequestHandler
+
+export = morgan;
diff --git a/mpromise/mpromise.d.ts b/mpromise/mpromise.d.ts
index 73fafff1f6..d7ab105f19 100644
--- a/mpromise/mpromise.d.ts
+++ b/mpromise/mpromise.d.ts
@@ -3,20 +3,20 @@
 // Definitions by: Seulgi Kim <https://github.com/sgkim126/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "mpromise" {
-  interface IFulfillFunction<F> {
+
+interface IFulfillFunction<F> {
     (...args: F[]): void;
     (arg: F): void;
-  }
-  interface IRejectFunction<R> {
+}
+interface IRejectFunction<R> {
     (err: R): void;
-  }
-  interface IResolveFunction<F, R> {
+}
+interface IResolveFunction<F, R> {
     (err: R, ...args: F[]): void;
     (err: R, arg: F): void;
-  }
+}
 
-  class Promise<F, R> {
+declare class Promise<F, R> {
     constructor(fn?: IResolveFunction<F, R>);
 
     static FAILURE: string;
@@ -36,7 +36,6 @@ declare module "mpromise" {
     end(): void;
 
     chain(promise: Promise<F, R>): Promise<F, R>;
-  }
-
-  export = Promise;
 }
+
+export = Promise;
diff --git a/mqtt/mqtt.d.ts b/mqtt/mqtt.d.ts
index f783002d66..2b01580eb0 100644
--- a/mqtt/mqtt.d.ts
+++ b/mqtt/mqtt.d.ts
@@ -5,444 +5,442 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'mqtt' {
 
-    namespace mqtt {
 
-        import ReadableStream = NodeJS.ReadableStream;
-        import EventEmitter = NodeJS.EventEmitter;
+declare namespace mqtt {
 
-        interface Packet {
-            messageId: string;
-            [key: string]: any;
-        }
+    import ReadableStream = NodeJS.ReadableStream;
+    import EventEmitter = NodeJS.EventEmitter;
 
-        interface Granted {
-            /**
-             *  is a subscribed to topic
-             */
-            topic: string;
-            /**
-             *  is the granted qos level on it
-             */
-            qos: number;
-        }
+    interface Packet {
+        messageId: string;
+        [key: string]: any;
+    }
 
-        interface Topic {
-            /**
-             * object which has topic names as object keys and as value the QoS, like {'test1': 0, 'test2': 1}.
-             */
-            [topic: string]: number;
-        }
+    interface Granted {
+        /**
+         *  is a subscribed to topic
+         */
+        topic: string;
+        /**
+         *  is the granted qos level on it
+         */
+        qos: number;
+    }
+
+    interface Topic {
+        /**
+         * object which has topic names as object keys and as value the QoS, like {'test1': 0, 'test2': 1}.
+         */
+        [topic: string]: number;
+    }
+
+    /**
+     * MQTT CLIENT
+     */
+
+    interface ClientOptions extends SecureClientOptions {
+        /**
+         *  10 seconds, set to 0 to disable
+         */
+        keepalive?: number;
 
         /**
-         * MQTT CLIENT
+         * 'mqttjs_' + Math.random().toString(16).substr(2, 8)
          */
-
-        interface ClientOptions extends SecureClientOptions {
-            /**
-             *  10 seconds, set to 0 to disable
-             */
-            keepalive?: number;
-
-            /**
-             * 'mqttjs_' + Math.random().toString(16).substr(2, 8)
-             */
-            clientId?: string;
-            /**
-             * 'MQTT'
-             */
-            protocolId?: string;
-            /**
-             * 4
-             */
-            protocolVersion?: number;
-            /**
-             * true, set to false to receive QoS 1 and 2 messages while offline
-             */
-            clean?: boolean;
-            /**
-             * 1000 milliseconds, interval between two reconnections
-             */
-            reconnectPeriod?: number;
-            /**
-             * 30 * 1000 milliseconds, time to wait before a CONNACK is received
-             */
-            connectTimeout?: number;
-            /**
-             * the username required by your broker, if any
-             */
-            username?: string;
-            /**
-             * the password required by your broker, if any
-             */
-            password?: string;
-            /**
-             * a Store for the incoming packets
-             */
-            incomingStore?: Store;
-            /**
-             * a Store for the outgoing packets
-             */
-            outgoingStore?: Store;
-            /**
-             * a message that will sent by the broker automatically when the client disconnect badly.
-             */
-            will?: {
-                /**
-                 * the topic to publish
-                 */
-                topic: string;
-                /**
-                 * the message to publish
-                 */
-                payload: string;
-                /**
-                 * the QoS
-                 */
-                qos: number;
-                /**
-                 * the retain flag
-                 */
-                retain: boolean;
-            };
-
-        }
-
-        interface SecureClientOptions {
-            /**
-             * path to private key
-             */
-            keyPath?: string;
-            /**
-             * path to corresponding public cert
-             */
-            certPath?: string;
-            rejectUnauthorized?: boolean;
-        }
-
-        interface ClientPublishOptions {
-            /**
-             * the QoS
-             */
-            qos?: number;
-            /**
-             * the retain flag
-             */
-            retain?: boolean;
-        }
-
-        interface ClientSubscribeOptions {
-            /**
-             * the QoS
-             */
-            qos?: number;
-        }
-
-        interface ClientSubscribeCallback {
-            (err: any, granted: Granted): void;
-        }
-
+        clientId?: string;
         /**
-         * @deprecated use connect() instead
-         * Create a new IClient (see: IClient)
-         *
-         * @param port - broker port (default: 1883)
-         * @param host  - broker host (default: localhost)
-         * @param options - connect options
+         * 'MQTT'
          */
-        function createClient(port?: number, host?: string, options?: ClientOptions): Client;
-
+        protocolId?: string;
         /**
-         * @deprecated use connect() instead
-         * Create a new secure IClient
-         *
-         * @param port
-         * @param host
-         * @param options - connection options, must include keys.
+         * 4
          */
-        function createSecureClient(port?: number, host?: string, options?: SecureClientOptions): Client;
-
+        protocolVersion?: number;
         /**
-         * Create a new MqttClient (see: IClient)
-         *
-         * The brokerUrl supports normal connections using mqtt:// or tcp:// and secure connections using mqtts:// or ssl://.
-         *
-         *  Passing the clientId is also supported, for example mqtt://user@localhost?clientId=123abc.
-         *
-         * @param brokerUrl
-         * @param options
+         * true, set to false to receive QoS 1 and 2 messages while offline
          */
-        function connect(brokerUrl: string, options?: ClientOptions): Client;
-
+        clean?: boolean;
         /**
-         * The Client class wraps a client connection to an MQTT broker over an arbitrary transport method (TCP, TLS, WebSocket, ecc).
-         *
-         * Client automatically handles the following:
-         *  - Regular server pings
-         *  - QoS flow
-         *  - Automatic reconnections
-         *  - Start publishing before being connected
-         *
+         * 1000 milliseconds, interval between two reconnections
          */
-        interface Client extends EventEmitter {
-            (streamBuilder: any, options: ClientOptions): Client;
-
-            /**
-             * Publish a message to a topic
-             *
-             * @param topic
-             * @param message
-             * @param options
-             * @param callback
-             */
-            publish(topic: string, message: Buffer, options?: ClientPublishOptions, callback?: Function): Client;
-            publish(topic: string, message: string, options?: ClientPublishOptions, callback?: Function): Client;
-
-            /**
-             * Subscribe to a topic or topics
-             * @param topic to subscribe to or an Array of topics to subscribe to. It can also be an object.
-             * @param the options to subscribe with
-             * @param callback fired on suback
-             */
-            subscribe(topic: string, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-            subscribe(topic: string[], options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-            subscribe(topic: Topic, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-
-            /**
-             * Unsubscribe from a topic or topics
-             *
-             * @param topic  is a String topic or an array of topics to unsubscribe from
-             * @param options
-             * @param callback  fired on unsuback
-             */
-            unsubscribe(topic: string, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-            unsubscribe(topic: string[], options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
-
-            /**
-             * end - close connection
-             *
-             * @param force passing it to true will close the client right away, without waiting for the in-flight messages to be acked.
-             *     This parameter is optional.
-             * @param callback
-             */
-            end(force?: boolean, callback?: Function): Client;
-
-            /**
-             * Handle messages with backpressure support, one at a time. Override at will, but always call callback, or the client will
-             * hang.
-             *
-             * @param packet
-             * @param callback
-             */
-            handleMessage(packet: Packet, callback: Function): Client;
-
-        }
-
+        reconnectPeriod?: number;
         /**
-         * STORE
+         * 30 * 1000 milliseconds, time to wait before a CONNACK is received
          */
-
+        connectTimeout?: number;
         /**
-         * In-memory implementation of the message store.
-         *
-         * Another implementaion is mqtt-level-store which uses Level-browserify to store the inflight data,
-         * making it usable both in Node and the Browser.
+         * the username required by your broker, if any
          */
-        interface Store {
-            /**
-             * Adds a packet to the store, a packet is anything that has a messageId property. The callback is called when the packet has
-             * been stored.
-             * @param packet
-             * @param callback
-             */
-            put(packet: Packet, callback: Function): Store;
-
-            /**
-             * get a packet from the store
-             *
-             * @param packet
-             * @param callback
-             */
-            get(packet: Packet, callback: Function): Store;
-
-            /**
-             * Creates a stream with all the packets in the store.
-             */
-            createStream(): ReadableStream;
-
-            /**
-             * Removes a packet from the store, a packet is anything that has a messageId property. The callback is called when the packet
-             * has been removed.
-             * @param packet
-             * @param callback
-             */
-            del(packet: Packet, callback: Function): Store;
-
-            /**
-             * Closes the Store.
-             * @param callback
-             */
-            close(callback: Function): void;
-
-        }
-
+        username?: string;
         /**
-         * CONNECTION
+         * the password required by your broker, if any
          */
-
+        password?: string;
         /**
-         * @deprecated use mqtt-connect instead
-         * Create a new MqttConnection (see: MqttConnection)
-         *
-         * @param port - broker port (default: 1883)
-         * @param host - broker host (default: localhost)
-         * @param callback - fired on underlying stream connect
+         * a Store for the incoming packets
          */
-        function createConnection(port?: number, host?: string, callback?: Function): Connection;
-
-        interface ConnectOptions {
-
-            /**
-             * Protocol ID, usually MQIsdp.
-             */
-            protocolId?: string;
-            /**
-             * Protocol version, usually 3.
-             */
-            protocolVersion?: number;
-            /**
-             * keepalive period in seconds.
-             */
-            keepalive?: number;
-            /**
-             * client ID.
-             */
-            clientId?: string;
-            /**
-             * the client's will message options
-             */
-            will?: {
-                /**
-                 * the topic to publish
-                 */
-                topic: string;
-                /**
-                 * the message to publish
-                 */
-                payload: string;
-                /**
-                 * the QoS
-                 */
-                qos: number;
-                /**
-                 * the retain flag
-                 */
-                retain: boolean;
-            };
-            /**
-             * the 'clean start' flag.
-             */
-            clean?:  boolean;
-            /**
-             * username for protocol v3.1.
-             */
-            username?: string;
-            /**
-             * password for protocol v3.1.
-             */
-            password?: string;
-        }
-
-        interface ConnectionPublishOptions {
-            /**
-             * the message ID of the packet, required if qos > 0.
-             */
-            messageId?: number;
+        incomingStore?: Store;
+        /**
+         * a Store for the outgoing packets
+         */
+        outgoingStore?: Store;
+        /**
+         * a message that will sent by the broker automatically when the client disconnect badly.
+         */
+        will?: {
             /**
              * the topic to publish
              */
-            topic?: string;
+            topic: string;
             /**
              * the message to publish
              */
-            payload?: string;
+            payload: string;
             /**
              * the QoS
              */
-            qos?: number;
+            qos: number;
             /**
              * the retain flag
              */
-            retain?: boolean;
-        }
-
-        /**
-         * The MqttConnection class represents a raw MQTT connection, both on the server and on the client side. For client side
-         * operations, it is strongly recommended that MqttClient is used, as MqttConnection requires a great deal of additional
-         * boilerplate such as setting up error handling and ping request/responses.
-         *
-         * If such fine grained control is required, MqttConnection can be instantiated using the mqtt.createConnection method.
-         *
-         * MqttServerClient is an unaltered subclass of MqttConnection and can be used in exactly the same way.
-         *
-         * @link https://github.com/mqttjs/MQTT.js/wiki/connection
-         *
-         */
-        interface Connection extends EventEmitter {
-            /**
-             * Send an MQTT connect packet.
-             * @param options
-             */
-            connect(options?: ConnectOptions): Connection;
-            /**
-             * Send an MQTT connack packet.
-             * @param options
-             */
-            connack(options?: { returnCode: number; }): Connection;
-            /**
-             * Send an MQTT publish packet.
-             * @param options
-             */
-            publish(options?: ConnectionPublishOptions): Connection;
-        }
-
-        /**
-         * SERVER
-         */
-
-        /**
-         * @deprecated use connect instead
-         * Create a new MqttServer (see : IServer)
-         *
-         * @param listener - callback called on server client event
-         */
-        function createServer(listener?: Function): Server;
-
-        /**
-         * @deprecated use connect instead
-         * Create a new MqttSecureServer
-         * @param keyPath - path to private key file
-         * @param certPath - path to corresponding public cert
-         * @param listener - callback called on server client event
-         */
-        function createSecureServer(keyPath: string, certPath: string, listener?: Function): Server;
-
-        /**
-         * The primary methods of instantiating mqtt.js server classes are through the mqtt.createServer and mqtt.createSecureServer
-         * methods. The former returns an instance of MqttServer and and the latter returns an instance of MqttSecureServer.
-         *
-         * While it is possible to instantiate these classes through new MqttServer(), it is strongly recommended to use the factory
-         * methods
-         *
-         * @link https://github.com/mqttjs/MQTT.js/wiki/server
-         */
-        interface Server extends EventEmitter {
-
-        }
+            retain: boolean;
+        };
 
     }
 
-    export = mqtt;
+    interface SecureClientOptions {
+        /**
+         * path to private key
+         */
+        keyPath?: string;
+        /**
+         * path to corresponding public cert
+         */
+        certPath?: string;
+        rejectUnauthorized?: boolean;
+    }
+
+    interface ClientPublishOptions {
+        /**
+         * the QoS
+         */
+        qos?: number;
+        /**
+         * the retain flag
+         */
+        retain?: boolean;
+    }
+
+    interface ClientSubscribeOptions {
+        /**
+         * the QoS
+         */
+        qos?: number;
+    }
+
+    interface ClientSubscribeCallback {
+        (err: any, granted: Granted): void;
+    }
+
+    /**
+     * @deprecated use connect() instead
+     * Create a new IClient (see: IClient)
+     *
+     * @param port - broker port (default: 1883)
+     * @param host  - broker host (default: localhost)
+     * @param options - connect options
+     */
+    function createClient(port?: number, host?: string, options?: ClientOptions): Client;
+
+    /**
+     * @deprecated use connect() instead
+     * Create a new secure IClient
+     *
+     * @param port
+     * @param host
+     * @param options - connection options, must include keys.
+     */
+    function createSecureClient(port?: number, host?: string, options?: SecureClientOptions): Client;
+
+    /**
+     * Create a new MqttClient (see: IClient)
+     *
+     * The brokerUrl supports normal connections using mqtt:// or tcp:// and secure connections using mqtts:// or ssl://.
+     *
+     *  Passing the clientId is also supported, for example mqtt://user@localhost?clientId=123abc.
+     *
+     * @param brokerUrl
+     * @param options
+     */
+    function connect(brokerUrl: string, options?: ClientOptions): Client;
+
+    /**
+     * The Client class wraps a client connection to an MQTT broker over an arbitrary transport method (TCP, TLS, WebSocket, ecc).
+     *
+     * Client automatically handles the following:
+     *  - Regular server pings
+     *  - QoS flow
+     *  - Automatic reconnections
+     *  - Start publishing before being connected
+     *
+     */
+    interface Client extends EventEmitter {
+        (streamBuilder: any, options: ClientOptions): Client;
+
+        /**
+         * Publish a message to a topic
+         *
+         * @param topic
+         * @param message
+         * @param options
+         * @param callback
+         */
+        publish(topic: string, message: Buffer, options?: ClientPublishOptions, callback?: Function): Client;
+        publish(topic: string, message: string, options?: ClientPublishOptions, callback?: Function): Client;
+
+        /**
+         * Subscribe to a topic or topics
+         * @param topic to subscribe to or an Array of topics to subscribe to. It can also be an object.
+         * @param the options to subscribe with
+         * @param callback fired on suback
+         */
+        subscribe(topic: string, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+        subscribe(topic: string[], options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+        subscribe(topic: Topic, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+
+        /**
+         * Unsubscribe from a topic or topics
+         *
+         * @param topic  is a String topic or an array of topics to unsubscribe from
+         * @param options
+         * @param callback  fired on unsuback
+         */
+        unsubscribe(topic: string, options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+        unsubscribe(topic: string[], options?: ClientSubscribeOptions, callback?: ClientSubscribeCallback): Client;
+
+        /**
+         * end - close connection
+         *
+         * @param force passing it to true will close the client right away, without waiting for the in-flight messages to be acked.
+         *     This parameter is optional.
+         * @param callback
+         */
+        end(force?: boolean, callback?: Function): Client;
+
+        /**
+         * Handle messages with backpressure support, one at a time. Override at will, but always call callback, or the client will
+         * hang.
+         *
+         * @param packet
+         * @param callback
+         */
+        handleMessage(packet: Packet, callback: Function): Client;
+
+    }
+
+    /**
+     * STORE
+     */
+
+    /**
+     * In-memory implementation of the message store.
+     *
+     * Another implementaion is mqtt-level-store which uses Level-browserify to store the inflight data,
+     * making it usable both in Node and the Browser.
+     */
+    interface Store {
+        /**
+         * Adds a packet to the store, a packet is anything that has a messageId property. The callback is called when the packet has
+         * been stored.
+         * @param packet
+         * @param callback
+         */
+        put(packet: Packet, callback: Function): Store;
+
+        /**
+         * get a packet from the store
+         *
+         * @param packet
+         * @param callback
+         */
+        get(packet: Packet, callback: Function): Store;
+
+        /**
+         * Creates a stream with all the packets in the store.
+         */
+        createStream(): ReadableStream;
+
+        /**
+         * Removes a packet from the store, a packet is anything that has a messageId property. The callback is called when the packet
+         * has been removed.
+         * @param packet
+         * @param callback
+         */
+        del(packet: Packet, callback: Function): Store;
+
+        /**
+         * Closes the Store.
+         * @param callback
+         */
+        close(callback: Function): void;
+
+    }
+
+    /**
+     * CONNECTION
+     */
+
+    /**
+     * @deprecated use mqtt-connect instead
+     * Create a new MqttConnection (see: MqttConnection)
+     *
+     * @param port - broker port (default: 1883)
+     * @param host - broker host (default: localhost)
+     * @param callback - fired on underlying stream connect
+     */
+    function createConnection(port?: number, host?: string, callback?: Function): Connection;
+
+    interface ConnectOptions {
+
+        /**
+         * Protocol ID, usually MQIsdp.
+         */
+        protocolId?: string;
+        /**
+         * Protocol version, usually 3.
+         */
+        protocolVersion?: number;
+        /**
+         * keepalive period in seconds.
+         */
+        keepalive?: number;
+        /**
+         * client ID.
+         */
+        clientId?: string;
+        /**
+         * the client's will message options
+         */
+        will?: {
+            /**
+             * the topic to publish
+             */
+            topic: string;
+            /**
+             * the message to publish
+             */
+            payload: string;
+            /**
+             * the QoS
+             */
+            qos: number;
+            /**
+             * the retain flag
+             */
+            retain: boolean;
+        };
+        /**
+         * the 'clean start' flag.
+         */
+        clean?: boolean;
+        /**
+         * username for protocol v3.1.
+         */
+        username?: string;
+        /**
+         * password for protocol v3.1.
+         */
+        password?: string;
+    }
+
+    interface ConnectionPublishOptions {
+        /**
+         * the message ID of the packet, required if qos > 0.
+         */
+        messageId?: number;
+        /**
+         * the topic to publish
+         */
+        topic?: string;
+        /**
+         * the message to publish
+         */
+        payload?: string;
+        /**
+         * the QoS
+         */
+        qos?: number;
+        /**
+         * the retain flag
+         */
+        retain?: boolean;
+    }
+
+    /**
+     * The MqttConnection class represents a raw MQTT connection, both on the server and on the client side. For client side
+     * operations, it is strongly recommended that MqttClient is used, as MqttConnection requires a great deal of additional
+     * boilerplate such as setting up error handling and ping request/responses.
+     *
+     * If such fine grained control is required, MqttConnection can be instantiated using the mqtt.createConnection method.
+     *
+     * MqttServerClient is an unaltered subclass of MqttConnection and can be used in exactly the same way.
+     *
+     * @link https://github.com/mqttjs/MQTT.js/wiki/connection
+     *
+     */
+    interface Connection extends EventEmitter {
+        /**
+         * Send an MQTT connect packet.
+         * @param options
+         */
+        connect(options?: ConnectOptions): Connection;
+        /**
+         * Send an MQTT connack packet.
+         * @param options
+         */
+        connack(options?: { returnCode: number; }): Connection;
+        /**
+         * Send an MQTT publish packet.
+         * @param options
+         */
+        publish(options?: ConnectionPublishOptions): Connection;
+    }
+
+    /**
+     * SERVER
+     */
+
+    /**
+     * @deprecated use connect instead
+     * Create a new MqttServer (see : IServer)
+     *
+     * @param listener - callback called on server client event
+     */
+    function createServer(listener?: Function): Server;
+
+    /**
+     * @deprecated use connect instead
+     * Create a new MqttSecureServer
+     * @param keyPath - path to private key file
+     * @param certPath - path to corresponding public cert
+     * @param listener - callback called on server client event
+     */
+    function createSecureServer(keyPath: string, certPath: string, listener?: Function): Server;
+
+    /**
+     * The primary methods of instantiating mqtt.js server classes are through the mqtt.createServer and mqtt.createSecureServer
+     * methods. The former returns an instance of MqttServer and and the latter returns an instance of MqttSecureServer.
+     *
+     * While it is possible to instantiate these classes through new MqttServer(), it is strongly recommended to use the factory
+     * methods
+     *
+     * @link https://github.com/mqttjs/MQTT.js/wiki/server
+     */
+    interface Server extends EventEmitter {
+
+    }
 
 }
+
+export = mqtt;
diff --git a/ms/ms.d.ts b/ms/ms.d.ts
index acc4b9cd67..211c94508e 100644
--- a/ms/ms.d.ts
+++ b/ms/ms.d.ts
@@ -3,24 +3,23 @@
 // Definitions by: Zhiyuan Wang <https://github.com/danny8002/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'ms' {
 
-    /**
-    * Short/Long format for `value`.
-    *
-    * @param {Number} value
-    * @param {{long: boolean}} options
-    * @return {String}
-    */
-    function ms(value: number, options?: { long: boolean }): string;
 
-    /**
-    * Parse the given `value` and return milliseconds.
-    *
-    * @param {String} value
-    * @return {Number}
-    */
-    function ms(value: string): number;
+/**
+* Short/Long format for `value`.
+*
+* @param {Number} value
+* @param {{long: boolean}} options
+* @return {String}
+*/
+declare function ms(value: number, options?: { long: boolean }): string;
 
-    export = ms;
-}
\ No newline at end of file
+/**
+* Parse the given `value` and return milliseconds.
+*
+* @param {String} value
+* @return {Number}
+*/
+declare function ms(value: string): number;
+
+export = ms;
diff --git a/msnodesql/msnodesql.d.ts b/msnodesql/msnodesql.d.ts
index cbc6b53431..c821dbb51f 100644
--- a/msnodesql/msnodesql.d.ts
+++ b/msnodesql/msnodesql.d.ts
@@ -6,70 +6,69 @@
 
 ///<reference path='../node/node.d.ts' />
 
-declare module "msnodesql" {
-    import events = require('events');
 
-    export function open(connectionString: string, callback?: OpenCallback): Connection;
+import events = require('events');
 
-    export function query(connectionString: string, query: string): StreamEvents;
-    export function query(connectionString: string, query: string, callback: QueryCallback<any>): StreamEvents;
-    export function query(connectionString: string, query: string, params: any[]): StreamEvents;
-    export function query(connectionString: string, query: string, params: any[], callback: QueryCallback<any>): StreamEvents;
+declare export function open(connectionString: string, callback?: OpenCallback): Connection;
 
-    export function query<T>(connectionString: string, query: string, callback: QueryCallback<T>): StreamEvents;
-    export function query<T>(connectionString: string, query: string, params: any[], callback: QueryCallback<T>): StreamEvents;
+declare export function query(connectionString: string, query: string): StreamEvents;
+declare export function query(connectionString: string, query: string, callback: QueryCallback<any>): StreamEvents;
+declare export function query(connectionString: string, query: string, params: any[]): StreamEvents;
+declare export function query(connectionString: string, query: string, params: any[], callback: QueryCallback<any>): StreamEvents;
 
-    export function queryRaw(connectionString: string, query: string): StreamEvents;
-    export function queryRaw(connectionString: string, query: string, callback: QueryRawCallback): StreamEvents;
-    export function queryRaw(connectionString: string, query: string, params: any[]): StreamEvents;
-    export function queryRaw(connectionString: string, query: string, params: any[], callback: QueryRawCallback): StreamEvents;
+declare export function query<T>(connectionString: string, query: string, callback: QueryCallback<T>): StreamEvents;
+declare export function query<T>(connectionString: string, query: string, params: any[], callback: QueryCallback<T>): StreamEvents;
 
-    interface OpenCallback {
-        (err?: Error, connection?: Connection): void;
-    }
+declare export function queryRaw(connectionString: string, query: string): StreamEvents;
+declare export function queryRaw(connectionString: string, query: string, callback: QueryRawCallback): StreamEvents;
+declare export function queryRaw(connectionString: string, query: string, params: any[]): StreamEvents;
+declare export function queryRaw(connectionString: string, query: string, params: any[], callback: QueryRawCallback): StreamEvents;
 
-    interface QueryCallback<T> {
-        (err?: Error, results?: T[], more?: boolean): void;
-    }
+interface OpenCallback {
+    (err?: Error, connection?: Connection): void;
+}
 
-    interface QueryRawCallback {
-        (err?: Error, results?: QueryRawResult, more?: boolean): void;
-    }
+interface QueryCallback<T> {
+    (err?: Error, results?: T[], more?: boolean): void;
+}
 
-    interface QueryRawResult {
-        meta: QueryRawColumn[];
-        rows: any[][];
-    }
+interface QueryRawCallback {
+    (err?: Error, results?: QueryRawResult, more?: boolean): void;
+}
 
-    interface QueryRawColumn {
-        name?: string;
-    }
+interface QueryRawResult {
+    meta: QueryRawColumn[];
+    rows: any[][];
+}
 
-    interface ErrorCallback {
-        (err: Error): void;
-    }
+interface QueryRawColumn {
+    name?: string;
+}
 
-    interface Connection {
-        query(query: string): StreamEvents;
-        query(query: string, callback: QueryCallback<any>): StreamEvents;
-        query(query: string, params: any[]): StreamEvents;
-        query(query: string, params: any[], callback: QueryCallback<any>): StreamEvents;
+interface ErrorCallback {
+    (err: Error): void;
+}
 
-        query<T>(query: string, callback: QueryCallback<T>): StreamEvents;
-        query<T>(query: string, params: any[], callback: QueryCallback<T>): StreamEvents;
+interface Connection {
+    query(query: string): StreamEvents;
+    query(query: string, callback: QueryCallback<any>): StreamEvents;
+    query(query: string, params: any[]): StreamEvents;
+    query(query: string, params: any[], callback: QueryCallback<any>): StreamEvents;
 
-        queryRaw(query: string): StreamEvents;
-        queryRaw(query: string, callback: QueryRawCallback): StreamEvents;
-        queryRaw(query: string, params: any[]): StreamEvents;
-        queryRaw(query: string, params: any[], callback: QueryRawCallback): StreamEvents;
+    query<T>(query: string, callback: QueryCallback<T>): StreamEvents;
+    query<T>(query: string, params: any[], callback: QueryCallback<T>): StreamEvents;
 
-        beginTransaction(callback?: ErrorCallback);
-        commit(callback?: ErrorCallback);
-        rollback(callback?: ErrorCallback);
+    queryRaw(query: string): StreamEvents;
+    queryRaw(query: string, callback: QueryRawCallback): StreamEvents;
+    queryRaw(query: string, params: any[]): StreamEvents;
+    queryRaw(query: string, params: any[], callback: QueryRawCallback): StreamEvents;
 
-        close(callback?: ErrorCallback);
-        close(immediately: boolean, callback?: ErrorCallback);
-    }
+    beginTransaction(callback?: ErrorCallback);
+    commit(callback?: ErrorCallback);
+    rollback(callback?: ErrorCallback);
 
-    interface StreamEvents extends events.EventEmitter {}
-}
\ No newline at end of file
+    close(callback?: ErrorCallback);
+    close(immediately: boolean, callback?: ErrorCallback);
+}
+
+interface StreamEvents extends events.EventEmitter { }
diff --git a/mssql/mssql.d.ts b/mssql/mssql.d.ts
index 166c3b80ac..6729d81ff6 100644
--- a/mssql/mssql.d.ts
+++ b/mssql/mssql.d.ts
@@ -5,269 +5,268 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "mssql" {
-    import events = require('events');
 
-    type sqlTypeWithNoParams       = { type: sqlTypeFactoryWithNoParams }
-    type sqlTypeWithLength         = { type: sqlTypeFactoryWithLength, length: number }
-    type sqlTypeWithScale          = { type: sqlTypeFactoryWithScale, scale: number }
-    type sqlTypeWithPrecisionScale = { type: sqlTypeFactoryWithPrecisionScale, precision: number, scale: number }
-    type sqlTypeWithTvpType        = { type: sqlTypeFactoryWithTvpType, tvpType: any }
+import events = require('events');
 
-    type sqlTypeFactoryWithNoParams       = ()                                   => sqlTypeWithNoParams;
-    type sqlTypeFactoryWithLength         = (length?: number)                    => sqlTypeWithLength;
-    type sqlTypeFactoryWithScale          = (scale?: number)                     => sqlTypeWithScale;
-    type sqlTypeFactoryWithPrecisionScale = (precision?: number, scale?: number) => sqlTypeWithPrecisionScale;
-    type sqlTypeFactoryWithTvpType        = (tvpType: any)                       => sqlTypeWithTvpType;
+type sqlTypeWithNoParams = { type: sqlTypeFactoryWithNoParams }
+type sqlTypeWithLength = { type: sqlTypeFactoryWithLength, length: number }
+type sqlTypeWithScale = { type: sqlTypeFactoryWithScale, scale: number }
+type sqlTypeWithPrecisionScale = { type: sqlTypeFactoryWithPrecisionScale, precision: number, scale: number }
+type sqlTypeWithTvpType = { type: sqlTypeFactoryWithTvpType, tvpType: any }
 
-    export var VarChar:          sqlTypeFactoryWithLength;
-    export var NVarChar:         sqlTypeFactoryWithLength;
-    export var Text:             sqlTypeFactoryWithNoParams;
-    export var Int:              sqlTypeFactoryWithNoParams;
-    export var BigInt:           sqlTypeFactoryWithNoParams;
-    export var TinyInt:          sqlTypeFactoryWithNoParams;
-    export var SmallInt:         sqlTypeFactoryWithNoParams;
-    export var Bit:              sqlTypeFactoryWithNoParams;
-    export var Float:            sqlTypeFactoryWithNoParams;
-    export var Numeric:          sqlTypeFactoryWithPrecisionScale;
-    export var Decimal:          sqlTypeFactoryWithPrecisionScale;
-    export var Real:             sqlTypeFactoryWithNoParams;
-    export var Date:             sqlTypeFactoryWithNoParams;
-    export var DateTime:         sqlTypeFactoryWithNoParams;
-    export var DateTime2:        sqlTypeFactoryWithScale;
-    export var DateTimeOffset:   sqlTypeFactoryWithScale;
-    export var SmallDateTime:    sqlTypeFactoryWithNoParams;
-    export var Time:             sqlTypeFactoryWithScale;
-    export var UniqueIdentifier: sqlTypeFactoryWithNoParams;
-    export var SmallMoney:       sqlTypeFactoryWithNoParams;
-    export var Money:            sqlTypeFactoryWithNoParams;
-    export var Binary:           sqlTypeFactoryWithNoParams;
-    export var VarBinary:        sqlTypeFactoryWithLength;
-    export var Image:            sqlTypeFactoryWithNoParams;
-    export var Xml:              sqlTypeFactoryWithNoParams;
-    export var Char:             sqlTypeFactoryWithLength;
-    export var NChar:            sqlTypeFactoryWithLength;
-    export var NText:            sqlTypeFactoryWithNoParams;
-    export var TVP:              sqlTypeFactoryWithTvpType;
-    export var UDT:              sqlTypeFactoryWithNoParams;
-    export var Geography:        sqlTypeFactoryWithNoParams;
-    export var Geometry:         sqlTypeFactoryWithNoParams;
+type sqlTypeFactoryWithNoParams = () => sqlTypeWithNoParams;
+type sqlTypeFactoryWithLength = (length?: number) => sqlTypeWithLength;
+type sqlTypeFactoryWithScale = (scale?: number) => sqlTypeWithScale;
+type sqlTypeFactoryWithPrecisionScale = (precision?: number, scale?: number) => sqlTypeWithPrecisionScale;
+type sqlTypeFactoryWithTvpType = (tvpType: any) => sqlTypeWithTvpType;
 
-    export var TYPES: {
-        VarChar:          sqlTypeFactoryWithLength;
-        NVarChar:         sqlTypeFactoryWithLength;
-        Text:             sqlTypeFactoryWithNoParams;
-        Int:              sqlTypeFactoryWithNoParams;
-        BigInt:           sqlTypeFactoryWithNoParams;
-        TinyInt:          sqlTypeFactoryWithNoParams;
-        SmallInt:         sqlTypeFactoryWithNoParams;
-        Bit:              sqlTypeFactoryWithNoParams;
-        Float:            sqlTypeFactoryWithNoParams;
-        Numeric:          sqlTypeFactoryWithPrecisionScale;
-        Decimal:          sqlTypeFactoryWithPrecisionScale;
-        Real:             sqlTypeFactoryWithNoParams;
-        Date:             sqlTypeFactoryWithNoParams;
-        DateTime:         sqlTypeFactoryWithNoParams;
-        DateTime2:        sqlTypeFactoryWithScale;
-        DateTimeOffset:   sqlTypeFactoryWithScale;
-        SmallDateTime:    sqlTypeFactoryWithNoParams;
-        Time:             sqlTypeFactoryWithScale;
-        UniqueIdentifier: sqlTypeFactoryWithNoParams;
-        SmallMoney:       sqlTypeFactoryWithNoParams;
-        Money:            sqlTypeFactoryWithNoParams;
-        Binary:           sqlTypeFactoryWithNoParams;
-        VarBinary:        sqlTypeFactoryWithLength;
-        Image:            sqlTypeFactoryWithNoParams;
-        Xml:              sqlTypeFactoryWithNoParams;
-        Char:             sqlTypeFactoryWithLength;
-        NChar:            sqlTypeFactoryWithLength;
-        NText:            sqlTypeFactoryWithNoParams;
-        TVP:              sqlTypeFactoryWithTvpType;
-        UDT:              sqlTypeFactoryWithNoParams;
-        Geography:        sqlTypeFactoryWithNoParams;
-        Geometry:         sqlTypeFactoryWithNoParams;
-    };
+declare export var VarChar: sqlTypeFactoryWithLength;
+declare export var NVarChar: sqlTypeFactoryWithLength;
+declare export var Text: sqlTypeFactoryWithNoParams;
+declare export var Int: sqlTypeFactoryWithNoParams;
+declare export var BigInt: sqlTypeFactoryWithNoParams;
+declare export var TinyInt: sqlTypeFactoryWithNoParams;
+declare export var SmallInt: sqlTypeFactoryWithNoParams;
+declare export var Bit: sqlTypeFactoryWithNoParams;
+declare export var Float: sqlTypeFactoryWithNoParams;
+declare export var Numeric: sqlTypeFactoryWithPrecisionScale;
+declare export var Decimal: sqlTypeFactoryWithPrecisionScale;
+declare export var Real: sqlTypeFactoryWithNoParams;
+declare export var Date: sqlTypeFactoryWithNoParams;
+declare export var DateTime: sqlTypeFactoryWithNoParams;
+declare export var DateTime2: sqlTypeFactoryWithScale;
+declare export var DateTimeOffset: sqlTypeFactoryWithScale;
+declare export var SmallDateTime: sqlTypeFactoryWithNoParams;
+declare export var Time: sqlTypeFactoryWithScale;
+declare export var UniqueIdentifier: sqlTypeFactoryWithNoParams;
+declare export var SmallMoney: sqlTypeFactoryWithNoParams;
+declare export var Money: sqlTypeFactoryWithNoParams;
+declare export var Binary: sqlTypeFactoryWithNoParams;
+declare export var VarBinary: sqlTypeFactoryWithLength;
+declare export var Image: sqlTypeFactoryWithNoParams;
+declare export var Xml: sqlTypeFactoryWithNoParams;
+declare export var Char: sqlTypeFactoryWithLength;
+declare export var NChar: sqlTypeFactoryWithLength;
+declare export var NText: sqlTypeFactoryWithNoParams;
+declare export var TVP: sqlTypeFactoryWithTvpType;
+declare export var UDT: sqlTypeFactoryWithNoParams;
+declare export var Geography: sqlTypeFactoryWithNoParams;
+declare export var Geometry: sqlTypeFactoryWithNoParams;
 
-    export var MAX: number;
-    export var fix: boolean;
-    export var Promise: any;
+declare export var TYPES: {
+    VarChar: sqlTypeFactoryWithLength;
+    NVarChar: sqlTypeFactoryWithLength;
+    Text: sqlTypeFactoryWithNoParams;
+    Int: sqlTypeFactoryWithNoParams;
+    BigInt: sqlTypeFactoryWithNoParams;
+    TinyInt: sqlTypeFactoryWithNoParams;
+    SmallInt: sqlTypeFactoryWithNoParams;
+    Bit: sqlTypeFactoryWithNoParams;
+    Float: sqlTypeFactoryWithNoParams;
+    Numeric: sqlTypeFactoryWithPrecisionScale;
+    Decimal: sqlTypeFactoryWithPrecisionScale;
+    Real: sqlTypeFactoryWithNoParams;
+    Date: sqlTypeFactoryWithNoParams;
+    DateTime: sqlTypeFactoryWithNoParams;
+    DateTime2: sqlTypeFactoryWithScale;
+    DateTimeOffset: sqlTypeFactoryWithScale;
+    SmallDateTime: sqlTypeFactoryWithNoParams;
+    Time: sqlTypeFactoryWithScale;
+    UniqueIdentifier: sqlTypeFactoryWithNoParams;
+    SmallMoney: sqlTypeFactoryWithNoParams;
+    Money: sqlTypeFactoryWithNoParams;
+    Binary: sqlTypeFactoryWithNoParams;
+    VarBinary: sqlTypeFactoryWithLength;
+    Image: sqlTypeFactoryWithNoParams;
+    Xml: sqlTypeFactoryWithNoParams;
+    Char: sqlTypeFactoryWithLength;
+    NChar: sqlTypeFactoryWithLength;
+    NText: sqlTypeFactoryWithNoParams;
+    TVP: sqlTypeFactoryWithTvpType;
+    UDT: sqlTypeFactoryWithNoParams;
+    Geography: sqlTypeFactoryWithNoParams;
+    Geometry: sqlTypeFactoryWithNoParams;
+};
+
+declare export var MAX: number;
+declare export var fix: boolean;
+declare export var Promise: any;
 
 
-    interface IMap extends Array<{js: any, sql: any }> {
-        register(jstype: any, sql: any): void;
-    }
+interface IMap extends Array<{ js: any, sql: any }> {
+    register(jstype: any, sql: any): void;
+}
 
-    export var map: IMap;
+declare export var map: IMap;
 
-    export var DRIVERS: string[];
+declare export var DRIVERS: string[];
 
-    type recordSet = any;
-    type IIsolationLevel = number;
+type recordSet = any;
+type IIsolationLevel = number;
 
-    export var ISOLATION_LEVEL: {
-        READ_UNCOMMITTED: IIsolationLevel
-        READ_COMMITTED: IIsolationLevel
-        REPEATABLE_READ: IIsolationLevel
-        SERIALIZABLE: IIsolationLevel
-        SNAPSHOT: IIsolationLevel
-    }
+declare export var ISOLATION_LEVEL: {
+    READ_UNCOMMITTED: IIsolationLevel
+    READ_COMMITTED: IIsolationLevel
+    REPEATABLE_READ: IIsolationLevel
+    SERIALIZABLE: IIsolationLevel
+    SNAPSHOT: IIsolationLevel
+}
 
-    export interface IOptions {
-        encrypt: boolean;
-    }
+export interface IOptions {
+    encrypt: boolean;
+}
 
 
-    export interface IPool {
-        min: number;
-        max: number;
-        idleTimeoutMillis: number;
-    }
+export interface IPool {
+    min: number;
+    max: number;
+    idleTimeoutMillis: number;
+}
 
-    export var pool: IPool;
+declare export var pool: IPool;
 
-    export interface config {
-        driver?: string;
-        user?: string;
-        password?: string;
-        server: string;
-        port?: number;
-        domain?: string;
-        database: string;
-        connectionTimeout?: number;
-        requestTimeout?: number;
-        stream?: boolean;
-        options?: IOptions;
-        pool?: IPool;
-    }
+export interface config {
+    driver?: string;
+    user?: string;
+    password?: string;
+    server: string;
+    port?: number;
+    domain?: string;
+    database: string;
+    connectionTimeout?: number;
+    requestTimeout?: number;
+    stream?: boolean;
+    options?: IOptions;
+    pool?: IPool;
+}
 
-    export class Connection extends events.EventEmitter {
-        public connected: boolean;
-        public connecting: boolean;
-        public driver: string;
-        public constructor(config: config, callback?: (err?: any) => void);
-        public connect(): Promise<void>;
-        public connect(callback: (err: any) => void): void;
-        public close(): Promise<void>;
-        public close(callback: (err: any) => void): void;
-    }
+declare export class Connection extends events.EventEmitter {
+    public connected: boolean;
+    public connecting: boolean;
+    public driver: string;
+    public constructor(config: config, callback?: (err?: any) => void);
+    public connect(): Promise<void>;
+    public connect(callback: (err: any) => void): void;
+    public close(): Promise<void>;
+    public close(callback: (err: any) => void): void;
+}
 
-    export class ConnectionError implements Error {
-        constructor(message: string, code?: any)
-        public name: string;
-        public message: string;
-        public code: string;
-    }
+declare export class ConnectionError implements Error {
+    constructor(message: string, code?: any)
+    public name: string;
+    public message: string;
+    public code: string;
+}
 
-    class columns {
-        public add(name: string, type: any, options: any): void;
-    }
+declare class columns {
+    public add(name: string, type: any, options: any): void;
+}
 
-    class rows {
-        public add(...row: any[]): void;
-    }
+declare class rows {
+    public add(...row: any[]): void;
+}
 
-    export class Table {
-        public create: boolean;
-        public columns: columns;
-        public rows: rows;
-        public constructor(tableName: string);
-    }
+declare export class Table {
+    public create: boolean;
+    public columns: columns;
+    public rows: rows;
+    public constructor(tableName: string);
+}
 
-    interface IRequestParameters {
-        [name: string]: {
-            name: string;
-            type: any;
-            io: number;
-            value: any;
-            length: number;
-            scale: number;
-            precision: number;
-            tvpType: any;
-        }
-    }
-
-    export class Request extends events.EventEmitter {
-        public connection: Connection;
-        public transaction: Transaction;
-        public pstatement: PreparedStatement;
-        public parameters: IRequestParameters;
-        public verbose: boolean;
-        public multiple: boolean;
-        public canceled: boolean;
-        public stream: any;
-        public constructor(connection?: Connection);
-        public constructor(transaction: Transaction);
-        public constructor(preparedStatement: PreparedStatement);
-        public execute(procedure: string): Promise<recordSet>;
-        public execute<Entity>(procedure: string, callback: (err?: any, recordsets?: Entity[], returnValue?: any, rowsAffected?: number) => void): void;
-        public input(name: string, value: any): void;
-        public input(name: string, type: any, value: any): void;
-        public output(name: string, type: any, value?: any): void;
-        public pipe(stream: NodeJS.WritableStream): void;
-        public query(command: string): Promise<void>;
-        public query<Entity>(command: string): Promise<Entity[]>;
-        public query(command: string, callback: (err?: any, recordset?: any, rowsAffected?: number) => void): void;
-        public query<Entity>(command: string, callback: (err?: any, recordset?: Entity[]) => void): void;
-        public batch(batch: string): Promise<recordSet>;
-        public batch<Entity>(batch: string): Promise<Entity[]>;
-        public batch(batch: string, callback: (err?: any, recordset?: any) => void): void;
-        public batch<Entity>(batch: string, callback: (err?: any, recordset?: Entity[]) => void): void;
-        public bulk(table: Table): Promise<void>;
-        public bulk(table: Table, callback: (err: any, rowCount: any) => void): void;
-        public cancel(): void;
-    }
-
-    export class RequestError implements Error {
-        constructor(message: string, code?: any)
-        public name: string;
-        public message: string;
-        public code: string;
-    }
-
-    export class Transaction extends events.EventEmitter {
-        public connection: Connection;
-        public isolationLevel: IIsolationLevel;
-        public constructor(connection?: Connection);
-        public begin(isolationLevel?: IIsolationLevel): Promise<void>;
-        public begin(isolationLevel?: IIsolationLevel, callback?: (err?: any) => void): void;
-        public commit(): Promise<void>;
-        public commit(callback: (err?: any) => void): void;
-        public rollback(): Promise<void>;
-        public rollback(callback: (err?: any) => void): void;
-    }
-
-    export class TransactionError implements Error {
-        constructor(message: string, code?: any)
-        public name: string;
-        public message: string;
-        public code: string;
-    }
-
-    export class PreparedStatement extends events.EventEmitter {
-        public connection: Connection;
-        public transaction: Transaction;
-        public prepared: boolean;
-        public statement: string;
-        public parameters: IRequestParameters;
-        public multiple: boolean;
-        public stream: any;
-        public constructor(connection?: Connection);
-        public input(name: string, type: any): void;
-        public output(name: string, type: any): void;
-        public prepare(statement?: string): Promise<void>;
-        public prepare(statement?: string, callback?: (err?: any) => void): void;
-        public execute(values: Object): Promise<recordSet>;
-        public execute<Entity>(values: Object): Promise<Entity[]>;
-        public execute(values: Object, callback: (err: any, recordSet: recordSet, rowsAffected: number) => void): void;
-        public execute<Entity>(values: Object, callback: (err: any, recordSet: Entity[]) => void): void;
-        public unprepare(): Promise<void>;
-        public unprepare(callback: (err?: any) => void): void;
-    }
-
-    export class PreparedStatementError implements Error {
-        constructor(message: string, code?: any)
-        public name: string;
-        public message: string;
-        public code: string;
+interface IRequestParameters {
+    [name: string]: {
+        name: string;
+        type: any;
+        io: number;
+        value: any;
+        length: number;
+        scale: number;
+        precision: number;
+        tvpType: any;
     }
 }
+
+declare export class Request extends events.EventEmitter {
+    public connection: Connection;
+    public transaction: Transaction;
+    public pstatement: PreparedStatement;
+    public parameters: IRequestParameters;
+    public verbose: boolean;
+    public multiple: boolean;
+    public canceled: boolean;
+    public stream: any;
+    public constructor(connection?: Connection);
+    public constructor(transaction: Transaction);
+    public constructor(preparedStatement: PreparedStatement);
+    public execute(procedure: string): Promise<recordSet>;
+    public execute<Entity>(procedure: string, callback: (err?: any, recordsets?: Entity[], returnValue?: any, rowsAffected?: number) => void): void;
+    public input(name: string, value: any): void;
+    public input(name: string, type: any, value: any): void;
+    public output(name: string, type: any, value?: any): void;
+    public pipe(stream: NodeJS.WritableStream): void;
+    public query(command: string): Promise<void>;
+    public query<Entity>(command: string): Promise<Entity[]>;
+    public query(command: string, callback: (err?: any, recordset?: any, rowsAffected?: number) => void): void;
+    public query<Entity>(command: string, callback: (err?: any, recordset?: Entity[]) => void): void;
+    public batch(batch: string): Promise<recordSet>;
+    public batch<Entity>(batch: string): Promise<Entity[]>;
+    public batch(batch: string, callback: (err?: any, recordset?: any) => void): void;
+    public batch<Entity>(batch: string, callback: (err?: any, recordset?: Entity[]) => void): void;
+    public bulk(table: Table): Promise<void>;
+    public bulk(table: Table, callback: (err: any, rowCount: any) => void): void;
+    public cancel(): void;
+}
+
+declare export class RequestError implements Error {
+    constructor(message: string, code?: any)
+    public name: string;
+    public message: string;
+    public code: string;
+}
+
+declare export class Transaction extends events.EventEmitter {
+    public connection: Connection;
+    public isolationLevel: IIsolationLevel;
+    public constructor(connection?: Connection);
+    public begin(isolationLevel?: IIsolationLevel): Promise<void>;
+    public begin(isolationLevel?: IIsolationLevel, callback?: (err?: any) => void): void;
+    public commit(): Promise<void>;
+    public commit(callback: (err?: any) => void): void;
+    public rollback(): Promise<void>;
+    public rollback(callback: (err?: any) => void): void;
+}
+
+declare export class TransactionError implements Error {
+    constructor(message: string, code?: any)
+    public name: string;
+    public message: string;
+    public code: string;
+}
+
+declare export class PreparedStatement extends events.EventEmitter {
+    public connection: Connection;
+    public transaction: Transaction;
+    public prepared: boolean;
+    public statement: string;
+    public parameters: IRequestParameters;
+    public multiple: boolean;
+    public stream: any;
+    public constructor(connection?: Connection);
+    public input(name: string, type: any): void;
+    public output(name: string, type: any): void;
+    public prepare(statement?: string): Promise<void>;
+    public prepare(statement?: string, callback?: (err?: any) => void): void;
+    public execute(values: Object): Promise<recordSet>;
+    public execute<Entity>(values: Object): Promise<Entity[]>;
+    public execute(values: Object, callback: (err: any, recordSet: recordSet, rowsAffected: number) => void): void;
+    public execute<Entity>(values: Object, callback: (err: any, recordSet: Entity[]) => void): void;
+    public unprepare(): Promise<void>;
+    public unprepare(callback: (err?: any) => void): void;
+}
+
+declare export class PreparedStatementError implements Error {
+    constructor(message: string, code?: any)
+    public name: string;
+    public message: string;
+    public code: string;
+}
diff --git a/mu2/mu2.d.ts b/mu2/mu2.d.ts
index e2c84af069..ddeb39a044 100644
--- a/mu2/mu2.d.ts
+++ b/mu2/mu2.d.ts
@@ -7,23 +7,22 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "mu2" {
-	export var root: string;
 
-	export function compileAndRender(templateName: string, view: any): NodeJS.ReadableStream;
+declare export var root: string;
 
-	export function compile(filename: string, callback: (err: Error, parsed: IParsed) => void): void;
+declare export function compileAndRender(templateName: string, view: any): NodeJS.ReadableStream;
 
-	export function compileText(name: string, template: string, callback: (err: Error, parsed: IParsed) => void): void;
-	export function compileText(name: string, template: string): IParsed;
-	export function compileText(template: string): IParsed;
+declare export function compile(filename: string, callback: (err: Error, parsed: IParsed) => void): void;
 
-	export function render(filenameOrParsed: string, view: any): NodeJS.ReadableStream;
-	export function render(filenameOrParsed: IParsed, view: any): NodeJS.ReadableStream;
+declare export function compileText(name: string, template: string, callback: (err: Error, parsed: IParsed) => void): void;
+declare export function compileText(name: string, template: string): IParsed;
+declare export function compileText(template: string): IParsed;
 
-	export function renderText(template: string, view: any, partials?: any): NodeJS.ReadableStream;
+declare export function render(filenameOrParsed: string, view: any): NodeJS.ReadableStream;
+declare export function render(filenameOrParsed: IParsed, view: any): NodeJS.ReadableStream;
 
-	export function clearCache(templateName?: string): void;
+declare export function renderText(template: string, view: any, partials?: any): NodeJS.ReadableStream;
 
-	export interface IParsed { }
-}
+declare export function clearCache(templateName?: string): void;
+
+export interface IParsed { }
diff --git a/multiparty/multiparty.d.ts b/multiparty/multiparty.d.ts
index a280c366f8..0929c87530 100644
--- a/multiparty/multiparty.d.ts
+++ b/multiparty/multiparty.d.ts
@@ -5,12 +5,12 @@
 
 /// <reference path='../node/node.d.ts' />
 
-declare module "multiparty" {
-  import http = require('http');
-  import events = require('events');
-  import stream = require('stream');
 
-  export class Form extends events.EventEmitter {
+import http = require('http');
+import events = require('events');
+import stream = require('stream');
+
+declare export class Form extends events.EventEmitter {
     constructor(options?: FormOptions);
     /**
      * Parses an incoming node.js request containing form data.
@@ -19,9 +19,9 @@ declare module "multiparty" {
      * @param callback
      */
     parse(request: http.ServerRequest, callback?: (error: Error, fields: any, files: any) => any): void;
-  }
+}
 
-  export interface File {
+export interface File {
     /**
      * same as name - the field name for this file
      */
@@ -42,9 +42,9 @@ declare module "multiparty" {
      * size of the file in bytes
      */
     size: number;
-  }
+}
 
-  interface Part extends stream.Readable {
+interface Part extends stream.Readable {
     /**
      * the headers for this part. For example, you may be interested in content-type
      */
@@ -67,45 +67,44 @@ declare module "multiparty" {
      * If the part had a Content-Length header then that value is used here instead.
      */
     byteCount: number;
-  }
+}
 
-  export interface FormOptions {
+export interface FormOptions {
     /**
      * sets encoding for the incoming form fields. Defaults to utf8.
      */
-    encoding?:string;
+    encoding?: string;
     /**
      * Limits the amount of memory all fields (not files) can allocate in bytes.
      * If this value is exceeded, an error event is emitted. The default size is 2MB.
      */
-    maxFieldsSize?:number;
+    maxFieldsSize?: number;
     /**
      * Limits the number of fields that will be parsed before emitting an error event.
      * A file counts as a field in this case. Defaults to 1000.
      */
-    maxFields?:number;
+    maxFields?: number;
     /**
      * Only relevant when autoFiles is true.
      * Limits the total bytes accepted for all files combined.
      * If this value is exceeded, an error event is emitted.
      * The default is Infinity.
      */
-    maxFilesSize?:number;
+    maxFilesSize?: number;
     /**
      * Enables field events and disables part events for fields.
      * This is automatically set to true if you add a field listener.
      */
-    autoFields?:boolean;
+    autoFields?: boolean;
     /**
      * Enables file events and disables part events for files.
      * This is automatically set to true if you add a file listener.
      */
-    autoFiles?:boolean;
+    autoFiles?: boolean;
     /**
      * Only relevant when autoFiles is true.
      * The directory for placing file uploads in.
      * You can move them later using fs.rename(). Defaults to os.tmpDir().
      */
-    uploadDir?:string;
-  }
-}
\ No newline at end of file
+    uploadDir?: string;
+}
diff --git a/mysql/mysql.d.ts b/mysql/mysql.d.ts
index b03db6eaaa..6480dae645 100644
--- a/mysql/mysql.d.ts
+++ b/mysql/mysql.d.ts
@@ -5,498 +5,496 @@
 
 ///<reference path='../node/node.d.ts' />
 
-declare module "mysql" {
-	import stream = require("stream");
 
-	function createConnection(connectionUri: string): IConnection;
-	function createConnection(config: IConnectionConfig): IConnection;
-	function createPool(config: IPoolConfig): IPool;
-	function createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
-	function escape(value: any): string;
-	function format(sql: string): string;
-	function format(sql: string, values: Array<any>): string;
-	function format(sql: string, values: any): string;
-
-	interface IMySql {
-		createConnection(connectionUri: string): IConnection;
-		createConnection(config: IConnectionConfig): IConnection;
-		createPool(config: IPoolConfig): IPool;
-		createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
-		escape(value: any): string;
-		format(sql: string): string;
-		format(sql: string, values: Array<any>): string;
-		format(sql: string, values: any): string;
-	}
-
-    interface IConnectionStatic {
-        createQuery(sql: string): IQuery;
-        createQuery(sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
-        createQuery(sql: string, values: Array<any>): IQuery;
-        createQuery(sql: string, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
-    }
-
-    interface IConnection {
-        config: IConnectionConfig;
-
-        threadId: number;
-
-        beginTransaction(callback: (err: IError) => void): void;
-
-        connect(): void;
-        connect(callback: (err: IError, ...args: any[]) => void): void;
-        connect(options: any, callback?: (err: IError, ...args: any[]) => void): void;
-
-        commit(callback: (err: IError) => void): void;
-
-        changeUser(options: IConnectionOptions): void;
-        changeUser(options: IConnectionOptions, callback: (err: IError) => void): void;
-
-        query: IQueryFunction;
-
-        end(): void;
-        end(callback: (err: IError, ...args: any[]) => void): void;
-        end(options: any, callback: (err: IError, ...args: any[]) => void): void;
-
-        destroy(): void;
-
-        pause(): void;
-
-        release(): void;
-        resume(): void;
-
-        escape(value: any): string;
-
-        escapeId(value: string): string;
-        escapeId(values: Array<string>): string;
-
-        format(sql: string): string;
-        format(sql: string, values: Array<any>): string;
-        format(sql: string, values: any): string;
-
-        on(ev: string, callback: (...args: any[]) => void): IConnection;
-        on(ev: 'error', callback: (err: IError) => void): IConnection;
-
-        rollback(callback: () => void): void;
-    }
-
-    interface IPool {
-        config: IPoolConfig;
-
-        getConnection(callback: (err: IError, connection: IConnection) => void): void;
-
-        query: IQueryFunction;
-
-        end(): void;
-        end(callback: (err: IError, ...args: any[]) => void): void;
-
-        on(ev: string, callback: (...args: any[]) => void): IPool;
-        on(ev: 'connection', callback: (connection: IConnection) => void): IPool;
-        on(ev: 'error', callback: (err: IError) => void): IPool;
-    }
-
-    interface IPoolCluster {
-        config: IPoolClusterConfig;
-
-        add(config: IPoolConfig): void;
-        add(group: string, config: IPoolConfig): void;
-
-        end(): void;
-
-        getConnection(callback: (err: IError, connection: IConnection) => void): void;
-        getConnection(group: string, callback: (err: IError, connection: IConnection) => void): void;
-        getConnection(group: string, selector: string, callback: (err: IError, connection: IConnection) => void): void;
-
-        of(pattern: string): IPool;
-        of(pattern: string, selector: string): IPool;
-
-        on(ev: string, callback: (...args: any[]) => void): IPoolCluster;
-        on(ev: 'remove', callback: (nodeId: number) => void): IPoolCluster;
-        on(ev: 'connection', callback: (connection: IConnection) => void): IPoolCluster;
-        on(ev: 'error', callback: (err: IError) => void): IPoolCluster;
-    }
-
-    interface IQuery {
-        /**
-         * The SQL for a constructed query
-         */
-        sql: string;
-
-        /**
-         * Emits a query packet to start the query
-         */
-        start(): void;
-
-        /**
-         * Determines the packet class to use given the first byte of the packet.
-         * 
-         * @param firstByte The first byte of the packet
-         * @param parser The packet parser
-         */
-        determinePacket(firstByte: number, parser: any): any;
-
-        /**
-         * Creates a Readable stream with the given options
-         * 
-         * @param options The options for the stream.
-         */
-        stream(options: IStreamOptions): stream.Readable;
-
-        /**
-         * Pipes a stream downstream, providing automatic pause/resume based on the 
-         * options sent to the stream.
-         * 
-         * @param options The options for the stream.
-         */
-        pipe(callback: (...args: any[]) => void): IQuery;
-
-        on(ev: string, callback: (...args: any[]) => void): IQuery;
-        on(ev: 'error', callback: (err: IError) => void): IQuery;
-        on(ev: 'fields', callback: (fields: any, index: number) => void): IQuery;
-        on(ev: 'result', callback: (row: any, index: number) => void): IQuery;
-        on(ev: 'end', callback: () => void): IQuery;
-    }
-
-    interface IQueryFunction {
-        (sql: string): IQuery;
-        (sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (sql: string, values: Array<any>): IQuery;
-        (sql: string, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (sql: string, values: any): IQuery;
-        (sql: string, values: any, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (options: IQueryOptions): IQuery;
-        (options: IQueryOptions, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (options: IQueryOptions, values: Array<any>): IQuery;
-        (options: IQueryOptions, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
-        (options: IQueryOptions, values: any): IQuery;
-        (options: IQueryOptions, values: any, callback: (err: IError, ...args: any[]) => void): IQuery;
-    }
-
-    interface IQueryOptions {
-        /**
-         * The SQL for the query
-         */
-        sql: string;
-
-        /**
-         * Every operation takes an optional inactivity timeout option. This allows you to specify appropriate timeouts for 
-         * operations. It is important to note that these timeouts are not part of the MySQL protocol, and rather timeout 
-         * operations through the client. This means that when a timeout is reached, the connection it occurred on will be 
-         * destroyed and no further operations can be performed.
-         */
-        timeout?: number;
-
-        /**
-         * Either a boolean or string. If true, tables will be nested objects. If string (e.g. '_'), tables will be 
-         * nested as tableName_fieldName
-         */
-        nestTables?: any;
-
-        /**
-         * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
-         * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
-         * 
-         * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
-         * 
-         * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
-         * 
-         * field.string()
-         * field.buffer()
-         * field.geometry()
-         * 
-         * are aliases for
-         * 
-         * parser.parseLengthCodedString()
-         * parser.parseLengthCodedBuffer()
-         * parser.parseGeometryValue()
-         * 
-         * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
-         */
-        typeCast?: any;
-    }
-
-    interface IStreamOptions {
-        /**
-         * Sets the max buffer size in objects of a stream
-         */
-        highWaterMark?: number;
-
-        /**
-         * The object mode of the stream (Default: true)
-         */
-        objectMode?: any;
-    }
-
-    interface IConnectionOptions {
-        /**
-         * The MySQL user to authenticate as
-         */
-        user?: string;
-
-        /**
-         * The password of that MySQL user
-         */
-        password?: string;
-
-        /**
-         * Name of the database to use for this connection
-         */
-        database?: string;
-
-        /**
-         * The charset for the connection. This is called "collation" in the SQL-level of MySQL (like utf8_general_ci). 
-         * If a SQL-level charset is specified (like utf8mb4) then the default collation for that charset is used. 
-         * (Default: 'UTF8_GENERAL_CI')
-         */
-        charset?: string;
-    }
-
-    interface IConnectionConfig extends IConnectionOptions {
-        /**
-         * The hostname of the database you are connecting to. (Default: localhost)
-         */
-        host?: string;
-
-        /**
-         * The port number to connect to. (Default: 3306)
-         */
-        port?: number;
-
-        /**
-         * The source IP address to use for TCP connection
-         */
-        localAddress?: string;
-
-        /**
-         * The path to a unix domain socket to connect to. When used host and port are ignored
-         */
-        socketPath?: string;
-
-        /**
-         * The timezone used to store local dates. (Default: 'local')
-         */
-        timezone?: string;
-
-        /**
-         * The milliseconds before a timeout occurs during the initial connection to the MySQL server. (Default: 10 seconds)
-         */
-        connectTimeout?: number;
-
-        /**
-         * Stringify objects instead of converting to values. (Default: 'false')
-         */
-        stringifyObjects?: boolean;
-
-        /**
-         * Allow connecting to MySQL instances that ask for the old (insecure) authentication method. (Default: false)
-         */
-        insecureAuth?: boolean;
-
-        /**
-         * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
-         * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
-         * 
-         * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
-         * 
-         * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
-         * 
-         * field.string()
-         * field.buffer()
-         * field.geometry()
-         * 
-         * are aliases for
-         * 
-         * parser.parseLengthCodedString()
-         * parser.parseLengthCodedBuffer()
-         * parser.parseGeometryValue()
-         * 
-         * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
-         */
-        typeCast?: any;
-
-        /**
-         * A custom query format function
-         */
-        queryFormat?: (query: string, values: any) => void;
-
-        /**
-         * When dealing with big numbers (BIGINT and DECIMAL columns) in the database, you should enable this option 
-         * (Default: false)
-         */
-        supportBigNumbers?: boolean;
-
-        /**
-         * Enabling both supportBigNumbers and bigNumberStrings forces big numbers (BIGINT and DECIMAL columns) to be 
-         * always returned as JavaScript String objects (Default: false). Enabling supportBigNumbers but leaving 
-         * bigNumberStrings disabled will return big numbers as String objects only when they cannot be accurately 
-         * represented with [JavaScript Number objects] (http://ecma262-5.com/ELS5_HTML.htm#Section_8.5) 
-         * (which happens when they exceed the [-2^53, +2^53] range), otherwise they will be returned as Number objects. 
-         * This option is ignored if supportBigNumbers is disabled.
-         */
-        bigNumberStrings?: boolean;
-
-        /**
-         * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript Date 
-         * objects. (Default: false)
-         */
-        dateStrings?: boolean;
-
-        /**
-         * This will print all incoming and outgoing packets on stdout. 
-         * You can also restrict debugging to packet types by passing an array of types (strings) to debug;
-         * 
-         * (Default: false)
-         */
-        debug?: any;
-
-        /**
-         * Generates stack traces on Error to include call site of library entrance ("long stack traces"). Slight 
-         * performance penalty for most calls. (Default: true)
-         */
-        trace?: boolean;
-
-        /**
-         * Allow multiple mysql statements per query. Be careful with this, it exposes you to SQL injection attacks. (Default: false)
-         */
-        multipleStatements?: boolean;
-
-        /**
-         * List of connection flags to use other than the default ones. It is also possible to blacklist default ones
-         */
-        flags?: Array<string>;
-
-        /**
-         * object with ssl parameters or a string containing name of ssl profile
-         */
-        ssl?: any;
-    }
-
-    interface IPoolConfig extends IConnectionConfig {
-        /**
-         * The milliseconds before a timeout occurs during the connection acquisition. This is slightly different from connectTimeout, 
-         * because acquiring a pool connection does not always involve making a connection. (Default: 10 seconds)
-         */
-        acquireTimeout?: number;
-
-        /**
-         * Determines the pool's action when no connections are available and the limit has been reached. If true, the pool will queue 
-         * the connection request and call it when one becomes available. If false, the pool will immediately call back with an error. 
-         * (Default: true)
-         */
-        waitForConnections?: boolean;
-
-        /**
-         * The maximum number of connections to create at once. (Default: 10)
-         */
-        connectionLimit?: number;
-
-        /**
-         * The maximum number of connection requests the pool will queue before returning an error from getConnection. If set to 0, there 
-         * is no limit to the number of queued connection requests. (Default: 0)
-         */
-        queueLimit?: number;
-    }
-
-    interface IPoolClusterConfig {
-        /**
-         * If true, PoolCluster will attempt to reconnect when connection fails. (Default: true)
-         */
-        canRetry?: boolean;
-
-        /**
-         * If connection fails, node's errorCount increases. When errorCount is greater than removeNodeErrorCount, 
-         * remove a node in the PoolCluster. (Default: 5)
-         */
-        removeNodeErrorCount?: number;
-
-        /**
-         * If connection fails, specifies the number of milliseconds before another connection attempt will be made.
-         * If set to 0, then node will be removed instead and never re-used. (Default: 0)
-         */
-        restoreNodeTimeout?: number;
-
-        /**
-         * The default selector. (Default: RR)
-         * RR: Select one alternately. (Round-Robin)
-         * RANDOM: Select the node by random function.
-         * ORDER: Select the first node available unconditionally.
-         */
-        defaultSelector?: string;
-    }
-
-    interface ISslCredentials {
-        /**
-         * A string or buffer holding the PFX or PKCS12 encoded private key, certificate and CA certificates
-         */
-        pfx?: string;
-
-        /**
-         * A string holding the PEM encoded private key
-         */
-        key?: string;
-        
-        /**
-         * A string of passphrase for the private key or pfx
-         */
-        passphrase?: string;
-        
-        /**
-         * A string holding the PEM encoded certificate
-         */
-        cert?: string;
-        
-        /**
-         * Either a string or list of strings of PEM encoded CA certificates to trust.
-         */
-        ca?: Array<string>;
-        
-        /**
-         * Either a string or list of strings of PEM encoded CRLs (Certificate Revocation List)
-         */
-        crl?: Array<string>;
-        
-        /**
-         * A string describing the ciphers to use or exclude
-         */
-        ciphers?: string;
-    }
-
-    interface IError extends Error {
-        /**
-         * Either a MySQL server error (e.g. 'ER_ACCESS_DENIED_ERROR'), 
-         * a node.js error (e.g. 'ECONNREFUSED') or an internal error 
-         * (e.g. 'PROTOCOL_CONNECTION_LOST').
-         */
-        code: string;
-
-        /**
-         * The error number for the error code
-         */
-        errno: number;
-
-        /**
-         * The sql state marker
-         */
-        sqlStateMarker?: string;
-
-        /**
-         * The sql state
-         */
-        sqlState?: string;
-
-        /**
-         * The field count
-         */
-        fieldCount?: number;
-
-        /**
-         * The stack trace for the error
-         */
-        stack?: string;
-
-        /**
-         * Boolean, indicating if this error is terminal to the connection object.
-         */
-        fatal: boolean;
-    }
+import stream = require("stream");
+
+declare function createConnection(connectionUri: string): IConnection;
+declare function createConnection(config: IConnectionConfig): IConnection;
+declare function createPool(config: IPoolConfig): IPool;
+declare function createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
+declare function escape(value: any): string;
+declare function format(sql: string): string;
+declare function format(sql: string, values: Array<any>): string;
+declare function format(sql: string, values: any): string;
+
+interface IMySql {
+    createConnection(connectionUri: string): IConnection;
+    createConnection(config: IConnectionConfig): IConnection;
+    createPool(config: IPoolConfig): IPool;
+    createPoolCluster(config?: IPoolClusterConfig): IPoolCluster;
+    escape(value: any): string;
+    format(sql: string): string;
+    format(sql: string, values: Array<any>): string;
+    format(sql: string, values: any): string;
 }
 
+interface IConnectionStatic {
+    createQuery(sql: string): IQuery;
+    createQuery(sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
+    createQuery(sql: string, values: Array<any>): IQuery;
+    createQuery(sql: string, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
+}
+
+interface IConnection {
+    config: IConnectionConfig;
+
+    threadId: number;
+
+    beginTransaction(callback: (err: IError) => void): void;
+
+    connect(): void;
+    connect(callback: (err: IError, ...args: any[]) => void): void;
+    connect(options: any, callback?: (err: IError, ...args: any[]) => void): void;
+
+    commit(callback: (err: IError) => void): void;
+
+    changeUser(options: IConnectionOptions): void;
+    changeUser(options: IConnectionOptions, callback: (err: IError) => void): void;
+
+    query: IQueryFunction;
+
+    end(): void;
+    end(callback: (err: IError, ...args: any[]) => void): void;
+    end(options: any, callback: (err: IError, ...args: any[]) => void): void;
+
+    destroy(): void;
+
+    pause(): void;
+
+    release(): void;
+    resume(): void;
+
+    escape(value: any): string;
+
+    escapeId(value: string): string;
+    escapeId(values: Array<string>): string;
+
+    format(sql: string): string;
+    format(sql: string, values: Array<any>): string;
+    format(sql: string, values: any): string;
+
+    on(ev: string, callback: (...args: any[]) => void): IConnection;
+    on(ev: 'error', callback: (err: IError) => void): IConnection;
+
+    rollback(callback: () => void): void;
+}
+
+interface IPool {
+    config: IPoolConfig;
+
+    getConnection(callback: (err: IError, connection: IConnection) => void): void;
+
+    query: IQueryFunction;
+
+    end(): void;
+    end(callback: (err: IError, ...args: any[]) => void): void;
+
+    on(ev: string, callback: (...args: any[]) => void): IPool;
+    on(ev: 'connection', callback: (connection: IConnection) => void): IPool;
+    on(ev: 'error', callback: (err: IError) => void): IPool;
+}
+
+interface IPoolCluster {
+    config: IPoolClusterConfig;
+
+    add(config: IPoolConfig): void;
+    add(group: string, config: IPoolConfig): void;
+
+    end(): void;
+
+    getConnection(callback: (err: IError, connection: IConnection) => void): void;
+    getConnection(group: string, callback: (err: IError, connection: IConnection) => void): void;
+    getConnection(group: string, selector: string, callback: (err: IError, connection: IConnection) => void): void;
+
+    of(pattern: string): IPool;
+    of(pattern: string, selector: string): IPool;
+
+    on(ev: string, callback: (...args: any[]) => void): IPoolCluster;
+    on(ev: 'remove', callback: (nodeId: number) => void): IPoolCluster;
+    on(ev: 'connection', callback: (connection: IConnection) => void): IPoolCluster;
+    on(ev: 'error', callback: (err: IError) => void): IPoolCluster;
+}
+
+interface IQuery {
+    /**
+     * The SQL for a constructed query
+     */
+    sql: string;
+
+    /**
+     * Emits a query packet to start the query
+     */
+    start(): void;
+
+    /**
+     * Determines the packet class to use given the first byte of the packet.
+     * 
+     * @param firstByte The first byte of the packet
+     * @param parser The packet parser
+     */
+    determinePacket(firstByte: number, parser: any): any;
+
+    /**
+     * Creates a Readable stream with the given options
+     * 
+     * @param options The options for the stream.
+     */
+    stream(options: IStreamOptions): stream.Readable;
+
+    /**
+     * Pipes a stream downstream, providing automatic pause/resume based on the 
+     * options sent to the stream.
+     * 
+     * @param options The options for the stream.
+     */
+    pipe(callback: (...args: any[]) => void): IQuery;
+
+    on(ev: string, callback: (...args: any[]) => void): IQuery;
+    on(ev: 'error', callback: (err: IError) => void): IQuery;
+    on(ev: 'fields', callback: (fields: any, index: number) => void): IQuery;
+    on(ev: 'result', callback: (row: any, index: number) => void): IQuery;
+    on(ev: 'end', callback: () => void): IQuery;
+}
+
+interface IQueryFunction {
+    (sql: string): IQuery;
+    (sql: string, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (sql: string, values: Array<any>): IQuery;
+    (sql: string, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (sql: string, values: any): IQuery;
+    (sql: string, values: any, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (options: IQueryOptions): IQuery;
+    (options: IQueryOptions, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (options: IQueryOptions, values: Array<any>): IQuery;
+    (options: IQueryOptions, values: Array<any>, callback: (err: IError, ...args: any[]) => void): IQuery;
+    (options: IQueryOptions, values: any): IQuery;
+    (options: IQueryOptions, values: any, callback: (err: IError, ...args: any[]) => void): IQuery;
+}
+
+interface IQueryOptions {
+    /**
+     * The SQL for the query
+     */
+    sql: string;
+
+    /**
+     * Every operation takes an optional inactivity timeout option. This allows you to specify appropriate timeouts for 
+     * operations. It is important to note that these timeouts are not part of the MySQL protocol, and rather timeout 
+     * operations through the client. This means that when a timeout is reached, the connection it occurred on will be 
+     * destroyed and no further operations can be performed.
+     */
+    timeout?: number;
+
+    /**
+     * Either a boolean or string. If true, tables will be nested objects. If string (e.g. '_'), tables will be 
+     * nested as tableName_fieldName
+     */
+    nestTables?: any;
+
+    /**
+     * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
+     * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
+     * 
+     * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
+     * 
+     * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
+     * 
+     * field.string()
+     * field.buffer()
+     * field.geometry()
+     * 
+     * are aliases for
+     * 
+     * parser.parseLengthCodedString()
+     * parser.parseLengthCodedBuffer()
+     * parser.parseGeometryValue()
+     * 
+     * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
+     */
+    typeCast?: any;
+}
+
+interface IStreamOptions {
+    /**
+     * Sets the max buffer size in objects of a stream
+     */
+    highWaterMark?: number;
+
+    /**
+     * The object mode of the stream (Default: true)
+     */
+    objectMode?: any;
+}
+
+interface IConnectionOptions {
+    /**
+     * The MySQL user to authenticate as
+     */
+    user?: string;
+
+    /**
+     * The password of that MySQL user
+     */
+    password?: string;
+
+    /**
+     * Name of the database to use for this connection
+     */
+    database?: string;
+
+    /**
+     * The charset for the connection. This is called "collation" in the SQL-level of MySQL (like utf8_general_ci). 
+     * If a SQL-level charset is specified (like utf8mb4) then the default collation for that charset is used. 
+     * (Default: 'UTF8_GENERAL_CI')
+     */
+    charset?: string;
+}
+
+interface IConnectionConfig extends IConnectionOptions {
+    /**
+     * The hostname of the database you are connecting to. (Default: localhost)
+     */
+    host?: string;
+
+    /**
+     * The port number to connect to. (Default: 3306)
+     */
+    port?: number;
+
+    /**
+     * The source IP address to use for TCP connection
+     */
+    localAddress?: string;
+
+    /**
+     * The path to a unix domain socket to connect to. When used host and port are ignored
+     */
+    socketPath?: string;
+
+    /**
+     * The timezone used to store local dates. (Default: 'local')
+     */
+    timezone?: string;
+
+    /**
+     * The milliseconds before a timeout occurs during the initial connection to the MySQL server. (Default: 10 seconds)
+     */
+    connectTimeout?: number;
+
+    /**
+     * Stringify objects instead of converting to values. (Default: 'false')
+     */
+    stringifyObjects?: boolean;
+
+    /**
+     * Allow connecting to MySQL instances that ask for the old (insecure) authentication method. (Default: false)
+     */
+    insecureAuth?: boolean;
+
+    /**
+     * Determines if column values should be converted to native JavaScript types. It is not recommended (and may go away / change in the future) 
+     * to disable type casting, but you can currently do so on either the connection or query level. (Default: true)
+     * 
+     * You can also specify a function (field: any, next: () => void) => {} to do the type casting yourself.
+     * 
+     * WARNING: YOU MUST INVOKE the parser using one of these three field functions in your custom typeCast callback. They can only be called once.
+     * 
+     * field.string()
+     * field.buffer()
+     * field.geometry()
+     * 
+     * are aliases for
+     * 
+     * parser.parseLengthCodedString()
+     * parser.parseLengthCodedBuffer()
+     * parser.parseGeometryValue()
+     * 
+     * You can find which field function you need to use by looking at: RowDataPacket.prototype._typeCast
+     */
+    typeCast?: any;
+
+    /**
+     * A custom query format function
+     */
+    queryFormat?: (query: string, values: any) => void;
+
+    /**
+     * When dealing with big numbers (BIGINT and DECIMAL columns) in the database, you should enable this option 
+     * (Default: false)
+     */
+    supportBigNumbers?: boolean;
+
+    /**
+     * Enabling both supportBigNumbers and bigNumberStrings forces big numbers (BIGINT and DECIMAL columns) to be 
+     * always returned as JavaScript String objects (Default: false). Enabling supportBigNumbers but leaving 
+     * bigNumberStrings disabled will return big numbers as String objects only when they cannot be accurately 
+     * represented with [JavaScript Number objects] (http://ecma262-5.com/ELS5_HTML.htm#Section_8.5) 
+     * (which happens when they exceed the [-2^53, +2^53] range), otherwise they will be returned as Number objects. 
+     * This option is ignored if supportBigNumbers is disabled.
+     */
+    bigNumberStrings?: boolean;
+
+    /**
+     * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript Date 
+     * objects. (Default: false)
+     */
+    dateStrings?: boolean;
+
+    /**
+     * This will print all incoming and outgoing packets on stdout. 
+     * You can also restrict debugging to packet types by passing an array of types (strings) to debug;
+     * 
+     * (Default: false)
+     */
+    debug?: any;
+
+    /**
+     * Generates stack traces on Error to include call site of library entrance ("long stack traces"). Slight 
+     * performance penalty for most calls. (Default: true)
+     */
+    trace?: boolean;
+
+    /**
+     * Allow multiple mysql statements per query. Be careful with this, it exposes you to SQL injection attacks. (Default: false)
+     */
+    multipleStatements?: boolean;
+
+    /**
+     * List of connection flags to use other than the default ones. It is also possible to blacklist default ones
+     */
+    flags?: Array<string>;
+
+    /**
+     * object with ssl parameters or a string containing name of ssl profile
+     */
+    ssl?: any;
+}
+
+interface IPoolConfig extends IConnectionConfig {
+    /**
+     * The milliseconds before a timeout occurs during the connection acquisition. This is slightly different from connectTimeout, 
+     * because acquiring a pool connection does not always involve making a connection. (Default: 10 seconds)
+     */
+    acquireTimeout?: number;
+
+    /**
+     * Determines the pool's action when no connections are available and the limit has been reached. If true, the pool will queue 
+     * the connection request and call it when one becomes available. If false, the pool will immediately call back with an error. 
+     * (Default: true)
+     */
+    waitForConnections?: boolean;
+
+    /**
+     * The maximum number of connections to create at once. (Default: 10)
+     */
+    connectionLimit?: number;
+
+    /**
+     * The maximum number of connection requests the pool will queue before returning an error from getConnection. If set to 0, there 
+     * is no limit to the number of queued connection requests. (Default: 0)
+     */
+    queueLimit?: number;
+}
+
+interface IPoolClusterConfig {
+    /**
+     * If true, PoolCluster will attempt to reconnect when connection fails. (Default: true)
+     */
+    canRetry?: boolean;
+
+    /**
+     * If connection fails, node's errorCount increases. When errorCount is greater than removeNodeErrorCount, 
+     * remove a node in the PoolCluster. (Default: 5)
+     */
+    removeNodeErrorCount?: number;
+
+    /**
+     * If connection fails, specifies the number of milliseconds before another connection attempt will be made.
+     * If set to 0, then node will be removed instead and never re-used. (Default: 0)
+     */
+    restoreNodeTimeout?: number;
+
+    /**
+     * The default selector. (Default: RR)
+     * RR: Select one alternately. (Round-Robin)
+     * RANDOM: Select the node by random function.
+     * ORDER: Select the first node available unconditionally.
+     */
+    defaultSelector?: string;
+}
+
+interface ISslCredentials {
+    /**
+     * A string or buffer holding the PFX or PKCS12 encoded private key, certificate and CA certificates
+     */
+    pfx?: string;
+
+    /**
+     * A string holding the PEM encoded private key
+     */
+    key?: string;
+
+    /**
+     * A string of passphrase for the private key or pfx
+     */
+    passphrase?: string;
+
+    /**
+     * A string holding the PEM encoded certificate
+     */
+    cert?: string;
+
+    /**
+     * Either a string or list of strings of PEM encoded CA certificates to trust.
+     */
+    ca?: Array<string>;
+
+    /**
+     * Either a string or list of strings of PEM encoded CRLs (Certificate Revocation List)
+     */
+    crl?: Array<string>;
+
+    /**
+     * A string describing the ciphers to use or exclude
+     */
+    ciphers?: string;
+}
+
+interface IError extends Error {
+    /**
+     * Either a MySQL server error (e.g. 'ER_ACCESS_DENIED_ERROR'), 
+     * a node.js error (e.g. 'ECONNREFUSED') or an internal error 
+     * (e.g. 'PROTOCOL_CONNECTION_LOST').
+     */
+    code: string;
+
+    /**
+     * The error number for the error code
+     */
+    errno: number;
+
+    /**
+     * The sql state marker
+     */
+    sqlStateMarker?: string;
+
+    /**
+     * The sql state
+     */
+    sqlState?: string;
+
+    /**
+     * The field count
+     */
+    fieldCount?: number;
+
+    /**
+     * The stack trace for the error
+     */
+    stack?: string;
+
+    /**
+     * Boolean, indicating if this error is terminal to the connection object.
+     */
+    fatal: boolean;
+}
diff --git a/nanoajax/nanoajax.d.ts b/nanoajax/nanoajax.d.ts
index bd068e2bc9..9e12b7d6c0 100644
--- a/nanoajax/nanoajax.d.ts
+++ b/nanoajax/nanoajax.d.ts
@@ -3,18 +3,17 @@
 // Definitions by: Nathan Cahill <https://github.com/nathancahill/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'nanoajax' {
-    interface RequestParameters {
-        url: string;
-        headers?: { [key: string]: string; };
-        body?: string|FormData;
-        method?: string;
-        cors?: boolean;
-    }
 
-    interface Callback {
-        (statusCode: number, response: string, request: XMLHttpRequest): any
-    }
-
-    export function ajax(params: RequestParameters, callback: Callback): XMLHttpRequest
+interface RequestParameters {
+    url: string;
+    headers?: { [key: string]: string; };
+    body?: string | FormData;
+    method?: string;
+    cors?: boolean;
 }
+
+interface Callback {
+    (statusCode: number, response: string, request: XMLHttpRequest): any
+}
+
+declare export function ajax(params: RequestParameters, callback: Callback): XMLHttpRequest
diff --git a/natural-sort/natural-sort.d.ts b/natural-sort/natural-sort.d.ts
index 90da9a19ef..55721f935c 100644
--- a/natural-sort/natural-sort.d.ts
+++ b/natural-sort/natural-sort.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Antonio Morales <https://github.com/a-morales>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "natural-sort" {
-  function naturalSort<T>(a: T, b: T): number;
-  export = naturalSort;
-}
+
+declare function naturalSort<T>(a: T, b: T): number;
+export = naturalSort;
diff --git a/natural/natural.d.ts b/natural/natural.d.ts
index ff519eeccf..7a9e355e79 100644
--- a/natural/natural.d.ts
+++ b/natural/natural.d.ts
@@ -5,70 +5,70 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "natural" {
-  import events = require("events");
 
-  interface Tokenizer {
+import events = require("events");
+
+interface Tokenizer {
     tokenize(text: string): string[];
-  }
-  class WordTokenizer implements Tokenizer {
+}
+declare class WordTokenizer implements Tokenizer {
     tokenize(text: string): string[];
-  }
-  class AggressiveTokenizer implements Tokenizer {
+}
+declare class AggressiveTokenizer implements Tokenizer {
     tokenize(text: string): string[];
-  }
-  class TreebankWordTokenizer implements Tokenizer {
+}
+declare class TreebankWordTokenizer implements Tokenizer {
     tokenize(text: string): string[];
-  }
-  interface RegexTokenizerOptions {
+}
+interface RegexTokenizerOptions {
     pattern: RegExp;
     discardEmpty?: boolean;
-  }
-  class RegexpTokenizer implements Tokenizer {
+}
+declare class RegexpTokenizer implements Tokenizer {
     constructor(options: RegexTokenizerOptions);
     tokenize(text: string): string[];
-  }
-  class WordPunctTokenizer implements Tokenizer {
+}
+declare class WordPunctTokenizer implements Tokenizer {
     tokenize(text: string): string[];
-  }
+}
 
-  function JaroWinklerDistance(s1: string, s2: string, dt?: number): number;
-  function LevenshteinDistance(source: string, target: string, options?: any): number;
-  function DiceCoefficient(str1: string, str2: string): number;
+declare function JaroWinklerDistance(s1: string, s2: string, dt?: number): number;
+declare function LevenshteinDistance(source: string, target: string, options?: any): number;
+declare function DiceCoefficient(str1: string, str2: string): number;
 
-  interface Stemmer {
+interface Stemmer {
     stem(token: string): string;
-  }
-  var PorterStemmer: {
+}
+declare var PorterStemmer: {
     stem(token: string): string;
-  }
-  var PorterStemmerRu: {
+}
+declare var PorterStemmerRu: {
     stem(token: string): string;
-  }
-  var PorterStemmerEs: {
+}
+declare var PorterStemmerEs: {
     stem(token: string): string;
-  }
-  var PorterStemmerFa: {
+}
+declare var PorterStemmerFa: {
     stem(token: string): string;
-  }
-  var PorterStemmerFr: {
+}
+declare var PorterStemmerFr: {
     stem(token: string): string;
-  }
-  var PorterStemmerIt: {
+}
+declare var PorterStemmerIt: {
     stem(token: string): string;
-  }
-  var PorterStemmerNo: {
+}
+declare var PorterStemmerNo: {
     stem(token: string): string;
-  }
-  var PorterStemmerPt: {
+}
+declare var PorterStemmerPt: {
     stem(token: string): string;
-  }
-  var LancasterStemmer: {
+}
+declare var LancasterStemmer: {
     stem(token: string): string;
-  }
+}
 
-  interface BayesClassifierCallback { (err: any, classifier: any): void }
-  class BayesClassifier {
+interface BayesClassifierCallback { (err: any, classifier: any): void }
+declare class BayesClassifier {
     events: events.EventEmitter;
     addDocument(text: string, stem: string): void;
     addDocument(text: string[], stem: string): void;
@@ -78,59 +78,59 @@ declare module "natural" {
     save(filename: string, callback: BayesClassifierCallback): void;
     static load(filename: string, stemmer: Stemmer, callback: BayesClassifierCallback): void;
     static restore(classifier: any, stemmer?: Stemmer): BayesClassifier;
-  }
+}
 
-  interface Phonetic {
+interface Phonetic {
     compare(stringA: string, stringB: string): boolean;
     process(token: string, maxLength?: number): string;
-  }
-  var Metaphone: {
+}
+declare var Metaphone: {
     compare(stringA: string, stringB: string): boolean;
     process(token: string, maxLength?: number): string;
-  };
-  var SoundEx: {
+};
+declare var SoundEx: {
     compare(stringA: string, stringB: string): boolean;
     process(token: string, maxLength?: number): string;
-  };
-  var DoubleMetaphone: {
+};
+declare var DoubleMetaphone: {
     compare(stringA: string, stringB: string): boolean;
     process(token: string, maxLength?: number): string[];
-  };
+};
 
-  class NounInflector {
+declare class NounInflector {
     pluralize(token: string): string;
     singularize(token: string): string;
-  }
-  var CountInflector: {
+}
+declare var CountInflector: {
     nth(i: number): string;
-  }
-  class PresentVerbInflector {
+}
+declare class PresentVerbInflector {
     pluralize(token: string): string;
     singularize(token: string): string;
-  }
-  var NGrams: {
+}
+declare var NGrams: {
     bigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
     bigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
     trigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
     trigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
     ngrams(sequence: string, n: number, startSymbol?: string, endSymbol?: string): string[][];
     ngrams(sequence: string[], n: number, startSymbol?: string, endSymbol?: string): string[][];
-  }
-  var NGramsZH: {
+}
+declare var NGramsZH: {
     bigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
     bigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
     trigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
     trigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
     ngrams(sequence: string, n: number, startSymbol?: string, endSymbol?: string): string[][];
     ngrams(sequence: string[], n: number, startSymbol?: string, endSymbol?: string): string[][];
-  }
+}
 
-  interface TfIdfCallback { (i: number, measure: number): void }
-  interface TfIdfTerm {
+interface TfIdfCallback { (i: number, measure: number): void }
+interface TfIdfTerm {
     term: string;
     tfidf: number;
-  }
-  class TfIdf {
+}
+declare class TfIdf {
     constructor(deserialized?: any);
     addDocument(document: string, key?: string, restoreCache?: boolean): void;
     addDocument(document: string[], key?: string, restoreCache?: boolean): void;
@@ -139,9 +139,9 @@ declare module "natural" {
     tfidfs(terms: string, callback: TfIdfCallback): void;
     tfidfs(terms: string[], callback: TfIdfCallback): void;
     listTerms(d: number): TfIdfTerm[];
-  }
+}
 
-  class Trie {
+declare class Trie {
     constructor(caseSensitive?: boolean);
     addString(text: string): boolean;
     addStrings(strings: string[]): void;
@@ -149,44 +149,43 @@ declare module "natural" {
     findPrefix(text: string): string[];
     findMatchesOnPath(text: string): string[];
     keysWithPrefix(text: string): string[];
-  }
+}
 
-  class EdgeWeightedDigraph {
+declare class EdgeWeightedDigraph {
     add(start: number, end: number, weight: number): void;
     v(): number;
     e(): number;
-  }
-  class ShortestPathTree {
+}
+declare class ShortestPathTree {
     constructor(diagraph: EdgeWeightedDigraph, startVertex: number);
     getDistTo(vertex: number): number;
     hasDistTo(vertex: number): boolean;
     pathTo(vertex: number): number[];
-  }
-  class LongestPathTree {
+}
+declare class LongestPathTree {
     constructor(diagraph: EdgeWeightedDigraph, startVertex: number);
     getDistTo(vertex: number): number;
     hasDistTo(vertex: number): boolean;
     pathTo(vertex: number): number[];
-  }
+}
 
-  interface WordNetLookupResults {
+interface WordNetLookupResults {
     synsetOffset: number;
     pos: string;
     lemma: string;
     synonyms: string[];
     gloss: string;
-  }
-  interface WordNetLookupCallback { (results: WordNetLookupResults[]): void }
-  interface WordNetGetCallback { (results: WordNetLookupResults): void }
-  class WordNet {
+}
+interface WordNetLookupCallback { (results: WordNetLookupResults[]): void }
+interface WordNetGetCallback { (results: WordNetLookupResults): void }
+declare class WordNet {
     constructor(filename?: string);
     lookup(word: string, callback: WordNetLookupCallback): void;
     get(synsetOffset: number, pos: string, callback: WordNetGetCallback): void;
-  }
+}
 
-  class Spellcheck {
+declare class Spellcheck {
     constructor(wordlist: string[]);
     isCorrect(word: string): boolean;
     getCorrections(word: string, maxDistance?: number): string[];
-  }
 }
diff --git a/nconf/nconf.d.ts b/nconf/nconf.d.ts
index e631fe86c5..05b94ac71d 100644
--- a/nconf/nconf.d.ts
+++ b/nconf/nconf.d.ts
@@ -5,105 +5,104 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/nconf.d.ts
 
-declare module "nconf" {
-	export var version: number;
-	export var stores: any;
-	export var sources: any[];
 
-	export function clear(key: string, callback?: ICallbackFunction): any;
-	export function get (key: string, callback?: ICallbackFunction): any;
-	export function merge(key: string, value: any, callback?: ICallbackFunction): any;
-	export function set (key: string, value: any, callback?: ICallbackFunction): any;
-	export function reset(callback?: ICallbackFunction): any;
+declare export var version: number;
+declare export var stores: any;
+declare export var sources: any[];
 
-	export function load(callback?: ICallbackFunction): any;
-	export function mergeSources(data: any): void;
-	export function loadSources(): any;
-	export function save(value: any, callback?: ICallbackFunction): any;
+declare export function clear(key: string, callback?: ICallbackFunction): any;
+declare export function get(key: string, callback?: ICallbackFunction): any;
+declare export function merge(key: string, value: any, callback?: ICallbackFunction): any;
+declare export function set(key: string, value: any, callback?: ICallbackFunction): any;
+declare export function reset(callback?: ICallbackFunction): any;
 
-	export function add(name: string, options?: IOptions): Provider;
-	export function argv(options?: IOptions): Provider;
-	export function env(options?: IOptions): Provider;
-	export function file(name: string, options?: IFileOptions): Provider;
-	export function file(name: string, filename: string): Provider;
-	export function file(options: IFileOptions): Provider;
-	export function use(name: string, options?: IOptions): Provider;
-	export function defaults(options?: IOptions): Provider;
-	export function init(options?: IOptions): void;
-	export function overrides(options?: IOptions): Provider;
-	export function remove(name: string): void;
-	export function create(name: string, options: IOptions): IStore;
+declare export function load(callback?: ICallbackFunction): any;
+declare export function mergeSources(data: any): void;
+declare export function loadSources(): any;
+declare export function save(value: any, callback?: ICallbackFunction): any;
 
-	export function key(...values: any[]): string;
-	export function path(key: any): any[];
-	export function loadFiles(files: any, callback?: ICallbackFunction): void;
-	export function loadFilesSync(files: any, callback?: ICallbackFunction): void;
+declare export function add(name: string, options?: IOptions): Provider;
+declare export function argv(options?: IOptions): Provider;
+declare export function env(options?: IOptions): Provider;
+declare export function file(name: string, options?: IFileOptions): Provider;
+declare export function file(name: string, filename: string): Provider;
+declare export function file(options: IFileOptions): Provider;
+declare export function use(name: string, options?: IOptions): Provider;
+declare export function defaults(options?: IOptions): Provider;
+declare export function init(options?: IOptions): void;
+declare export function overrides(options?: IOptions): Provider;
+declare export function remove(name: string): void;
+declare export function create(name: string, options: IOptions): IStore;
 
-	export var formats: {
-		json: IFormat;
-		ini: IFormat;
-	};
+declare export function key(...values: any[]): string;
+declare export function path(key: any): any[];
+declare export function loadFiles(files: any, callback?: ICallbackFunction): void;
+declare export function loadFilesSync(files: any, callback?: ICallbackFunction): void;
 
-	export interface IFormat {
-		stringify: (obj: any, replacer: any, spacing?: any) => string;
-		parse: (str: string) => any;
-	}
+declare export var formats: {
+    json: IFormat;
+    ini: IFormat;
+};
 
-	export interface IOptions {
-		[index: string]: any;
-	}
-
-	export interface IFileOptions {
-		type?: string;
-		file?: string;
-		dir?: string;
-		search?: boolean;
-		format?: IFormat;
-		json_spacing?: number;
-	}
-
-	export interface ICallbackFunction {
-		(err: Error): void;
-	}
-
-	export class Provider {
-		constructor(options: IOptions);
-
-		stores: any;
-		sources: any[];
-
-		clear(key: string, callback?: ICallbackFunction): any;
-		get (key: string, callback?: ICallbackFunction): any;
-		merge(key: string, value: any, callback?: ICallbackFunction): any;
-		set (key: string, value: any, callback?: ICallbackFunction): any;
-		reset(callback?: ICallbackFunction): any;
-
-		load(callback?: ICallbackFunction): any;
-		mergeSources(data: any): void;
-		loadSources(): any;
-		save(value: any, callback?: ICallbackFunction): any;
-
-		add(name: string, options?: IOptions): Provider;
-		argv(options?: IOptions): Provider;
-		env(options?: IOptions): Provider;
-		file(name: string, options?: IFileOptions): Provider;
-		file(name: string, filename: string): Provider;
-		file(options: IFileOptions): Provider;
-		use(name: string, options?: IOptions): Provider;
-
-		defaults(options?: IOptions): Provider;
-		init(options?: IOptions): void;
-		overrides(options?: IOptions): Provider;
-		remove(name: string): void;
-		create(name: string, options: IOptions): IStore;
-	}
-
-	export interface IStore {
-		type: string;
-		get (key: string): any;
-		set (key: string, value: any): boolean;
-		clear(key: string): boolean;
-		merge(key: string, value: any): boolean;
-		reset(callback?: ICallbackFunction): boolean;
-	}
+export interface IFormat {
+    stringify: (obj: any, replacer: any, spacing?: any) => string;
+    parse: (str: string) => any;
+}
+
+export interface IOptions {
+    [index: string]: any;
+}
+
+export interface IFileOptions {
+    type?: string;
+    file?: string;
+    dir?: string;
+    search?: boolean;
+    format?: IFormat;
+    json_spacing?: number;
+}
+
+export interface ICallbackFunction {
+    (err: Error): void;
+}
+
+declare export class Provider {
+    constructor(options: IOptions);
+
+    stores: any;
+    sources: any[];
+
+    clear(key: string, callback?: ICallbackFunction): any;
+    get(key: string, callback?: ICallbackFunction): any;
+    merge(key: string, value: any, callback?: ICallbackFunction): any;
+    set(key: string, value: any, callback?: ICallbackFunction): any;
+    reset(callback?: ICallbackFunction): any;
+
+    load(callback?: ICallbackFunction): any;
+    mergeSources(data: any): void;
+    loadSources(): any;
+    save(value: any, callback?: ICallbackFunction): any;
+
+    add(name: string, options?: IOptions): Provider;
+    argv(options?: IOptions): Provider;
+    env(options?: IOptions): Provider;
+    file(name: string, options?: IFileOptions): Provider;
+    file(name: string, filename: string): Provider;
+    file(options: IFileOptions): Provider;
+    use(name: string, options?: IOptions): Provider;
+
+    defaults(options?: IOptions): Provider;
+    init(options?: IOptions): void;
+    overrides(options?: IOptions): Provider;
+    remove(name: string): void;
+    create(name: string, options: IOptions): IStore;
+}
+
+export interface IStore {
+    type: string;
+    get(key: string): any;
+    set(key: string, value: any): boolean;
+    clear(key: string): boolean;
+    merge(key: string, value: any): boolean;
+    reset(callback?: ICallbackFunction): boolean;
 }
diff --git a/ncp/ncp.d.ts b/ncp/ncp.d.ts
index 50393195e6..1f4de0f21c 100644
--- a/ncp/ncp.d.ts
+++ b/ncp/ncp.d.ts
@@ -5,15 +5,14 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'ncp' {
-	function ncp (source: string, destination: string, callback: (err: Error) => void): void;
-	function ncp (source: string, destination: string, options: Options, callback: (err: Error) => void): void;
 
-	interface Options {
-		filter? : RegExp;
-		transform? : (read: NodeJS.ReadableStream, write: NodeJS.WritableStream) => void;
-		clobber? : boolean;
-		stopOnErr? : boolean;
-		errs? : NodeJS.WritableStream;
-	}
+declare function ncp(source: string, destination: string, callback: (err: Error) => void): void;
+declare function ncp(source: string, destination: string, options: Options, callback: (err: Error) => void): void;
+
+interface Options {
+    filter?: RegExp;
+    transform?: (read: NodeJS.ReadableStream, write: NodeJS.WritableStream) => void;
+    clobber?: boolean;
+    stopOnErr?: boolean;
+    errs?: NodeJS.WritableStream;
 }
diff --git a/netmask/netmask.d.ts b/netmask/netmask.d.ts
index 698a834fbb..d55668d92e 100644
--- a/netmask/netmask.d.ts
+++ b/netmask/netmask.d.ts
@@ -5,12 +5,12 @@
 
 // netmask.d.ts
 
-declare module 'netmask' {
 
-  export function long2ip(long: number): string;
-  export function ip2long(ip: string): number;
 
-  export class Netmask {
+declare export function long2ip(long: number): string;
+declare export function ip2long(ip: string): number;
+
+declare export class Netmask {
     maskLong: number;
     bitmask: number;
     netLong: number;
@@ -29,8 +29,8 @@ declare module 'netmask' {
     // The block's broadcast address: the last address of the block (eg.: 192.168.1.255)
     broadcast: string;
 
-    constructor (netmask: string);
-    constructor (net: string, mask: string);
+    constructor(netmask: string);
+    constructor(net: string, mask: string);
 
     // Returns true if the given ip or netmask is contained in the block
     contains(ip: string | Netmask | number): boolean;
@@ -43,5 +43,4 @@ declare module 'netmask' {
 
     // Returns the complete netmask formatted as `base/bitmask`
     toString(): string;
-  }
 }
diff --git a/nexpect/nexpect.d.ts b/nexpect/nexpect.d.ts
index e3326fe324..bc5828b4a3 100644
--- a/nexpect/nexpect.d.ts
+++ b/nexpect/nexpect.d.ts
@@ -5,31 +5,30 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "nexpect" {
-    import child_process = require("child_process");
 
-    function spawn(command:string[], options?:ISpawnOptions):IChain;
+import child_process = require("child_process");
 
-    function spawn(command:string, params?:any[], options?:ISpawnOptions):IChain;
+declare function spawn(command: string[], options?: ISpawnOptions): IChain;
 
-    function spawn(command:string, options?:ISpawnOptions):IChain;
+declare function spawn(command: string, params?: any[], options?: ISpawnOptions): IChain;
 
-    interface IChain {
-        expect(expectation:string):IChain;
-        expect(expectation:RegExp):IChain;
-        wait(expectation:string):IChain;
-        wait(expectation:RegExp):IChain;
-        sendline(line:string):IChain;
-        sendEof():IChain;
-        run(callback:(err:Error, output:string[], exit: string | number)=>void):child_process.ChildProcess;
-    }
+declare function spawn(command: string, options?: ISpawnOptions): IChain;
 
-    interface ISpawnOptions {
-        cwd?:string;
-        env?:any;
-        ignoreCase?:any;
-        stripColors?:any;
-        stream?:any;
-        verbose?:any;
-    }
+interface IChain {
+    expect(expectation: string): IChain;
+    expect(expectation: RegExp): IChain;
+    wait(expectation: string): IChain;
+    wait(expectation: RegExp): IChain;
+    sendline(line: string): IChain;
+    sendEof(): IChain;
+    run(callback: (err: Error, output: string[], exit: string | number) => void): child_process.ChildProcess;
+}
+
+interface ISpawnOptions {
+    cwd?: string;
+    env?: any;
+    ignoreCase?: any;
+    stripColors?: any;
+    stream?: any;
+    verbose?: any;
 }
diff --git a/nightmare/nightmare.d.ts b/nightmare/nightmare.d.ts
index f67d7594d7..9abcbca272 100644
--- a/nightmare/nightmare.d.ts
+++ b/nightmare/nightmare.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: horiuchi <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "nightmare" {
 
-  class Nightmare {
+
+declare class Nightmare {
     constructor(options?: Nightmare.IConstructorOptions);
 
     // Interact
@@ -60,62 +60,60 @@ declare module "nightmare" {
     viewport(width: number, height: number): Nightmare;
     zoom(zoomFactor: number): Nightmare;
     headers(headers: Object): Nightmare;
-  }
+}
 
-  namespace Nightmare {
+declare namespace Nightmare {
     export interface IConstructorOptions {
-      timeout?: any;  // number | string;
-      interval?: any; // number | string;
-      port?: number;
-      weak?: boolean;
-      loadImages?: boolean;
-      ignoreSslErrors?: boolean;
-      sslProtocol?: string;
-      webSecurity?: boolean;
-      proxy?: string;
-      proxyType?: string;
-      proxyAuth?: string;
-      cookiesFile?: string;
-      phantomPath?: string;
+        timeout?: any;  // number | string;
+        interval?: any; // number | string;
+        port?: number;
+        weak?: boolean;
+        loadImages?: boolean;
+        ignoreSslErrors?: boolean;
+        sslProtocol?: string;
+        webSecurity?: boolean;
+        proxy?: string;
+        proxyType?: string;
+        proxyAuth?: string;
+        cookiesFile?: string;
+        phantomPath?: string;
     }
 
     export interface IRequest {
-      id: number;
-      method: string;
-      url: string;
-      time: Date;
-      headers: Object;
+        id: number;
+        method: string;
+        url: string;
+        time: Date;
+        headers: Object;
     }
     export interface INetwordRequest {
-      abort(): void;
-      changeUrl(url: string): void;
-      setHeader(key: string, value: string): void;
+        abort(): void;
+        changeUrl(url: string): void;
+        setHeader(key: string, value: string): void;
     }
     export interface IResponse {
-      id: number;
-      url: string;
-      time: Date;
-      headers: Object;
-      bodySize: number;
-      contentType: string;
-      redirectURL: string;
-      stage: string;
-      status: number;
-      statusText: string;
+        id: number;
+        url: string;
+        time: Date;
+        headers: Object;
+        bodySize: number;
+        contentType: string;
+        redirectURL: string;
+        stage: string;
+        status: number;
+        statusText: string;
     }
     export interface IResourceError {
-      id: number;
-      url: string;
-      errorCode: number;
-      errorString: string;
+        id: number;
+        url: string;
+        errorCode: number;
+        errorString: string;
     }
     export interface IStackTrace {
-      file: string;
-      line: number;
-      function?: string;
+        file: string;
+        line: number;
+        function?: string;
     }
-  }
-
-  export = Nightmare;
 }
 
+export = Nightmare;
diff --git a/noble/noble.d.ts b/noble/noble.d.ts
index 8003bdbc68..7c9c792113 100644
--- a/noble/noble.d.ts
+++ b/noble/noble.d.ts
@@ -5,104 +5,102 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "noble" {
-    import events = require("events");
 
-    export function startScanning(): void;
-    export function startScanning(serviceUUIDs: string[]): void;
-    export function startScanning(serviceUUIDs: string[], allowDuplicates: boolean): void;
-    export function stopScanning(): void;
+import events = require("events");
 
-    export function on(event: string, listener: Function): events.EventEmitter;
-    export function on(event: "stateChange", listener: (state: string) => void): events.EventEmitter;
-    export function on(event: "scanStart", listener: () => void): events.EventEmitter;
-    export function on(event: "scanStop", listener: () => void): events.EventEmitter;
-    export function on(event: "discover", listener: (peripheral: Peripheral) => void): events.EventEmitter;
+declare export function startScanning(): void;
+declare export function startScanning(serviceUUIDs: string[]): void;
+declare export function startScanning(serviceUUIDs: string[], allowDuplicates: boolean): void;
+declare export function stopScanning(): void;
 
-    export class Peripheral extends events.EventEmitter {
-        uuid:          string;
-        advertisement: Advertisement;
-        rssi:          number;
-        services:      Service[];
-        state:         string;
+declare export function on(event: string, listener: Function): events.EventEmitter;
+declare export function on(event: "stateChange", listener: (state: string) => void): events.EventEmitter;
+declare export function on(event: "scanStart", listener: () => void): events.EventEmitter;
+declare export function on(event: "scanStop", listener: () => void): events.EventEmitter;
+declare export function on(event: "discover", listener: (peripheral: Peripheral) => void): events.EventEmitter;
 
-        connect(callback?: (error: string) => void): void;
-        disconnect(callback?: () => void): void;
-        updateRssi(callback?: (error: string, rssi: number) => void): void;
-        discoverServices(serviceUUIDs: string[], callback?: (error: string, services: Service[]) => void): void;
-        discoverAllServicesAndCharacteristics(callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
-        discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
+declare export class Peripheral extends events.EventEmitter {
+    uuid: string;
+    advertisement: Advertisement;
+    rssi: number;
+    services: Service[];
+    state: string;
 
-        readHandle(handle: Buffer, callback: (error: string, data: Buffer) => void): void;
-        writeHandle(handle: Buffer, data: Buffer, withoutResponse: boolean, callback: (error: string) => void): void;
-        toString(): string;
+    connect(callback?: (error: string) => void): void;
+    disconnect(callback?: () => void): void;
+    updateRssi(callback?: (error: string, rssi: number) => void): void;
+    discoverServices(serviceUUIDs: string[], callback?: (error: string, services: Service[]) => void): void;
+    discoverAllServicesAndCharacteristics(callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
+    discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void;
 
-        on(event: string, listener: Function): this;
-        on(event: "connect", listener: (error: string) => void): this;
-        on(event: "disconnect", listener: (error: string) => void): this;
-        on(event: "rssiUpdate", listener: (rssi: number) => void): this;
-        on(event: "servicesDiscover", listener: (services: Service[]) => void): this;
-    }
+    readHandle(handle: Buffer, callback: (error: string, data: Buffer) => void): void;
+    writeHandle(handle: Buffer, data: Buffer, withoutResponse: boolean, callback: (error: string) => void): void;
+    toString(): string;
 
-    export interface Advertisement {
-        localName:        string;
-        serviceData:      Buffer;
-        txPowerLevel:     number;
-        manufacturerData: Buffer;
-        serviceUuids:     string[];
-    }
-
-    export class Service extends events.EventEmitter {
-        uuid:                 string;
-        name:                 string;
-        type:                 string;
-        includedServiceUuids: string[];
-        characteristics:      Characteristic[];
-
-        discoverIncludedServices(serviceUUIDs: string[], callback?: (error: string, includedServiceUuids: string[]) => void): void;
-        discoverCharacteristics(characteristicUUIDs: string[], callback?: (error: string, characteristics: Characteristic[]) => void): void;
-        toString(): string;
-
-        on(event: string, listener: Function): this;
-        on(event: "includedServicesDiscover", listener: (includedServiceUuids: string[]) => void): this;
-        on(event: "characteristicsDiscover", listener: (characteristics: Characteristic[]) => void): this;
-    }
-
-    export class Characteristic extends events.EventEmitter {
-        uuid:        string;
-        name:        string;
-        type:        string;
-        properties:  string[];
-        descriptors: Descriptor[];
-
-        read(callback?: (error: string, data: Buffer) => void): void;
-        write(data: Buffer, notify: boolean, callback?: (error: string) => void): void;
-        broadcast(broadcast: boolean, callback?: (error: string) => void): void;
-        notify(notify: boolean, callback?: (error: string) => void): void;
-        discoverDescriptors(callback?: (error: string, descriptors: Descriptor[]) => void): void;
-        toString(): string;
-
-        on(event: string, listener: Function): this;
-        on(event: string, option: boolean, listener: Function): this;
-        on(event: "read", listener: (data: Buffer, isNotification: boolean) => void): this;
-        on(event: "write", withoutResponse: boolean, listener: (error: string) => void): this;
-        on(event: "broadcast", listener: (state: string) => void): this;
-        on(event: "notify", listener: (state: string) => void): this;
-        on(event: "descriptorsDiscover", listener: (descriptors: Descriptor[]) => void): this;
-    }
-
-    export class Descriptor extends events.EventEmitter {
-        uuid: string;
-        name: string;
-        type: string;
-
-        readValue(callback?: (error: string, data: Buffer) => void): void;
-        writeValue(data: Buffer, callback?: (error: string) => void): void;
-        toString(): string;
-
-        on(event: string, listener: Function): this;
-        on(event: "valueRead", listener: (error: string, data: Buffer) => void): this;
-        on(event: "valueWrite", listener: (error: string) => void): this;
-    }
+    on(event: string, listener: Function): this;
+    on(event: "connect", listener: (error: string) => void): this;
+    on(event: "disconnect", listener: (error: string) => void): this;
+    on(event: "rssiUpdate", listener: (rssi: number) => void): this;
+    on(event: "servicesDiscover", listener: (services: Service[]) => void): this;
 }
 
+export interface Advertisement {
+    localName: string;
+    serviceData: Buffer;
+    txPowerLevel: number;
+    manufacturerData: Buffer;
+    serviceUuids: string[];
+}
+
+declare export class Service extends events.EventEmitter {
+    uuid: string;
+    name: string;
+    type: string;
+    includedServiceUuids: string[];
+    characteristics: Characteristic[];
+
+    discoverIncludedServices(serviceUUIDs: string[], callback?: (error: string, includedServiceUuids: string[]) => void): void;
+    discoverCharacteristics(characteristicUUIDs: string[], callback?: (error: string, characteristics: Characteristic[]) => void): void;
+    toString(): string;
+
+    on(event: string, listener: Function): this;
+    on(event: "includedServicesDiscover", listener: (includedServiceUuids: string[]) => void): this;
+    on(event: "characteristicsDiscover", listener: (characteristics: Characteristic[]) => void): this;
+}
+
+declare export class Characteristic extends events.EventEmitter {
+    uuid: string;
+    name: string;
+    type: string;
+    properties: string[];
+    descriptors: Descriptor[];
+
+    read(callback?: (error: string, data: Buffer) => void): void;
+    write(data: Buffer, notify: boolean, callback?: (error: string) => void): void;
+    broadcast(broadcast: boolean, callback?: (error: string) => void): void;
+    notify(notify: boolean, callback?: (error: string) => void): void;
+    discoverDescriptors(callback?: (error: string, descriptors: Descriptor[]) => void): void;
+    toString(): string;
+
+    on(event: string, listener: Function): this;
+    on(event: string, option: boolean, listener: Function): this;
+    on(event: "read", listener: (data: Buffer, isNotification: boolean) => void): this;
+    on(event: "write", withoutResponse: boolean, listener: (error: string) => void): this;
+    on(event: "broadcast", listener: (state: string) => void): this;
+    on(event: "notify", listener: (state: string) => void): this;
+    on(event: "descriptorsDiscover", listener: (descriptors: Descriptor[]) => void): this;
+}
+
+declare export class Descriptor extends events.EventEmitter {
+    uuid: string;
+    name: string;
+    type: string;
+
+    readValue(callback?: (error: string, data: Buffer) => void): void;
+    writeValue(data: Buffer, callback?: (error: string) => void): void;
+    toString(): string;
+
+    on(event: string, listener: Function): this;
+    on(event: "valueRead", listener: (error: string, data: Buffer) => void): this;
+    on(event: "valueWrite", listener: (error: string) => void): this;
+}
diff --git a/nock/nock.d.ts b/nock/nock.d.ts
index 208aac9b31..63e3bef0b6 100644
--- a/nock/nock.d.ts
+++ b/nock/nock.d.ts
@@ -5,101 +5,100 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/nock.d.ts
 
-declare module "nock" {
-	export = nock;
 
-	function nock (host: string, options?: nock.Options): nock.Scope;
+export = nock;
 
-	namespace nock {
-		export function cleanAll(): void;
+declare function nock(host: string, options?: nock.Options): nock.Scope;
 
-		export function disableNetConnect(): void;
-		export function enableNetConnect(): void;
-		export function enableNetConnect(regex: RegExp): void;
-		export function enableNetConnect(domain: string): void;
+declare namespace nock {
+    export function cleanAll(): void;
 
-		export var recorder: Recorder;
+    export function disableNetConnect(): void;
+    export function enableNetConnect(): void;
+    export function enableNetConnect(regex: RegExp): void;
+    export function enableNetConnect(domain: string): void;
 
-		export interface Scope {
-			get(path: string, data?: string): Scope;
+    export var recorder: Recorder;
 
-			post(path: string, data?: string): Scope;
-			post(path: string, data?: Object): Scope;
-			post(path: string, regex?: RegExp): Scope;
+    export interface Scope {
+        get(path: string, data?: string): Scope;
 
-			patch(path: string, data?: string): Scope;
-			patch(path: string, data?: Object): Scope;
-			patch(path: string, regex?: RegExp): Scope;
+        post(path: string, data?: string): Scope;
+        post(path: string, data?: Object): Scope;
+        post(path: string, regex?: RegExp): Scope;
 
-			put(path: string, data?: string): Scope;
-			put(path: string, data?: Object): Scope;
-			put(path: string, regex?: RegExp): Scope;
+        patch(path: string, data?: string): Scope;
+        patch(path: string, data?: Object): Scope;
+        patch(path: string, regex?: RegExp): Scope;
 
-			head(path: string): Scope;
+        put(path: string, data?: string): Scope;
+        put(path: string, data?: Object): Scope;
+        put(path: string, regex?: RegExp): Scope;
 
-			delete(path: string, data?: string): Scope;
-			delete(path: string, data?: Object): Scope;
-			delete(path: string, regex?: RegExp): Scope;
+        head(path: string): Scope;
 
-			merge(path: string, data?: string): Scope;
-			merge(path: string, data?: Object): Scope;
-			merge(path: string, regex?: RegExp): Scope;
+        delete(path: string, data?: string): Scope;
+        delete(path: string, data?: Object): Scope;
+        delete(path: string, regex?: RegExp): Scope;
 
-			query(params: any): Scope;
-			query(acceptAnyParams: boolean): Scope;
+        merge(path: string, data?: string): Scope;
+        merge(path: string, data?: Object): Scope;
+        merge(path: string, regex?: RegExp): Scope;
 
-			intercept(path: string, verb: string, body?: string, options?: any): Scope;
-			intercept(path: string, verb: string, body?: Object, options?: any): Scope;
-			intercept(path: string, verb: string, body?: RegExp, options?: any): Scope;
+        query(params: any): Scope;
+        query(acceptAnyParams: boolean): Scope;
 
-			reply(responseCode: number, body?: string, headers?: Object): Scope;
-			reply(responseCode: number, body?: Object, headers?: Object): Scope;
-			reply(responseCode: number, callback: (uri: string, body: string) => string, headers?: Object): Scope;
-			replyWithFile(responseCode: number, fileName: string): Scope;
-			replyWithError(errorMessage: string): Scope;
+        intercept(path: string, verb: string, body?: string, options?: any): Scope;
+        intercept(path: string, verb: string, body?: Object, options?: any): Scope;
+        intercept(path: string, verb: string, body?: RegExp, options?: any): Scope;
 
-			defaultReplyHeaders(headers: Object): Scope;
+        reply(responseCode: number, body?: string, headers?: Object): Scope;
+        reply(responseCode: number, body?: Object, headers?: Object): Scope;
+        reply(responseCode: number, callback: (uri: string, body: string) => string, headers?: Object): Scope;
+        replyWithFile(responseCode: number, fileName: string): Scope;
+        replyWithError(errorMessage: string): Scope;
 
-			matchHeader(name: string, value: string): Scope;
-			matchHeader(name: string, regex: RegExp): Scope;
-			matchHeader(name: string, fn: (value: string) => boolean): Scope;
+        defaultReplyHeaders(headers: Object): Scope;
 
-			filteringPath(regex: RegExp, replace: string): Scope;
-			filteringPath(fn: (path: string) => string): Scope;
-			filteringRequestBody(regex: RegExp, replace: string): Scope;
-			filteringRequestBody(fn: (path: string) => string): Scope;
+        matchHeader(name: string, value: string): Scope;
+        matchHeader(name: string, regex: RegExp): Scope;
+        matchHeader(name: string, fn: (value: string) => boolean): Scope;
 
-			persist(): Scope;
-			log(out: () => void): Scope;
+        filteringPath(regex: RegExp, replace: string): Scope;
+        filteringPath(fn: (path: string) => string): Scope;
+        filteringRequestBody(regex: RegExp, replace: string): Scope;
+        filteringRequestBody(fn: (path: string) => string): Scope;
 
-			delay(timeMs: number): Scope;
-			delayConnection(timeMs: number): Scope;
+        persist(): Scope;
+        log(out: () => void): Scope;
 
-			times(repeats: number): Scope;
-			once(): Scope;
-			twice(): Scope;
-			thrice(): Scope;
+        delay(timeMs: number): Scope;
+        delayConnection(timeMs: number): Scope;
 
-			done(): void;
-			isDone(): boolean;
-			restore(): void;
-			pendingMocks(): Object[];
-		}
+        times(repeats: number): Scope;
+        once(): Scope;
+        twice(): Scope;
+        thrice(): Scope;
 
-		export interface Recorder {
-			rec(capture?: boolean): void;
-			rec(options?: RecorderOptions): void;
-			play(): any[];
-		}
+        done(): void;
+        isDone(): boolean;
+        restore(): void;
+        pendingMocks(): Object[];
+    }
 
-		export interface Options {
-			allowUnmocked?: boolean;
-		}
+    export interface Recorder {
+        rec(capture?: boolean): void;
+        rec(options?: RecorderOptions): void;
+        play(): any[];
+    }
 
-		export interface RecorderOptions {
-			dont_print?: boolean;
-			output_objects?: boolean;
-			enable_reqheaders_recording?: boolean;
-		}
-	}
+    export interface Options {
+        allowUnmocked?: boolean;
+    }
+
+    export interface RecorderOptions {
+        dont_print?: boolean;
+        output_objects?: boolean;
+        enable_reqheaders_recording?: boolean;
+    }
 }
diff --git a/node-array-ext/node-array-ext.d.ts b/node-array-ext/node-array-ext.d.ts
index 3199751330..4dbccde814 100644
--- a/node-array-ext/node-array-ext.d.ts
+++ b/node-array-ext/node-array-ext.d.ts
@@ -3,15 +3,14 @@
 // Definitions by: Ben Goltz <https://github.com/Beng89>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "node-array-ext" {
-	/**
-	 * Processes each of the elements in the array and triggers a callback once every element has been processed.
-	 *  - note that the elements are called in order but are not guaranteed to finish in order.
-	 */
-	export function asyncEach<T> (array: Array<T>, each: (i: number, element: T, done: (err?: Error) => void) => void, finish: (err?: Error) => void): void;
-	/**
-	 * Processes each of the elements in the array and triggers a callback once every element has been processed.
-	 *  - note that the elements are called in order and are guaranteed to finish in order.
-	 */
-	export function awaitEach<T> (array: Array<T>, each: (i: number, element: T, done: (err?: Error) => void) => void, finish: (err?: Error) => void): void;
-}
\ No newline at end of file
+
+/**
+ * Processes each of the elements in the array and triggers a callback once every element has been processed.
+ *  - note that the elements are called in order but are not guaranteed to finish in order.
+ */
+declare export function asyncEach<T>(array: Array<T>, each: (i: number, element: T, done: (err?: Error) => void) => void, finish: (err?: Error) => void): void;
+/**
+ * Processes each of the elements in the array and triggers a callback once every element has been processed.
+ *  - note that the elements are called in order and are guaranteed to finish in order.
+ */
+declare export function awaitEach<T>(array: Array<T>, each: (i: number, element: T, done: (err?: Error) => void) => void, finish: (err?: Error) => void): void;
diff --git a/node-config-manager/node-config-manager.d.ts b/node-config-manager/node-config-manager.d.ts
index 0ef556ac5b..748da75066 100644
--- a/node-config-manager/node-config-manager.d.ts
+++ b/node-config-manager/node-config-manager.d.ts
@@ -3,24 +3,23 @@
 // Definitions by: TANAKA Koichi <https://gitnub.com/mugeso/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "node-config-manager" {
-    interface Options {
-        configDir: string;
-        env: string;
-        camelCase: boolean;
-    }
 
-    interface ConfigManager {
-        init(options: Options): ConfigManager;
-        set(key: string, value: string|boolean): ConfigManager;
-        get(key: string): string|boolean;
-        addConfig(configName: string): ConfigManager;
-        getConfig(configName: string): any;
-        removeConfig(configName: string): ConfigManager;
-        count(): number;
-        method: any;
-    }
-
-    var cfgManager: ConfigManager;
-    export = cfgManager;
+interface Options {
+    configDir: string;
+    env: string;
+    camelCase: boolean;
 }
+
+interface ConfigManager {
+    init(options: Options): ConfigManager;
+    set(key: string, value: string | boolean): ConfigManager;
+    get(key: string): string | boolean;
+    addConfig(configName: string): ConfigManager;
+    getConfig(configName: string): any;
+    removeConfig(configName: string): ConfigManager;
+    count(): number;
+    method: any;
+}
+
+declare var cfgManager: ConfigManager;
+export = cfgManager;
diff --git a/node-dir/node-dir.d.ts b/node-dir/node-dir.d.ts
index 857cdf7bdf..3c920dd86b 100644
--- a/node-dir/node-dir.d.ts
+++ b/node-dir/node-dir.d.ts
@@ -3,63 +3,62 @@
 // Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "node-dir" {
-    export interface Options {
-        // file encoding (defaults to 'utf8')
-        encoding?: string;
 
-        // a regex pattern or array to specify filenames to ignore
-        exclude?: RegExp | string[];
+export interface Options {
+    // file encoding (defaults to 'utf8')
+    encoding?: string;
 
-        // a regex pattern or array to specify directories to ignore
-        excludeDir?: RegExp | string[];
+    // a regex pattern or array to specify filenames to ignore
+    exclude?: RegExp | string[];
 
-        // a regex pattern or array to specify filenames to operate on
-        match?: RegExp | string[];
+    // a regex pattern or array to specify directories to ignore
+    excludeDir?: RegExp | string[];
 
-        // a regex pattern or array to specify directories to recurse
-        matchDir?: RegExp | string[];
+    // a regex pattern or array to specify filenames to operate on
+    match?: RegExp | string[];
 
-        // whether to recurse subdirectories when reading files (defaults to true)
-        recursive?: boolean;
+    // a regex pattern or array to specify directories to recurse
+    matchDir?: RegExp | string[];
 
-        // sort files in each directory in descending order
-        reverse?: boolean;
+    // whether to recurse subdirectories when reading files (defaults to true)
+    recursive?: boolean;
 
-        // whether to aggregate only the base filename rather than the full filepath
-        shortName?: boolean;
+    // sort files in each directory in descending order
+    reverse?: boolean;
 
-        // sort files in each directory in ascending order (defaults to true)
-        sort?: boolean;
+    // whether to aggregate only the base filename rather than the full filepath
+    shortName?: boolean;
 
-        // control if done function called on error (defaults to true)
-        doneOnErr?: boolean;
-    }
+    // sort files in each directory in ascending order (defaults to true)
+    sort?: boolean;
 
-    export interface FileCallback {
-        (error: any, content: any, next: () => void): void;
-    }
-
-    export interface FileNamedCallback {
-        (error: any, content: any, filename: string, next: () => void): void;
-    }
-
-    export interface StreamCallback {
-        (error: any, stream: any, next: () => void): void;
-    }
-
-    export interface FinishedCallback {
-        (error: any, files: any): void;
-    }
-
-    export function readFiles(dir: string, fileCallback: FileCallback, finishedCallback?: FinishedCallback): void;
-	export function readFiles(dir: string, fileCallback: FileNamedCallback, finishedCallback?: FinishedCallback): void;
-    export function readFiles(dir: string, options: Options, fileCallback: FileCallback, finishedCallback?: FinishedCallback): void;
-    export function readFiles(dir: string, options: Options, fileCallback: FileNamedCallback, finishedCallback?: FinishedCallback): void;
-    export function readFilesStream(dir: string, options: Options, streamCallback: StreamCallback,
-        finishedCallback?: FinishedCallback): void;
-    export function files(dir: string, callback: (error: any, files: any) => void): void;
-    export function subdirs(dir: string, callback: (error: any, subdirs: any) => void): void;
-    export function paths(dir: string, callback: (error: any, paths: any) => void): void;
-    export function paths(dir: string, combine: boolean, callback: (error: any, paths: any) => void): void;
+    // control if done function called on error (defaults to true)
+    doneOnErr?: boolean;
 }
+
+export interface FileCallback {
+    (error: any, content: any, next: () => void): void;
+}
+
+export interface FileNamedCallback {
+    (error: any, content: any, filename: string, next: () => void): void;
+}
+
+export interface StreamCallback {
+    (error: any, stream: any, next: () => void): void;
+}
+
+export interface FinishedCallback {
+    (error: any, files: any): void;
+}
+
+declare export function readFiles(dir: string, fileCallback: FileCallback, finishedCallback?: FinishedCallback): void;
+declare export function readFiles(dir: string, fileCallback: FileNamedCallback, finishedCallback?: FinishedCallback): void;
+declare export function readFiles(dir: string, options: Options, fileCallback: FileCallback, finishedCallback?: FinishedCallback): void;
+declare export function readFiles(dir: string, options: Options, fileCallback: FileNamedCallback, finishedCallback?: FinishedCallback): void;
+declare export function readFilesStream(dir: string, options: Options, streamCallback: StreamCallback,
+    finishedCallback?: FinishedCallback): void;
+declare export function files(dir: string, callback: (error: any, files: any) => void): void;
+declare export function subdirs(dir: string, callback: (error: any, subdirs: any) => void): void;
+declare export function paths(dir: string, callback: (error: any, paths: any) => void): void;
+declare export function paths(dir: string, combine: boolean, callback: (error: any, paths: any) => void): void;
diff --git a/node-gcm/node-gcm.d.ts b/node-gcm/node-gcm.d.ts
index 9b3b3f97a0..faa272678a 100644
--- a/node-gcm/node-gcm.d.ts
+++ b/node-gcm/node-gcm.d.ts
@@ -3,88 +3,85 @@
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "node-gcm" {
-
-    export interface INotificationOptions {
-        title: string;
-        body?: string;
-        icon: string;
-        sound?: string;
-        badge?: string;
-        tag?: string;
-        color?: string;
-        click_action?: string;
-    }
-    
-    export interface IMessageOptions {
-        collapseKey?: string;
-        priority?: string;
-        contentAvailable?: boolean;
-        delayWhileIdle?: boolean;
-        timeToLive?: number;
-        restrictedPackageName?: string;
-        dryRun?: boolean;
-        data?: {
-            [key: string]: string;
-        };
-        notification?: INotificationOptions;
-    }
-    
-    export class Message {
-        constructor(options?: IMessageOptions);
-        collapseKey: string;
-        delayWhileIdle: boolean;
-        timeToLive: number;
-        dryRun: boolean;
-
-        addData(key: string, value: string): void;
-        addData(data: { [key: string]: string }): void;
-        addNotification(value: INotificationOptions): void;
-        addNotification(key: string, value:INotificationOptions): void;
-    }
 
 
-    export interface ISenderOptions {
-        proxy?: any;
-        maxSockets?: number;
-        timeout?: number;
-    }
-    export interface ISenderSendOptions {
-        retries?: number;
-        backoff?: number;
-    }
-
-    export interface IRecipient {
-        to?: string,
-        topic?: string,
-        notificationKey?: string,
-        registrationIds?: string[],
-        registrationTokens?: string[]
-    }
-    
-    export class Sender {
-        constructor(key: string, options?: ISenderOptions);
-        key: string;
-        options: ISenderOptions;
-
-        send(message: Message, registrationIds: string|string[]|IRecipient, callback: (err: any, resJson: IResponseBody) => void): void;
-        send(message: Message, registrationIds: string|string[]|IRecipient, retries: number, callback: (err: any, resJson: IResponseBody) => void): void;
-        send(message: Message, registrationIds: string|string[]|IRecipient, options: ISenderSendOptions, callback: (err: any, resJson: IResponseBody) => void): void;
-        sendNoRetry(message: Message, registrationIds: string|string[]|IRecipient, callback: (err: any, resJson: IResponseBody) => void): void;
-    }
-
-
-    export interface IResponseBody {
-        success: number;
-        failure: number;
-        canonical_ids: number;
-        multicast_id?: number;
-        results?: {
-            message_id?: string;
-            registration_id?: string;
-            error?: string;
-        }[];
-    }
-
+export interface INotificationOptions {
+    title: string;
+    body?: string;
+    icon: string;
+    sound?: string;
+    badge?: string;
+    tag?: string;
+    color?: string;
+    click_action?: string;
 }
 
+export interface IMessageOptions {
+    collapseKey?: string;
+    priority?: string;
+    contentAvailable?: boolean;
+    delayWhileIdle?: boolean;
+    timeToLive?: number;
+    restrictedPackageName?: string;
+    dryRun?: boolean;
+    data?: {
+        [key: string]: string;
+    };
+    notification?: INotificationOptions;
+}
+
+declare export class Message {
+    constructor(options?: IMessageOptions);
+    collapseKey: string;
+    delayWhileIdle: boolean;
+    timeToLive: number;
+    dryRun: boolean;
+
+    addData(key: string, value: string): void;
+    addData(data: { [key: string]: string }): void;
+    addNotification(value: INotificationOptions): void;
+    addNotification(key: string, value: INotificationOptions): void;
+}
+
+
+export interface ISenderOptions {
+    proxy?: any;
+    maxSockets?: number;
+    timeout?: number;
+}
+export interface ISenderSendOptions {
+    retries?: number;
+    backoff?: number;
+}
+
+export interface IRecipient {
+    to?: string,
+    topic?: string,
+    notificationKey?: string,
+    registrationIds?: string[],
+    registrationTokens?: string[]
+}
+
+declare export class Sender {
+    constructor(key: string, options?: ISenderOptions);
+    key: string;
+    options: ISenderOptions;
+
+    send(message: Message, registrationIds: string | string[] | IRecipient, callback: (err: any, resJson: IResponseBody) => void): void;
+    send(message: Message, registrationIds: string | string[] | IRecipient, retries: number, callback: (err: any, resJson: IResponseBody) => void): void;
+    send(message: Message, registrationIds: string | string[] | IRecipient, options: ISenderSendOptions, callback: (err: any, resJson: IResponseBody) => void): void;
+    sendNoRetry(message: Message, registrationIds: string | string[] | IRecipient, callback: (err: any, resJson: IResponseBody) => void): void;
+}
+
+
+export interface IResponseBody {
+    success: number;
+    failure: number;
+    canonical_ids: number;
+    multicast_id?: number;
+    results?: {
+        message_id?: string;
+        registration_id?: string;
+        error?: string;
+    }[];
+}
diff --git a/node-getopt/node-getopt.d.ts b/node-getopt/node-getopt.d.ts
index 4a205e800d..35811064f8 100644
--- a/node-getopt/node-getopt.d.ts
+++ b/node-getopt/node-getopt.d.ts
@@ -6,124 +6,123 @@
 /**
  * Type Script Declaration for node-getopt
  */
-declare module "node-getopt" {
 
-    interface StringMap {
-        [index: string]: string;
-    }
+
+interface StringMap {
+    [index: string]: string;
+}
+
+/**
+ * Parsed options.
+ */
+declare class ParsedOption {
+    public argv: string[];
+    public options: StringMap;
+
+    constructor(argv: string[], options: StringMap);
+    public empty(): boolean;
+}
+
+interface EventCallback {
+    (arguments: string[], options: StringMap): void;
+}
+
+interface ErrorFunc {
+    (exception: Error): void;
+}
+
+interface OptionConfigurationArray {
+    [index: number]: string[];
+}
+
+declare class Getopt {
+    static HAS_ARGUMENT: boolean;
+    static NO_ARGUMENT: boolean;
+    static MULTI_SUPPORTED: boolean;
+    static SINGLE_ONLY: boolean;
+    static VERSION: string;
 
     /**
-     * Parsed options.
+     * options is a set of option. each option contains 3 fields.
+     *    [short_name, long_name_with_definition, comment]
+     *    Definition:
+     *    * '=ARG':   has argument
+     *    * '[=ARG]': has argument but optional
+     *    * '+':      multiple option supported
+     *
+     *    ARG can be replaced by any word.
+     * @param options
      */
-    class ParsedOption {
-        public argv: string[];
-        public options: StringMap;
+    public constructor(options: any[]);
 
-        constructor(argv: string[], options: StringMap);
-        public empty() : boolean;
-    }
+    /**
+     * after parsing, trigger the action if optionName is found.
+     * the 'this' in action will be the instance of Getopt.
+     * @param name
+     * @param cb
+     */
+    public on(name: string, cb: EventCallback): Getopt;
 
-    interface EventCallback {
-        (arguments: string[], options: StringMap) : void;
-    }
+    public emit(name: string, cb: EventCallback): Getopt;
 
-    interface ErrorFunc {
-        (exception: Error): void;
-    }
+    /**
+     * parse argv
+     *
+     * Returns: {argv: '...', options: {...}}
+     *
+     */
+    public parse(argv: string[]): ParsedOption;
 
-    interface OptionConfigurationArray {
-        [index: number]: string[];
-    }
+    /**
+     * alias of parse(process.argv.slice(2))
+     */
+    public parse_system(): ParsedOption;
 
-    class Getopt {
-        static HAS_ARGUMENT : boolean;
-        static NO_ARGUMENT : boolean;
-        static MULTI_SUPPORTED : boolean;
-        static SINGLE_ONLY : boolean;
-        static VERSION : string;
+    public parseSystem(): ParsedOption;
 
-        /**
-         * options is a set of option. each option contains 3 fields.
-         *    [short_name, long_name_with_definition, comment]
-         *    Definition:
-         *    * '=ARG':   has argument
-         *    * '[=ARG]': has argument but optional
-         *    * '+':      multiple option supported
-         *
-         *    ARG can be replaced by any word.
-         * @param options
-         */
-        public constructor(options: any[]);
+    /**
+     * Set help template. the placeholders will be replaced by getopt.
+     *
+     * Placeholders:
+     *    * [[OPTIONS]] - The options list
+     *
+     * Returns: String
+     * @param help
+     */
+    public setHelp(help: string): Getopt;
 
-        /**
-         * after parsing, trigger the action if optionName is found.
-         * the 'this' in action will be the instance of Getopt.
-         * @param name
-         * @param cb
-         */
-        public on(name: string, cb: EventCallback) : Getopt;
+    /**
+     * console.info(getopt.getHelp());
+     */
+    public showHelp(): Getopt;
 
-        public emit(name: string, cb: EventCallback) : Getopt;
+    /**
+     * Get the help generated.
+     */
+    public getHelp(): string;
 
-        /**
-         * parse argv
-         *
-         * Returns: {argv: '...', options: {...}}
-         *
-         */
-        public parse(argv: string[]): ParsedOption;
+    /**
+     * set help template to HELP if HELP is not empty.
+     * bind 'help' option to default action, show help and exit with 0.
+     * @param help
+     */
+    public bindHelp(help?: string): Getopt;
 
-        /**
-         * alias of parse(process.argv.slice(2))
-         */
-        public parse_system(): ParsedOption;
+    public getVersion(): string;
 
-        public parseSystem():ParsedOption;
+    static getVersion(): string;
 
-        /**
-         * Set help template. the placeholders will be replaced by getopt.
-         *
-         * Placeholders:
-         *    * [[OPTIONS]] - The options list
-         *
-         * Returns: String
-         * @param help
-         */
-        public setHelp(help: string): Getopt;
+    /**
+     * when parse failed callback will be trigger. default is display error message and exit with 1.
+     * @param errorFunc
+     */
+    public error(errorFunc: ErrorFunc): Getopt;
 
-        /**
-         * console.info(getopt.getHelp());
-         */
-        public showHelp():Getopt;
-
-        /**
-         * Get the help generated.
-         */
-        public getHelp(): string;
-
-        /**
-         * set help template to HELP if HELP is not empty.
-         * bind 'help' option to default action, show help and exit with 0.
-         * @param help
-         */
-        public bindHelp(help?:string): Getopt;
-
-        public getVersion(): string;
-
-        static getVersion():string;
-
-        /**
-         * when parse failed callback will be trigger. default is display error message and exit with 1.
-         * @param errorFunc
-         */
-        public error(errorFunc: ErrorFunc) : Getopt;
-
-        /**
-         * equals new Getopt(options)
-         * @param options
-         */
-        static create(options: string[]): Getopt;
-    }
-
-    export = Getopt;
+    /**
+     * equals new Getopt(options)
+     * @param options
+     */
+    static create(options: string[]): Getopt;
 }
+
+export = Getopt;
diff --git a/node-int64/node-int64.d.ts b/node-int64/node-int64.d.ts
index d441d28458..75ee0a717c 100644
--- a/node-int64/node-int64.d.ts
+++ b/node-int64/node-int64.d.ts
@@ -5,35 +5,31 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "node-int64" {
-	class Int64 {
 
-		static MAX_INT: number;
-		static MIN_INT: number;
+declare class Int64 {
 
-		constructor(buffer:Buffer, offset?:number);
-		constructor(array:Uint8Array, offset?:number);
-		constructor(str:string);
-		constructor(hi:number, lo:number);
+    static MAX_INT: number;
+    static MIN_INT: number;
+
+    constructor(buffer: Buffer, offset?: number);
+    constructor(array: Uint8Array, offset?: number);
+    constructor(str: string);
+    constructor(hi: number, lo: number);
 
 
-		_2scomp(): void;
+    _2scomp(): void;
 
-		setValue(str:string): void;
-		toNumber(allowImprecise?:boolean): number;
-		valueOf(): number;
-		toString(radix?:number): string;
-		toOctetString(separator?:string): string;
-		toBuffer(rawBuffer?:boolean): Buffer;
-		copy(targetBuffer: Buffer, targetOffset?:number): void;
-		compare(other: Int64): number;
-		equals(other: Int64): boolean;
-		inspect(): string;
-
-	}
-
-	export = Int64;
+    setValue(str: string): void;
+    toNumber(allowImprecise?: boolean): number;
+    valueOf(): number;
+    toString(radix?: number): string;
+    toOctetString(separator?: string): string;
+    toBuffer(rawBuffer?: boolean): Buffer;
+    copy(targetBuffer: Buffer, targetOffset?: number): void;
+    compare(other: Int64): number;
+    equals(other: Int64): boolean;
+    inspect(): string;
 
 }
 
-
+export = Int64;
diff --git a/node-jsfl-runner/node-jsfl-runner.d.ts b/node-jsfl-runner/node-jsfl-runner.d.ts
index f3bf197635..59c152988b 100644
--- a/node-jsfl-runner/node-jsfl-runner.d.ts
+++ b/node-jsfl-runner/node-jsfl-runner.d.ts
@@ -4,33 +4,32 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-declare module "node-jsfl-runner" {
-  interface JSFL {
+
+interface JSFL {
     init: (...args: any[]) => void;
     [index: string]: any;
-  }
-  
-  /**
-   * Creates a JSFL file from a JSFL object
-   * @param jsfl A valid JSFL object
-   * @param fileName Path to output JSFL file location
-   * @param initParams Parameters to pass to JSFL init function
-   * @param callback Callback
-   */
-  function createJSFL(jsfl: JSFL, fileName: string, initParams: Array<any>, callback: (err: NodeJS.ErrnoException) => void): void;
-  
-  /**
-   * Deletes a JSFL file
-   * @param fileName Path to JSFL file to delete
-   * @param callback Callback
-   */
-  function deleteJSFL(fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
-  
-  /**
-   * Runs a JSFL file
-   * @param flashLocation Path to Flash executable
-   * @param fileName Path to JSFL file to run
-   * @param callback Callback
-   */
-  function runJSFL(flashLocation:string, fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
-}
\ No newline at end of file
+}
+
+/**
+ * Creates a JSFL file from a JSFL object
+ * @param jsfl A valid JSFL object
+ * @param fileName Path to output JSFL file location
+ * @param initParams Parameters to pass to JSFL init function
+ * @param callback Callback
+ */
+declare function createJSFL(jsfl: JSFL, fileName: string, initParams: Array<any>, callback: (err: NodeJS.ErrnoException) => void): void;
+
+/**
+ * Deletes a JSFL file
+ * @param fileName Path to JSFL file to delete
+ * @param callback Callback
+ */
+declare function deleteJSFL(fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
+
+/**
+ * Runs a JSFL file
+ * @param flashLocation Path to Flash executable
+ * @param fileName Path to JSFL file to run
+ * @param callback Callback
+ */
+declare function runJSFL(flashLocation: string, fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
diff --git a/node-mysql-wrapper/node-mysql-wrapper.d.ts b/node-mysql-wrapper/node-mysql-wrapper.d.ts
index 2eb489f079..a94593886a 100644
--- a/node-mysql-wrapper/node-mysql-wrapper.d.ts
+++ b/node-mysql-wrapper/node-mysql-wrapper.d.ts
@@ -8,823 +8,822 @@
 ///<reference path="./my-meteor.d.ts" />
 
 
-declare module "node-mysql-wrapper" {
-    import * as Mysql from 'mysql';
-    import * as Promise from 'bluebird';
-    import {EventEmitter} from 'events';
 
-    var EQUAL_TO_PROPERTY_SYMBOL: string;
-    var TABLE_RULES_PROPERTY: string;
+import * as Mysql from 'mysql';
+import * as Promise from 'bluebird';
+import {EventEmitter} from 'events';
 
-    type DeleteAnswer = {
-        affectedRows: number;
-        table: string;
-    };
+declare var EQUAL_TO_PROPERTY_SYMBOL: string;
+declare var TABLE_RULES_PROPERTY: string;
 
-    type RawRules = {
-        table: string,
-        begin: string,
-        orderBy: string,
-        orderByDesc: string,
-        groupBy: string,
-        limit: number, // limit = limitStart  =0 and limitEnd = limit.
-        limitStart: number,
-        limitEnd: number,
-        end: string
+type DeleteAnswer = {
+    affectedRows: number;
+    table: string;
+};
 
-    };
+type RawRules = {
+    table: string,
+    begin: string,
+    orderBy: string,
+    orderByDesc: string,
+    groupBy: string,
+    limit: number, // limit = limitStart  =0 and limitEnd = limit.
+    limitStart: number,
+    limitEnd: number,
+    end: string
 
-    type TableToSearchPart = { tableName: string, propertyName: string };
+};
 
-    type PropertyChangedCallback = (args: PropertyChangedArgs) => any;
+type TableToSearchPart = { tableName: string, propertyName: string };
 
-    interface Map<T> {
-        [index: string]: T;
-    }
+type PropertyChangedCallback = (args: PropertyChangedArgs) => any;
 
-    interface IQuery<T> {
-        _table: Table<T>;
-        execute(rawCriteria: any, callback?: (_results: any) => any): Promise<any>;
-    }
-
-    interface IQueryConstructor<T> {
-        new (_table: Table<T>): IQuery<T>;
-    }
-
-
-    class Helper {
-        /** 
-         * Callback like forEach
-         * @name valueCallback
-         * @function
-         * @param {T} the value of the object's key 
-         * @returnTye {U}
-         * @return {U}
-        */
-        
-        /**
-         * Callback like forEach
-         * @name keyCallback
-         * @function
-         * @param {string} the name of the object's key 
-         * @returnTye {U}
-         * @return {U}
-        */
-
-        constructor();
-        
-        /**
-         * Create and return a copy of an object.
-         * @param {T} object the object you want to copy.
-         * @returnType {T}
-         * @return {T}
-         */
-        static copyObject<T>(object: T): T;
-        
-        /**
-         * Converts any_string to anyString and returns it.
-         * @param {string} columnKey the string you want to convert.
-         * @returnType {string}
-         * @return {string}
-         */
-        static toObjectProperty(columnKey: string): string;
-        
-        /**
-         * Converts anyString to any_string and returns it.
-         * @param {string} objectKey the string you want to convert.
-         * @returnType {string}
-         * @return {string}
-         */
-        static toRowProperty(objectKey: string): string;
-    
-        /**
-         * Iterate object's keys and return their values to the callback.
-         * @param {<T>} map the object.
-         * @param {valueCallback}
-         * @returnType {U}
-         * @return {U}
-         */
-        static forEachValue<T, U>(map: T, callback: (value: T) => U): U;
-
-        /**
-        * Iterate object's keys and return their names to the callback.
-        * @param {Map<T>} map the object.
-        * @param {keyCallback}
-        * @returnType {U}
-        * @return {U}
-        */
-
-        static forEachKey<T, U>(map: Map<T>, callback: (key: string) => U): U;
-        
-        /**
-         * Checks if anything is a function.
-         * @param {functionToCheck} the object or function to pass
-         * @return boolean
-         */
-        static isFunction(functionToCheck: any): boolean;
-        
-        /**
-         * Checks if an object has 'tableRules' property.
-         * @param {obj} the object to pass
-         * @return boolean
-         */
-        static hasRules(obj: any): boolean;
-    }
-
-
-    interface ICriteriaParts {
-        rawCriteriaObject: any;
-        tables: TableToSearchPart[];
-        noDatabaseProperties: string[];
-        whereClause: string;
-
-        selectFromClause<T>(_table: Table<T>): string;
-
-    }
-
-
-
-    class CriteriaParts implements ICriteriaParts {
-        
-        /**
-         * The raw format of the criteria eg: {yearsOld:22}.
-         */
-        rawCriteriaObject: any;
-        
-        /**
-         * Which tables to search after the find method of the proto table finish.
-         */
-        tables: TableToSearchPart[];
-        
-        /**
-         * The properties of the criteria which don't belong to the database's table.
-         */
-        noDatabaseProperties: string[];
-        
-        /**
-         * The converted/exported where clause. 
-         */
-        whereClause: string;
-
-        constructor(rawCriteriaObject: any, tables: TableToSearchPart[], noDatabaseProperties: string[], whereClause: string);
-
-        selectFromClause<T>(_table: Table<T>): string;
-    }
-
-    class CriteriaDivider<T> {
-        private _table;
-        constructor(table: Table<T>);
-        
-        /**
-         * Builds the criteria raw object to Criteria object.
-         * @param {any} rawCriteriaObject the criteria at raw format you pass eg: {yearsOld:18}.
-         * @returnType {Criteria}
-         * @return {Criteria}
-         */
-        build(rawCriteriaObject: any): CriteriaParts;
-    }
-
-    class SelectQueryRules {
-        private lastPropertyClauseName: string;
-        manuallyEndClause: string;
-        manuallyBeginClause: string;
-        exceptColumns: string[];
-        orderByColumn: string;
-        orderByDescColumn: string;
-        groupByColumn: string;
-        limitStart: number;
-        limitEnd: number;
-        public tableName: string; //auto den benei oute sto last, oute sto from.
-        static build(): SelectQueryRules;
-        private last(propertyClauseName);
-        except(...columns: string[]): SelectQueryRules;
-        
-        /**
-         * Same as .except(...columns)
-         */
-        exclude(...columns: string[]): SelectQueryRules;
-
-        orderBy(columnKey: string, descending?: boolean): SelectQueryRules;
-        groupBy(columnKey: string): SelectQueryRules;
-        limit(limitRowsOrStart: number, limitEnd?: number): SelectQueryRules;
-        appendToBegin(manualAfterWhereString: string): SelectQueryRules;
-        appendToEnd(manualAfterWhereString: string): SelectQueryRules;
-        append(appendToCurrent: string): SelectQueryRules;
-        clearOrderBy(): SelectQueryRules;
-        clearGroupBy(): SelectQueryRules;
-        clearLimit(): SelectQueryRules;
-        clearEndClause(): SelectQueryRules;
-        clearBeginClause(): SelectQueryRules;
-        clear(): SelectQueryRules;
-        from(parentRule: SelectQueryRules): SelectQueryRules;
-        isEmpty(): boolean;
-        toString(): string;
-        toRawObject(): RawRules;
-        static toString(rules: SelectQueryRules): string;
-        static toRawObject(rules: SelectQueryRules): RawRules;
-        static fromRawObject(obj: RawRules): SelectQueryRules;
-    }
-
-    class CriteriaBuilder<T>{
-
-        private rawCriteria: any;
-        private primaryTable: Table<T>;
-        private parentBuilder: CriteriaBuilder<any>;
-
-        constructor(primaryTable: Table<T>); //to arxiko apo to Table.ts 9a benei
-        constructor(primaryTable: Table<T>, tableName: string, parentBuilder: CriteriaBuilder<any>);// auta 9a benoun apo to parent select query.
-        constructor(primaryTable: Table<T>, tablePropertyName?: string, parentBuilder?: CriteriaBuilder<any>);
-
-        except(...columns: string[]): CriteriaBuilder<T>;
-        
-        /**
-	    * Same as .except(...columns)
-	    */
-        exclude(...columns: string[]): CriteriaBuilder<T>;
-
-        where(key: string, value: any): CriteriaBuilder<T>;
-
-        private createRulesIfNotExists(): void;
-
-        orderBy(column: string, desceding?: boolean): CriteriaBuilder<T>;
-
-        limit(start: number, end?: number): CriteriaBuilder<T>;
-
-        join(realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
-
-        joinAs(tableNameProperty: string, realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
-
-        at(tableNameProperty: string): CriteriaBuilder<T>;
-
-        parent(): CriteriaBuilder<T>;
-
-        original(): CriteriaBuilder<T>;
-        
-        /**
-         * Auto kanei kuklous mexri na paei sto primary table kai ekei na epistrepsei to sunoliko raw criteria gia execute i kati allo.
-         */
-        build(): any;
-
-        static from<T>(table: Table<T>): CriteriaBuilder<T>
-
-    }
-
-    class SelectQuery<T> implements IQuery<T> { // T for Table's result type.
-       
-        _table: Table<T>
-        constructor(_table: Table<T>);
-
-        private parseQueryResult(result: any, criteria: ICriteriaParts): Promise<any>;
-
-        /**
-         * Executes the select and returns the Promise.
-         */
-        promise(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
-
-        /**
-         * Exactly the same thing as promise().
-         * Executes the select and returns the Promise.
-        */
-        execute(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
-    }
-
-    class SaveQuery<T> implements IQuery<T> {
-        _table: Table<T>
-        constructor(_table: Table<T>);
-        execute(criteriaRawJsObject: any, callback?: (_result: T | any) => any): Promise<T | any>;
-    }
-
-    class DeleteQuery<T> implements IQuery<T>{
-        _table: Table<T>
-        constructor(_table: Table<T>);
-        execute(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
-    }
-
-
-    class PropertyChangedArgs {
-        propertyName: string;
-        oldValue: any;
-        constructor(propertyName: string, oldValue: any);
-    }
-
-    class ObservableObject {
-
-        /** Property names that your row couldn't have:
-         * "propertyChangedListeners", "notifyPropertyChanged", "onPropertyChanged", "toJSON", "makeObservable", "_forget"
-         */
-        static RESERVED_PROPERTY_NAMES: string[];
-
-        private propertyChangedListeners: PropertyChangedCallback[];
-        
-        /** Make the obj observable. Used in constructor or extend this class and use it. */
-        private makeObservable(obj: any): void;
-
-        constructor();
-        constructor(obj?: any);
-
-        /**Add a listener/observer to watch for changes in this object's properties */
-        onPropertyChanged(listener: PropertyChangedCallback): void;
-        
-        /** If developer wants manualy notify for property changed */
-        notifyPropertyChanged(propertyName: string, oldValue: any): void;
-
-        /**Remove property changed listeners  */
-        _forget(): void;
-
-        toJSON(...excludeProperties: string[]): any;
-
-    }
-
-    enum CollectionChangedAction {
-        INSERT, DELETE, RESET//for now I will use only add, remove and reset . replace and move is for future., REPLACE, MOVE
-    }
-
-    class CollectionChangedEventArgs<T> {
-        action: CollectionChangedAction;
-        oldItems: (T | (T & ObservableObject))[];
-        newItems: (T | (T & ObservableObject))[];
-        oldStartingIndex: number;
-        newStartingIndex: number;
-
-        constructor(action: CollectionChangedAction, oldItems?: (T | (T & ObservableObject))[], newItems?: (T | (T & ObservableObject))[], oldStartingIndex?: number, newStartingIndex?: number);
-    }
-
-
-    class BaseCollection<T> {//T=result type of Table
-        private list: (T | (T & ObservableObject))[];
-        listeners: ((eventArgs: CollectionChangedEventArgs<T>) => void)[];
-        constructor(table: Table<T>);
-        length: number;
-        items: (T | (T & ObservableObject))[];
-        indexOf(item: T | string | number): number;
-        findItem(itemId: string | number): T;
-        getItem(index: number): T;
-        getItemObservable(index: number): T & ObservableObject;
-        addItem(...items: (T | (T & ObservableObject))[]): (T | (T & ObservableObject));
-        removeItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
-        removeItemById(id: number | string): BaseCollection<T>;
-        forgetItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
-        reset(): BaseCollection<T>;
-        notifyCollectionChanged(evtArgs: CollectionChangedEventArgs<T>): void;
-        onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
-    }
-
-    class ObservableCollection<T> { //auti i klasi 9a xrisimopoieite ws Collection me kapoies paralages mesa sto index.ts.
-        local: BaseCollection<T>;
-        private _items: (T & ObservableObject)[];
-
-        constructor(table: Table<T>, fetchAllFromDatabase?: boolean, callbackWhenReady?: Function);
-
-        items: (T & ObservableObject)[];
-
-        onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
-
-        startListeningToDatabase(): void;
-
-        find(criteriaRawJsObject?: any, callback?: (_results: T[]) => any): Promise<T[]>;
-
-        findOne(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
-
-        findById(id: number | string, callback?: (result: T) => any): Promise<T>;
-
-        findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
-    
-        /**
-         * .insert() and .update() do the same thing:  .save();
-         */
-        insert(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
-
-        update(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
-
-        save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
-
-        remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
-	
-        /**
-         * same thing as .remove();
-         */
-        delete(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
-
-
-    }
-
-    class MeteorCollection<T> {
-        private collection: Mongo.Collection<T>;
-        protected table: Table<T>;
-
-        constructor(table: Table<T>, name?: string);
-
-        startListeningToDatabase(): void;
-
-        rawCollection: Mongo.Collection<T>;
-
-        fill(criteriaRawJsObject: any): void;
-
-        fillAll(): void;
-
-        fillOne(criteriaRawJsObject: any): void;
-    
-        //ONLY MONGO/METEOR COLLECTION METHODS START
-        allow(options: {
-            insert?: (userId: string, doc: T) => boolean;
-            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
-            remove?: (userId: string, doc: T) => boolean;
-            fetch?: string[];
-            transform?: Function;
-        }): boolean;
-
-        deny(options: {
-            insert?: (userId: string, doc: T) => boolean;
-            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
-            remove?: (userId: string, doc: T) => boolean;
-            fetch?: string[];
-            transform?: Function;
-        }): boolean;
-
-        find(selector?: any, options?: {
-            sort?: any;
-            skip?: number;
-            limit?: number;
-            fields?: any;
-            reactive?: boolean;
-            transform?: Function;
-        }): Mongo.Cursor<T>;
-
-        findOne(selector?: any, options?: {
-            sort?: any;
-            skip?: number;
-            fields?: any;
-            reactive?: boolean;
-            transform?: Function;
-        }): T;
-    
-        //ONLY MONGO/METEOR COLLECTION METHODS FINISH.
-
-    }
-
-
-    class Connection extends EventEmitter {
-        
-        /**
-         * The real database connection socket.
-         */
-        connection: Mysql.IConnection;
-        
-        /**
-         * Collection of the supported event types for the tables.
-         */
-        eventTypes: string[];
-        
-        /**
-         * Force to fetch ONLY these Database table names {array of string}.  
-         */
-        tableNamesToUseOnly: any[];
-        
-        /**
-         * All tables {MysqlTable} inside this connection's database.
-         */
-        tables: Table<any>[];
-
-        constructor(connection: string | Mysql.IConnection | Mysql.IConnectionConfig);
-        
-        /**
-         * Creates the MysqlConnection from the connection url or the real connection object.
-         * @param {string | Mysql.IConnection |  Mysql.IConnectionConfig} connection the connection url or the real connection object.
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        create(connection: string | Mysql.IConnection | Mysql.IConnectionConfig): void;
-        
-        /**
-         * Attach a real connection.
-         * @param {Mysql.IConnection} connection the real connection object.
-         * @returnType {nothing}
-         * @return {nothing} 
-         */
-        attach(connection: Mysql.IConnection): void;
-        
-        /**
-         * Close the entire real connection and remove all event's listeners (if exist).
-         * @param {function} callback If error occurs when closing the connection, this callback has the responsibility to catch it.
-         * @returnType {nothing}
-         * @return {nothing} 
-         */
-        end(callback?: (error: any) => void): void;
-        
-        /**
-         * Close the entire real connection and remove all event's listeners (if exist).
-         * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
-         */
-        destroy(): void;
-        
-        /**
-         * Clear all binary logs from the whole database.
-         * When finish returns a promise, use it with .then(function(){});
-         * @return Promise
-         */
-        clearBinaryLogs(): Promise<void>;
-        
-        /**
-         * Link the real connection with this MysqlConnection object.
-         * @param {function} readyCallback when the link operation is done this callback is executed.
-         * @returnType {Promise}
-         * @return {Promise}
-         */
-        link(readyCallback?: () => void): Promise<void>;
-        
-        /**
-         * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
-         * @param {Array} tables the array of the tables  {string}
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        useOnly(...tables: any[]): void;
-        
-        /**
-         * This method has the resposibility of fetching the correct tables from the database ( table = columns' names, primary key name).
-         * @returnType {Promise}
-         * @return {Promise}
-         */
-        fetchDatabaseInformation(): Promise<void>;
-        
-        /**
-         * Escape the query column's value  and return it.
-         * @param {string} val the value which will be escaped. 
-         * @returnType {string}
-         * @return {string}
-         */
-        escape(val: string): string;
-        
-        /**
-         * Call when must notify the Database events, SAVE(INSERT,UPDATE), REMOVE(DELETE).
-         * @param {string} tableWhichCalled the table name which event is coming from.
-         * @param {string} queryStr the full parsed query string which used to determinate the type of event to notify.
-         * @param {any[]} rawRows the raw rows results (results before a method parse/edit/export them as objects), these are passing to the watch listener(s).
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        notice(tableWhichCalled: string, queryStr: string, rawRows: any[]): void;
-        
-        /**
-         * Adds an event listener/watcher on a table for a 'database event'.
-         * @param {string} tableName the table name which you want to add the event listener.
-         * @param {string or string[]} evtType the event(s) type you want to watch, one of these(string) or an array of them(string[]): ["INSERT", "UPDATE", "REMOVE", "SAVE"].
-         * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawRows (results after query executed and before parsed to object(s)). 
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        watch(tableName: string, evtType: any, callback: (rawRows: any[]) => void): void;
-        
-        /**
-         * Removes an event listener/watcher from a table for a specific event type.
-         * @param {string} tableName the table name which you want to remove the event listener. 
-         * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
-         * @param {function} callbackToRemove the callback that you were used for watch this event type.
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        unwatch(tableName: string, evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
-        
-        /**
-         * Executes a database query.
-         * @param {string} queryStr the query text/string to be executed.
-         * @param {function} callback the function will be called and fill the one and only parameter when an errors occurs.
-         * @param {any[]} queryArguments (optional) the query arguments you want to pass into query. ['arg1','arg2']...
-         * @returnType {nothing}
-         * @return {nothing} 
-         */
-        query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
-        
-        /**
-         * Returns a MysqlTable object from the database factory. (Note: this method doesn't create anything, just finds and returns the correct table, you don't have to create anything at all. Tables are fetched by the library itself.)
-         * If you are using typescript you can pass a class (generic<T>) in order to use the auto completion assistance on table's results methods(find,findById,findAll,save,remove,safeRemove). 
-         * @param {string} tableName the table name which you want to get, on the form of: 'anyDatabaseTable' OR 'any_database_table' (possible your real table name into your database).
-         * @returnType {MysqlTable}
-         * @return {MysqlTable}
-         */
-        table<T>(tableName: string): Table<T>;
-    }
-
-    class Table<T>  {
-        /** Private keywords here are useless but I put them. 
-         * If the developer wants to see the properties of the Table class, he/she just comes here.
-        */
-
-        private _name: string;
-        private _connection: Connection;
-        private _columns: string[];
-        private _primaryKey: string;
-        private _criteriaDivider: CriteriaDivider<T>;
-        private _rules: SelectQueryRules;
-        private _selectQuery: SelectQuery<T>
-        private _saveQuery: SaveQuery<T>;
-        private _deleteQuery: DeleteQuery<T>;
-        constructor(tableName: string, connection: Connection);
-
-
-      
-        /**
-         * An array of all columns' names inside this table.
-         */
-        columns: string[];
-        
-        /**
-         * The name of the primary key column which this table is using.
-         */
-        primaryKey: string;
-        
-        /**
-         * The MysqlConnection object which this MysqlTable belongs. 
-         */
-        connection: Connection;
-        
-        /**
-         * The real database name of the table. Autofilled by library. 
-         */
-        name: string;
-        
-        /**
-         * Set of the query rules that will be applied after the 'where clause' on each select query executed by this table. 
-         * @return {SelectQueryRules}
-         */
-        rules: SelectQueryRules;
-        
-        /**
-         * Returns this table's criteria divider class.
-         * @return {CriteriaDivider}
-         */
-        criteriaDivider: CriteriaDivider<T>;
-        
-        /**
-         * Returns new Criteria Builder each time.
-         * Helps you  to make criteria raw js objects ready to use in find,remove and save methods.
-         * @return {CriteriaBuilder}
-         */
-        criteria: CriteriaBuilder<T>;
-        
-        /**
-        * Adds or turn on an event listener/watcher on a table for a 'database event'.
-        * @param {string} evtType the event type you want to watch, one of these: ["INSERT", "UPDATE", "REMOVE", "SAVE"].
-        * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawResults (results after query executed and before exports to object(s)). 
-        * @returnType {nothing}
-        * @return {nothing}
-        */
-        on(evtType: string, callback: (rawResults: any[]) => void): void;
-            
-        /**
-         * Removes or turn off an event listener/watcher from a table for a specific event type.
-         * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
-         * @param {function} callbackToRemove the callback that you were used for watch this event type.
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        off(evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
-         
-        /**
-         * Use it when you want to check if extended function is exists here.
-         * @param {string} extendedFunctionName the name of the function you want to check.
-         * @returnType {boolean}
-         * @return {boolean}
-         */
-        has(extendedFunctionName: string): boolean;
-        
-        /**
-         * Extends this table's capabilities with a function.
-         * @param {string} functionName the function name you want to use, this is used when you want to call this function later.
-         * @param {function} theFunction the function with any optional parameters you want to pass along.
-         * @returnType {nothing}
-         * @return {nothing} 
-         */
-        extend(functionName: string, theFunction: (...args: any[]) => any): void;
-        
-        /**
-         * Converts and returns an object from this form: { a_property:'dsda', other_property:something, any_property_name:true } to { aProperty:..., otherProperty...,anyPropertyName...}
-         * @param {any} row the raw row object.
-         * @returnType {any}
-         * @return {any}
-         */
-        objectFromRow(row: any): any;
-           
-        /**
-         * Converts and returns an object from this form: { aProperty:'dsda', otherProperty:something, anyPropertyName:true } to { a_property:..., other_property...,any_property_name...}
-         * @param {any} row the raw row object.
-         * @returnType {any}
-         * @return {any}
-         */
-        rowFromObject(obj: any): any;
-        
-        /**
-         * Returns and array of [columns[],values[]]
-         * @param {any} jsObject the raw row object.
-         * @returnType {array}
-         * @return {array}
-         */
-        getRowAsArray(jsObject: any): Array<any>;
-        
-        /**
-         * Returns the primary key's value from an object.
-         * @param {any} jsObject the object which you want to find and return the value of the primary key.
-         * @returnType {number | string}
-         * @return {number | string}
-         */
-        getPrimaryKeyValue(jsObject: any): number | string;
-        
-        /**
-         * 
-         */
-        find(criteriaRawJsObject: any): Promise<T[]>; // only criteria 
-        find(criteriaRawJsObject: any, callback: ((_results: T[]) => any)): Promise<T[]>; // criteria and callback
-        find(criteriaRawJsObject: any, callback?: (_results: T[]) => any): Promise<T[]>;
-
-        findSingle(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
-
-        findById(id: number | string): Promise<T>; // without callback
-        findById(id: number | string, callback?: (result: T) => any): Promise<T>;
-
-        findAll(): Promise<T[]>; // only criteria and promise
-        findAll(tableRules: RawRules): Promise<T[]> // only rules and promise
-        findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
-
-
-        save(criteriaRawJsObject: any): Promise<any>; //without callback
-        save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<any>;
-
-        remove(id: number | string): Promise<DeleteAnswer>; // ID without callback
-        remove(criteriaRawObject: any): Promise<DeleteAnswer>; // criteria obj without callback
-        remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
-
-    }
-
-    class MeteorTable<T>{
-        public table: Table<T>;
-        constructor(table: Table<T>);
-
-        insert(doc: T, callback?: (_result: T) => void): T;
-
-        remove(selector: any, callback?: () => DeleteAnswer): DeleteAnswer;
-
-        update(selector: any, modifier: any, options?: {
-            multi?: boolean;
-            upsert?: boolean;
-        }, callback?: (result: T) => any): number;
-
-        collection(nameOfCollection?: string, fillWithCriteria?: any): Mongo.Collection<T>;
-    }
-
-    class Database {
-        connection: Connection;
-        isReady: boolean;
-        readyListenerCallbacks: Function[];
-        constructor(connection?: Connection);
-        static when(..._promises: Promise<any>[]): Promise<any>;
-        setConnection(connection: Connection): void;
-            
-        /**
-         * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
-         * @param {Array} tables the array of the tables  {string}
-         * @returnType {nothing}
-         * @return {nothing}
-         */
-        useOnly(...useTables: any[]): void;
-
-        has(tableName: string, functionName?: string): boolean;
-        ready(callback?: () => void): void;
-        table<T>(tableName: string): Table<T>;
-        noticeReady(): void;
-        removeReadyListener(callback: () => void): void;
-        query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
-        
-        /**
-        * Close the entire real connection and remove all event's listeners (if exist).
-        * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
-        */
-        destroy(): void;
-        
-        /**
-       * Close the entire real connection and remove all event's listeners (if exist).
-       * @param {function} maybeAcallbackError If error occurs when closing the connection, this callback has the responsibility to catch it.
-       * @returnType {nothing}
-       * @return {nothing} 
-       */
-        end(maybeAcallbackError: (err: any) => void): void;
-
-        newTableRules(tableName: string): SelectQueryRules;
-
-        buildRules(): SelectQueryRules;
-        buildRules(parentRules?: SelectQueryRules): SelectQueryRules;
-
-        collection<T>(tableName: string, callbackWhenReady?: Function): ObservableCollection<T>;
-
-        /**Meteor js feature only: Returns a table which it's collection can make synchronization with the client */
-        meteorTable<T>(tableName: string): MeteorTable<T>;
-    }
-
-    function wrap(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
-    
-    /** For meteor js only
-     * Same as wrap but it's sync mode - autoconnect to the database without need to use database.ready(callback).
-     */
-    function connect(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
-
-    function observable<T>(obj: T): T & ObservableObject;
+interface Map<T> {
+    [index: string]: T;
 }
+
+interface IQuery<T> {
+    _table: Table<T>;
+    execute(rawCriteria: any, callback?: (_results: any) => any): Promise<any>;
+}
+
+interface IQueryConstructor<T> {
+    new (_table: Table<T>): IQuery<T>;
+}
+
+
+declare class Helper {
+    /** 
+     * Callback like forEach
+     * @name valueCallback
+     * @function
+     * @param {T} the value of the object's key 
+     * @returnTye {U}
+     * @return {U}
+    */
+        
+    /**
+     * CallbaforEach
+     * @name keyCallback
+     * @function
+     * @param {string} the name of the object's key 
+     * @returnTye {U}
+     * @return {U}
+    */
+
+    constructor();
+
+    /**
+     * Create and return a copy of an object.
+     * @param {T} object the object you want to copy.
+     * @returnType {T}
+     * @return {T}
+     */
+    static copyObject<T>(object: T): T;
+
+    /**
+     * Converts any_string to anyString and returns it.
+     * @param {string} columnKey the string you want to convert.
+     * @returnType {string}
+     * @return {string}
+     */
+    static toObjectProperty(columnKey: string): string;
+
+    /**
+     * Converts anyString to any_string and returns it.
+     * @param {string} objectKey the string you want to convert.
+     * @returnType {string}
+     * @return {string}
+     */
+    static toRowProperty(objectKey: string): string;
+
+    /**
+     * Iterate object's keys and return their values to the callback.
+     * @param {<T>} map the object.
+     * @param {valueCallback}
+     * @returnType {U}
+     * @return {U}
+     */
+    static forEachValue<T, U>(map: T, callback: (value: T) => U): U;
+
+    /**
+    * Iterate object's keys and return their names to the callback.
+    * @param {Map<T>} map the object.
+    * @param {keyCallback}
+    * @returnType {U}
+    * @return {U}
+    */
+
+    static forEachKey<T, U>(map: Map<T>, callback: (key: string) => U): U;
+
+    /**
+     * Checks if anything is a function.
+     * @param {functionToCheck} the object or function to pass
+     * @return boolean
+     */
+    static isFunction(functionToCheck: any): boolean;
+
+    /**
+     * Checks if an object has 'tableRules' property.
+     * @param {obj} the object to pass
+     * @return boolean
+     */
+    static hasRules(obj: any): boolean;
+}
+
+
+interface ICriteriaParts {
+    rawCriteriaObject: any;
+    tables: TableToSearchPart[];
+    noDatabaseProperties: string[];
+    whereClause: string;
+
+    selectFromClause<T>(_table: Table<T>): string;
+
+}
+
+
+
+declare class CriteriaParts implements ICriteriaParts {
+
+    /**
+     * The raw format of the criteria eg: {yearsOld:22}.
+     */
+    rawCriteriaObject: any;
+
+    /**
+     * Which tables to search after the find method of the proto table finish.
+     */
+    tables: TableToSearchPart[];
+
+    /**
+     * The properties of the criteria which don't belong to the database's table.
+     */
+    noDatabaseProperties: string[];
+
+    /**
+     * The converted/exported where clause. 
+     */
+    whereClause: string;
+
+    constructor(rawCriteriaObject: any, tables: TableToSearchPart[], noDatabaseProperties: string[], whereClause: string);
+
+    selectFromClause<T>(_table: Table<T>): string;
+}
+
+declare class CriteriaDivider<T> {
+    private _table;
+    constructor(table: Table<T>);
+
+    /**
+     * Builds the criteria raw object to Criteria object.
+     * @param {any} rawCriteriaObject the criteria at raw format you pass eg: {yearsOld:18}.
+     * @returnType {Criteria}
+     * @return {Criteria}
+     */
+    build(rawCriteriaObject: any): CriteriaParts;
+}
+
+declare class SelectQueryRules {
+    private lastPropertyClauseName: string;
+    manuallyEndClause: string;
+    manuallyBeginClause: string;
+    exceptColumns: string[];
+    orderByColumn: string;
+    orderByDescColumn: string;
+    groupByColumn: string;
+    limitStart: number;
+    limitEnd: number;
+    public tableName: string; //auto den benei oute sto last, oute sto from.
+    static build(): SelectQueryRules;
+    private last(propertyClauseName);
+    except(...columns: string[]): SelectQueryRules;
+
+    /**
+     * Same as .except(...columns)
+     */
+    exclude(...columns: string[]): SelectQueryRules;
+
+    orderBy(columnKey: string, descending?: boolean): SelectQueryRules;
+    groupBy(columnKey: string): SelectQueryRules;
+    limit(limitRowsOrStart: number, limitEnd?: number): SelectQueryRules;
+    appendToBegin(manualAfterWhereString: string): SelectQueryRules;
+    appendToEnd(manualAfterWhereString: string): SelectQueryRules;
+    append(appendToCurrent: string): SelectQueryRules;
+    clearOrderBy(): SelectQueryRules;
+    clearGroupBy(): SelectQueryRules;
+    clearLimit(): SelectQueryRules;
+    clearEndClause(): SelectQueryRules;
+    clearBeginClause(): SelectQueryRules;
+    clear(): SelectQueryRules;
+    from(parentRule: SelectQueryRules): SelectQueryRules;
+    isEmpty(): boolean;
+    toString(): string;
+    toRawObject(): RawRules;
+    static toString(rules: SelectQueryRules): string;
+    static toRawObject(rules: SelectQueryRules): RawRules;
+    static fromRawObject(obj: RawRules): SelectQueryRules;
+}
+
+declare class CriteriaBuilder<T>{
+
+    private rawCriteria: any;
+    private primaryTable: Table<T>;
+    private parentBuilder: CriteriaBuilder<any>;
+
+    constructor(primaryTable: Table<T>); //to arxiko apo to Table.ts 9a benei
+    constructor(primaryTable: Table<T>, tableName: string, parentBuilder: CriteriaBuilder<any>);// auta 9a benoun apo to parent select query.
+    constructor(primaryTable: Table<T>, tablePropertyName?: string, parentBuilder?: CriteriaBuilder<any>);
+
+    except(...columns: string[]): CriteriaBuilder<T>;
+
+    /**
+    * Same as .except(...columns)
+    */
+    exclude(...columns: string[]): CriteriaBuilder<T>;
+
+    where(key: string, value: any): CriteriaBuilder<T>;
+
+    private createRulesIfNotExists(): void;
+
+    orderBy(column: string, desceding?: boolean): CriteriaBuilder<T>;
+
+    limit(start: number, end?: number): CriteriaBuilder<T>;
+
+    join(realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
+
+    joinAs(tableNameProperty: string, realTableName: string, foreignColumnName: string): CriteriaBuilder<T>;
+
+    at(tableNameProperty: string): CriteriaBuilder<T>;
+
+    parent(): CriteriaBuilder<T>;
+
+    original(): CriteriaBuilder<T>;
+
+    /**
+     * Auto kanei kuklous mexri na paei sto primary table kai ekei na epistrepsei to sunoliko raw criteria gia execute i kati allo.
+     */
+    build(): any;
+
+    static from<T>(table: Table<T>): CriteriaBuilder<T>
+
+}
+
+declare class SelectQuery<T> implements IQuery<T> { // T for Table's result type.
+
+    _table: Table<T>
+    constructor(_table: Table<T>);
+
+    private parseQueryResult(result: any, criteria: ICriteriaParts): Promise<any>;
+
+    /**
+     * Executes the select and returns the Promise.
+     */
+    promise(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
+    /**
+     * Exactly the same thing as promise().
+     * Executes the select and returns the Promise.
+    */
+    execute(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
+}
+
+declare class SaveQuery<T> implements IQuery<T> {
+    _table: Table<T>
+    constructor(_table: Table<T>);
+    execute(criteriaRawJsObject: any, callback?: (_result: T | any) => any): Promise<T | any>;
+}
+
+declare class DeleteQuery<T> implements IQuery<T>{
+    _table: Table<T>
+    constructor(_table: Table<T>);
+    execute(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+}
+
+
+declare class PropertyChangedArgs {
+    propertyName: string;
+    oldValue: any;
+    constructor(propertyName: string, oldValue: any);
+}
+
+declare class ObservableObject {
+
+    /** Property names that your row couldn't have:
+     * "propertyChangedListeners", "notifyPropertyChanged", "onPropertyChanged", "toJSON", "makeObservable", "_forget"
+     */
+    static RESERVED_PROPERTY_NAMES: string[];
+
+    private propertyChangedListeners: PropertyChangedCallback[];
+
+    /** Make the obj observable. Used in constructor or extend this class and use it. */
+    private makeObservable(obj: any): void;
+
+    constructor();
+    constructor(obj?: any);
+
+    /**Add a listener/observer to watch for changes in this object's properties */
+    onPropertyChanged(listener: PropertyChangedCallback): void;
+
+    /** If developer wants manualy notify for property changed */
+    notifyPropertyChanged(propertyName: string, oldValue: any): void;
+
+    /**Remove property changed listeners  */
+    _forget(): void;
+
+    toJSON(...excludeProperties: string[]): any;
+
+}
+
+declare enum CollectionChangedAction {
+    INSERT, DELETE, RESET//for now I will use only add, remove and reset . replace and move is for future., REPLACE, MOVE
+}
+
+declare class CollectionChangedEventArgs<T> {
+    action: CollectionChangedAction;
+    oldItems: (T | (T & ObservableObject))[];
+    newItems: (T | (T & ObservableObject))[];
+    oldStartingIndex: number;
+    newStartingIndex: number;
+
+    constructor(action: CollectionChangedAction, oldItems?: (T | (T & ObservableObject))[], newItems?: (T | (T & ObservableObject))[], oldStartingIndex?: number, newStartingIndex?: number);
+}
+
+
+declare class BaseCollection<T> {//T=result type of Table
+    private list: (T | (T & ObservableObject))[];
+    listeners: ((eventArgs: CollectionChangedEventArgs<T>) => void)[];
+    constructor(table: Table<T>);
+    length: number;
+    items: (T | (T & ObservableObject))[];
+    indexOf(item: T | string | number): number;
+    findItem(itemId: string | number): T;
+    getItem(index: number): T;
+    getItemObservable(index: number): T & ObservableObject;
+    addItem(...items: (T | (T & ObservableObject))[]): (T | (T & ObservableObject));
+    removeItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
+    removeItemById(id: number | string): BaseCollection<T>;
+    forgetItem(...items: (T | (T & ObservableObject))[]): BaseCollection<T>;
+    reset(): BaseCollection<T>;
+    notifyCollectionChanged(evtArgs: CollectionChangedEventArgs<T>): void;
+    onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
+}
+
+declare class ObservableCollection<T> { //auti i klasi 9a xrisimopoieite ws Collection me kapoies paralages mesa sto index.ts.
+    local: BaseCollection<T>;
+    private _items: (T & ObservableObject)[];
+
+    constructor(table: Table<T>, fetchAllFromDatabase?: boolean, callbackWhenReady?: Function);
+
+    items: (T & ObservableObject)[];
+
+    onCollectionChanged(callback: (eventArgs: CollectionChangedEventArgs<T>) => void): void;
+
+    startListeningToDatabase(): void;
+
+    find(criteriaRawJsObject?: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
+    findOne(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
+
+    findById(id: number | string, callback?: (result: T) => any): Promise<T>;
+
+    findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
+
+    /**
+     * .insert() and .update() do the same thing:  .save();
+     */
+    insert(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+    update(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+    save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<T | any>;
+
+    remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+
+    /**
+     * same thing as .remove();
+     */
+    delete(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+
+
+}
+
+declare class MeteorCollection<T> {
+    private collection: Mongo.Collection<T>;
+    protected table: Table<T>;
+
+    constructor(table: Table<T>, name?: string);
+
+    startListeningToDatabase(): void;
+
+    rawCollection: Mongo.Collection<T>;
+
+    fill(criteriaRawJsObject: any): void;
+
+    fillAll(): void;
+
+    fillOne(criteriaRawJsObject: any): void;
+
+    //ONLY MONGO/METEOR COLLECTION METHODS START
+    allow(options: {
+        insert?: (userId: string, doc: T) => boolean;
+        update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+        remove?: (userId: string, doc: T) => boolean;
+        fetch?: string[];
+        transform?: Function;
+    }): boolean;
+
+    deny(options: {
+        insert?: (userId: string, doc: T) => boolean;
+        update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+        remove?: (userId: string, doc: T) => boolean;
+        fetch?: string[];
+        transform?: Function;
+    }): boolean;
+
+    find(selector?: any, options?: {
+        sort?: any;
+        skip?: number;
+        limit?: number;
+        fields?: any;
+        reactive?: boolean;
+        transform?: Function;
+    }): Mongo.Cursor<T>;
+
+    findOne(selector?: any, options?: {
+        sort?: any;
+        skip?: number;
+        fields?: any;
+        reactive?: boolean;
+        transform?: Function;
+    }): T;
+
+    //ONLY MONGO/METEOR COLLECTION METHODS FINISH.
+
+}
+
+
+declare class Connection extends EventEmitter {
+
+    /**
+     * The real database connection socket.
+     */
+    connection: Mysql.IConnection;
+
+    /**
+     * Collection of the supported event types for the tables.
+     */
+    eventTypes: string[];
+
+    /**
+     * Force to fetch ONLY these Database table names {array of string}.  
+     */
+    tableNamesToUseOnly: any[];
+
+    /**
+     * All tables {MysqlTable} inside this connection's database.
+     */
+    tables: Table<any>[];
+
+    constructor(connection: string | Mysql.IConnection | Mysql.IConnectionConfig);
+
+    /**
+     * Creates the MysqlConnection from the connection url or the real connection object.
+     * @param {string | Mysql.IConnection |  Mysql.IConnectionConfig} connection the connection url or the real connection object.
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    create(connection: string | Mysql.IConnection | Mysql.IConnectionConfig): void;
+
+    /**
+     * Attach a real connection.
+     * @param {Mysql.IConnection} connection the real connection object.
+     * @returnType {nothing}
+     * @return {nothing} 
+     */
+    attach(connection: Mysql.IConnection): void;
+
+    /**
+     * Close the entire real connection and remove all event's listeners (if exist).
+     * @param {function} callback If error occurs when closing the connection, this callback has the responsibility to catch it.
+     * @returnType {nothing}
+     * @return {nothing} 
+     */
+    end(callback?: (error: any) => void): void;
+
+    /**
+     * Close the entire real connection and remove all event's listeners (if exist).
+     * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
+     */
+    destroy(): void;
+
+    /**
+     * Clear all binary logs from the whole database.
+     * When finish returns a promise, use it with .then(function(){});
+     * @return Promise
+     */
+    clearBinaryLogs(): Promise<void>;
+
+    /**
+     * Link the real connection with this MysqlConnection object.
+     * @param {function} readyCallback when the link operation is done this callback is executed.
+     * @returnType {Promise}
+     * @return {Promise}
+     */
+    link(readyCallback?: () => void): Promise<void>;
+
+    /**
+     * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
+     * @param {Array} tables the array of the tables  {string}
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    useOnly(...tables: any[]): void;
+
+    /**
+     * This method has the resposibility of fetching the correct tables from the database ( table = columns' names, primary key name).
+     * @returnType {Promise}
+     * @return {Promise}
+     */
+    fetchDatabaseInformation(): Promise<void>;
+
+    /**
+     * Escape the query column's value  and return it.
+     * @param {string} val the value which will be escaped. 
+     * @returnType {string}
+     * @return {string}
+     */
+    escape(val: string): string;
+
+    /**
+     * Call when must notify the Database events, SAVE(INSERT,UPDATE), REMOVE(DELETE).
+     * @param {string} tableWhichCalled the table name which event is coming from.
+     * @param {string} queryStr the full parsed query string which used to determinate the type of event to notify.
+     * @param {any[]} rawRows the raw rows results (results before a method parse/edit/export them as objects), these are passing to the watch listener(s).
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    notice(tableWhichCalled: string, queryStr: string, rawRows: any[]): void;
+
+    /**
+     * Adds an event listener/watcher on a table for a 'database event'.
+     * @param {string} tableName the table name which you want to add the event listener.
+     * @param {string or string[]} evtType the event(s) type you want to watch, one of these(string) or an array of them(string[]): ["INSERT", "UPDATE", "REMOVE", "SAVE"].
+     * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawRows (results after query executed and before parsed to object(s)). 
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    watch(tableName: string, evtType: any, callback: (rawRows: any[]) => void): void;
+
+    /**
+     * Removes an event listener/watcher from a table for a specific event type.
+     * @param {string} tableName the table name which you want to remove the event listener. 
+     * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
+     * @param {function} callbackToRemove the callback that you were used for watch this event type.
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    unwatch(tableName: string, evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
+
+    /**
+     * Executes a database query.
+     * @param {string} queryStr the query text/string to be executed.
+     * @param {function} callback the function will be called and fill the one and only parameter when an errors occurs.
+     * @param {any[]} queryArguments (optional) the query arguments you want to pass into query. ['arg1','arg2']...
+     * @returnType {nothing}
+     * @return {nothing} 
+     */
+    query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
+
+    /**
+     * Returns a MysqlTable object from the database factory. (Note: this method doesn't create anything, just finds and returns the correct table, you don't have to create anything at all. Tables are fetched by the library itself.)
+     * If you are using typescript you can pass a class (generic<T>) in order to use the auto completion assistance on table's results methods(find,findById,findAll,save,remove,safeRemove). 
+     * @param {string} tableName the table name which you want to get, on the form of: 'anyDatabaseTable' OR 'any_database_table' (possible your real table name into your database).
+     * @returnType {MysqlTable}
+     * @return {MysqlTable}
+     */
+    table<T>(tableName: string): Table<T>;
+}
+
+declare class Table<T>  {
+    /** Private keywords here are useless but I put them. 
+     * If the developer wants to see the properties of the Table class, he/she just comes here.
+    */
+
+    private _name: string;
+    private _connection: Connection;
+    private _columns: string[];
+    private _primaryKey: string;
+    private _criteriaDivider: CriteriaDivider<T>;
+    private _rules: SelectQueryRules;
+    private _selectQuery: SelectQuery<T>
+    private _saveQuery: SaveQuery<T>;
+    private _deleteQuery: DeleteQuery<T>;
+    constructor(tableName: string, connection: Connection);
+
+
+
+    /**
+     * An array of all columns' names inside this table.
+     */
+    columns: string[];
+
+    /**
+     * The name of the primary key column which this table is using.
+     */
+    primaryKey: string;
+
+    /**
+     * The MysqlConnection object which this MysqlTable belongs. 
+     */
+    connection: Connection;
+
+    /**
+     * The real database name of the table. Autofilled by library. 
+     */
+    name: string;
+
+    /**
+     * Set of the query rules that will be applied after the 'where clause' on each select query executed by this table. 
+     * @return {SelectQueryRules}
+     */
+    rules: SelectQueryRules;
+
+    /**
+     * Returns this table's criteria divider class.
+     * @return {CriteriaDivider}
+     */
+    criteriaDivider: CriteriaDivider<T>;
+
+    /**
+     * Returns new Criteria Builder each time.
+     * Helps you  to make criteria raw js objects ready to use in find,remove and save methods.
+     * @return {CriteriaBuilder}
+     */
+    criteria: CriteriaBuilder<T>;
+
+    /**
+    * Adds or turn on an event listener/watcher on a table for a 'database event'.
+    * @param {string} evtType the event type you want to watch, one of these: ["INSERT", "UPDATE", "REMOVE", "SAVE"].
+    * @param {function} callback Callback which has one parameter(typeof any[]) which filled by the rawResults (results after query executed and before exports to object(s)). 
+    * @returnType {nothing}
+    * @return {nothing}
+    */
+    on(evtType: string, callback: (rawResults: any[]) => void): void;
+
+    /**
+     * Removes or turn off an event listener/watcher from a table for a specific event type.
+     * @param {string} evtType the Event type you want to remove, one of these: "INSERT", "UPDATE", "REMOVE", "SAVE".
+     * @param {function} callbackToRemove the callback that you were used for watch this event type.
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    off(evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
+
+    /**
+     * Use it when you want to check if extended function is exists here.
+     * @param {string} extendedFunctionName the name of the function you want to check.
+     * @returnType {boolean}
+     * @return {boolean}
+     */
+    has(extendedFunctionName: string): boolean;
+
+    /**
+     * Extends this table's capabilities with a function.
+     * @param {string} functionName the function name you want to use, this is used when you want to call this function later.
+     * @param {function} theFunction the function with any optional parameters you want to pass along.
+     * @returnType {nothing}
+     * @return {nothing} 
+     */
+    extend(functionName: string, theFunction: (...args: any[]) => any): void;
+
+    /**
+     * Converts and returns an object from this form: { a_property:'dsda', other_property:something, any_property_name:true } to { aProperty:..., otherProperty...,anyPropertyName...}
+     * @param {any} row the raw row object.
+     * @returnType {any}
+     * @return {any}
+     */
+    objectFromRow(row: any): any;
+
+    /**
+     * Converts and returns an object from this form: { aProperty:'dsda', otherProperty:something, anyPropertyName:true } to { a_property:..., other_property...,any_property_name...}
+     * @param {any} row the raw row object.
+     * @returnType {any}
+     * @return {any}
+     */
+    rowFromObject(obj: any): any;
+
+    /**
+     * Returns and array of [columns[],values[]]
+     * @param {any} jsObject the raw row object.
+     * @returnType {array}
+     * @return {array}
+     */
+    getRowAsArray(jsObject: any): Array<any>;
+
+    /**
+     * Returns the primary key's value from an object.
+     * @param {any} jsObject the object which you want to find and return the value of the primary key.
+     * @returnType {number | string}
+     * @return {number | string}
+     */
+    getPrimaryKeyValue(jsObject: any): number | string;
+
+    /**
+     * 
+     */
+    find(criteriaRawJsObject: any): Promise<T[]>; // only criteria 
+    find(criteriaRawJsObject: any, callback: ((_results: T[]) => any)): Promise<T[]>; // criteria and callback
+    find(criteriaRawJsObject: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
+    findSingle(criteriaRawJsObject: any, callback?: (_result: T) => any): Promise<T>;
+
+    findById(id: number | string): Promise<T>; // without callback
+    findById(id: number | string, callback?: (result: T) => any): Promise<T>;
+
+    findAll(): Promise<T[]>; // only criteria and promise
+    findAll(tableRules: RawRules): Promise<T[]> // only rules and promise
+    findAll(tableRules?: RawRules, callback?: (_results: T[]) => any): Promise<T[]>;
+
+
+    save(criteriaRawJsObject: any): Promise<any>; //without callback
+    save(criteriaRawJsObject: any, callback?: (_result: any) => any): Promise<any>;
+
+    remove(id: number | string): Promise<DeleteAnswer>; // ID without callback
+    remove(criteriaRawObject: any): Promise<DeleteAnswer>; // criteria obj without callback
+    remove(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+
+}
+
+declare class MeteorTable<T>{
+    public table: Table<T>;
+    constructor(table: Table<T>);
+
+    insert(doc: T, callback?: (_result: T) => void): T;
+
+    remove(selector: any, callback?: () => DeleteAnswer): DeleteAnswer;
+
+    update(selector: any, modifier: any, options?: {
+        multi?: boolean;
+        upsert?: boolean;
+    }, callback?: (result: T) => any): number;
+
+    collection(nameOfCollection?: string, fillWithCriteria?: any): Mongo.Collection<T>;
+}
+
+declare class Database {
+    connection: Connection;
+    isReady: boolean;
+    readyListenerCallbacks: Function[];
+    constructor(connection?: Connection);
+    static when(..._promises: Promise<any>[]): Promise<any>;
+    setConnection(connection: Connection): void;
+
+    /**
+     * Force to use/fetch information from only certain of database's tables, otherwise all database's tables information will be fetched.
+     * @param {Array} tables the array of the tables  {string}
+     * @returnType {nothing}
+     * @return {nothing}
+     */
+    useOnly(...useTables: any[]): void;
+
+    has(tableName: string, functionName?: string): boolean;
+    ready(callback?: () => void): void;
+    table<T>(tableName: string): Table<T>;
+    noticeReady(): void;
+    removeReadyListener(callback: () => void): void;
+    query(queryStr: string, callback: (err: Mysql.IError, results: any) => any, queryArguments?: any[]): void;
+
+    /**
+    * Close the entire real connection and remove all event's listeners (if exist).
+    * the difference from the 'end' is that this method doesn't care about errors so no callback passing here. 
+    */
+    destroy(): void;
+
+    /**
+   * Close the entire real connection and remove all event's listeners (if exist).
+   * @param {function} maybeAcallbackError If error occurs when closing the connection, this callback has the responsibility to catch it.
+   * @returnType {nothing}
+   * @return {nothing} 
+   */
+    end(maybeAcallbackError: (err: any) => void): void;
+
+    newTableRules(tableName: string): SelectQueryRules;
+
+    buildRules(): SelectQueryRules;
+    buildRules(parentRules?: SelectQueryRules): SelectQueryRules;
+
+    collection<T>(tableName: string, callbackWhenReady?: Function): ObservableCollection<T>;
+
+    /**Meteor js feature only: Returns a table which it's collection can make synchronization with the client */
+    meteorTable<T>(tableName: string): MeteorTable<T>;
+}
+
+declare function wrap(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
+
+/** For meteor js only
+ * Same as wrap but it's sync mode - autoconnect to the database without need to use database.ready(callback).
+ */
+declare function connect(mysqlUrlOrObjectOrMysqlAlreadyConnection: Mysql.IConnection | string, ...useTables: any[]): Database;
+
+declare function observable<T>(obj: T): T & ObservableObject;
diff --git a/node-persist/node-persist.d.ts b/node-persist/node-persist.d.ts
index c6c5378aef..867b545211 100644
--- a/node-persist/node-persist.d.ts
+++ b/node-persist/node-persist.d.ts
@@ -6,39 +6,38 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../q/Q.d.ts" />
 
-declare module "node-persist" {
-    type milliseconds = number;
-    namespace NodePersist {
-        export interface InitOptions {
-            dir?: string;
-            stringify?: (toSerialize: any)=>string;
-            parse?: (serialized: string)=>any;
-            encoding?: string;
-            logging?: boolean|Function;
-            continuous?: boolean;
-            interval?: milliseconds|boolean;
-            ttl?: milliseconds|boolean;
-        }
-        export function init(options?: InitOptions, callback?: Function): Q.Promise<any>;
-        export function initSync(options?: InitOptions): void;
-        export function getItem(key: string, callback?: (err: any, value: any)=>any): Q.Promise<any>;
-        export function getItemSync(key: string): any;
-        export function setItem(key: string, value: any, callback?: (err: any)=>any): Q.Promise<any>;
-        export function setItemSync(key: string, value: any): void;
-        export function removeItem(key: string, callback?: (err: any)=>any): Q.Promise<any>;
-        export function removeItemSync(key: string): void;
-        export function clear(callback?: (err: any)=>any): Q.Promise<any>;
-        export function clearSync(): void;
-        export function values(): Array<any>;
-        export function valuesWithKeyMatch(match: string): Array<any>;
-        export function keys(): Array<string>;
-        export function length(): number;
-        export function forEach(callback: (key: string, value: any)=>void): void;
 
-        export function persist(callback?: (err: any)=>any): Q.Promise<any>;
-        export function persistSync(): void;
-        export function persistKey(key: string, callback?: (err: any)=>any): Q.Promise<any>;
-        export function persistKeySync(key: string): void;
+type milliseconds = number;
+declare namespace NodePersist {
+    export interface InitOptions {
+        dir?: string;
+        stringify?: (toSerialize: any) => string;
+        parse?: (serialized: string) => any;
+        encoding?: string;
+        logging?: boolean | Function;
+        continuous?: boolean;
+        interval?: milliseconds | boolean;
+        ttl?: milliseconds | boolean;
     }
-    export = NodePersist;
+    export function init(options?: InitOptions, callback?: Function): Q.Promise<any>;
+    export function initSync(options?: InitOptions): void;
+    export function getItem(key: string, callback?: (err: any, value: any) => any): Q.Promise<any>;
+    export function getItemSync(key: string): any;
+    export function setItem(key: string, value: any, callback?: (err: any) => any): Q.Promise<any>;
+    export function setItemSync(key: string, value: any): void;
+    export function removeItem(key: string, callback?: (err: any) => any): Q.Promise<any>;
+    export function removeItemSync(key: string): void;
+    export function clear(callback?: (err: any) => any): Q.Promise<any>;
+    export function clearSync(): void;
+    export function values(): Array<any>;
+    export function valuesWithKeyMatch(match: string): Array<any>;
+    export function keys(): Array<string>;
+    export function length(): number;
+    export function forEach(callback: (key: string, value: any) => void): void;
+
+    export function persist(callback?: (err: any) => any): Q.Promise<any>;
+    export function persistSync(): void;
+    export function persistKey(key: string, callback?: (err: any) => any): Q.Promise<any>;
+    export function persistKeySync(key: string): void;
 }
+export = NodePersist;
diff --git a/node-polyglot/node-polyglot.d.ts b/node-polyglot/node-polyglot.d.ts
index 829f20d150..9ea2c09a48 100644
--- a/node-polyglot/node-polyglot.d.ts
+++ b/node-polyglot/node-polyglot.d.ts
@@ -3,41 +3,39 @@
 // Definitions by: Tim Jackson-Kiely <https://github.com/timjk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "node-polyglot" {
-	namespace Polyglot {
-		interface InterpolationOptions {
-			smart_count?: number | { length: number };
-			_?: string;
 
-			[interpolationKey: string]: any;
-		}
+declare namespace Polyglot {
+    interface InterpolationOptions {
+        smart_count?: number | { length: number };
+        _?: string;
 
-		interface PolyglotOptions {
-			phrases?: any;
-			locale?: string;
-		}
-	}
+        [interpolationKey: string]: any;
+    }
 
-	class Polyglot {
-		constructor(options?: Polyglot.PolyglotOptions);
-
-		extend(phrases: any): void;
-
-		t(phrase: string): string;
-
-		t(phrase: string, smartCount: number): string;
-
-		t(phrase: string, interpolationOptions: Polyglot.InterpolationOptions): string;
-
-		clear(): void;
-
-		replace(phrases: any): void;
-
-		locale(): string;
-
-		locale(locale: string): void;
-	}
-
-	export = Polyglot;
+    interface PolyglotOptions {
+        phrases?: any;
+        locale?: string;
+    }
 }
 
+declare class Polyglot {
+    constructor(options?: Polyglot.PolyglotOptions);
+
+    extend(phrases: any): void;
+
+    t(phrase: string): string;
+
+    t(phrase: string, smartCount: number): string;
+
+    t(phrase: string, interpolationOptions: Polyglot.InterpolationOptions): string;
+
+    clear(): void;
+
+    replace(phrases: any): void;
+
+    locale(): string;
+
+    locale(locale: string): void;
+}
+
+export = Polyglot;
diff --git a/node-sass-middleware/node-sass-middleware.d.ts b/node-sass-middleware/node-sass-middleware.d.ts
index 36af6b6c25..deae237245 100644
--- a/node-sass-middleware/node-sass-middleware.d.ts
+++ b/node-sass-middleware/node-sass-middleware.d.ts
@@ -6,64 +6,63 @@
 /// <reference path="../express/express.d.ts" />
 /// <reference path="../node-sass/node-sass.d.ts" />
 
-declare module "node-sass-middleware" {
 
-    import * as sass from "node-sass";
-    import * as express from "express";
 
-    interface Options extends sass.Options {
-        /**
-         * 
-         */
-        src: string;
-        /**
-         * 
-         */
-        dest?: string;
-        /**
-         * 
-         */
-        root?: string;
-        /**
-         * 
-         */
-        prefix?: string;
-        /**
-         * 
-         */
-        force?: boolean;
-        /**
-         * 
-         */
-        debug?: boolean;
-        /**
-         * 
-         */
-        indentedSyntax?: boolean;
-        /**
-         * 
-         */
-        response?: boolean;
-        /**
-         * 
-         */
-        error?: () => void;
-    }
-
-    /**
-     * 
-     *
-     */
-
-    function nodeSassMiddleware(options: Options): express.RequestHandler;
+import * as sass from "node-sass";
+import * as express from "express";
 
+interface Options extends sass.Options {
     /**
      * 
      */
-    namespace nodeSassMiddleware { }
-
+    src: string;
     /**
      * 
      */
-    export = nodeSassMiddleware;
-}
\ No newline at end of file
+    dest?: string;
+    /**
+     * 
+     */
+    root?: string;
+    /**
+     * 
+     */
+    prefix?: string;
+    /**
+     * 
+     */
+    force?: boolean;
+    /**
+     * 
+     */
+    debug?: boolean;
+    /**
+     * 
+     */
+    indentedSyntax?: boolean;
+    /**
+     * 
+     */
+    response?: boolean;
+    /**
+     * 
+     */
+    error?: () => void;
+}
+
+/**
+ * 
+ *
+ */
+
+declare function nodeSassMiddleware(options: Options): express.RequestHandler;
+
+/**
+ * 
+ */
+declare namespace nodeSassMiddleware { }
+
+/**
+ * 
+ */
+export = nodeSassMiddleware;
diff --git a/node-sass/node-sass.d.ts b/node-sass/node-sass.d.ts
index 93844fb445..76aef830f1 100644
--- a/node-sass/node-sass.d.ts
+++ b/node-sass/node-sass.d.ts
@@ -5,52 +5,51 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "node-sass" {
-    interface Importer {
-        (url: string, prev: string, done: (data: { file: string; contents: string; }) => void): void;
-    }
 
-    interface Options {
-        file?: string;
-        data?: string;
-        importer?: Importer | Importer[];
-        functions?: { [key: string]: Function };
-        includePaths?: string[];
-        indentedSyntax?: boolean;
-        indentType?: string;
-        indentWidth?: number;
-        linefeed?: string;
-        omitSourceMapUrl?: boolean;
-        outFile?: string;
-        outputStyle?: string;
-        precision?: number;
-        sourceComments?: boolean;
-        sourceMap?: boolean | string;
-        sourceMapContents?: boolean;
-        sourceMapEmbed?: boolean;
-        sourceMapRoot?: boolean;
-    }
-
-    interface SassError extends Error {
-        message: string;
-        line: number;
-        column: number;
-        status: number;
-        file: string;
-    }
-
-    interface Result {
-        css: Buffer;
-        map: Buffer;
-        stats: {
-            entry: string;
-            start: number;
-            end: number;
-            duration: number;
-            includedFiles: string[];
-        }
-    }
-
-    export function render(options: Options, callback: (err: SassError, result: Result) => any): void;
-    export function renderSync(options: Options): Result;
+interface Importer {
+    (url: string, prev: string, done: (data: { file: string; contents: string; }) => void): void;
 }
+
+interface Options {
+    file?: string;
+    data?: string;
+    importer?: Importer | Importer[];
+    functions?: { [key: string]: Function };
+    includePaths?: string[];
+    indentedSyntax?: boolean;
+    indentType?: string;
+    indentWidth?: number;
+    linefeed?: string;
+    omitSourceMapUrl?: boolean;
+    outFile?: string;
+    outputStyle?: string;
+    precision?: number;
+    sourceComments?: boolean;
+    sourceMap?: boolean | string;
+    sourceMapContents?: boolean;
+    sourceMapEmbed?: boolean;
+    sourceMapRoot?: boolean;
+}
+
+interface SassError extends Error {
+    message: string;
+    line: number;
+    column: number;
+    status: number;
+    file: string;
+}
+
+interface Result {
+    css: Buffer;
+    map: Buffer;
+    stats: {
+        entry: string;
+        start: number;
+        end: number;
+        duration: number;
+        includedFiles: string[];
+    }
+}
+
+declare export function render(options: Options, callback: (err: SassError, result: Result) => any): void;
+declare export function renderSync(options: Options): Result;
diff --git a/node-schedule/node-schedule.d.ts b/node-schedule/node-schedule.d.ts
index 17dbb8402a..b8edfe4d4f 100644
--- a/node-schedule/node-schedule.d.ts
+++ b/node-schedule/node-schedule.d.ts
@@ -3,197 +3,196 @@
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "node-schedule" {
-    import nodeSchedule = require('node-schedule');
 
+import nodeSchedule = require('node-schedule');
+
+/**
+ * Recurrence rules.
+ */
+export interface RecurrenceRule {
     /**
-     * Recurrence rules.
-     */
-    export interface RecurrenceRule {
-        /**
-         * Day of the month.
-         *
-         * @public
-         * @type {number}
-         */
-        date?: number;
-
-        /**
-         * Day of the week.
-         *
-         * @public
-         * @type {number|Array<number|Range>}
-         */
-        dayOfWeek?: number|Array<number|Range>;
-
-        /**
-         * Hour.
-         *
-         * @public
-         * @type {number}
-         */
-        hour?: number;
-
-        /**
-         * Minute.
-         *
-         * @public
-         * @type {number}
-         */
-        minute?: number;
-
-        /**
-         * Month.
-         *
-         * @public
-         * @type {number}
-         */
-        month?: number;
-
-        /**
-         * Second.
-         *
-         * @public
-         * @type {number}
-         */
-        second?: number;
-
-        /**
-         * Year.
-         *
-         * @public
-         * @type {number}
-         */
-        year?: number;
-    }
-
-    /**
-     * Range.
+     * Day of the month.
      *
-     * @class
+     * @public
+     * @type {number}
      */
-    export class Range {
-        /**
-         * Constructor.
-         *
-         * @constructor
-         * @param {number} start The start.
-         * @param {end}    end   The end.
-         * @param {step}   step  The step.
-         */
-        constructor(start?: number, end?: number, step?: number);
-
-        /**
-         * Return a {boolean} if the class contains the specified value.
-         *
-         * @param {number} value The value.
-         * @returns {boolean} {true} if the class contains the specified value, otherwise, {false}.
-         */
-        contains(value: number): boolean;
-    }
+    date?: number;
 
     /**
-     * Scheduler jobs.
+     * Day of the week.
      *
-     * @class
+     * @public
+     * @type {number|Array<number|Range>}
      */
-    export class Job {
-        /**
-         * Constructor.
-         *
-         * @constructor
-         * @param {RecurrenceRule}  rule      The rule.
-         * @param {callback}        callback  The callback.
-         */
-        constructor(name?: string, job?: Function, callback?: Function);
-
-        /**
-         * Constructor.
-         *
-         * @constructor
-         * @param {RecurrenceRule} rule The rule.
-         * @param
-         */
-        constructor(job?: Function, callback?: Function);
-
-        /**
-         * Attach an event handler function.
-         *
-         * @public
-         * @param {string}    eventName The event name.
-         * @param {Function}  handler   The function to execute when the event is triggered.
-         */
-        on(eventName: string, handler: Function): void;
-
-        /**
-         *
-         * @public
-         */
-        schedule(date: Date): void;
-    }
+    dayOfWeek?: number | Array<number | Range>;
 
     /**
-     * Invocation.
+     * Hour.
      *
-     * @class
+     * @public
+     * @type {number}
      */
-    export class Invocation {
-        /**
-         * Fire date.
-         *
-         * @public
-         * @type {Date}
-         */
-        public fireDate: Date;
-
-        /**
-         * Job.
-         *
-         * @public
-         * @type {Job}
-         */
-        public job: Job;
-
-        /**
-         * Recurrence rule.
-         *
-         * @public
-         * @type {RecurrenceRule}
-         */
-        public recurrenceRule: RecurrenceRule;
-
-        /**
-         * Timer identifier.
-         *
-         * @public
-         * @type {number}
-         */
-        public timerID: number;
-
-        /**
-         * Constructor.
-         *
-         * @constructor
-         * @param {Job}             job             The job.
-         * @param {Date}            fireDate        The fire date.
-         * @param {RecurrenceRule}  recurrenceRule  The recurrence rule.
-         */
-        constructor(job: Job, fireDate: Date, recurrenceRule: RecurrenceRule);
-    }
+    hour?: number;
 
     /**
-     * Cancels the job.
+     * Minute.
      *
-     * @param {Job} job The job.
-     * @returns {boolean} {true} if the job has been cancelled with success, otherwise, {false}.
+     * @public
+     * @type {number}
      */
-    export function cancelJob(job: Job): boolean;
+    minute?: number;
 
     /**
-     * Create a schedule job.
+     * Month.
      *
-     * @param {RecurrenceRule} rule The rule.
-     * @param {Function} callback The callback.
+     * @public
+     * @type {number}
      */
-    export function scheduleJob(rule: RecurrenceRule|Date|string, callback: Function): void;
+    month?: number;
+
+    /**
+     * Second.
+     *
+     * @public
+     * @type {number}
+     */
+    second?: number;
+
+    /**
+     * Year.
+     *
+     * @public
+     * @type {number}
+     */
+    year?: number;
 }
+
+/**
+ * Range.
+ *
+ * @class
+ */
+declare export class Range {
+    /**
+     * Constructor.
+     *
+     * @constructor
+     * @param {number} start The start.
+     * @param {end}    end   The end.
+     * @param {step}   step  The step.
+     */
+    constructor(start?: number, end?: number, step?: number);
+
+    /**
+     * Return a {boolean} if the class contains the specified value.
+     *
+     * @param {number} value The value.
+     * @returns {boolean} {true} if the class contains the specified value, otherwise, {false}.
+     */
+    contains(value: number): boolean;
+}
+
+/**
+ * Scheduler jobs.
+ *
+ * @class
+ */
+declare export class Job {
+    /**
+     * Constructor.
+     *
+     * @constructor
+     * @param {RecurrenceRule}  rule      The rule.
+     * @param {callback}        callback  The callback.
+     */
+    constructor(name?: string, job?: Function, callback?: Function);
+
+    /**
+     * Constructor.
+     *
+     * @constructor
+     * @param {RecurrenceRule} rule The rule.
+     * @param
+     */
+    constructor(job?: Function, callback?: Function);
+
+    /**
+     * Attach an event handler function.
+     *
+     * @public
+     * @param {string}    eventName The event name.
+     * @param {Function}  handler   The function to execute when the event is triggered.
+     */
+    on(eventName: string, handler: Function): void;
+
+    /**
+     *
+     * @public
+     */
+    schedule(date: Date): void;
+}
+
+/**
+ * Invocation.
+ *
+ * @class
+ */
+declare export class Invocation {
+    /**
+     * Fire date.
+     *
+     * @public
+     * @type {Date}
+     */
+    public fireDate: Date;
+
+    /**
+     * Job.
+     *
+     * @public
+     * @type {Job}
+     */
+    public job: Job;
+
+    /**
+     * Recurrence rule.
+     *
+     * @public
+     * @type {RecurrenceRule}
+     */
+    public recurrenceRule: RecurrenceRule;
+
+    /**
+     * Timer identifier.
+     *
+     * @public
+     * @type {number}
+     */
+    public timerID: number;
+
+    /**
+     * Constructor.
+     *
+     * @constructor
+     * @param {Job}             job             The job.
+     * @param {Date}            fireDate        The fire date.
+     * @param {RecurrenceRule}  recurrenceRule  The recurrence rule.
+     */
+    constructor(job: Job, fireDate: Date, recurrenceRule: RecurrenceRule);
+}
+
+/**
+ * Cancels the job.
+ *
+ * @param {Job} job The job.
+ * @returns {boolean} {true} if the job has been cancelled with success, otherwise, {false}.
+ */
+declare export function cancelJob(job: Job): boolean;
+
+/**
+ * Create a schedule job.
+ *
+ * @param {RecurrenceRule} rule The rule.
+ * @param {Function} callback The callback.
+ */
+declare export function scheduleJob(rule: RecurrenceRule | Date | string, callback: Function): void;
diff --git a/node-slack/node-slack.d.ts b/node-slack/node-slack.d.ts
index dd99332a05..25f4f76962 100644
--- a/node-slack/node-slack.d.ts
+++ b/node-slack/node-slack.d.ts
@@ -5,57 +5,55 @@
 
 /// <reference path="../request/request.d.ts" />
 
-declare module "node-slack" {
-    import request = require('request');
 
-    class Slack {
-        constructor(hookUrl: string, option?: Slack.Option);
-        send(message: Slack.Message): any; //TODO: Here comes deferred's promise as a return type
-        send(message: Slack.Message, callback: Slack.SendCallback): request.Request;
-        respond(query: Slack.Query): Slack.TextResponse;
-        respond(query: Slack.Query, callback: Slack.ResponseCallback): Slack.TextResponse;
-    }
+import request = require('request');
 
-    namespace Slack {
-
-        interface Option {
-            proxy: string;
-        }
-
-        interface Message {
-            text: string;
-            channel?: string;
-            username?: string;
-            icon_emoji?: string;
-            attachments?: any[];
-            unfurl_links?: boolean;
-            link_names?: number;
-        }
-
-        interface SendCallback {
-            (err: any, body: any): any;
-        }
-
-        interface Query {
-            token?: string;
-            team_id?: string;
-            channel_id?: string;
-            channel_name?: string;
-            timestamp?: number;
-            user_id?: string;
-            user_name?: string;
-            text: string;
-        }
-
-        interface TextResponse {
-            text: string;
-        }
-
-        interface ResponseCallback {
-            (err: any, query: Query): any;
-        }
-    }
-
-    export = Slack;
+declare class Slack {
+    constructor(hookUrl: string, option?: Slack.Option);
+    send(message: Slack.Message): any; //TODO: Here comes deferred's promise as a return type
+    send(message: Slack.Message, callback: Slack.SendCallback): request.Request;
+    respond(query: Slack.Query): Slack.TextResponse;
+    respond(query: Slack.Query, callback: Slack.ResponseCallback): Slack.TextResponse;
 }
 
+declare namespace Slack {
+
+    interface Option {
+        proxy: string;
+    }
+
+    interface Message {
+        text: string;
+        channel?: string;
+        username?: string;
+        icon_emoji?: string;
+        attachments?: any[];
+        unfurl_links?: boolean;
+        link_names?: number;
+    }
+
+    interface SendCallback {
+        (err: any, body: any): any;
+    }
+
+    interface Query {
+        token?: string;
+        team_id?: string;
+        channel_id?: string;
+        channel_name?: string;
+        timestamp?: number;
+        user_id?: string;
+        user_name?: string;
+        text: string;
+    }
+
+    interface TextResponse {
+        text: string;
+    }
+
+    interface ResponseCallback {
+        (err: any, query: Query): any;
+    }
+}
+
+export = Slack;
diff --git a/node-snap7/node-snap7.d.ts b/node-snap7/node-snap7.d.ts
index 422a32085d..fcd0b80330 100644
--- a/node-snap7/node-snap7.d.ts
+++ b/node-snap7/node-snap7.d.ts
@@ -7,15 +7,15 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "node-snap7" {
 
-  export enum ConnectionType {
+
+declare export enum ConnectionType {
     CONNTYPE_PG = 0x01,
     CONNTYPE_OP = 0x02,
     CONNTYPE_BASIC = 0x03
-  }
+}
 
-  export enum ParamNumber {
+declare export enum ParamNumber {
     RemotePort = 2,
     PingTimeout = 3,
     SendTimeout = 4,
@@ -24,18 +24,18 @@ declare module "node-snap7" {
     DstRef = 8,
     SrcTSap = 9,
     PDURequest = 10
-  }
+}
 
-  export enum Area {
+declare export enum Area {
     S7AreaPE = 0x81,
     S7AreaPA = 0x82,
     S7AreaMK = 0x83,
     S7AreaDB = 0x84,
     S7AreaCT = 0x1C,
     S7AreaTM = 0x1D
-  }
+}
 
-  export enum WordLen {
+declare export enum WordLen {
     S7WLBit = 0x01,
     S7WLByte = 0x02,
     S7WLWord = 0x04,
@@ -43,9 +43,9 @@ declare module "node-snap7" {
     S7WLReal = 0x08,
     S7WLCounter = 0x1C,
     S7WLTimer = 0x1D
-  }
+}
 
-  export enum BlockType {
+declare export enum BlockType {
     Block_OB = 0x38,
     Block_DB = 0x41,
     Block_SDB = 0x42,
@@ -53,9 +53,9 @@ declare module "node-snap7" {
     Block_SFC = 0x44,
     Block_FB = 0x45,
     Block_SFB = 0x46
-  }
+}
 
-  export enum SubBlockType {
+declare export enum SubBlockType {
     SubBlk_OB = 0x08,
     SubBlk_DB = 0x0A,
     SubBlk_SDB = 0x0B,
@@ -63,62 +63,61 @@ declare module "node-snap7" {
     SubBlk_SFC = 0x0D,
     SubBlk_FB = 0x0E,
     SubBlk_SFB = 0x0F
-  }
+}
 
-  export enum LangType {
+declare export enum LangType {
     BlockLangAWL = 0x01,
     BlockLangKOP = 0x02,
     BlockLangFUP = 0x03,
     BlockLangSCL = 0x04,
     BlockLangDB = 0x05,
     BlockLangGRAPH = 0x06
-  }
+}
 
-  export enum Status {
+declare export enum Status {
     S7CpuStatusUnknown = 0x00,
     S7CpuStatusRun = 0x08,
     S7CpuStatusStop = 0x04
-  }
-  
-  interface MultiVarRead{
+}
+
+interface MultiVarRead {
     Area: Area;
     WordLen: WordLen;
     DBNumber?: number;
     Start: number;
     Amount: number;
-  }
-  
-  interface MultiVarWrite{
+}
+
+interface MultiVarWrite {
     Area: Area;
     WordLen: WordLen;
     DBNumber?: number;
     Start: number;
     Amount: number;
     Data: Buffer;
-  }
-  
-  interface MultiVarsReadResult{
+}
+
+interface MultiVarsReadResult {
     Result: number; //Error Code
     Data: Buffer;
-  }
-  
-  interface MultiVarsWriteResult{
+}
+
+interface MultiVarsWriteResult {
     Result: number; //Error Code
+}
+
+interface S7Client_Static {
+    new (): S7Client;
+
+    //Static members here ...
   }
-  
-  interface S7Client_Static {
-      new(): S7Client;
-      
-      //Static members here ...
-      
-  }
-  
-  interface S7Client {
+
+interface S7Client {
 
     //Instance members here
 
     //API - Control functions
-       
+
     /** 
      * Connects the client to the PLC with the parameters specified in the previous call of ConnectTo() or SetConnectionParams().
      * - cb: The optional callback parameter will be executed after connection attempt
@@ -126,7 +125,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     Connect(callback?: (err: any) => void): boolean;
-    
+
     /** 
      * Connects the client to the hardware at ip, rack, slot coordinates.
      * - ip: PLC/Equipment IPV4 Address ex. “192.168.1.12�
@@ -137,7 +136,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     ConnectTo(ip: string, rack: number, slot: number, callback?: (err: any) => void): boolean;
-    
+
     /** 
      * Sets internally ip, localTSAP, remoteTSAP coordinates.
      * - ip PLC/Equipment IPv4 address ex. “192.168.1.12�
@@ -146,12 +145,12 @@ declare module "node-snap7" {
      * Returns true on success or false on error. 
      */
     SetConnectionParams(ip: string, localTSAP: any, remoteTSAP: any): boolean;
-    
+
     /**
      * Sets the connection resource type, i.e the way in which the Clients connects to a PLC.
      */
     SetConnectionType(connectionType: ConnectionType): void;
-    
+
     /**
      * Disconnects “gracefully� the Client from the PLC.
      * Returns true on success or false on error.
@@ -163,7 +162,7 @@ declare module "node-snap7" {
      * Returns the parameter value on success or false on error.
      */
     GetParam(paramNumber: ParamNumber): any;
-    
+
     /**
      * Sets an internal Client object parameter.
      * paramNumber One from the parameter list above
@@ -171,9 +170,9 @@ declare module "node-snap7" {
      * Returns true on success or false on error.
      */
     SetParam(paramNumber: ParamNumber, value: any): boolean;
-   
+
     //API - Data I/O functions
-    
+
     /**
      * This is the main function to read data from a PLC. With it you can read DB, Inputs, Outputs, Merkers, Timers and Counters.
      * - area Area identifier (see table below)
@@ -185,8 +184,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    ReadArea(area: Area, dbNumber: number, start: number, amount: number, wordLen: WordLen, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
+    ReadArea(area: Area, dbNumber: number, start: number, amount: number, wordLen: WordLen, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
     /**
      * This is the main function to write data into a PLC.
      * - area Area identifier (see table below)
@@ -211,8 +210,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    DBRead(dbNumber: number, start: number, size: number, callback?: (err: any, data: any) => void): Buffer|boolean;
-    
+    DBRead(dbNumber: number, start: number, size: number, callback?: (err: any, data: any) => void): Buffer | boolean;
+
     /**
      * This is a lean function of WriteArea() to write PLC DB.
      * It simply internally calls WriteArea() with area = S7Client.S7AreaDB and wordLen = s7client.S7WLByte.
@@ -225,7 +224,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     DBWrite(dbNumber: number, start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
+
     /**
      * This is a lean function of ReadArea() to read PLC process outputs.
      * It simply internally calls ReadArea() with area = S7Client.S7AreaPA and wordLen = s7client.S7WLByte.
@@ -235,8 +234,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    ABRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
+    ABRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
     /**
      * This is a lean function of WriteArea() to write PLC process outputs.
      * It simply internally calls WriteArea() with area = S7Client.S7AreaPA and wordLen = s7client.S7WLByte.
@@ -248,7 +247,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     ABWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
+
     /**
      * This is a lean function of ReadArea() to read PLC process inputs.
      * It simply internally calls ReadArea() with area = S7Client.S7AreaPE and wordLen = s7client.S7WLByte.
@@ -258,8 +257,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    EBRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
+    EBRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
     /**
      * This is a lean function of WriteArea() to write PLC process inputs.
      * It simply internally calls WriteArea() with area = S7Client.S7AreaPE and wordLen = s7client.S7WLByte.
@@ -271,7 +270,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     EBWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
+
     /**
      * This is a lean function of ReadArea() to read PLC Merkers.
      * It simply internally calls ReadArea() with area = S7Client.S7AreaMK and wordLen = s7client.S7WLByte.
@@ -281,8 +280,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    MBRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
+    MBRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
     /**
      * This is a lean function of WriteArea() to write PLC Merkers.
      * It simply internally calls WriteArea() with area = S7Client.S7AreaMK and wordLen = s7client.S7WLByte.
@@ -294,7 +293,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     MBWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
+
     /**
      * This is a lean function of ReadArea() to read PLC Timers.
      * It simply internally calls ReadArea() with area = S7Client.S7AreaTM and wordLen = S7Client.S7WLTimer.
@@ -304,7 +303,7 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    TMRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
+    TMRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
 
     /**
      * This is a lean function of WriteArea() to write PLC Timers.
@@ -327,8 +326,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    CTRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
+    CTRead(start: number, size: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
     /**
      * This is a lean function of WriteArea() to write PLC Counters.
      * It simply internally calls WriteArea() with area = S7Client.S7AreaCT and wordLen = S7Client.S7WLCounter.
@@ -340,7 +339,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     CTWrite(start: number, size: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
+
     /**
      * This is function allows to read different kind of variables from a PLC in a single call. With it you can read DB, 
      * Inputs, Outputs, Merkers, Timers and Counters.
@@ -349,8 +348,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns an array on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    ReadMultiVars(multiVars: MultiVarRead[], callback?: (err: any, data: MultiVarsReadResult[]) => void): MultiVarsReadResult[]|boolean;
-    
+    ReadMultiVars(multiVars: MultiVarRead[], callback?: (err: any, data: MultiVarsReadResult[]) => void): MultiVarsReadResult[] | boolean;
+
     /**
      * This is function allows to write different kind of variables into a PLC in a single call. With it you can write DB, 
      * Inputs, Outputs, Merkers, Timers and Counters.
@@ -359,18 +358,18 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns an array on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    WriteMultiVars(multiVars: MultiVarWrite[], callback?: (err: any, data: MultiVarsWriteResult[]) => void): MultiVarsWriteResult[]|boolean;
+    WriteMultiVars(multiVars: MultiVarWrite[], callback?: (err: any, data: MultiVarsWriteResult[]) => void): MultiVarsWriteResult[] | boolean;
 
     //API - Directory functions
-    
+
     /**
      * This function returns an object of the AG blocks amount divided by type.
      * - The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns an object (see below) on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    ListBlocks(callback?: (err: any, data: Object) => void): Object|boolean;
-    
+    ListBlocks(callback?: (err: any, data: Object) => void): Object | boolean;
+
     /**
      * This function returns an array of the AG list of a specified block type.
      * - blockType Type of block (see table below)
@@ -378,8 +377,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns an array on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    ListBlocksOfType(blockType: BlockType, callback?: (err: any, data: any) => void): any|boolean;
-    
+    ListBlocksOfType(blockType: BlockType, callback?: (err: any, data: any) => void): any | boolean;
+
     /**
      * Returns an object with detailed information about a given AG block. This function is very useful if you need to read or write 
      * data in a DB which you do not know the size in advance (see MC7Size field)
@@ -389,18 +388,18 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns an object (see below) on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    GetAgBlockInfo(blockType: BlockType, blockNum: number, callback?: (err: any, data: any) => void): any|boolean;
-    
+    GetAgBlockInfo(blockType: BlockType, blockNum: number, callback?: (err: any, data: any) => void): any | boolean;
+
     /**
      * Returns detailed information about a block present in a user buffer. This function is usually used in conjunction with FullUpload(). 
      * An uploaded block saved to disk, could be loaded in a user buffer and checked with this function.
      * - buffer User buffer
      * Returns an object (see example above) on success or false on error.
      */
-    GetPgBlockInfo(buffer: Buffer): Object|boolean;
-      
+    GetPgBlockInfo(buffer: Buffer): Object | boolean;
+
     //API - Block oriented functions
-    
+
     /**
      * Uploads a block from AG. The whole block (including header and footer) is copied into the user buffer.
      * - blockType Type of block (see table above)
@@ -409,8 +408,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a Buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    FullUpload(blockType: BlockType, blockNum: number, callback?: (err: any, data: Object) => void): Object|boolean;
-    
+    FullUpload(blockType: BlockType, blockNum: number, callback?: (err: any, data: Object) => void): Object | boolean;
+
     /**
      * Uploads a block body from AG. Only the block body (but header and footer) is copied into the user buffer.
      * - blockType Type of block (see table above)
@@ -419,8 +418,8 @@ declare module "node-snap7" {
      * If callback is not set the function is blocking and returns a Buffer object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    Upload(blockType: BlockType, blockNum: number, callback?: (err: any, data: Object) => void): Object|boolean;
-    
+    Upload(blockType: BlockType, blockNum: number, callback?: (err: any, data: Object) => void): Object | boolean;
+
     /**
      * Downloads a block into AG. A whole block (including header and footer) must be available into the user buffer.
      * - blockNum Number of block
@@ -431,7 +430,7 @@ declare module "node-snap7" {
      * If the parameter blockNum is -1, the block number is not changed else the block is downloaded with the provided number (just like a “Download As…�).
      */
     Download(blockNum: number, buffer: Buffer, callback?: (err: any) => void): boolean;
-    
+
     /**
      * Deletes a block into AG.
      * !!! There is no undo function available !!!
@@ -442,7 +441,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     Delete(blockType: BlockType, blockNum: number, callback?: (err: any) => void): boolean;
-    
+
     /**
      * Uploads a DB from AG. This function is equivalent to Upload() with BlockType = Block_DB but it uses a different approach 
      * so it’s not subject to the security level set.
@@ -453,8 +452,8 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      * This function first gathers the DB size via GetAgBlockInfo() then calls DBRead().
      */
-    DBGet(dbNumber: number, callback?: (err: any, data: Buffer) => void): Buffer|boolean;
-    
+    DBGet(dbNumber: number, callback?: (err: any, data: Buffer) => void): Buffer | boolean;
+
     /**
      * Fills a DB in AG with a given byte without the need of specifying its size.
      * - dbNumber DB number
@@ -466,15 +465,15 @@ declare module "node-snap7" {
     DBFill(dbNumber: number, fillChar: string, callback?: (err: any) => void): boolean;
 
     //API - Date/Time functions
-    
+
     /**
      * Reads PLC date and time.
      * - The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns a javascript Date() object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    GetPlcDateTime(callback?: (err: any, data: any) => void): any|boolean;
-    
+    GetPlcDateTime(callback?: (err: any, data: any) => void): any | boolean;
+
     /**
      * Sets the PLC date and time.
      * - dateTime
@@ -492,7 +491,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     SetPlcDateTime(dateTime: Date, callback?: (err: any) => void): boolean;
-    
+
     /**
      * Sets the PLC date and time in accord to the PC system Date/Time.
      * - The optional callback parameter will be executed after completion
@@ -500,51 +499,51 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     SetPlcSystemDateTime(callback?: (err: any) => void): boolean;
-    
+
     //API - System info functions
-    
+
     /**
      * Reads a partial list of given idand index.
      * - The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns a buffer on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    ReadSZL(id: number, index: number, callback?: (err: any, data: any) => void): Buffer|boolean;
-    
+    ReadSZL(id: number, index: number, callback?: (err: any, data: any) => void): Buffer | boolean;
+
     /**
      * Reads the directory of the partial lists.
      * - The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns an array on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    ReadSZLList(callback?: (err: any, data: any) => void): any|boolean;
-    
+    ReadSZLList(callback?: (err: any, data: any) => void): any | boolean;
+
     /**
      * Gets CPU order code and version info.
      * - The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns an object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    GetOrderCode(callback?: (err: any, data: any) => void): any|boolean;
-    
+    GetOrderCode(callback?: (err: any, data: any) => void): any | boolean;
+
     /**
      * Gets CPU module name, serial number and other info.
      * - The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns an object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    GetCpuInfo(callback?: (err: any, data: any) => void): any|boolean;
-    
+    GetCpuInfo(callback?: (err: any, data: any) => void): any | boolean;
+
     /**
      * Gets CP (communication processor) info.
      * - The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns an object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    GetCpInfo(callback?: (err: any, data: any) => void): any|boolean;
-    
+    GetCpInfo(callback?: (err: any, data: any) => void): any | boolean;
+
     //API - PLC control functions
-    
+
     /**
      * Puts the CPU in RUN mode performing an HOT START.
      * - The optional callback parameter will be executed after completion
@@ -552,7 +551,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     PlcHotStart(callback?: (err: any) => void): boolean;
-    
+
     /**
      * Puts the CPU in RUN mode performing a COLD START.
      * - The optional callback parameter will be executed after completion
@@ -560,7 +559,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     PlcColdStart(callback?: (err: any) => void): boolean;
-    
+
     /**
      * Puts the CPU in STOP mode.
      * - The optional callback parameter will be executed after completion
@@ -568,7 +567,7 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     PlcStop(callback?: (err: any) => void): boolean;
-    
+
     /**
      * Performs the Copy Ram to Rom action.
      * - timeout Maximum time expected to complete the operation (ms)
@@ -578,7 +577,7 @@ declare module "node-snap7" {
      * Not all CPUs support this operation. The CPU must be in STOP mode.
      */
     CopyRamToRom(timeout: number, callback?: (err: any) => void): boolean;
-    
+
     /**
      * Performs the Memory compress action.
      * - timeout Maximum time expected to complete the operation (ms)
@@ -587,9 +586,9 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     Compress(timeout: number, callback?: (err: any) => void): boolean;
-    
+
     //API - Security functions
-    
+
     /**
      * Send the password to the PLC to meet its security level.
      * - password Password
@@ -599,7 +598,7 @@ declare module "node-snap7" {
      * A password accepted by a PLC is an 8 chars string, a longer password will be trimmed, and a shorter one will be "right space padded".
      */
     SetSessionPassword(password: string, callback?: (err: any) => void): boolean;
-    
+
     /**
      * Clears the password set for the current session (logout).
      * - The optional callback parameter will be executed after completion
@@ -607,58 +606,57 @@ declare module "node-snap7" {
      * If callback is set the function is non-blocking and an error argument is given to the callback.
      */
     ClearSessionPassword(callback?: (err: any) => void): boolean;
-    
+
     /**
      * Gets the CPU protection level info.
      * - The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns the protection object on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    GetProtection(callback?: (err: any, data: any) => void): any|boolean;
-    
+    GetProtection(callback?: (err: any, data: any) => void): any | boolean;
+
     //API - Properties
-    
+
     /**
      * Returns the last job execution time in milliseconds or false on error.
      */
-    ExecTime(): number|boolean;
-    
+    ExecTime(): number | boolean;
+
     /**
      * Returns the last job result.
      */
     LastError(): any;
-    
+
     /**
      * Returns the PDU length requested by the client or false on error. The requested PDU length can be modified with SetParam().
      */
-    PduRequested(): number|boolean;
-    
+    PduRequested(): number | boolean;
+
     /**
      * Returns the PDU length negotiated between the client and the PLC during the connection or false on error.
      * It’s useful to know the PDU negotiated when we need to call ReadMultivar() or WriteMultiVar(). 
      * All other data transfer functions handle this information by themselves and split the telegrams automatically if needed.
      */
-    PduLength(): number|boolean;
-    
+    PduLength(): number | boolean;
+
     /**
      * Returns the CPU status (running/stopped).
      * The optional callback parameter will be executed after completion
      * If callback is not set the function is blocking and returns the CPU status on success or false on error. 
      * If callback is set the function is non-blocking and an error and result argument is given to the callback.
      */
-    PlcStatus(callback?: (err: any, data: Status) => void): Status|boolean;
-    
+    PlcStatus(callback?: (err: any, data: Status) => void): Status | boolean;
+
     /**
      * Returns the connection status.
      */
     Connected(): any;
-    
+
     /**
      * Returns a textual explanation of a given error number.
      * - errNum Error number
      */
     ErrorText(err: number): string;
-  }
-  
-  export var S7Client :S7Client_Static;
 }
+
+declare export var S7Client: S7Client_Static;
diff --git a/nodemailer-direct-transport/nodemailer-direct-transport.d.ts b/nodemailer-direct-transport/nodemailer-direct-transport.d.ts
index ce5caed172..9f0b6917fe 100644
--- a/nodemailer-direct-transport/nodemailer-direct-transport.d.ts
+++ b/nodemailer-direct-transport/nodemailer-direct-transport.d.ts
@@ -6,30 +6,28 @@
 
 /// <reference path="../nodemailer/nodemailer-types.d.ts" />
 
-declare module "nodemailer-direct-transport" {
 
-	namespace directTransport {
 
-		export interface AuthOptions {
-			user?: string;
-			pass?: string;
-			xoauth2?: any;
-		}
+declare namespace directTransport {
 
-		export interface DirectOptions {
-			/**
-			 * optional hostname of the client, used for identifying to the server
-			 */
-			name?: string;
-			/**
-			 * if true, the connection emits all traffic between client and server as 'log' events
-			 */
-			debug?: boolean;
-		}
-	}
-
-	function directTransport(options: directTransport.DirectOptions): nodemailer.Transport;
-
-	export = directTransport;
+    export interface AuthOptions {
+        user?: string;
+        pass?: string;
+        xoauth2?: any;
+    }
 
+    export interface DirectOptions {
+        /**
+         * optional hostname of the client, used for identifying to the server
+         */
+        name?: string;
+        /**
+         * if true, the connection emits all traffic between client and server as 'log' events
+         */
+        debug?: boolean;
+    }
 }
+
+declare function directTransport(options: directTransport.DirectOptions): nodemailer.Transport;
+
+export = directTransport;
diff --git a/nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts b/nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts
index 52aef3801d..5f1d5ca970 100644
--- a/nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts
+++ b/nodemailer-pickup-transport/nodemailer-pickup-transport.d.ts
@@ -5,15 +5,13 @@
 
 /// <reference path="../nodemailer/nodemailer-types.d.ts" />
 
-declare module "nodemailer-pickup-transport" {
 
-    namespace PickupTransport {
-        export interface Options {
-            directory: string;
-        }
+
+declare namespace PickupTransport {
+    export interface Options {
+        directory: string;
     }
-
-    function PickupTransport(options: PickupTransport.Options): nodemailer.Transport;
-    export = PickupTransport;
 }
 
+declare function PickupTransport(options: PickupTransport.Options): nodemailer.Transport;
+export = PickupTransport;
diff --git a/nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts b/nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts
index d815bab293..763ae0e1f9 100644
--- a/nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts
+++ b/nodemailer-smtp-pool/nodemailer-smtp-pool.d.ts
@@ -6,83 +6,81 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../nodemailer/nodemailer-types.d.ts" />
 
-declare module "nodemailer-smtp-pool" {
-	import tls = require("tls");
 
-	namespace smtpPool {
+import tls = require("tls");
 
-		export interface AuthOptions {
-			user?: string;
-			pass?: string;
-			xoauth2?: any;
-		}
+declare namespace smtpPool {
 
-		export interface SmtpPoolOptions {
-			/**
-			 * is the port to connect to (defaults to 25 or 465)
-			 */
-			port?: number;
-			/**
-			 * is the hostname or IP address to connect to (defaults to 'localhost')
-			 */
-			host?: string;
-			/**
-			 * defines if the connection should use SSL (if true) or not (if false)
-			 */
-			secure?: boolean;
-			/**
-			 *  defines authentication data (see authentication section below)
-			 */
-			auth?: AuthOptions;
-			/**
-			 *  turns off STARTTLS support if true
-			 */
-			ignoreTLS?: boolean;
-			/**
-			 * optional hostname of the client, used for identifying to the server
-			 */
-			name?: string;
-			/**
-			 * is the local interface to bind to for network connections
-			 */
-			localAddress?: string;
-			/**
-			 * how many milliseconds to wait for the connection to establish
-			 */
-			connectionTimeout?: number;
-			/**
-			 * how many milliseconds to wait for the greeting after connection is established
-			 */
-			greetingTimeout?: number;
-			/**
-			 * how many milliseconds of inactivity to allow
-			 */
-			socketTimeout?: number;
-			/**
-			 * if true, the connection emits all traffic between client and server as 'log' events
-			 */
-			debug?: boolean;
-			/**
-			 * defines preferred authentication method, eg. 'PLAIN'
-			 */
-			authMethod?: string;
-			/**
-			 *  defines additional options to be passed to the socket constructor, eg. {rejectUnauthorized: true}
-			 */
-			tls?: tls.ConnectionOptions;
-			/**
-			 * (defaults to 5) is the count of maximum simultaneous connections to make against the SMTP server
-			 */
-			maxConnections?: number;
-			/**
-			 * (defaults to 100) limits the message count to be sent using a single connection. After maxMessages messages the connection is dropped and a new one is created for the following messages
-			 */
-			maxMessages?: number;
-		}
-	}
-
-
-	function smtpPool(options: smtpPool.SmtpPoolOptions): nodemailer.Transport;
-	export = smtpPool;
+    export interface AuthOptions {
+        user?: string;
+        pass?: string;
+        xoauth2?: any;
+    }
 
+    export interface SmtpPoolOptions {
+        /**
+         * is the port to connect to (defaults to 25 or 465)
+         */
+        port?: number;
+        /**
+         * is the hostname or IP address to connect to (defaults to 'localhost')
+         */
+        host?: string;
+        /**
+         * defines if the connection should use SSL (if true) or not (if false)
+         */
+        secure?: boolean;
+        /**
+         *  defines authentication data (see authentication section below)
+         */
+        auth?: AuthOptions;
+        /**
+         *  turns off STARTTLS support if true
+         */
+        ignoreTLS?: boolean;
+        /**
+         * optional hostname of the client, used for identifying to the server
+         */
+        name?: string;
+        /**
+         * is the local interface to bind to for network connections
+         */
+        localAddress?: string;
+        /**
+         * how many milliseconds to wait for the connection to establish
+         */
+        connectionTimeout?: number;
+        /**
+         * how many milliseconds to wait for the greeting after connection is established
+         */
+        greetingTimeout?: number;
+        /**
+         * how many milliseconds of inactivity to allow
+         */
+        socketTimeout?: number;
+        /**
+         * if true, the connection emits all traffic between client and server as 'log' events
+         */
+        debug?: boolean;
+        /**
+         * defines preferred authentication method, eg. 'PLAIN'
+         */
+        authMethod?: string;
+        /**
+         *  defines additional options to be passed to the socket constructor, eg. {rejectUnauthorized: true}
+         */
+        tls?: tls.ConnectionOptions;
+        /**
+         * (defaults to 5) is the count of maximum simultaneous connections to make against the SMTP server
+         */
+        maxConnections?: number;
+        /**
+         * (defaults to 100) limits the message count to be sent using a single connection. After maxMessages messages the connection is dropped and a new one is created for the following messages
+         */
+        maxMessages?: number;
+    }
 }
+
+
+declare function smtpPool(options: smtpPool.SmtpPoolOptions): nodemailer.Transport;
+export = smtpPool;
diff --git a/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts b/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts
index 0beff75ee5..a4cfc309f6 100644
--- a/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts
+++ b/nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts
@@ -6,108 +6,107 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../nodemailer/nodemailer-types.d.ts" />
 
-declare module "nodemailer-smtp-transport" {
 
-	import tls = require("tls");
 
-	namespace smtpTransport {
-		export interface AuthOptions {
-			user?: string;
-			pass?: string;
-			xoauth2?: any;
-		}
+import tls = require("tls");
 
-		export interface SmtpOptions {
-			/**
-			 * Fills in certain SMTP configurations options (e.g. 'host', 'port', and 'secure') for
-			 * well-known services. Possible values:
-			 *   - '1und1'
-			 *   - 'AOL'
-			 *   - 'DebugMail.io'
-			 *   - 'DynectEmail'
-			 *   - 'FastMail'
-			 *   - 'GandiMail'
-			 *   - 'Gmail'
-			 *   - 'Godaddy'
-			 *   - 'GodaddyAsia'
-			 *   - 'GodaddyEurope'
-			 *   - 'hot.ee'
-			 *   - 'Hotmail'
-			 *   - 'iCloud'
-			 *   - 'mail.ee'
-			 *   - 'Mail.ru'
-			 *   - 'Mailgun'
-			 *   - 'Mailjet'
-			 *   - 'Mandrill'
-			 *   - 'Naver'
-			 *   - 'Postmark'
-			 *   - 'QQ'
-			 *   - 'QQex'
-			 *   - 'SendCloud'
-			 *   - 'SendGrid'
-			 *   - 'SES'
-			 *   - 'Sparkpost'
-			 *   - 'Yahoo'
-			 *   - 'Yandex'
-			 *   - 'Zoho'
-			 */
-			service?: string;
-			/**
-			 * is the port to connect to (defaults to 25 or 465)
-			 */
-			port?: number;
-			/**
-			 * is the hostname or IP address to connect to (defaults to 'localhost')
-			 */
-			host?: string;
-			/**
-			 * defines if the connection should use SSL (if true) or not (if false)
-			 */
-			secure?: boolean;
-			/**
-			 *  defines authentication data (see authentication section below)
-			 */
-			auth?: AuthOptions;
-			/**
-			 *  turns off STARTTLS support if true
-			 */
-			ignoreTLS?: boolean;
-			/**
-			 * optional hostname of the client, used for identifying to the server
-			 */
-			name?: string;
-			/**
-			 * is the local interface to bind to for network connections
-			 */
-			localAddress?: string;
-			/**
-			 * how many milliseconds to wait for the connection to establish
-			 */
-			connectionTimeout?: number;
-			/**
-			 * how many milliseconds to wait for the greeting after connection is established
-			 */
-			greetingTimeout?: number;
-			/**
-			 * how many milliseconds of inactivity to allow
-			 */
-			socketTimeout?: number;
-			/**
-			 * if true, the connection emits all traffic between client and server as 'log' events
-			 */
-			debug?: boolean;
-			/**
-			 * defines preferred authentication method, eg. 'PLAIN'
-			 */
-			authMethod?: string;
-			/**
-			 *  defines additional options to be passed to the socket constructor, eg. {rejectUnauthorized: true}
-			 */
-			tls?: tls.ConnectionOptions;
-		}
-	}
+declare namespace smtpTransport {
+    export interface AuthOptions {
+        user?: string;
+        pass?: string;
+        xoauth2?: any;
+    }
 
-	function smtpTransport(options: smtpTransport.SmtpOptions): nodemailer.Transport;
-
-	export = smtpTransport;
+    export interface SmtpOptions {
+        /**
+         * Fills in certain SMTP configurations options (e.g. 'host', 'port', and 'secure') for
+         * well-known services. Possible values:
+         *   - '1und1'
+         *   - 'AOL'
+         *   - 'DebugMail.io'
+         *   - 'DynectEmail'
+         *   - 'FastMail'
+         *   - 'GandiMail'
+         *   - 'Gmail'
+         *   - 'Godaddy'
+         *   - 'GodaddyAsia'
+         *   - 'GodaddyEurope'
+         *   - 'hot.ee'
+         *   - 'Hotmail'
+         *   - 'iCloud'
+         *   - 'mail.ee'
+         *   - 'Mail.ru'
+         *   - 'Mailgun'
+         *   - 'Mailjet'
+         *   - 'Mandrill'
+         *   - 'Naver'
+         *   - 'Postmark'
+         *   - 'QQ'
+         *   - 'QQex'
+         *   - 'SendCloud'
+         *   - 'SendGrid'
+         *   - 'SES'
+         *   - 'Sparkpost'
+         *   - 'Yahoo'
+         *   - 'Yandex'
+         *   - 'Zoho'
+         */
+        service?: string;
+        /**
+         * is the port to connect to (defaults to 25 or 465)
+         */
+        port?: number;
+        /**
+         * is the hostname or IP address to connect to (defaults to 'localhost')
+         */
+        host?: string;
+        /**
+         * defines if the connection should use SSL (if true) or not (if false)
+         */
+        secure?: boolean;
+        /**
+         *  defines authentication data (see authentication section below)
+         */
+        auth?: AuthOptions;
+        /**
+         *  turns off STARTTLS support if true
+         */
+        ignoreTLS?: boolean;
+        /**
+         * optional hostname of the client, used for identifying to the server
+         */
+        name?: string;
+        /**
+         * is the local interface to bind to for network connections
+         */
+        localAddress?: string;
+        /**
+         * how many milliseconds to wait for the connection to establish
+         */
+        connectionTimeout?: number;
+        /**
+         * how many milliseconds to wait for the greeting after connection is established
+         */
+        greetingTimeout?: number;
+        /**
+         * how many milliseconds of inactivity to allow
+         */
+        socketTimeout?: number;
+        /**
+         * if true, the connection emits all traffic between client and server as 'log' events
+         */
+        debug?: boolean;
+        /**
+         * defines preferred authentication method, eg. 'PLAIN'
+         */
+        authMethod?: string;
+        /**
+         *  defines additional options to be passed to the socket constructor, eg. {rejectUnauthorized: true}
+         */
+        tls?: tls.ConnectionOptions;
+    }
 }
+
+declare function smtpTransport(options: smtpTransport.SmtpOptions): nodemailer.Transport;
+
+export = smtpTransport;
diff --git a/nodemailer/nodemailer.d.ts b/nodemailer/nodemailer.d.ts
index 7f5d070927..0bcb05ef37 100644
--- a/nodemailer/nodemailer.d.ts
+++ b/nodemailer/nodemailer.d.ts
@@ -8,56 +8,55 @@
 /// <reference path="../nodemailer-direct-transport/nodemailer-direct-transport.d.ts" />
 /// <reference path="../nodemailer-smtp-transport/nodemailer-smtp-transport.d.ts" />
 
-declare module "nodemailer" {
-
-	import directTransport = require("nodemailer-direct-transport");
-	import smtpTransport = require("nodemailer-smtp-transport");
-
-	export type Transport = nodemailer.Transport;
-	export type SendMailOptions = nodemailer.SendMailOptions;
-	export type SentMessageInfo = nodemailer.SentMessageInfo;
-
-	/**
-	 * Transporter plugin
-	 */
-	export interface Plugin {
-		(mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
-	}
-
-	/**
-	 * This is what you use to send mail
-	 */
-	export interface Transporter {
-		/**
-		 * Send a mail
-		 */
-		sendMail(mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
-
-		/**
-		 * Attach a plugin. 'compile' and 'stream' plugins can be attached with use(plugin) method
-		 *
-		 * @param step is a string, either 'compile' or 'stream' thatd defines when the plugin should be hooked
-		 * @param pluginFunc is a function that takes two arguments: the mail object and a callback function
-		 */
-		use(step: string, plugin: Plugin): void;
 
 
-		/**
-		 * Close all connections
-		 */
-		close?(): void;
-	}
+import directTransport = require("nodemailer-direct-transport");
+import smtpTransport = require("nodemailer-smtp-transport");
 
-	/**
-	 * Create a direct transporter
-	 */
-	export function createTransport(options?: directTransport.DirectOptions, defaults?: Object): Transporter;
-	/**
-	 * Create an SMTP transporter
-	 */
-	export function createTransport(options?: smtpTransport.SmtpOptions, defaults?: Object): Transporter;
-	/**
-	 * Create a transporter from a given implementation
-	 */
-	export function createTransport(transport: Transport, defaults?: Object): Transporter;
+export type Transport = nodemailer.Transport;
+export type SendMailOptions = nodemailer.SendMailOptions;
+export type SentMessageInfo = nodemailer.SentMessageInfo;
+
+/**
+ * Transporter plugin
+ */
+export interface Plugin {
+    (mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
 }
+
+/**
+ * This is what you use to send mail
+ */
+export interface Transporter {
+    /**
+     * Send a mail
+     */
+    sendMail(mail: SendMailOptions, callback?: (error: Error, info: SentMessageInfo) => void): void;
+
+    /**
+     * Attach a plugin. 'compile' and 'stream' plugins can be attached with use(plugin) method
+     *
+     * @param step is a string, either 'compile' or 'stream' thatd defines when the plugin should be hooked
+     * @param pluginFunc is a function that takes two arguments: the mail object and a callback function
+     */
+    use(step: string, plugin: Plugin): void;
+
+
+    /**
+     * Close all connections
+     */
+    close?(): void;
+}
+
+/**
+ * Create a direct transporter
+ */
+declare export function createTransport(options?: directTransport.DirectOptions, defaults?: Object): Transporter;
+/**
+ * Create an SMTP transporter
+ */
+declare export function createTransport(options?: smtpTransport.SmtpOptions, defaults?: Object): Transporter;
+/**
+ * Create a transporter from a given implementation
+ */
+declare export function createTransport(transport: Transport, defaults?: Object): Transporter;
diff --git a/nodeunit/nodeunit.d.ts b/nodeunit/nodeunit.d.ts
index cb71d729a0..cb75879898 100644
--- a/nodeunit/nodeunit.d.ts
+++ b/nodeunit/nodeunit.d.ts
@@ -5,62 +5,61 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/nodeunit.d.ts
 
-declare module 'nodeunit' {
-	export interface ITestCase {
-			(testCase: {[property: string]: ITestBody | ITestGroup | void}) : void;
-		}
-    export var testCase : ITestCase;
 
-	export interface Test {
-		done: ICallbackFunction;
-		expect(num: number): void;
-
-		//assersions from node assert module
-		fail(actual: any, expected: any, message: string, operator: string): void;
-		assert(value: any, message: string): void;
-		ok(value: any, message?: string): void;
-		equal(actual: any, expected: any, message?: string): void;
-		notEqual(actual: any, expected: any, message?: string): void;
-		deepEqual(actual: any, expected: any, message?: string): void;
-		notDeepEqual(actual: any, expected: any, message?: string): void;
-		strictEqual(actual: any, expected: any, message?: string): void;
-		notStrictEqual(actual: any, expected: any, message?: string): void;
-		throws(block: any, error?: any, message?: string): void;
-		doesNotThrow(block: any, error?: any, message?: string): void;
-		ifError(value: any): void;
-
-		//assertion wrappers
-		equals(actual: any, expected: any, message?: string): void;
-		same(actual: any, expected: any, message?: string): void;
-	}
-
-	// Test Group Usage:
-	//  var testGroup: nodeunit.ITestGroup = {
-	//      setUp: (callback) => {
-	// 	      callback();
-	//      },
-	//      tearDown: (callback) => {
-	// 	       callback();
-	//      },
-	//      test1: (test: nodeunit.Test) => {
-	//          test.done();
-	//      }
-	//    }
-	//    exports.testgroup = testGroup;
-
-	export interface ITestBody {
-		(callback: Test): void;
-	}
-
-	export interface ITestGroup {
-		/** The setUp function is run before each test */
-		setUp?: (callback: ICallbackFunction) => void;
-		/** The tearDown function is run after each test calls test.done() */
-		tearDown?: (callback: ICallbackFunction) => void;
-		[property: string] : ITestGroup | ITestBody | ((callback: ICallbackFunction) => void);
-	}
-
-	export interface ICallbackFunction {
-		(err?: any): void;
-	}
+export interface ITestCase {
+    (testCase: { [property: string]: ITestBody | ITestGroup | void }): void;
+}
+declare export var testCase: ITestCase;
+
+export interface Test {
+    done: ICallbackFunction;
+    expect(num: number): void;
+
+    //assersions from node assert module
+    fail(actual: any, expected: any, message: string, operator: string): void;
+    assert(value: any, message: string): void;
+    ok(value: any, message?: string): void;
+    equal(actual: any, expected: any, message?: string): void;
+    notEqual(actual: any, expected: any, message?: string): void;
+    deepEqual(actual: any, expected: any, message?: string): void;
+    notDeepEqual(actual: any, expected: any, message?: string): void;
+    strictEqual(actual: any, expected: any, message?: string): void;
+    notStrictEqual(actual: any, expected: any, message?: string): void;
+    throws(block: any, error?: any, message?: string): void;
+    doesNotThrow(block: any, error?: any, message?: string): void;
+    ifError(value: any): void;
+
+    //assertion wrappers
+    equals(actual: any, expected: any, message?: string): void;
+    same(actual: any, expected: any, message?: string): void;
+}
+
+// Test Group Usage:
+//  var testGroup: nodeunit.ITestGroup = {
+//      setUp: (callback) => {
+// 	      callback();
+//      },
+//      tearDown: (callback) => {
+// 	       callback();
+//      },
+//      test1: (test: nodeunit.Test) => {
+//          test.done();
+//      }
+//    }
+//    exports.testgroup = testGroup;
+
+export interface ITestBody {
+    (callback: Test): void;
+}
+
+export interface ITestGroup {
+    /** The setUp function is run before each test */
+    setUp?: (callback: ICallbackFunction) => void;
+    /** The tearDown function is run after each test calls test.done() */
+    tearDown?: (callback: ICallbackFunction) => void;
+    [property: string]: ITestGroup | ITestBody | ((callback: ICallbackFunction) => void);
+}
+
+export interface ICallbackFunction {
+    (err?: any): void;
 }
diff --git a/nopt/nopt.d.ts b/nopt/nopt.d.ts
index 5cbda6b2b9..e6422fafc3 100644
--- a/nopt/nopt.d.ts
+++ b/nopt/nopt.d.ts
@@ -3,44 +3,43 @@
 // Definitions by: jbondc <https://github.com/jbondc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "nopt" {
 
-	interface CommandData {
-		[key: string]: string
-	}
 
-	interface TypeDefs {
-		[key: string]: TypeInfo
-	}
-
-	interface TypeInfo {
-		type: Object
-		validate: (data: CommandData, k: string, val: string) => boolean
-	}
-
-	namespace nopt {
-		export function clean(data: CommandData, types: FlagTypeMap, typeDefs?: TypeDefs): string
-		export var typeDefs: TypeDefs
-	}
-
-	interface FlagTypeMap {
-		[k: string]: Object
-	}
-
-	interface ShortFlags {
-		[k: string]: string[]|string
-	}
-
-	function nopt(types: FlagTypeMap, shorthands?: ShortFlags, args?: string[], slice?: number): OptionsParsed
-
-	interface OptionsParsed {
-		[k: string]: any
-		argv: {
-			remain: string[]
-			cooked: string[]
-			original: string[]
-		}
-	}
-
-	export = nopt
+interface CommandData {
+    [key: string]: string
 }
+
+interface TypeDefs {
+    [key: string]: TypeInfo
+}
+
+interface TypeInfo {
+    type: Object
+    validate: (data: CommandData, k: string, val: string) => boolean
+}
+
+declare namespace nopt {
+    export function clean(data: CommandData, types: FlagTypeMap, typeDefs?: TypeDefs): string
+    export var typeDefs: TypeDefs
+}
+
+interface FlagTypeMap {
+    [k: string]: Object
+}
+
+interface ShortFlags {
+    [k: string]: string[] | string
+}
+
+declare function nopt(types: FlagTypeMap, shorthands?: ShortFlags, args?: string[], slice?: number): OptionsParsed
+
+interface OptionsParsed {
+    [k: string]: any
+    argv: {
+        remain: string[]
+        cooked: string[]
+        original: string[]
+    }
+}
+
+export = nopt
diff --git a/nunjucks/nunjucks.d.ts b/nunjucks/nunjucks.d.ts
index f6c059128f..c4f1ce9e8c 100644
--- a/nunjucks/nunjucks.d.ts
+++ b/nunjucks/nunjucks.d.ts
@@ -3,131 +3,130 @@
 // Definitions by: Ruben Slabbert <https://github.com/RubenSlabbert/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "nunjucks" {
-    namespace Nunjucks {
-        function render(name: string, context?: Object): string;
-        function render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
 
-        function renderString(src: string, context: Object): string;
-        function renderString(src: string, context: Object, callback?: (err: any, res: string) => any): void;
+declare namespace Nunjucks {
+    function render(name: string, context?: Object): string;
+    function render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
 
-        function compile(src: string, env?: Environment): Template;
-        function compile(src: string, env?: Environment, callback?: (err: any, res: Template) => any): Template;
+    function renderString(src: string, context: Object): string;
+    function renderString(src: string, context: Object, callback?: (err: any, res: string) => any): void;
 
-        function precompile(path: string, opts?: PrecompileOptions): string;
-        function precompileString(src: string, opts?: PrecompileOptions): string;
+    function compile(src: string, env?: Environment): Template;
+    function compile(src: string, env?: Environment, callback?: (err: any, res: Template) => any): Template;
 
-        interface PrecompileOptions {
-            name?: string;
-            asFunction?: boolean;
-            force?: boolean;
-            env?: Environment;
-            include?: string[];
-            exclude?: string[];
-            wrapper?(templates: { name: string, template: string }, opts: PrecompileOptions): string;
-        }
+    function precompile(path: string, opts?: PrecompileOptions): string;
+    function precompileString(src: string, opts?: PrecompileOptions): string;
 
-        class Template {
-            constructor(src: string, env?: Environment, eagerCompile?: boolean);
-            render(context?: Object): string;
-            render(context?: Object, callback?: (err: any, res: string) => any): void;
-        }
-
-        function configure(options: ConfigureOptions): Environment;
-        function configure(path: string, options?: ConfigureOptions): Environment;
-
-        interface ConfigureOptions {
-            autoescape?: boolean;
-            throwOnUndefined?: boolean;
-            trimBlocks?: boolean;
-            lstripBlocks?: boolean;
-            watch?: boolean;
-            noCache?: boolean;
-            web?: {
-                useCache?: boolean,
-                async?: boolean
-            };
-            express?: Object;
-            tags?: {
-                blockStart?: string,
-                blockEnd?: string,
-                variableStart?: string,
-                variableEnd?: string,
-                commentStart?: string,
-                commentEnd?: string
-            };
-        }
-
-        class Environment {
-            options: {
-                autoescape: boolean;
-            };
-
-            constructor(loader: ILoader, opts?: ConfigureOptions);
-            constructor(loaders: ILoader[], opts?: ConfigureOptions);
-
-            render(name: string, context?: Object): string;
-            render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
-
-            renderString(name: string, context: Object): string;
-            renderString(name: string, context: Object, callback?: (err: any, res: string) => any): void;
-
-            addFilter(name: string, func: (...args: any[]) => any, async?: boolean): void;
-            getFilter(name: string): void;
-
-            addExtension(name: string, ext: Extension): void;
-            removeExtension(name: string): void;
-            getExtension(name: string): Extension;
-            hasExtension(name: string): void;
-
-            addGlobal(name: string, value: any): void;
-
-            getTemplate(name: string, eagerCompile?: boolean): Template;
-            getTemplate(name: string, eagerCompile?: boolean, callback?: (err: any, templ: Template) => Template): void;
-
-            express(app: Object): void;
-        }
-
-        interface Extension {
-            tags: string[];
-            // Parser API is undocumented it is suggested to check the source: https://github.com/mozilla/nunjucks/blob/master/src/parser.js
-            parse(parser: any, nodes: any, lexer: any): any;
-        }
-
-        function installJinjaCompat(): void;
-
-        interface ILoader {
-            async?: boolean;
-            getSource(name: string): LoaderSource;
-            extend?(extender: ILoader): ILoader;
-        }
-
-        // Needs both Loader and ILoader since nunjucks uses a custom object system
-        // Object system is also responsible for the extend methods
-        class Loader {
-            on(name: string, func: (...args: any[]) => any): void;
-            emit(name: string, ...args: any[]): void;
-            resolve(from: string, to: string): string;
-            isRelative(filename: string): boolean;
-            extend(toExtend: ILoader): ILoader;
-        }
-
-        interface LoaderSource {
-            src: string;
-            path: string;
-            noCache: boolean;
-        }
-
-        class FileSystemLoader extends Loader implements ILoader {
-            init(searchPaths: string[], opts: any): void;
-            getSource(name: string): LoaderSource;
-        }
-
-        class PrecompiledLoader extends Loader implements ILoader {
-            init(searchPaths: string[], opts: any): void;
-            getSource(name: string): LoaderSource;
-        }
+    interface PrecompileOptions {
+        name?: string;
+        asFunction?: boolean;
+        force?: boolean;
+        env?: Environment;
+        include?: string[];
+        exclude?: string[];
+        wrapper?(templates: { name: string, template: string }, opts: PrecompileOptions): string;
     }
 
-    export = Nunjucks;
-}
\ No newline at end of file
+    class Template {
+        constructor(src: string, env?: Environment, eagerCompile?: boolean);
+        render(context?: Object): string;
+        render(context?: Object, callback?: (err: any, res: string) => any): void;
+    }
+
+    function configure(options: ConfigureOptions): Environment;
+    function configure(path: string, options?: ConfigureOptions): Environment;
+
+    interface ConfigureOptions {
+        autoescape?: boolean;
+        throwOnUndefined?: boolean;
+        trimBlocks?: boolean;
+        lstripBlocks?: boolean;
+        watch?: boolean;
+        noCache?: boolean;
+        web?: {
+            useCache?: boolean,
+            async?: boolean
+        };
+        express?: Object;
+        tags?: {
+            blockStart?: string,
+            blockEnd?: string,
+            variableStart?: string,
+            variableEnd?: string,
+            commentStart?: string,
+            commentEnd?: string
+        };
+    }
+
+    class Environment {
+        options: {
+            autoescape: boolean;
+        };
+
+        constructor(loader: ILoader, opts?: ConfigureOptions);
+        constructor(loaders: ILoader[], opts?: ConfigureOptions);
+
+        render(name: string, context?: Object): string;
+        render(name: string, context?: Object, callback?: (err: any, res: string) => any): void;
+
+        renderString(name: string, context: Object): string;
+        renderString(name: string, context: Object, callback?: (err: any, res: string) => any): void;
+
+        addFilter(name: string, func: (...args: any[]) => any, async?: boolean): void;
+        getFilter(name: string): void;
+
+        addExtension(name: string, ext: Extension): void;
+        removeExtension(name: string): void;
+        getExtension(name: string): Extension;
+        hasExtension(name: string): void;
+
+        addGlobal(name: string, value: any): void;
+
+        getTemplate(name: string, eagerCompile?: boolean): Template;
+        getTemplate(name: string, eagerCompile?: boolean, callback?: (err: any, templ: Template) => Template): void;
+
+        express(app: Object): void;
+    }
+
+    interface Extension {
+        tags: string[];
+        // Parser API is undocumented it is suggested to check the source: https://github.com/mozilla/nunjucks/blob/master/src/parser.js
+        parse(parser: any, nodes: any, lexer: any): any;
+    }
+
+    function installJinjaCompat(): void;
+
+    interface ILoader {
+        async?: boolean;
+        getSource(name: string): LoaderSource;
+        extend?(extender: ILoader): ILoader;
+    }
+
+    // Needs both Loader and ILoader since nunjucks uses a custom object system
+    // Object system is also responsible for the extend methods
+    class Loader {
+        on(name: string, func: (...args: any[]) => any): void;
+        emit(name: string, ...args: any[]): void;
+        resolve(from: string, to: string): string;
+        isRelative(filename: string): boolean;
+        extend(toExtend: ILoader): ILoader;
+    }
+
+    interface LoaderSource {
+        src: string;
+        path: string;
+        noCache: boolean;
+    }
+
+    class FileSystemLoader extends Loader implements ILoader {
+        init(searchPaths: string[], opts: any): void;
+        getSource(name: string): LoaderSource;
+    }
+
+    class PrecompiledLoader extends Loader implements ILoader {
+        init(searchPaths: string[], opts: any): void;
+        getSource(name: string): LoaderSource;
+    }
+}
+
+export = Nunjucks;
diff --git a/nw.gui/nw.gui.d.ts b/nw.gui/nw.gui.d.ts
index 81129274dc..eab724a366 100644
--- a/nw.gui/nw.gui.d.ts
+++ b/nw.gui/nw.gui.d.ts
@@ -3,219 +3,217 @@
 // Definitions by: Pedro Casaubon <https://github.com/xperiments>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "nw.gui" {
 
-    interface IEventEmitter {
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): void;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-    }
 
-    class EventEmitter implements IEventEmitter {
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): void;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-    }
+interface IEventEmitter {
+    addListener(event: string, listener: Function): EventEmitter;
+    on(event: string, listener: Function): EventEmitter;
+    once(event: string, listener: Function): EventEmitter;
+    removeListener(event: string, listener: Function): EventEmitter;
+    removeAllListeners(event?: string): EventEmitter;
+    setMaxListeners(n: number): void;
+    listeners(event: string): Function[];
+    emit(event: string, ...args: any[]): boolean;
+}
 
-    export interface MenuConfig {
-        type?: string;
-    }
+declare class EventEmitter implements IEventEmitter {
+    addListener(event: string, listener: Function): EventEmitter;
+    on(event: string, listener: Function): EventEmitter;
+    once(event: string, listener: Function): EventEmitter;
+    removeListener(event: string, listener: Function): EventEmitter;
+    removeAllListeners(event?: string): EventEmitter;
+    setMaxListeners(n: number): void;
+    listeners(event: string): Function[];
+    emit(event: string, ...args: any[]): boolean;
+}
 
-    export interface HideMenusOptions {
-        hideEdit: boolean;
-        hideWindow: boolean;
-    }
+export interface MenuConfig {
+    type?: string;
+}
 
-    export interface MenuItemConfig {
-        label?: string;
-        click?: Function;
-        type?: string;
-        submenu?: Menu;
-        icon?: string;
-        tooltip?: string;
-        checked?: boolean;
-        enabled?: boolean;
-        key?: string;
-        modifiers?: string;
-    }
+export interface HideMenusOptions {
+    hideEdit: boolean;
+    hideWindow: boolean;
+}
 
-    export class MenuItem extends EventEmitter implements MenuItemConfig {
-        constructor(config: MenuItemConfig);
-        label: string;
-        click: Function;
-        type: string;
-        submenu: Menu;
-        icon: string;
-        tooltip: string;
-        checked: boolean;
-        enabled: boolean;
-        key: string;
-        modifiers: string;
-    }
+export interface MenuItemConfig {
+    label?: string;
+    click?: Function;
+    type?: string;
+    submenu?: Menu;
+    icon?: string;
+    tooltip?: string;
+    checked?: boolean;
+    enabled?: boolean;
+    key?: string;
+    modifiers?: string;
+}
 
-    export class Menu {
-        constructor(config?: MenuConfig);
-        items: MenuItem[];
-        append(item: MenuItem): void;
-        remove(item: MenuItem): void;
-        insert(item: MenuItem, atPosition: number): void;
-        removeAt(index: number): void;
-        popup(x: number, y: number): void;
-        // since v0.10.0-rc1
-        createMacBuiltin(appname: string, options?: HideMenusOptions): void;
+declare export class MenuItem extends EventEmitter implements MenuItemConfig {
+    constructor(config: MenuItemConfig);
+    label: string;
+    click: Function;
+    type: string;
+    submenu: Menu;
+    icon: string;
+    tooltip: string;
+    checked: boolean;
+    enabled: boolean;
+    key: string;
+    modifiers: string;
+}
 
-    }
-
-    export interface ShortcutOption {
-        key: string;
-        active: Function;
-        failed: Function;
-    }
-
-    export class Shortcut extends EventEmitter {
-        constructor(option: ShortcutOption);
-        key: string;
-        active: Function;
-        failed: Function;
-    }
-
-    export interface WindowManifestOptions {
-
-        title?: string;
-        icon?: string;
-        toolbar?: boolean;
-        frame?: boolean;
-        width?: number;
-        height?: number;
-        position?: string;
-        min_width?: number;
-        min_height?: number;
-        max_width?: number;
-        max_height?: number;
-    }
-
-    export class Window extends EventEmitter {
-        static get(windowObject?: any): Window;
-        static open(url: string, options?: WindowManifestOptions): Window;
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        title: string;
-        menu: Menu;
-        isFullScreen: boolean;
-        isKioskMode: boolean;
-        zoomLevel: number;
-        moveTo(x: number, y: number): void;
-        moveBy(x: number, y: number): void;
-        resizeTo(width: number, height: number): void;
-        resizeBy(width: number, height: number): void;
-        focus(): void;
-        blur(): void;
-        show(): void;
-        hide(): void;
-        close(force?: boolean): void;
-        reload(): void;
-        reloadIgnoringCache(): void;
-        maximize(): void;
-        unmaximize(): void;
-        minimize(): void;
-        restore(): void;
-        enterFullscreen(): void;
-        leaveFullscreen(): void;
-        toggleFullscreen(): void;
-        enterKioskMode(): void;
-        leaveKioskMode(): void;
-        toggleKioskMode(): void;
-        showDevTools(id?: string, headless?: boolean): void;
-        showDevTools(id: HTMLIFrameElement, headless?: boolean): void;
-        closeDevTools(): void;
-        isDevToolsOpen(): boolean;
-        setMaximumSize(width: number, height: number): void;
-        setMinimumSize(width: number, height: number): void;
-        setResizable(resizable: boolean): void;
-        setAlwaysOnTop(top: boolean): void;
-        setPosition(position: string): void;
-        setShowInTaskbar(show: boolean): void;
-        requestAttention(attention: boolean): void;
-        requestAttention(attention: number): void;
-        capturePage(callback: Function, imageformat?: string): void;
-        capturePage(callback: Function, config_object: { format: string; datatype: string }): void;
-        setProgressBar(progress: number): void;
-        setBadgeLabel(label: string): void;
-        eval(frame: HTMLIFrameElement, script: string): void;
-    }
-
-    export interface App {
-        argv: any;
-        fullArgv: any;
-        dataPath: string;
-        manifest: any;
-        clearCache(): void;
-        closeAllWindows(): void;
-        crashBrowser(): void;
-        crashRenderer(): void;
-        getProxyForURL(url: string): void;
-        quit(): void;
-        setCrashDumpDir(dir: string): void;
-        addOriginAccessWhitelistEntry(
-            sourceOrigin: string
-            , destinationProtocol: string
-            , destinationHost: string
-            , allowDestinationSubdomains: boolean
-            ): void;
-        removeOriginAccessWhitelistEntry(
-            sourceOrigin: string
-            , destinationProtocol: string
-            , destinationHost: string
-            , allowDestinationSubdomains: boolean
-            ): void;
-        registerGlobalHotKey(shortcut: Shortcut): void;
-        unregisterGlobalHotKey(shortcut: Shortcut): void;
-    }
-
-    export class Clipboard {
-        static get(): Clipboard;
-        get(type?: string): string;
-        set(data: string, type?: string): void;
-        clear(): void;
-    }
-
-    export interface TrayOption {
-        title?: string;
-        tooltip?: string;
-        icon?: string;
-        alticon?: string;
-        menu?: Menu;
-    }
-
-    export class Tray implements TrayOption {
-        constructor(option: TrayOption);
-        title: string;
-        tooltip: string;
-        icon: string;
-        alticon: string;
-        menu: Menu;
-        remove(): void;
-    }
-
-    interface Shell {
-        openExternal(uri: string): void;
-        openItem(file_path: string): void;
-        showItemInFolder(file_path: string): void;
-    }
-
-    export var App: App;
-    export var Shell: Shell;
+declare export class Menu {
+    constructor(config?: MenuConfig);
+    items: MenuItem[];
+    append(item: MenuItem): void;
+    remove(item: MenuItem): void;
+    insert(item: MenuItem, atPosition: number): void;
+    removeAt(index: number): void;
+    popup(x: number, y: number): void;
+    // since v0.10.0-rc1
+    createMacBuiltin(appname: string, options?: HideMenusOptions): void;
 
 }
+
+export interface ShortcutOption {
+    key: string;
+    active: Function;
+    failed: Function;
+}
+
+declare export class Shortcut extends EventEmitter {
+    constructor(option: ShortcutOption);
+    key: string;
+    active: Function;
+    failed: Function;
+}
+
+export interface WindowManifestOptions {
+
+    title?: string;
+    icon?: string;
+    toolbar?: boolean;
+    frame?: boolean;
+    width?: number;
+    height?: number;
+    position?: string;
+    min_width?: number;
+    min_height?: number;
+    max_width?: number;
+    max_height?: number;
+}
+
+declare export class Window extends EventEmitter {
+    static get(windowObject?: any): Window;
+    static open(url: string, options?: WindowManifestOptions): Window;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    title: string;
+    menu: Menu;
+    isFullScreen: boolean;
+    isKioskMode: boolean;
+    zoomLevel: number;
+    moveTo(x: number, y: number): void;
+    moveBy(x: number, y: number): void;
+    resizeTo(width: number, height: number): void;
+    resizeBy(width: number, height: number): void;
+    focus(): void;
+    blur(): void;
+    show(): void;
+    hide(): void;
+    close(force?: boolean): void;
+    reload(): void;
+    reloadIgnoringCache(): void;
+    maximize(): void;
+    unmaximize(): void;
+    minimize(): void;
+    restore(): void;
+    enterFullscreen(): void;
+    leaveFullscreen(): void;
+    toggleFullscreen(): void;
+    enterKioskMode(): void;
+    leaveKioskMode(): void;
+    toggleKioskMode(): void;
+    showDevTools(id?: string, headless?: boolean): void;
+    showDevTools(id: HTMLIFrameElement, headless?: boolean): void;
+    closeDevTools(): void;
+    isDevToolsOpen(): boolean;
+    setMaximumSize(width: number, height: number): void;
+    setMinimumSize(width: number, height: number): void;
+    setResizable(resizable: boolean): void;
+    setAlwaysOnTop(top: boolean): void;
+    setPosition(position: string): void;
+    setShowInTaskbar(show: boolean): void;
+    requestAttention(attention: boolean): void;
+    requestAttention(attention: number): void;
+    capturePage(callback: Function, imageformat?: string): void;
+    capturePage(callback: Function, config_object: { format: string; datatype: string }): void;
+    setProgressBar(progress: number): void;
+    setBadgeLabel(label: string): void;
+    eval(frame: HTMLIFrameElement, script: string): void;
+}
+
+export interface App {
+    argv: any;
+    fullArgv: any;
+    dataPath: string;
+    manifest: any;
+    clearCache(): void;
+    closeAllWindows(): void;
+    crashBrowser(): void;
+    crashRenderer(): void;
+    getProxyForURL(url: string): void;
+    quit(): void;
+    setCrashDumpDir(dir: string): void;
+    addOriginAccessWhitelistEntry(
+        sourceOrigin: string
+        , destinationProtocol: string
+        , destinationHost: string
+        , allowDestinationSubdomains: boolean
+    ): void;
+    removeOriginAccessWhitelistEntry(
+        sourceOrigin: string
+        , destinationProtocol: string
+        , destinationHost: string
+        , allowDestinationSubdomains: boolean
+    ): void;
+    registerGlobalHotKey(shortcut: Shortcut): void;
+    unregisterGlobalHotKey(shortcut: Shortcut): void;
+}
+
+declare export class Clipboard {
+    static get(): Clipboard;
+    get(type?: string): string;
+    set(data: string, type?: string): void;
+    clear(): void;
+}
+
+export interface TrayOption {
+    title?: string;
+    tooltip?: string;
+    icon?: string;
+    alticon?: string;
+    menu?: Menu;
+}
+
+declare export class Tray implements TrayOption {
+    constructor(option: TrayOption);
+    title: string;
+    tooltip: string;
+    icon: string;
+    alticon: string;
+    menu: Menu;
+    remove(): void;
+}
+
+interface Shell {
+    openExternal(uri: string): void;
+    openItem(file_path: string): void;
+    showItemInFolder(file_path: string): void;
+}
+
+declare export var App: App;
+declare export var Shell: Shell;
diff --git a/oauth2-server/oauth2-server.d.ts b/oauth2-server/oauth2-server.d.ts
index 8c562269e8..24470b169c 100644
--- a/oauth2-server/oauth2-server.d.ts
+++ b/oauth2-server/oauth2-server.d.ts
@@ -12,413 +12,412 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "oauth2-server" {
-    import {RequestHandler} from "express";
-    import {Request} from "express";
 
-    function o(config : o.Config) : o.OAuth2Server;
+import {RequestHandler} from "express";
+import {Request} from "express";
 
-    namespace o {
-        interface OAuth2Server {
-            grant() : RequestHandler;
-            authorise() : any;
-            errorHandler() : any;
-        }
+declare function o(config: o.Config): o.OAuth2Server;
 
-        interface Config {
-            /**
-             * Model object
-             */
-            model: {};
-
-            /**
-             * grant types you wish to support, currently the module supports authorization_code,
-             * password, refresh_token and client_credentials
-             */
-            grants: string[];
-
-            /**
-             * If true errors will be logged to console. You may also pass a custom function, in
-             * which case that function will be called with the error as its first argument
-             * Default: false
-             */
-            debug?: boolean;
-
-            /**
-             * Life of access tokens in seconds
-             * If null, tokens will considered to never expire
-             * Default: 3600
-             */
-            accessTokenLifetime?: number;
-
-            /**
-             * Life of refresh tokens in seconds
-             * If null, tokens will considered to never expire
-             * Default: 1209600
-             */
-            refreshTokenLifetime?: number;
-
-            /**
-             * Life of auth codes in seconds
-             * Default: 30
-             */
-            authCodeLifetime?: number;
-
-            /**
-             * Regex to sanity check client id against before checking model. Note: the default
-             * just matches common client_id structures, change as needed
-             * Default: /^[a-z0-9-_]{3,40}$/i
-             */
-            clientIdRegex?: RegExp;
-
-            /**
-             * If true, non grant errors will not be handled internally (so you can ensure a
-             * consistent format with the rest of your api)
-             */
-            passthroughErrors?: boolean;
-
-            /**
-             * If true, next will be called even if a response has been sent (you probably don't want this)
-             */
-            continueAfterResponse?: boolean;
-        }
-
-        interface BaseModel {
-            /**
-             *
-             * @param bearerToken - The bearer token (access token) that has been provided
-             * @param callback
-             */
-            getAccessToken(bearerToken:string,
-                           callback:GetAccessTokenCallback) : void;
-
-            /**
-             *
-             * @param clientId
-             * @param clientSecret - If null, omit from search query (only search by clientId)
-             * @param callback
-             */
-            getClient(clientId:string,
-                      clientSecret:string,
-                      callback:GetClientCallback) : void;
-
-            /**
-             *
-             * @param clientId
-             * @param grantType
-             * @param callback
-             */
-            grantTypeAllowed(clientId:string,
-                             grantType:string,
-                             callback:GrantTypeAllowedCallback) : void;
-
-            /**
-             *
-             * @param accessToken
-             * @param clientId
-             * @param expires
-             * @param user
-             * @param callback
-             */
-            saveAccessToken(accessToken:string,
-                            clientId:string,
-                            expires:Date,
-                            user:User,
-                            callback:SaveAccessTokenCallback) : void;
-        }
-
-        interface AuthorizationCodeModel extends BaseModel {
-            /**
-             *
-             * @param authCode
-             * @param callback
-             */
-            getAuthCode(authCode:string,
-                        callback:GetAuthCodeCallback) : void;
-
-            /**
-             *
-             * @param authCode
-             * @param clientId
-             * @param expires
-             * @param user - Whatever was passed as user to the codeGrant function (see example)
-             * @param callback
-             */
-            saveAuthCode(authCode:string,
-                         clientId:string,
-                         expires:Date,
-                         user:User|string,
-                         callback:SaveAuthCodeCallback) : void;
-        }
-
-        interface PasswordModel extends BaseModel {
-            /**
-             *
-             * @param username
-             * @param password
-             * @param callback
-             */
-            getUser(username:string,
-                    password:string,
-                    callback:GetUserCallback) : void;
-        }
-
-        interface RefreshTokenModel extends BaseModel {
-            /**
-             *
-             * @param refreshToken
-             * @param clientId
-             * @param expires
-             * @param user
-             * @param callback
-             */
-            saveRefreshToken(refreshToken:string,
-                             clientId:string,
-                             expires:Date,
-                             user:User,
-                             callback:SaveRefreshTokenCallback) : void;
-
-            /**
-             *
-             * @param refreshToken - The bearer token (refresh token) that has been provided
-             * @param callback
-             */
-            getRefreshToken(refreshToken:string,
-                            callback:GetRefreshTokenCallback) : void;
-
-            /**
-             * The spec does not actually require that you revoke the old token - hence this is
-             * optional (Last paragraph: http://tools.ietf.org/html/rfc6749#section-6)
-             * @param refreshToken
-             * @param callback
-             */
-            revokeRefreshToken?(refreshToken:string,
-                                callback:RevokeRefreshTokenCallback) : void;
-        }
-
-        interface ExtensionModel extends BaseModel {
-            /**
-             *
-             * @param grantType
-             * @param req
-             * @param callback
-             */
-            extendedGrant(grantType:string,
-                          req:Request,
-                          callback:ExtendedGrantCallback) : void;
-        }
-
-        interface ClientCredentialsModel extends BaseModel {
-            /**
-             *
-             * @param clientId
-             * @param clientSecret
-             * @param callback
-             */
-            getUserFromClient(clientId:string,
-                              clientSecret:string,
-                              callback:GetUserFromClientCallback) : void;
-
-            /**
-             *
-             * @param type - accessToken or refreshToken
-             * @param req - The current express request
-             * @param callback
-             */
-            generateToken?(type:string,
-                           req:Request,
-                           callback:GenerateTokenCallback) : void;
-        }
-
-        interface GenerateTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param token - string indicates success
-             * null indicates to revert to the default token generator
-             * object indicates a reissue (i.e. will not be passed to saveAccessToken/saveRefreshToken)
-             * Must contain the following keys (if object):
-             * string accessToken OR refreshToken dependant on type
-             */
-            (error:any, token:string|Object) : void;
-        }
-
-        interface GetUserFromClientCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param user - The user retrieved from storage or falsey to indicate an invalid user
-             * Saved in req.user
-             */
-            (error:any, user:User) : void;
-        }
-
-        interface ExtendedGrantCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param supported - Whether you support the grant type
-             * @param user - The user retrieved from storage or falsey to indicate an invalid user
-             * Saved in req.user
-             */
-            (error:any, supported:boolean, user:User) : void;
-        }
-
-        interface RevokeRefreshTokenCallback {
-            /**
-             * Truthy to indicate an error
-             * @param error
-             */
-            (error:any) : void;
-        }
-
-        interface GetRefreshTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param refreshToken - The refresh token retrieved form storage or falsey to indicate invalid refresh token
-             */
-            (error:any, refreshToken:RefreshToken) : void;
-        }
-
-        interface SaveRefreshTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             */
-            (error:any) : void;
-        }
-
-        interface GetUserCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param user - The user retrieved from storage or falsey to indicate an invalid user
-             * Saved in req.user
-             */
-            (error:any, user:User) : void;
-        }
-
-        interface SaveAuthCodeCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             */
-            (error:any) : void;
-        }
-
-        interface GetAuthCodeCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param authCode - The authorization code retrieved form storage or falsey to indicate invalid code
-             */
-            (error:String, authCode:AuthCode) : void
-        }
-
-        interface SaveAccessTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             */
-            (error:any) : void;
-        }
-
-        interface GetAccessTokenCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param accessToken - The access token retrieved form storage or falsey to indicate invalid access token
-             */
-            (error:any, accessToken:AccessToken) : void;
-        }
-
-        interface GetClientCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param client - The client retrieved from storage or falsey to indicate an invalid client
-             * Saved in req.client
-             */
-            (error:any, client:Client) : void;
-        }
-
-        interface GrantTypeAllowedCallback {
-            /**
-             *
-             * @param error - Truthy to indicate an error
-             * @param allowed - Indicates whether the grantType is allowed for this clientId
-             */
-            (error:any, allowed:boolean) : void;
-        }
-
-        interface RefreshToken {
-            /**
-             * client id associated with this token
-             */
-            clientId : string;
-
-            /**
-             * The date when it expires
-             * null to indicate the token never expires
-             */
-            expires : Date;
-
-            /**
-             *
-             */
-            userId : string;
-        }
-
-        interface AuthCode {
-            /**
-             * client id associated with this auth code
-             */
-            clientId : string;
-
-            /**
-             * The date when it expires
-             */
-            expires : Date;
-
-            /**
-             * The userId
-             */
-            userId : string;
-        }
-
-        interface User {
-            id: string;
-        }
-
-        interface Client {
-            clientId: string;
-
-            /**
-             * authorization_code grant type only
-             */
-            redirectUri: string;
-        }
-
-        interface AccessToken {
-            /**
-             * The date when it expires
-             * null to indicate the token never expires
-             */
-            expires: Date;
-
-            /**
-             * If a user key exists, this is saved as req.user
-             */
-            user?: User;
-
-            /**
-             * If a user key exists, this is saved as req.user
-             * Otherwise a userId key must exist, which is saved in req.user.id
-             */
-            userId?: string;
-        }
+declare namespace o {
+    interface OAuth2Server {
+        grant(): RequestHandler;
+        authorise(): any;
+        errorHandler(): any;
     }
 
-    export = o;
+    interface Config {
+        /**
+         * Model object
+         */
+        model: {};
+
+        /**
+         * grant types you wish to support, currently the module supports authorization_code,
+         * password, refresh_token and client_credentials
+         */
+        grants: string[];
+
+        /**
+         * If true errors will be logged to console. You may also pass a custom function, in
+         * which case that function will be called with the error as its first argument
+         * Default: false
+         */
+        debug?: boolean;
+
+        /**
+         * Life of access tokens in seconds
+         * If null, tokens will considered to never expire
+         * Default: 3600
+         */
+        accessTokenLifetime?: number;
+
+        /**
+         * Life of refresh tokens in seconds
+         * If null, tokens will considered to never expire
+         * Default: 1209600
+         */
+        refreshTokenLifetime?: number;
+
+        /**
+         * Life of auth codes in seconds
+         * Default: 30
+         */
+        authCodeLifetime?: number;
+
+        /**
+         * Regex to sanity check client id against before checking model. Note: the default
+         * just matches common client_id structures, change as needed
+         * Default: /^[a-z0-9-_]{3,40}$/i
+         */
+        clientIdRegex?: RegExp;
+
+        /**
+         * If true, non grant errors will not be handled internally (so you can ensure a
+         * consistent format with the rest of your api)
+         */
+        passthroughErrors?: boolean;
+
+        /**
+         * If true, next will be called even if a response has been sent (you probably don't want this)
+         */
+        continueAfterResponse?: boolean;
+    }
+
+    interface BaseModel {
+        /**
+         *
+         * @param bearerToken - The bearer token (access token) that has been provided
+         * @param callback
+         */
+        getAccessToken(bearerToken: string,
+            callback: GetAccessTokenCallback): void;
+
+        /**
+         *
+         * @param clientId
+         * @param clientSecret - If null, omit from search query (only search by clientId)
+         * @param callback
+         */
+        getClient(clientId: string,
+            clientSecret: string,
+            callback: GetClientCallback): void;
+
+        /**
+         *
+         * @param clientId
+         * @param grantType
+         * @param callback
+         */
+        grantTypeAllowed(clientId: string,
+            grantType: string,
+            callback: GrantTypeAllowedCallback): void;
+
+        /**
+         *
+         * @param accessToken
+         * @param clientId
+         * @param expires
+         * @param user
+         * @param callback
+         */
+        saveAccessToken(accessToken: string,
+            clientId: string,
+            expires: Date,
+            user: User,
+            callback: SaveAccessTokenCallback): void;
+    }
+
+    interface AuthorizationCodeModel extends BaseModel {
+        /**
+         *
+         * @param authCode
+         * @param callback
+         */
+        getAuthCode(authCode: string,
+            callback: GetAuthCodeCallback): void;
+
+        /**
+         *
+         * @param authCode
+         * @param clientId
+         * @param expires
+         * @param user - Whatever was passed as user to the codeGrant function (see example)
+         * @param callback
+         */
+        saveAuthCode(authCode: string,
+            clientId: string,
+            expires: Date,
+            user: User | string,
+            callback: SaveAuthCodeCallback): void;
+    }
+
+    interface PasswordModel extends BaseModel {
+        /**
+         *
+         * @param username
+         * @param password
+         * @param callback
+         */
+        getUser(username: string,
+            password: string,
+            callback: GetUserCallback): void;
+    }
+
+    interface RefreshTokenModel extends BaseModel {
+        /**
+         *
+         * @param refreshToken
+         * @param clientId
+         * @param expires
+         * @param user
+         * @param callback
+         */
+        saveRefreshToken(refreshToken: string,
+            clientId: string,
+            expires: Date,
+            user: User,
+            callback: SaveRefreshTokenCallback): void;
+
+        /**
+         *
+         * @param refreshToken - The bearer token (refresh token) that has been provided
+         * @param callback
+         */
+        getRefreshToken(refreshToken: string,
+            callback: GetRefreshTokenCallback): void;
+
+        /**
+         * The spec does not actually require that you revoke the old token - hence this is
+         * optional (Last paragraph: http://tools.ietf.org/html/rfc6749#section-6)
+         * @param refreshToken
+         * @param callback
+         */
+        revokeRefreshToken?(refreshToken: string,
+            callback: RevokeRefreshTokenCallback): void;
+    }
+
+    interface ExtensionModel extends BaseModel {
+        /**
+         *
+         * @param grantType
+         * @param req
+         * @param callback
+         */
+        extendedGrant(grantType: string,
+            req: Request,
+            callback: ExtendedGrantCallback): void;
+    }
+
+    interface ClientCredentialsModel extends BaseModel {
+        /**
+         *
+         * @param clientId
+         * @param clientSecret
+         * @param callback
+         */
+        getUserFromClient(clientId: string,
+            clientSecret: string,
+            callback: GetUserFromClientCallback): void;
+
+        /**
+         *
+         * @param type - accessToken or refreshToken
+         * @param req - The current express request
+         * @param callback
+         */
+        generateToken?(type: string,
+            req: Request,
+            callback: GenerateTokenCallback): void;
+    }
+
+    interface GenerateTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param token - string indicates success
+         * null indicates to revert to the default token generator
+         * object indicates a reissue (i.e. will not be passed to saveAccessToken/saveRefreshToken)
+         * Must contain the following keys (if object):
+         * string accessToken OR refreshToken dependant on type
+         */
+        (error: any, token: string | Object): void;
+    }
+
+    interface GetUserFromClientCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param user - The user retrieved from storage or falsey to indicate an invalid user
+         * Saved in req.user
+         */
+        (error: any, user: User): void;
+    }
+
+    interface ExtendedGrantCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param supported - Whether you support the grant type
+         * @param user - The user retrieved from storage or falsey to indicate an invalid user
+         * Saved in req.user
+         */
+        (error: any, supported: boolean, user: User): void;
+    }
+
+    interface RevokeRefreshTokenCallback {
+        /**
+         * Truthy to indicate an error
+         * @param error
+         */
+        (error: any): void;
+    }
+
+    interface GetRefreshTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param refreshToken - The refresh token retrieved form storage or falsey to indicate invalid refresh token
+         */
+        (error: any, refreshToken: RefreshToken): void;
+    }
+
+    interface SaveRefreshTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         */
+        (error: any): void;
+    }
+
+    interface GetUserCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param user - The user retrieved from storage or falsey to indicate an invalid user
+         * Saved in req.user
+         */
+        (error: any, user: User): void;
+    }
+
+    interface SaveAuthCodeCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         */
+        (error: any): void;
+    }
+
+    interface GetAuthCodeCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param authCode - The authorization code retrieved form storage or falsey to indicate invalid code
+         */
+        (error: String, authCode: AuthCode): void
+    }
+
+    interface SaveAccessTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         */
+        (error: any): void;
+    }
+
+    interface GetAccessTokenCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param accessToken - The access token retrieved form storage or falsey to indicate invalid access token
+         */
+        (error: any, accessToken: AccessToken): void;
+    }
+
+    interface GetClientCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param client - The client retrieved from storage or falsey to indicate an invalid client
+         * Saved in req.client
+         */
+        (error: any, client: Client): void;
+    }
+
+    interface GrantTypeAllowedCallback {
+        /**
+         *
+         * @param error - Truthy to indicate an error
+         * @param allowed - Indicates whether the grantType is allowed for this clientId
+         */
+        (error: any, allowed: boolean): void;
+    }
+
+    interface RefreshToken {
+        /**
+         * client id associated with this token
+         */
+        clientId: string;
+
+        /**
+         * The date when it expires
+         * null to indicate the token never expires
+         */
+        expires: Date;
+
+        /**
+         *
+         */
+        userId: string;
+    }
+
+    interface AuthCode {
+        /**
+         * client id associated with this auth code
+         */
+        clientId: string;
+
+        /**
+         * The date when it expires
+         */
+        expires: Date;
+
+        /**
+         * The userId
+         */
+        userId: string;
+    }
+
+    interface User {
+        id: string;
+    }
+
+    interface Client {
+        clientId: string;
+
+        /**
+         * authorization_code grant type only
+         */
+        redirectUri: string;
+    }
+
+    interface AccessToken {
+        /**
+         * The date when it expires
+         * null to indicate the token never expires
+         */
+        expires: Date;
+
+        /**
+         * If a user key exists, this is saved as req.user
+         */
+        user?: User;
+
+        /**
+         * If a user key exists, this is saved as req.user
+         * Otherwise a userId key must exist, which is saved in req.user.id
+         */
+        userId?: string;
+    }
 }
+
+export = o;
diff --git a/object-assign/object-assign.d.ts b/object-assign/object-assign.d.ts
index 52ef486c72..dce1a14efb 100644
--- a/object-assign/object-assign.d.ts
+++ b/object-assign/object-assign.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Christopher Brown <https://github.com/chbrown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "object-assign" {
-  function objectAssign(target: any, ...sources: any[]): any;
-  export = objectAssign;
-}
+
+declare function objectAssign(target: any, ...sources: any[]): any;
+export = objectAssign;
diff --git a/on-finished/on-finished.d.ts b/on-finished/on-finished.d.ts
index d81ad766a9..a38124393b 100644
--- a/on-finished/on-finished.d.ts
+++ b/on-finished/on-finished.d.ts
@@ -6,13 +6,12 @@
 /// <reference path="../node/node.d.ts" />
 
 
-declare module 'on-finished' {
 
-    function onFinished(msg:NodeJS.EventEmitter, listener:Function): NodeJS.EventEmitter;
 
-    namespace onFinished {
-        export function isFinished(msg:NodeJS.EventEmitter):boolean;
-    }
+declare function onFinished(msg: NodeJS.EventEmitter, listener: Function): NodeJS.EventEmitter;
 
-    export = onFinished;
+declare namespace onFinished {
+    export function isFinished(msg: NodeJS.EventEmitter): boolean;
 }
+
+export = onFinished;
diff --git a/on-headers/on-headers.d.ts b/on-headers/on-headers.d.ts
index 8ac8e2a2e2..2a01279a85 100644
--- a/on-headers/on-headers.d.ts
+++ b/on-headers/on-headers.d.ts
@@ -5,29 +5,28 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "on-headers" {
-    import http = require("http");
 
-    /**
-     * This will add the listener to fire when headers are emitted for res.
-     * The listener is passed the response object as its context (this).
-     * Headers are considered emitted only once, right before they 
-     * are sent to the client.
-     *
-     * When this is called multiple times on the same res, the listeners
-     * are fired in the reverse order they were added.
-     *
-     * @param res HTTP server response object
-     * @param listener Function to call prior to headers being emitted,
-     *        the response object is passed as this context.
-     */
-    function onHeaders(res: http.ServerResponse, listener: Function):void;
+import http = require("http");
 
-    // Note that this definition might be able to be improved in a future
-    // version of typescript. At the moment it is not possible to declare
-    // the type of the 'this' context for a function, but it might be included
-    // in a future typescript version.
-    // https://github.com/Microsoft/TypeScript/issues/229
+/**
+ * This will add the listener to fire when headers are emitted for res.
+ * The listener is passed the response object as its context (this).
+ * Headers are considered emitted only once, right before they 
+ * are sent to the client.
+ *
+ * When this is called multiple times on the same res, the listeners
+ * are fired in the reverse order they were added.
+ *
+ * @param res HTTP server response object
+ * @param listener Function to call prior to headers being emitted,
+ *        the response object is passed as this context.
+ */
+declare function onHeaders(res: http.ServerResponse, listener: Function): void;
 
-    export = onHeaders;
-}
\ No newline at end of file
+// Note that this definition might be able to be improved in a future
+// version of typescript. At the moment it is not possible to declare
+// the type of the 'this' context for a function, but it might be included
+// in a future typescript version.
+// https://github.com/Microsoft/TypeScript/issues/229
+
+export = onHeaders;
diff --git a/open/open.d.ts b/open/open.d.ts
index bca02e5ac1..9822824a98 100644
--- a/open/open.d.ts
+++ b/open/open.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'open' {
-	function open(target: string, app?: string): void;
-	export = open;
-}
+
+declare function open(target: string, app?: string): void;
+export = open;
diff --git a/optimist/optimist.d.ts b/optimist/optimist.d.ts
index 12a51be1d6..be4d8993a9 100644
--- a/optimist/optimist.d.ts
+++ b/optimist/optimist.d.ts
@@ -3,87 +3,86 @@
 // Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Christopher Brown <https://github.com/chbrown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "optimist" {
 
-	namespace optimist {
-		interface Opt {
-			alias?: string | string[];
-			default?: any;
-			demand?: string | number | string[];
-			describe?: string;
-			type?: string;
-		}
 
-		interface Parser {
-			/** Implicitly use process.argv array to construct the argv object */
-			argv: any;
-			/** Pass in the process.argv yourself */
-			(args: string[]): any;
-			/** Use .parse() to do the same thing as treating optimist as a function */
-			parse(args: string[]): any;
+declare namespace optimist {
+    interface Opt {
+        alias?: string | string[];
+        default?: any;
+        demand?: string | number | string[];
+        describe?: string;
+        type?: string;
+    }
 
-			// The types below follow the order and documentation of https://github.com/substack/node-optimist
+    interface Parser {
+        /** Implicitly use process.argv array to construct the argv object */
+        argv: any;
+        /** Pass in the process.argv yourself */
+        (args: string[]): any;
+        /** Use .parse() to do the same thing as treating optimist as a function */
+        parse(args: string[]): any;
 
-			/** Set key names as equivalent such that updates to a key will propagate to aliases and vice-versa. */
-			alias(key: string, alias: string | string[]): Parser;
-			/** Take an object that maps keys to aliases. */
-			alias(aliases: {[index: string]: string | string[]}): Parser;
+        // The types below follow the order and documentation of https://github.com/substack/node-optimist
 
-			/** Set argv[key] to value if no option was specified on process.argv */
-			default(key: string, value: any): Parser;
-			/** Take an object that maps keys to default values */
-			default(defaults: {[index: string]: any}): Parser;
+        /** Set key names as equivalent such that updates to a key will propagate to aliases and vice-versa. */
+        alias(key: string, alias: string | string[]): Parser;
+        /** Take an object that maps keys to aliases. */
+        alias(aliases: { [index: string]: string | string[] }): Parser;
 
-			/** Show the usage information and exit if key wasn't specified in process.argv */
-			demand(key: string): Parser;
-			/** Demand at least as many non-option arguments, which show up in argv._ */
-			demand(key: number): Parser;
-			/** Demand each element in key */
-			demand(key: string[]): Parser;
+        /** Set argv[key] to value if no option was specified on process.argv */
+        default(key: string, value: any): Parser;
+        /** Take an object that maps keys to default values */
+        default(defaults: { [index: string]: any }): Parser;
 
-			/** Describe a key for the generated usage information */
-			describe(key: string, desc: string): Parser;
-			/** Take an object that maps keys to descriptions */
-			describe(descriptions: {[index: string]: string}): Parser;
+        /** Show the usage information and exit if key wasn't specified in process.argv */
+        demand(key: string): Parser;
+        /** Demand at least as many non-option arguments, which show up in argv._ */
+        demand(key: number): Parser;
+        /** Demand each element in key */
+        demand(key: string[]): Parser;
 
-			/** Instead of chaining together, e.g. optimist.alias().demand().default()...,
-			you can specify keys in opt for each of the chainable methods. */
-			options(key: string, opt: Opt): Parser;
-			/** Take an object that maps keys to opt parameters */
-			options(options: {[index: string]: Opt}): Parser;
+        /** Describe a key for the generated usage information */
+        describe(key: string, desc: string): Parser;
+        /** Take an object that maps keys to descriptions */
+        describe(descriptions: { [index: string]: string }): Parser;
 
-			/** Set a usage message to show which commands to use. Inside message,
-			the string $0 will get interpolated to the current script name or node
-			command for the present script similar to how $0 works in bash or perl. */
-			usage(message: string): Parser;
+        /** Instead of chaining together, e.g. optimist.alias().demand().default()...,
+        you can specify keys in opt for each of the chainable methods. */
+        options(key: string, opt: Opt): Parser;
+        /** Take an object that maps keys to opt parameters */
+        options(options: { [index: string]: Opt }): Parser;
 
-			/** Check that certain conditions are met in the provided arguments. If fn
-			throws or returns false, show the thrown error, usage information, and exit.
-			*/
-			check(fn: (argv: any) => any): Parser;
+        /** Set a usage message to show which commands to use. Inside message,
+        the string $0 will get interpolated to the current script name or node
+        command for the present script similar to how $0 works in bash or perl. */
+        usage(message: string): Parser;
 
-			/** Interpret key as a boolean. If a non-flag option follows key in process.argv,
-			that string won't get set as the value of key. If key never shows up as a
-			flag in process.arguments, argv[key] will be false. */
-			boolean(key: string): Parser;
-			/** Interpret all the elements as booleans. */
-			boolean(key: string[]): Parser;
+        /** Check that certain conditions are met in the provided arguments. If fn
+        throws or returns false, show the thrown error, usage information, and exit.
+        */
+        check(fn: (argv: any) => any): Parser;
 
-			/** Tell the parser logic not to interpret key as a number or boolean. This can be useful if you need to preserve leading zeros in an input. */
-			string(key: string): Parser;
-			/** Interpret all the elements as strings */
-			string(key: string[]): Parser;
+        /** Interpret key as a boolean. If a non-flag option follows key in process.argv,
+        that string won't get set as the value of key. If key never shows up as a
+        flag in process.arguments, argv[key] will be false. */
+        boolean(key: string): Parser;
+        /** Interpret all the elements as booleans. */
+        boolean(key: string[]): Parser;
 
-			/** Format usage output to wrap at columns many columns. */
-			wrap(columns: number): Parser;
+        /** Tell the parser logic not to interpret key as a number or boolean. This can be useful if you need to preserve leading zeros in an input. */
+        string(key: string): Parser;
+        /** Interpret all the elements as strings */
+        string(key: string[]): Parser;
 
-			/** Return the generated usage string. */
-			help(): string;
-			/** Print the usage data using fn for printing (defaults to console.error). */
-			showHelp(fn?: (message: string) => void): void;
-		}
-	}
+        /** Format usage output to wrap at columns many columns. */
+        wrap(columns: number): Parser;
 
-	var optimist: optimist.Parser;
-	export = optimist;
+        /** Return the generated usage string. */
+        help(): string;
+        /** Print the usage data using fn for printing (defaults to console.error). */
+        showHelp(fn?: (message: string) => void): void;
+    }
 }
+
+declare var optimist: optimist.Parser;
+export = optimist;
diff --git a/ora/ora.d.ts b/ora/ora.d.ts
index 692f82b96c..e58b5575c7 100644
--- a/ora/ora.d.ts
+++ b/ora/ora.d.ts
@@ -3,24 +3,23 @@
 // Definitions by: Basarat Ali Syed <https://github.com/basarat/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'ora' {
-    type Color = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'gray';
-    type Text = string;
-    interface Options {
-        text?: Text;
-        spinner?: string | { interval?: number; frames: string[]; }
-        color?: Color;
-        stream?: any;
-    }
-    interface Instance {
-        start(): void;
-        stop(): void;
-        clear(): void;
-        frame(): void;
-        render(): void;
-        text: Text;
-        color: Color;
-    }
-    function ora(options: Options | Text): Instance;
-    export = ora;
+
+type Color = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'gray';
+type Text = string;
+interface Options {
+    text?: Text;
+    spinner?: string | { interval?: number; frames: string[]; }
+    color?: Color;
+    stream?: any;
 }
+interface Instance {
+    start(): void;
+    stop(): void;
+    clear(): void;
+    frame(): void;
+    render(): void;
+    text: Text;
+    color: Color;
+}
+declare function ora(options: Options | Text): Instance;
+export = ora;
diff --git a/oracledb/oracledb.d.ts b/oracledb/oracledb.d.ts
index c57a8efaae..14e0386ae7 100644
--- a/oracledb/oracledb.d.ts
+++ b/oracledb/oracledb.d.ts
@@ -5,304 +5,303 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'oracledb' {
-	import * as stream from "stream";
 
-	export interface ILob {
-		chunkSize: number;
-		length: number;
-		pieceSize: number;
-		offset?: number;
-		type: string;
-		/**
-		 * Release method on ILob class.
-		 * @remarks The cleanup() called by Release() only frees OCI error handle and Lob
-		 *          locator.  These calls acquire mutex on OCI environment handle very briefly.
-		 */
-		release?(): void;
-		/**
-		 * Read method on ILob class.
-		 * @param {(err : any, chunk: string | Buffer) => void} callback Callback to recive the data from lob.
-		 * @remarks CLobs send strings while BLobs send Buffer object.
-		 */
-		read?(callback: (err: any, chunk: string | Buffer) => void): void;
-		/**
-		 * Read method on ILob class.
-		 * @param {Buffer} data Data write into Lob.
-		 * @param {(err: any) => void} callback Callback executed when writ is finished or when some error occured.
-		 * @remarks CLobs send strings while BLobs send Buffer object.
-		 */
-		write?(data: Buffer, callback: (err: any) => void): void;
-	}
+import * as stream from "stream";
 
-	export interface Lob extends stream.Duplex {
-		iLob: ILob;
-		chunkSize: number;
-		length: number;
-		pieceSize: number;
-		type: string;
-
-		/**
-		 * Do not call this... used internally by node-oracledb
-		 */
-		constructor(iLob: ILob, opts: stream.DuplexOptions): Lob;
-		constructor(iLob: ILob): Lob;
-
-		/**
-		 * Closes the current LOB.
-		 * @param  {(err: any) => void} callback? When passed, is called after the release.
-		 * @returns void
-		 */
-		close(callback: (err: any) => void): void;
-		close(): void;
-	}
-
-	export interface IConnectionAttributes {
-		user?: string;
-		password?: string;
-		connectString: string;
-		stmtCacheSize?: number;
-		externalAuth?: boolean;
-	}
-
-	export interface IPoolAttributes extends IConnectionAttributes {
-		poolMax?: number;
-		poolMin?: number;
-		poolIncrement?: number;
-		poolTimeout?: number;
-	}
-
-	export interface IExecuteOptions {
-		/** Maximum number of rows that will be retrieved. Used when resultSet is false. */
-		maxRows?: number;
-		/** Number of rows to be fetched in advance. */
-		prefetchRows?: number;
-		/** Result format - ARRAY o OBJECT */
-		outFormat?: number;
-		/** Should use ResultSet or not. */
-		resultSet?: boolean;
-		/** Transaction should auto commit after each statement? */
-		autoCommit?: boolean;
-	}
-
-	export interface IExecuteReturn {
-		/** Number o rows affected by the statement (used for inserts / updates)*/
-		rowsAffected?: number;
-		/** When the statement has out parameters, it comes here. */
-		outBinds?: Array<any> | Object;
-		/** Metadata information - just columns names for now. */
-		metaData?: Array<IMetaData>;
-		/** When not using ResultSet, query results comes here. */
-		rows?: Array<Array<any>> | Array<any>;
-		/** When using ResultSet, query results comes here. */
-		resultSet?: IResultSet;
-	}
-
-	export interface IMetaData {
-		/** Column name */
-		name: string;
-	}
-
-	export interface IResultSet {
-		/** Metadata information - just columns names for now. */
-		metaData?: Array<IMetaData>;
-		/**
-		 * Closes the ResultSet.
-		 * @param  {(err:any)=>void} callback Callback called on finish or when some error occurs
-		 * @returns void
-		 * @remarks After using a resultSet, it must be closed to free the resources used by the driver.
-		 */
-		close(callback: (err: any) => void): void;
-		/**
-		 * Fetch one row from ResultSet.
-		 * @param  {(err:any,row:Array<any>|Object)=>void} callback Callback called when the row is available or when some error occurs.
-		 * @returns void
-		 */
-		getRow(callback: (err: any, row: Array<any> | Object) => void): void;
-		/**
-		 * Fetch some rows from ResultSet.
-		 * @param  {number} rowCount Number of rows to be fetched.
-		 * @param  {(err:any,rows:Array<Array<any>>|Array<Object>)=>void} callback Callback called when the rows are available, or when some error occurs.
-		 * @returns void
-		 * @remarks When the number of rows passed to the callback is less than the rowCount, no more rows are available to be fetched.
-		 */
-		getRows(rowCount: number, callback: (err: any, rows: Array<Array<any>> | Array<Object>) => void): void;
-	}
-
-	export interface IConnection {
-		/** Statement cache size in bytes (read-only)*/
-		stmtCacheSize: number;
-		/** Client id (to be sent to database) (write-only)*/
-		clientId: string;
-		/** Module (write-only) */
-		module: string;
-		/** Action */
-		action: string;
-		/** Oracle server version */
-		oracleServerVersion: number;
-
-		/**
-		 * Execute method on Connection class.
-		 * @param	{string} sql SQL Statement.
-		 * @param	{Object|Array<any>} Binds Binds Object/Array
-		 * @param	{IExecuteOptions} options Options object
-		 * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
-		 */
-		execute(sql: string,
-			binds: Object | Array<any>,
-			options: IExecuteOptions,
-			callback: (err: any, value: IExecuteReturn) => void): void;
-
-		/**
-		 * Execute method on Connection class.
-		 * @param	{string} sql SQL Statement.
-		 * @param	{Object|Array<any>} Binds Binds Object/Array
-		 * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
-		 */
-		execute(sql: string,
-			binds: Object | Array<any>,
-			callback: (err: any, value: IExecuteReturn) => void): void;
-
-		/**
-		 * Execute method on Connection class.
-		 * @param	{string} sql SQL Statement.
-		 * @param	{IExecuteOptions} options Options object
-		 * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
-		 */
-		execute(sql: string,
-			options: IExecuteOptions,
-			callback: (err: any, value: IExecuteReturn) => void): void;
-
-		/**
-		 * Execute method on Connection class.
-		 * @param	{string} sql SQL Statement.
-		 * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
-		 */
-		execute(sql: string,
-			callback: (err: any, value: IExecuteReturn) => void): void;
-
-		/**
-		 * Release method on Connection class.
-		 * @param	{(err: any) => void} callback Callback function to be called when the connection has been released.
-		 */
-		release(callback: (err: any) => void): void;
-
-		/**
-		 * Send a commit requisition to the database.
-		 * @param	{(err: any) => void} callback Callback on commit done.
-		 */
-		commit(callback: (err: any) => void): void;
-
-		/**
-		 * Send a rollback requisition to database.
-		 * @param	{(err: any) => void} callback Callback on rollback done.
-		 */
-		rollback(callback: (err: any) => void): void;
-
-		/**
-		 * Send a break to the database.
-		 * @param	{(err: any) => void} callback Callback on break done.
-		 */
-		break(callback: (err: any) => void): void;
-	}
-
-	export interface IConnectionPool {
-		poolMax: number;
-		poolMin: number;
-		poolIncrement: number;
-		poolTimeout: number;
-		connectionsOpen: number;
-		connectionsInUse: number;
-		stmtCacheSize: number;
-		/**
-		 * Finalizes the connection pool.
-		 * @param  {(err:any)=>void} callback Callback called when the pool is terminated or when some error occurs
-		 * @returns void
-		 */
-		terminate(callback: (err: any) => void): void;
-		/**
-		 * Retrieve a connection from the pool.
-		 * @param  {(err:any,connection:IConnection)=>void} callback Callback called when the connection is available or when some error occurs.
-		 * @returns void
-		 * @see {@link https://jsao.io/2015/03/making-a-wrapper-module-for-the-node-js-driver-for-oracle-database/}
-		 * @see {@link https://github.com/OraOpenSource/orawrap}
-		 */
-		getConnection(callback: (err: any, connection: IConnection) => void): void;
-	}
-
-	export const DEFAULT: number;
-	/** Data type */
-	export const STRING: number;
-	/** Data type */
-	export const NUMBER: number;
-	/** Data type */
-	export const DATE: number;
-	/** Data type */
-	export const CURSOR: number;
-	/** Data type */
-	export const BUFFER: number;
-	/** Data type */
-	export const CLOB: number;
-	/** Data type */
-	export const BLOB: number;
-	/** Bind direction */
-	export const BIND_IN: number;
-	/** Bind direction */
-	export const BIND_INOUT: number;
-	/** Bind direction */
-	export const BIND_OUT: number;
-	/** outFormat */
-	export const ARRAY: number;
-	/** outFormat */
-	export const OBJECT: number;
-
-	/**
-	 * Do not use this method - used internally by node-oracledb.
-	 */
-	export function newLob(iLob: ILob): Lob;
-
-	/**
-	 * Creates a connection with the database.
-	 * @param  {IConnectionAttributes} connectionAttributes Parameters to stablish the connection.
-	 * @param  {(err:any,connection:IConnection)=>void} callback Callback to run when the connection gets stablished or when some error occurs.
-	 * @returns void
-	 */
-	export function getConnection(connectionAttributes: IConnectionAttributes, callback: (err: any, connection: IConnection) => void): void;
-
-	/**
-	 * Creates a database managed connection pool.
-	 * @param  {IPoolAttributes} poolAttributes Parameters to stablish the connection pool.
-	 * @param  {(err:any,connection:IConnectionPool)=>void} callback Callback to run when the connection pool gets created or when some error occurs.
-	 * @returns void
-	 */
-	export function createPool(poolAttributes: IPoolAttributes, callback: (err: any, connection: IConnectionPool) => void): void;
-
-	/** Default maximum connections in created pools */
-	export var poolMax: number;
-	/** Default minimum connections in created pools */
-	export var poolMin: number;
-	/** Default number of connections to increment when available connections reach 0 in created pools. poolMax will be respected.*/
-	export var poolIncrement: number;
-	/** Default timeout for unused connections in pool to be released. poolMin will be respected.*/
-	export var poolTimeout: number;
-	/** Default size of statements cache. Used to speed up creating queries.*/
-	export var stmtCacheSize: number;
-	/** Default number of rows that the driver will fetch in each query.*/
-	export var prefetchRows: number;
-	/** Default transaction behaviour of auto commit for each statement. */
-	export var autoCommit: boolean;
-	/** Default maximum number of rows to be fetched in statements not using ResultSets */
-	export var maxRows: number;
-	/** Default format for returning rows. When ARRAY, it will return Array<Array<any>>. When OBJECT, it will return Array<Object>. */
-	export var outFormat: number;
-	/** node-oracledb driver version. */
-	export var version: number;
-	export var connectionClass: string;
-	/** Default authentication/authorization method. When true, the SO trusted user will be used. */
-	export var externalAuth: boolean;
-	export var fetchAsString: any;
-	/** Default size in bytes that the driver will fetch from LOBs in advance. */
-	export var lobPrefetchSize: number;
-	/** Version of OCI that is used. */
-	export var oracleClientVersion: number;
+export interface ILob {
+    chunkSize: number;
+    length: number;
+    pieceSize: number;
+    offset?: number;
+    type: string;
+    /**
+     * Release method on ILob class.
+     * @remarks The cleanup() called by Release() only frees OCI error handle and Lob
+     *          locator.  These calls acquire mutex on OCI environment handle very briefly.
+     */
+    release?(): void;
+    /**
+     * Read method on ILob class.
+     * @param {(err : any, chunk: string | Buffer) => void} callback Callback to recive the data from lob.
+     * @remarks CLobs send strings while BLobs send Buffer object.
+     */
+    read?(callback: (err: any, chunk: string | Buffer) => void): void;
+    /**
+     * Read method on ILob class.
+     * @param {Buffer} data Data write into Lob.
+     * @param {(err: any) => void} callback Callback executed when writ is finished or when some error occured.
+     * @remarks CLobs send strings while BLobs send Buffer object.
+     */
+    write?(data: Buffer, callback: (err: any) => void): void;
 }
+
+export interface Lob extends stream.Duplex {
+    iLob: ILob;
+    chunkSize: number;
+    length: number;
+    pieceSize: number;
+    type: string;
+
+    /**
+     * Do not call this... used internally by node-oracledb
+     */
+    constructor(iLob: ILob, opts: stream.DuplexOptions): Lob;
+    constructor(iLob: ILob): Lob;
+
+    /**
+     * Closes the current LOB.
+     * @param  {(err: any) => void} callback? When passed, is called after the release.
+     * @returns void
+     */
+    close(callback: (err: any) => void): void;
+    close(): void;
+}
+
+export interface IConnectionAttributes {
+    user?: string;
+    password?: string;
+    connectString: string;
+    stmtCacheSize?: number;
+    externalAuth?: boolean;
+}
+
+export interface IPoolAttributes extends IConnectionAttributes {
+    poolMax?: number;
+    poolMin?: number;
+    poolIncrement?: number;
+    poolTimeout?: number;
+}
+
+export interface IExecuteOptions {
+    /** Maximum number of rows that will be retrieved. Used when resultSet is false. */
+    maxRows?: number;
+    /** Number of rows to be fetched in advance. */
+    prefetchRows?: number;
+    /** Result format - ARRAY o OBJECT */
+    outFormat?: number;
+    /** Should use ResultSet or not. */
+    resultSet?: boolean;
+    /** Transaction should auto commit after each statement? */
+    autoCommit?: boolean;
+}
+
+export interface IExecuteReturn {
+    /** Number o rows affected by the statement (used for inserts / updates)*/
+    rowsAffected?: number;
+    /** When the statement has out parameters, it comes here. */
+    outBinds?: Array<any> | Object;
+    /** Metadata information - just columns names for now. */
+    metaData?: Array<IMetaData>;
+    /** When not using ResultSet, query results comes here. */
+    rows?: Array<Array<any>> | Array<any>;
+    /** When using ResultSet, query results comes here. */
+    resultSet?: IResultSet;
+}
+
+export interface IMetaData {
+    /** Column name */
+    name: string;
+}
+
+export interface IResultSet {
+    /** Metadata information - just columns names for now. */
+    metaData?: Array<IMetaData>;
+    /**
+     * Closes the ResultSet.
+     * @param  {(err:any)=>void} callback Callback called on finish or when some error occurs
+     * @returns void
+     * @remarks After using a resultSet, it must be closed to free the resources used by the driver.
+     */
+    close(callback: (err: any) => void): void;
+    /**
+     * Fetch one row from ResultSet.
+     * @param  {(err:any,row:Array<any>|Object)=>void} callback Callback called when the row is available or when some error occurs.
+     * @returns void
+     */
+    getRow(callback: (err: any, row: Array<any> | Object) => void): void;
+    /**
+     * Fetch some rows from ResultSet.
+     * @param  {number} rowCount Number of rows to be fetched.
+     * @param  {(err:any,rows:Array<Array<any>>|Array<Object>)=>void} callback Callback called when the rows are available, or when some error occurs.
+     * @returns void
+     * @remarks When the number of rows passed to the callback is less than the rowCount, no more rows are available to be fetched.
+     */
+    getRows(rowCount: number, callback: (err: any, rows: Array<Array<any>> | Array<Object>) => void): void;
+}
+
+export interface IConnection {
+    /** Statement cache size in bytes (read-only)*/
+    stmtCacheSize: number;
+    /** Client id (to be sent to database) (write-only)*/
+    clientId: string;
+    /** Module (write-only) */
+    module: string;
+    /** Action */
+    action: string;
+    /** Oracle server version */
+    oracleServerVersion: number;
+
+    /**
+     * Execute method on Connection class.
+     * @param	{string} sql SQL Statement.
+     * @param	{Object|Array<any>} Binds Binds Object/Array
+     * @param	{IExecuteOptions} options Options object
+     * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
+     */
+    execute(sql: string,
+        binds: Object | Array<any>,
+        options: IExecuteOptions,
+        callback: (err: any, value: IExecuteReturn) => void): void;
+
+    /**
+     * Execute method on Connection class.
+     * @param	{string} sql SQL Statement.
+     * @param	{Object|Array<any>} Binds Binds Object/Array
+     * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
+     */
+    execute(sql: string,
+        binds: Object | Array<any>,
+        callback: (err: any, value: IExecuteReturn) => void): void;
+
+    /**
+     * Execute method on Connection class.
+     * @param	{string} sql SQL Statement.
+     * @param	{IExecuteOptions} options Options object
+     * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
+     */
+    execute(sql: string,
+        options: IExecuteOptions,
+        callback: (err: any, value: IExecuteReturn) => void): void;
+
+    /**
+     * Execute method on Connection class.
+     * @param	{string} sql SQL Statement.
+     * @param	{(err: any, value: IExecuteReturn) => void} callback Callback function to receive the result.
+     */
+    execute(sql: string,
+        callback: (err: any, value: IExecuteReturn) => void): void;
+
+    /**
+     * Release method on Connection class.
+     * @param	{(err: any) => void} callback Callback function to be called when the connection has been released.
+     */
+    release(callback: (err: any) => void): void;
+
+    /**
+     * Send a commit requisition to the database.
+     * @param	{(err: any) => void} callback Callback on commit done.
+     */
+    commit(callback: (err: any) => void): void;
+
+    /**
+     * Send a rollback requisition to database.
+     * @param	{(err: any) => void} callback Callback on rollback done.
+     */
+    rollback(callback: (err: any) => void): void;
+
+    /**
+     * Send a break to the database.
+     * @param	{(err: any) => void} callback Callback on break done.
+     */
+    break(callback: (err: any) => void): void;
+}
+
+export interface IConnectionPool {
+    poolMax: number;
+    poolMin: number;
+    poolIncrement: number;
+    poolTimeout: number;
+    connectionsOpen: number;
+    connectionsInUse: number;
+    stmtCacheSize: number;
+    /**
+     * Finalizes the connection pool.
+     * @param  {(err:any)=>void} callback Callback called when the pool is terminated or when some error occurs
+     * @returns void
+     */
+    terminate(callback: (err: any) => void): void;
+    /**
+     * Retrieve a connection from the pool.
+     * @param  {(err:any,connection:IConnection)=>void} callback Callback called when the connection is available or when some error occurs.
+     * @returns void
+     * @see {@link https://jsao.io/2015/03/making-a-wrapper-module-for-the-node-js-driver-for-oracle-database/}
+     * @see {@link https://github.com/OraOpenSource/orawrap}
+     */
+    getConnection(callback: (err: any, connection: IConnection) => void): void;
+}
+
+declare export const DEFAULT: number;
+/** Data type */
+declare export const STRING: number;
+/** Data type */
+declare export const NUMBER: number;
+/** Data type */
+declare export const DATE: number;
+/** Data type */
+declare export const CURSOR: number;
+/** Data type */
+declare export const BUFFER: number;
+/** Data type */
+declare export const CLOB: number;
+/** Data type */
+declare export const BLOB: number;
+/** Bind direction */
+declare export const BIND_IN: number;
+/** Bind direction */
+declare export const BIND_INOUT: number;
+/** Bind direction */
+declare export const BIND_OUT: number;
+/** outFormat */
+declare export const ARRAY: number;
+/** outFormat */
+declare export const OBJECT: number;
+
+/**
+ * Do not use this method - used internally by node-oracledb.
+ */
+declare export function newLob(iLob: ILob): Lob;
+
+/**
+ * Creates a connection with the database.
+ * @param  {IConnectionAttributes} connectionAttributes Parameters to stablish the connection.
+ * @param  {(err:any,connection:IConnection)=>void} callback Callback to run when the connection gets stablished or when some error occurs.
+ * @returns void
+ */
+declare export function getConnection(connectionAttributes: IConnectionAttributes, callback: (err: any, connection: IConnection) => void): void;
+
+/**
+ * Creates a database managed connection pool.
+ * @param  {IPoolAttributes} poolAttributes Parameters to stablish the connection pool.
+ * @param  {(err:any,connection:IConnectionPool)=>void} callback Callback to run when the connection pool gets created or when some error occurs.
+ * @returns void
+ */
+declare export function createPool(poolAttributes: IPoolAttributes, callback: (err: any, connection: IConnectionPool) => void): void;
+
+/** Default maximum connections in created pools */
+declare export var poolMax: number;
+/** Default minimum connections in created pools */
+declare export var poolMin: number;
+/** Default number of connections to increment when available connections reach 0 in created pools. poolMax will be respected.*/
+declare export var poolIncrement: number;
+/** Default timeout for unused connections in pool to be released. poolMin will be respected.*/
+declare export var poolTimeout: number;
+/** Default size of statements cache. Used to speed up creating queries.*/
+declare export var stmtCacheSize: number;
+/** Default number of rows that the driver will fetch in each query.*/
+declare export var prefetchRows: number;
+/** Default transaction behaviour of auto commit for each statement. */
+declare export var autoCommit: boolean;
+/** Default maximum number of rows to be fetched in statements not using ResultSets */
+declare export var maxRows: number;
+/** Default format for returning rows. When ARRAY, it will return Array<Array<any>>. When OBJECT, it will return Array<Object>. */
+declare export var outFormat: number;
+/** node-oracledb driver version. */
+declare export var version: number;
+declare export var connectionClass: string;
+/** Default authentication/authorization method. When true, the SO trusted user will be used. */
+declare export var externalAuth: boolean;
+declare export var fetchAsString: any;
+/** Default size in bytes that the driver will fetch from LOBs in advance. */
+declare export var lobPrefetchSize: number;
+/** Version of OCI that is used. */
+declare export var oracleClientVersion: number;
diff --git a/os-locale/os-locale.d.ts b/os-locale/os-locale.d.ts
index 59d4036a92..c14e3b2bce 100644
--- a/os-locale/os-locale.d.ts
+++ b/os-locale/os-locale.d.ts
@@ -3,12 +3,11 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "os-locale" {
-	function osLocale(options: {spawn?: boolean}, cb: (err: any, locale: string) => void): void;
-	function osLocale(cb: (err: any, locale: string) => void): void;
-	function osLocaleSync(): string;
-	function osLocaleSync(options: {spawn?: boolean}): string;
 
-	export { osLocaleSync as sync };
-	export default osLocale;
-}
+declare function osLocale(options: { spawn?: boolean }, cb: (err: any, locale: string) => void): void;
+declare function osLocale(cb: (err: any, locale: string) => void): void;
+declare function osLocaleSync(): string;
+declare function osLocaleSync(options: { spawn?: boolean }): string;
+
+export { osLocaleSync as sync };
+export default osLocale;
diff --git a/osmtogeojson/osmtogeojson.d.ts b/osmtogeojson/osmtogeojson.d.ts
index 45e1b94ac4..3f0a03c4d7 100644
--- a/osmtogeojson/osmtogeojson.d.ts
+++ b/osmtogeojson/osmtogeojson.d.ts
@@ -3,13 +3,13 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "osmtogeojson" {
-  export interface OsmToGeoJSON {
-    (data: Document|OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject;
-    toGeojson(data: Document|OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject;
-  }
 
-  export interface Options {
+export interface OsmToGeoJSON {
+    (data: Document | OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject;
+    toGeojson(data: Document | OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject;
+}
+
+export interface Options {
     verbose?: boolean;
     /**
      * If true, the resulting GeoJSON feature's properties will be a simple key-value list instead of a structured json object (with separate tags and metadata). default: false
@@ -18,79 +18,77 @@ declare module "osmtogeojson" {
     /**
      * Either a blacklist of tag keys or a callback function. Will be used to decide if a feature is interesting enough for its own GeoJSON feature.
      */
-    uninterestingTags?: { [tag: string]: boolean; }|Function; //TODO: type function
+    uninterestingTags?: { [tag: string]: boolean; } | Function; //TODO: type function
     /**
      * Either a json object or callback function that is used to determine if a closed way should be treated as a Polygon or LineString.
      */
-    polygonFeatures?: any|Function; //TODO: type this
-  }
+    polygonFeatures?: any | Function; //TODO: type this
+}
 
-  export namespace GeoJSON {
+declare export namespace GeoJSON {
     export interface GeoJSONObject {
-      type: string;
+        type: string;
     }
 
     export interface Feature extends GeoJSONObject {
-      id?: string;
-      geometry: Geometry;
-      properties: any; //TODO: type this
+        id?: string;
+        geometry: Geometry;
+        properties: any; //TODO: type this
     }
 
     export interface FeatureCollection extends GeoJSONObject {
-      features: Feature[];
+        features: Feature[];
     }
 
     export interface Geometry extends GeoJSONObject {
-      coordinates: Coordinate|Coordinate[]|Coordinate[][];
+        coordinates: Coordinate | Coordinate[] | Coordinate[][];
     }
 
     export interface GeometryCollection extends GeoJSONObject {
-      geometries: Geometry[];
+        geometries: Geometry[];
     }
 
     export type Coordinate2d = [number, number];
     export type Coordinate3d = [number, number, number];
-    export type Coordinate = Coordinate2d|Coordinate3d;
-  }
+    export type Coordinate = Coordinate2d | Coordinate3d;
+}
 
-  export namespace OsmJSON {
+declare export namespace OsmJSON {
     export interface OsmJSONObject {
-      elements: (Node|Way|Relationship)[];
+        elements: (Node | Way | Relationship)[];
     }
 
     export interface Element {
-      type: string;
-      id: number;
-      tags?: { [name: string]: string; }
-      timestamp?: string;
-      version?: number;
-      changeset?: number;
-      user?: string;
-      uid?: number;
+        type: string;
+        id: number;
+        tags?: { [name: string]: string; }
+        timestamp?: string;
+        version?: number;
+        changeset?: number;
+        user?: string;
+        uid?: number;
     }
 
     export interface Node extends Element {
-      lat: number;
-      lon: number;
+        lat: number;
+        lon: number;
     }
 
     export interface Way extends Element {
-      nodes: number[];
+        nodes: number[];
     }
 
     export interface Relationship extends Element {
-      members: Member[];
+        members: Member[];
     }
 
     export interface Member {
-      type: string;
-      ref: number;
-      role: string;
+        type: string;
+        ref: number;
+        role: string;
     }
-  }
-
-  var osmtogeojson: OsmToGeoJSON;
-
-  export default osmtogeojson;
 }
 
+declare var osmtogeojson: OsmToGeoJSON;
+
+export default osmtogeojson;
diff --git a/packery/packery.d.ts b/packery/packery.d.ts
index 553d45b514..9141bbfd52 100644
--- a/packery/packery.d.ts
+++ b/packery/packery.d.ts
@@ -3,292 +3,291 @@
 // Definitions by: Piraveen Kamalathas from Kilix <https://github.com/piraveen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "packery" {
-	interface PackeryOptions {
-		/**
-		 * [itemSelector Specifies which child elements to be used as item elements. Setting itemSelector is always recommended. itemSelector is useful to exclude sizing elements]
-		 * @type {string}
-		 */
-		itemSelector?: string;
-		
-		/**
-		 * [columnWidth The width of a column of a horizontal grid. When set, Packery will align item elements horizontally to this grid]
-		 * @type {number}
-		 */
-		columnWidth?: number;
-		
-		/**
-		 * [rowHeight Height of a row of a vertical grid. When set, Packery will align item elements vertically to this grid]
-		 * @type {number}
-		 */
-		rowHeight?: number;
 
-		/**
-		 * [gutter The space between item elements, both vertically and horizontally]
-		 * @type {number}
-		 */
-		gutter?: number;
-		
-		/**
-		 * [percentPosition Will set item position in percent values, rather than pixel values. percentPosition works well with percent-width items, as items will not transition their position on resize]
-		 * @type {boolean}
-		 */
-		percentPosition?: boolean;
-		
-		/**
-		 * [stamp Specifies which elements are stamped within the layout. These are special layout elements which will not be laid out by Packery. Rather, Packery will layout item elements around stamped elements]
-		 * @type {string}
-		 */
-		stamp?: string;
-		
-		/**
-		 * [isHorizontal Arranges items horizontally instead of vertically]
-		 * @type {boolean}
-		 */
-		isHorizontal?: boolean;
-		
-		/**
-		 * [isOriginLeft Controls the horizontal flow of the layout. By default, item elements start positioning at the left. Set to false for right-to-left layouts]
-		 * @type {boolean}
-		 */
-		isOriginLeft?: boolean;
+interface PackeryOptions {
+    /**
+     * [itemSelector Specifies which child elements to be used as item elements. Setting itemSelector is always recommended. itemSelector is useful to exclude sizing elements]
+     * @type {string}
+     */
+    itemSelector?: string;
 
-		/**
-		 * [isOriginTop Controls the vertical flow of the layout. By default, item elements start positioning at the top. Set to false for bottom-up layouts. It’s like Tetris!]
-		 * @type {boolean}
-		 */
-		isOriginTop?: boolean;
+    /**
+     * [columnWidth The width of a column of a horizontal grid. When set, Packery will align item elements horizontally to this grid]
+     * @type {number}
+     */
+    columnWidth?: number;
 
-		/**
-		 * [transitionDuration The time duration of transitions for item elements]
-		 * @type {string}
-		 */
-		transitionDuration?: string;
+    /**
+     * [rowHeight Height of a row of a vertical grid. When set, Packery will align item elements vertically to this grid]
+     * @type {number}
+     */
+    rowHeight?: number;
 
-		/**
-		 * [containerStyle CSS styles that are applied to the container element. To disable Packery from setting any CSS to the container element, set containerStyle: null]
-		 * @type {Object}
-		 */
-		containerStyle?: Object;
-		
-		/**
-		 * [isResizeBound Binds layout to window resizing]
-		 * @type {boolean}
-		 */
-		isResizeBound?: boolean;
+    /**
+     * [gutter The space between item elements, both vertically and horizontally]
+     * @type {number}
+     */
+    gutter?: number;
 
-		/**
-		 * [isInitLayout Enables layout on initialization. Set this to false to disable layout on initialization, so you can use methods or add events before the initial layout]
-		 * @type {boolean}
-		 */
-		isInitLayout?: boolean;
-	}
+    /**
+     * [percentPosition Will set item position in percent values, rather than pixel values. percentPosition works well with percent-width items, as items will not transition their position on resize]
+     * @type {boolean}
+     */
+    percentPosition?: boolean;
 
-	class Packery {
-		constructor(element: Element, options?: Object);
+    /**
+     * [stamp Specifies which elements are stamped within the layout. These are special layout elements which will not be laid out by Packery. Rather, Packery will layout item elements around stamped elements]
+     * @type {string}
+     */
+    stamp?: string;
 
-		/**
-		 * [addItems Add item elements to the Packery instance]
-		 * @param {Element} elements [description]
-		 */
-		addItems(elements: Element): void;
+    /**
+     * [isHorizontal Arranges items horizontally instead of vertically]
+     * @type {boolean}
+     */
+    isHorizontal?: boolean;
 
-		/**
-		 * [addItems Add item elements to the Packery instance]
-		 * @param {NodeList} elements [description]
-		 */
-		addItems(elements: NodeList): void;
+    /**
+     * [isOriginLeft Controls the horizontal flow of the layout. By default, item elements start positioning at the left. Set to false for right-to-left layouts]
+     * @type {boolean}
+     */
+    isOriginLeft?: boolean;
 
-		/**
-		 * [addItems Add item elements to the Packery instance]
-		 * @param {Array<Element>} elements [description]
-		 */
-		addItems(elements: Array<Element>): void;
+    /**
+     * [isOriginTop Controls the vertical flow of the layout. By default, item elements start positioning at the top. Set to false for bottom-up layouts. It’s like Tetris!]
+     * @type {boolean}
+     */
+    isOriginTop?: boolean;
 
-		/**
-		 * [appended Add and lay out newly appended item elements]
-		 * @param {Element} elements [description]
-		 */
-		appended(elements: Element): void;
+    /**
+     * [transitionDuration The time duration of transitions for item elements]
+     * @type {string}
+     */
+    transitionDuration?: string;
 
-		/**
-		 * [appended Add and lay out newly appended item elements]
-		 * @param {NodeList} elements [description]
-		 */
-		appended(elements: NodeList): void;
+    /**
+     * [containerStyle CSS styles that are applied to the container element. To disable Packery from setting any CSS to the container element, set containerStyle: null]
+     * @type {Object}
+     */
+    containerStyle?: Object;
 
-		/**
-		 * [appended Add and lay out newly appended item elements]
-		 * @param {Array<Element>} elements [description]
-		 */
-		appended(elements: Array<Element>): void;
+    /**
+     * [isResizeBound Binds layout to window resizing]
+     * @type {boolean}
+     */
+    isResizeBound?: boolean;
 
-		/**
-		 * [bindDraggabillyEvents Bind Draggabilly events, so that the Packery instance will layout around the dragged element]
-		 * @param {any} draggie [description]
-		 */
-		bindDraggabillyEvents(draggie: any): void;
-
-		/**
-		 * [bindResize Binds event listener to window resize, so layout is triggered when the browser window is resized]
-		 */
-		bindResize(): void;
-
-		/**
-		 * [bindUIDraggableEvents Bind jQuery UI Draggable events, so that the Packery instance will layout around the dragged element]
-		 * @param {any} elements [jQuery UI]
-		 */
-		bindUIDraggableEvents($element: any): void;
-
-		/**
-		 * [data Get the Packery instance from an element. Note this method is of Packery, rather than of a Packery instance]
-		 * @param  {Element} element [description]
-		 * @return {Packery}         [description]
-		 */
-		data(element: Element): Packery;
-
-		/**
-		 * [destroy Removes the Packery functionality completely. This will return the element back to its pre-initialized state]
-		 */
-		destroy(): void;
-
-		/**
-		 * [fit Fit an item element within the layout, and have other item elements laid out around it. This method is useful when expanding an element, and keeping it in its same position.]
-		 * @param {any}    element [description]
-		 * @param {number} x       [description]
-		 * @param {number} y       [description]
-		 */
-		fit(element: Element, x ?: number, y ?: number): void;
-
-		/**
-		 * [getItemElements Get an array of elements used as the Packery instance's items.]
-		 * @return {Array<Element>}      [description]
-		 */
-		getItemElements(): Array<Element>;
-
-		/**
-		 * [getItem Get a Packery.Item from an element]
-		 * @param  {Element} element [description]
-		 * @return {any}             [Packery.item]
-		 */
-		getItem(element: Element): any;
-
-		/**
-		 * [layout Lay out all item elements.]
-		 */
-		layout(): void;
-
-		/**
-		 * [layoutItems Lay out specified items]
-		 * @param {Array<Packery.items>} items [description]
-		 */
-		layoutItems(items: Array<any>): void;
-
-		/**
-		 * [off Remove an event listener]
-		 * @param  {string}   eventName [description]
-		 * @param  {Function} listener  [description]
-		 * @return {Packery}            [description]
-		 */
-		off(eventName: string, listener: Function): Packery;
-
-		/**
-		 * [on Add an event listener for certain events]
-		 * @param  {string}   eventName [description]
-		 * @param  {Function} listener  [description]
-		 * @return {Packery}            [description]
-		 */
-		on(eventName: string, listener: Function): Packery;
-
-		/**
-		 * [once Add an event listener for certain events, to be triggered once]
-		 * @param {string}   eventName [description]
-		 * @param {Function} listener  [description]
-		 */
-		once(eventName: string, listener: Function): void;
-
-		/**
-		 * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-		 * @param {Element} elements [description]
-		 */
-		prepended(elements: Element): void;
-		
-		/**
-		 * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-		 * @param {NodeList} elements [description]
-		 */
-		prepended(elements: NodeList): void;
-		
-		/**
-		 * [prepended Add and lay out newly prepended item elements at the beginning of layout]
-		 * @param {Array<Element>} elements [description]
-		 */
-		prepended(elements: Array<Element>): void;
-		
-		/**
-		 * [reloadItems Recollect all item elements]
-		 */
-		reloadItems(): void;
-
-		/**
-		 * [remove Remove elements from the Packery instance, then from the DOM]
-		 * @param {Element} elements [description]
-		 */
-		remove(elements: Element): void;
-
-		/**
-		 * [remove Remove elements from the Packery instance, then from the DOM]
-		 * @param {NodeList} elements [description]
-		 */
-		remove(elements: NodeList): void;
-
-		/**
-		 * [remove Remove elements from the Packery instance, then from the DOM]
-		 * @param {Array<Element>} elements [description]
-		 */
-		remove(elements: Array<Element>): void;
-
-		/**
-		 * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-		 * @param {Element} elements [description]
-		 */
-		stamp(elements: Element): void;
-
-		/**
-		 * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-		 * @param {NodeList} elements [description]
-		 */
-		stamp(elements: NodeList): void;
-
-		/**
-		 * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
-		 * @param {Array<Element>} elements [description]
-		 */
-		stamp(elements: Array<Element>): void;
-
-		/**
-		 * [unbindResize Un-bind layout to window resize event]
-		 */
-		unbindResize(): void;
-
-		/**
-		 * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-		 * @param {Element} element [description]
-		 */
-		unstamp(element: Element): void;
-
-		/**
-		 * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-		 * @param {NodeList} element [description]
-		 */
-		unstamp(element: NodeList): void;
-
-		/**
-		 * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
-		 * @param {Array<Element>} element [description]
-		 */
-		unstamp(element: Array<Element>): void;
-	}
-
-	export = Packery;
+    /**
+     * [isInitLayout Enables layout on initialization. Set this to false to disable layout on initialization, so you can use methods or add events before the initial layout]
+     * @type {boolean}
+     */
+    isInitLayout?: boolean;
 }
+
+declare class Packery {
+    constructor(element: Element, options?: Object);
+
+    /**
+     * [addItems Add item elements to the Packery instance]
+     * @param {Element} elements [description]
+     */
+    addItems(elements: Element): void;
+
+    /**
+     * [addItems Add item elements to the Packery instance]
+     * @param {NodeList} elements [description]
+     */
+    addItems(elements: NodeList): void;
+
+    /**
+     * [addItems Add item elements to the Packery instance]
+     * @param {Array<Element>} elements [description]
+     */
+    addItems(elements: Array<Element>): void;
+
+    /**
+     * [appended Add and lay out newly appended item elements]
+     * @param {Element} elements [description]
+     */
+    appended(elements: Element): void;
+
+    /**
+     * [appended Add and lay out newly appended item elements]
+     * @param {NodeList} elements [description]
+     */
+    appended(elements: NodeList): void;
+
+    /**
+     * [appended Add and lay out newly appended item elements]
+     * @param {Array<Element>} elements [description]
+     */
+    appended(elements: Array<Element>): void;
+
+    /**
+     * [bindDraggabillyEvents Bind Draggabilly events, so that the Packery instance will layout around the dragged element]
+     * @param {any} draggie [description]
+     */
+    bindDraggabillyEvents(draggie: any): void;
+
+    /**
+     * [bindResize Binds event listener to window resize, so layout is triggered when the browser window is resized]
+     */
+    bindResize(): void;
+
+    /**
+     * [bindUIDraggableEvents Bind jQuery UI Draggable events, so that the Packery instance will layout around the dragged element]
+     * @param {any} elements [jQuery UI]
+     */
+    bindUIDraggableEvents($element: any): void;
+
+    /**
+     * [data Get the Packery instance from an element. Note this method is of Packery, rather than of a Packery instance]
+     * @param  {Element} element [description]
+     * @return {Packery}         [description]
+     */
+    data(element: Element): Packery;
+
+    /**
+     * [destroy Removes the Packery functionality completely. This will return the element back to its pre-initialized state]
+     */
+    destroy(): void;
+
+    /**
+     * [fit Fit an item element within the layout, and have other item elements laid out around it. This method is useful when expanding an element, and keeping it in its same position.]
+     * @param {any}    element [description]
+     * @param {number} x       [description]
+     * @param {number} y       [description]
+     */
+    fit(element: Element, x?: number, y?: number): void;
+
+    /**
+     * [getItemElements Get an array of elements used as the Packery instance's items.]
+     * @return {Array<Element>}      [description]
+     */
+    getItemElements(): Array<Element>;
+
+    /**
+     * [getItem Get a Packery.Item from an element]
+     * @param  {Element} element [description]
+     * @return {any}             [Packery.item]
+     */
+    getItem(element: Element): any;
+
+    /**
+     * [layout Lay out all item elements.]
+     */
+    layout(): void;
+
+    /**
+     * [layoutItems Lay out specified items]
+     * @param {Array<Packery.items>} items [description]
+     */
+    layoutItems(items: Array<any>): void;
+
+    /**
+     * [off Remove an event listener]
+     * @param  {string}   eventName [description]
+     * @param  {Function} listener  [description]
+     * @return {Packery}            [description]
+     */
+    off(eventName: string, listener: Function): Packery;
+
+    /**
+     * [on Add an event listener for certain events]
+     * @param  {string}   eventName [description]
+     * @param  {Function} listener  [description]
+     * @return {Packery}            [description]
+     */
+    on(eventName: string, listener: Function): Packery;
+
+    /**
+     * [once Add an event listener for certain events, to be triggered once]
+     * @param {string}   eventName [description]
+     * @param {Function} listener  [description]
+     */
+    once(eventName: string, listener: Function): void;
+
+    /**
+     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+     * @param {Element} elements [description]
+     */
+    prepended(elements: Element): void;
+
+    /**
+     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+     * @param {NodeList} elements [description]
+     */
+    prepended(elements: NodeList): void;
+
+    /**
+     * [prepended Add and lay out newly prepended item elements at the beginning of layout]
+     * @param {Array<Element>} elements [description]
+     */
+    prepended(elements: Array<Element>): void;
+
+    /**
+     * [reloadItems Recollect all item elements]
+     */
+    reloadItems(): void;
+
+    /**
+     * [remove Remove elements from the Packery instance, then from the DOM]
+     * @param {Element} elements [description]
+     */
+    remove(elements: Element): void;
+
+    /**
+     * [remove Remove elements from the Packery instance, then from the DOM]
+     * @param {NodeList} elements [description]
+     */
+    remove(elements: NodeList): void;
+
+    /**
+     * [remove Remove elements from the Packery instance, then from the DOM]
+     * @param {Array<Element>} elements [description]
+     */
+    remove(elements: Array<Element>): void;
+
+    /**
+     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+     * @param {Element} elements [description]
+     */
+    stamp(elements: Element): void;
+
+    /**
+     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+     * @param {NodeList} elements [description]
+     */
+    stamp(elements: NodeList): void;
+
+    /**
+     * [stamp Stamp the elements in the layout. Packery will lay out item elements around stamped element]
+     * @param {Array<Element>} elements [description]
+     */
+    stamp(elements: Array<Element>): void;
+
+    /**
+     * [unbindResize Un-bind layout to window resize event]
+     */
+    unbindResize(): void;
+
+    /**
+     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+     * @param {Element} element [description]
+     */
+    unstamp(element: Element): void;
+
+    /**
+     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+     * @param {NodeList} element [description]
+     */
+    unstamp(element: NodeList): void;
+
+    /**
+     * [unstamp Un-stamp the elements, so that Packery will no longer layout item elements around them]
+     * @param {Array<Element>} element [description]
+     */
+    unstamp(element: Array<Element>): void;
+}
+
+export = Packery;
diff --git a/param-case/param-case.d.ts b/param-case/param-case.d.ts
index 7fd8c31638..848acf0ac8 100644
--- a/param-case/param-case.d.ts
+++ b/param-case/param-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "param-case" {
-	function paramCase(string: string, locale?: string): string;
-	export = paramCase;
-}
+
+declare function paramCase(string: string, locale?: string): string;
+export = paramCase;
diff --git a/parse-glob/parse-glob.d.ts b/parse-glob/parse-glob.d.ts
index b3bb7e85df..d7577faf1d 100644
--- a/parse-glob/parse-glob.d.ts
+++ b/parse-glob/parse-glob.d.ts
@@ -3,90 +3,89 @@
 // Definitions by: glen-84 <https://github.com/glen-84>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'parse-glob' {
-    namespace parseGlob {
-        interface Result {
-            /**
-             * A copy of the original, unmodified glob pattern.
-             */
-            orig: string;
-            /**
-             * An object with boolean information about the glob.
-             */
-            is: {
-                /**
-                 * True if the pattern actually is a glob pattern.
-                 */
-                glob: boolean;
-                /**
-                 * True if it's a negation pattern (!/foo.js).
-                 */
-                negated: boolean;
-                /**
-                 * True if it has extglobs (@(foo|bar)).
-                 */
-                extglob: boolean;
-                /**
-                 * True if it has braces ({1..2} or .{txt,md}).
-                 */
-                braces: boolean;
-                /**
-                 * True if it has POSIX brackets ([[:alpha:]]).
-                 */
-                brackets: boolean;
-                /**
-                 * True if the pattern has a globstar (double star, **).
-                 */
-                globstar: boolean;
-                /**
-                 * True if the pattern should match dotfiles.
-                 */
-                dotfile: boolean;
-                /**
-                 * True if the pattern should match dot-directories (like .git).
-                 */
-                dotdir: boolean;
-            };
-            /**
-             * The glob pattern part of the string, if any.
-             */
-            glob: string;
-            /**
-             * The non-glob part of the string, if any.
-             */
-            base: string;
-            /**
-             * File path segments.
-             */
-            path: {
-                /**
-                 * Directory.
-                 */
-                dirname: string;
-                /**
-                 * File name with extension.
-                 */
-                basename: string;
-                /**
-                 * File name without extension.
-                 */
-                filename: string;
-                /**
-                 * File extension with dot.
-                 */
-                extname: string;
-                /**
-                 * File extension without dot.
-                 */
-                ext: string;
-            };
-        }
-    }
 
-    interface ParseGlob {
-        (glob: string): parseGlob.Result;
+declare namespace parseGlob {
+    interface Result {
+        /**
+         * A copy of the original, unmodified glob pattern.
+         */
+        orig: string;
+        /**
+         * An object with boolean information about the glob.
+         */
+        is: {
+            /**
+             * True if the pattern actually is a glob pattern.
+             */
+            glob: boolean;
+            /**
+             * True if it's a negation pattern (!/foo.js).
+             */
+            negated: boolean;
+            /**
+             * True if it has extglobs (@(foo|bar)).
+             */
+            extglob: boolean;
+            /**
+             * True if it has braces ({1..2} or .{txt,md}).
+             */
+            braces: boolean;
+            /**
+             * True if it has POSIX brackets ([[:alpha:]]).
+             */
+            brackets: boolean;
+            /**
+             * True if the pattern has a globstar (double star, **).
+             */
+            globstar: boolean;
+            /**
+             * True if the pattern should match dotfiles.
+             */
+            dotfile: boolean;
+            /**
+             * True if the pattern should match dot-directories (like .git).
+             */
+            dotdir: boolean;
+        };
+        /**
+         * The glob pattern part of the string, if any.
+         */
+        glob: string;
+        /**
+         * The non-glob part of the string, if any.
+         */
+        base: string;
+        /**
+         * File path segments.
+         */
+        path: {
+            /**
+             * Directory.
+             */
+            dirname: string;
+            /**
+             * File name with extension.
+             */
+            basename: string;
+            /**
+             * File name without extension.
+             */
+            filename: string;
+            /**
+             * File extension with dot.
+             */
+            extname: string;
+            /**
+             * File extension without dot.
+             */
+            ext: string;
+        };
     }
-
-    const parseGlob: ParseGlob;
-    export = parseGlob;
 }
+
+interface ParseGlob {
+    (glob: string): parseGlob.Result;
+}
+
+declare const parseGlob: ParseGlob;
+export = parseGlob;
diff --git a/parse5/parse5.d.ts b/parse5/parse5.d.ts
index 5b2557053e..4252344821 100644
--- a/parse5/parse5.d.ts
+++ b/parse5/parse5.d.ts
@@ -5,259 +5,257 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'parse5' {
-    import * as stream from "stream";
-    import * as events from "events";
-  
-    /**
-     * Parses an HTML string.
-     * @function
-     * @param {string} html - Input HTML string.
-     * @param {ParserOptions} html - Parsing options.
-     * 
-     * @example
-     * var parse5 = require('parse5');
-     * var document = parse5.parse('<!DOCTYPE html><html><head></head><body>Hi there!</body></html>');
-     */
-    export function parse(html: string, options?: ParserOptions): ASTNode;
-    
-    /**
-     * Parses an HTML fragment.
-     * 
-     * @param {string} html - Input html fragment
-     * @param {ParserOptions} - Parsign options
-     * @example
-     * var parse5 = require('parse5');
-     * var documentFragment = parse5.parseFragment('<table></table>');
-     * // Parses the html fragment in the context of the parsed <table> element.
-     * var trFragment = parser.parseFragment(documentFragment.childNodes[0], '<tr><td>Shake it, baby</td></tr>');
-     */
-    export function parseFragment(html: string, options?: ParserOptions): ASTNode;
-    export function parseFragment(fragmentContext: any, html: string, options?: ParserOptions): ASTNode;
 
-    /**
-     * Serializes an AST node to an HTML string.
-     * @param node Node to serialize.
-     * @param options Serialization options
-     */
-    export function serialize(node: ASTNode, options?: SerializerOptions): string;
+import * as stream from "stream";
+import * as events from "events";
 
-    export interface ASTAttribute {
-        name: string;
-        value: string;
-    }
+/**
+ * Parses an HTML string.
+ * @function
+ * @param {string} html - Input HTML string.
+ * @param {ParserOptions} html - Parsing options.
+ * 
+ * @example
+ * var parse5 = require('parse5');
+ * var document = parse5.parse('<!DOCTYPE html><html><head></head><body>Hi there!</body></html>');
+ */
+declare export function parse(html: string, options?: ParserOptions): ASTNode;
 
-    export interface Attribute {
-        key: string;
-        value: string;
-    }
+/**
+ * Parses an HTML fragment.
+ * 
+ * @param {string} html - Input html fragment
+ * @param {ParserOptions} - Parsign options
+ * @example
+ * var parse5 = require('parse5');
+ * var documentFragment = parse5.parseFragment('<table></table>');
+ * // Parses the html fragment in the context of the parsed <table> element.
+ * var trFragment = parser.parseFragment(documentFragment.childNodes[0], '<tr><td>Shake it, baby</td></tr>');
+ */
+declare export function parseFragment(html: string, options?: ParserOptions): ASTNode;
+declare export function parseFragment(fragmentContext: any, html: string, options?: ParserOptions): ASTNode;
 
-    export interface ASTNode {
-        attrs: ASTAttribute[];
-        childNodes?: ASTNode[];
-        namespaceURI?: string;
-        parentNode?: ASTNode;
-        nodeName: string;
-        quirksMode?: boolean;
-        value?: string;
-        __location: LocationInfo | ElementLocationInfo;
-    }
+/**
+ * Serializes an AST node to an HTML string.
+ * @param node Node to serialize.
+ * @param options Serialization options
+ */
+declare export function serialize(node: ASTNode, options?: SerializerOptions): string;
 
-    export interface LocationInfo {
-        /**
-         * One-based line index
-         */
-        line: number;
-        /**
-         * Zero-based first character index
-         */
-        col: number;
-        /**
-         * Zero-based first character index
-         */
-        startOffset: number;
-        /**
-         * Zero-based last character index
-         */
-        endOffset: number;
-    }
-    
-        
-    /**
-     * Streaming AST node to an HTML serializer. A readable stream.
-     */
-    export class SerializerStream extends stream.Readable {
-        /**
-         * Streaming AST node to an HTML serializer. A readable stream.
-         * 
-         * @param Node to serialize.
-         * @param options Serialization options.
-         */
-        constructor(node: ASTNode, options: SerializerOptions);
-    }
-    
-    /**
-     * Streaming HTML parser with scripting support. A writable stream.
-     */
-    export class ParserStream extends stream.Writable {
-        /**
-         * @param options Parsing options.
-         */
-        constructor(options?: ParserOptions);
-        /**
-         * The resulting document node.
-         */
-        document: ASTNode;
-        on(event: string, listener: Function): this;
-        /**
-         * Raised then parser encounters a <script> element. If this event has listeners, parsing will be suspended
-         *  once it is emitted. So, if <script> has the src attribute, 
-         * you can fetch it, execute and then resume parsing just like browsers do.
-         * The listener will have 3 parameters:
-         * The script element that caused the event, a function for writing additional html at the current parsing position. Suitable for implementing the DOM document.write and document.writeln methods.
-         * And finally a resume function as a callback to signal the continuation of the parsing
-         */
-        on(event: 'script', listener: (scriptElement: ASTNode, documentWrite: (html: string) => void, resume: Function) => void): this;
-    }
-
-    export class SAXParser extends stream.Transform {
-        constructor(options?: SAXParserOptions);
-        on(event: string, listener: Function): this;
-        /**
-         * Raised when the parser encounters a start tag.
-         * Listener function has 4 parameters:
-         * Tag name, List of attributes in the { key: String, value: String } form, selfClosing boolean 
-         * and start tag source code location info. Available if location info is enabled in SAXParserOptions.
-         */
-        on(event: 'startTag', listener: (name: string, attrs: Attribute[], selfClosing: boolean, location?: StartTagLocationInfo) => void): this;
-        /**
-         * Raised when parser encounters an end tag.
-         * Listener function has 2 parameters:
-         * Tag name and location End tag source code location info. Available if location info is enabled in SAXParserOptions. 
-         */
-        on(event: 'endTag', listener: (name: string, location?: LocationInfo) => void): this;
-        /**
-         * Raised then parser encounters a comment.
-         * Listener function has 2 parameters:
-         * The comment text and the source code location info. Available if location info is enabled in SAXParserOptions.
-         */
-        on(event: 'comment', listener: (text: string, location?: LocationInfo) => void): this;
-        /**
-         * Raised then parser encounters text content.
-         * Listener function has 2 parameters:
-         * The text content and location info. Available if location info is enabled in SAXParserOptions.
-         */
-        on(event: 'text', listener: (text: string, location?: LocationInfo) => void): this;
-        /**
-         * Raised then parser encounters a document type declaration.
-         * Listener function has 4 parameters:
-         * The document type name, document type public identifier, document type system identifier and
-         * location info. Available if location info is enabled in SAXParserOptions.
-         */
-        on(event: 'doctype', listener: (name: string, publicId: string, systemId: string, location?: LocationInfo) => void): this;
-        /**
-         * Stops parsing. Useful if you want the parser to stop consuming CPU time once you've obtained the desired info from the input stream. 
-         * Doesn't prevent piping, so that data will flow through the parser as usual.
-         */
-        stop(): void;
-    }
-
-    export interface TreeAdapter {
-        createDocument(): ASTNode;
-        createDocumentFragment(): ASTNode;
-        createElement(tagName: string, namespaceURI: string, attrs: Attribute[]): ASTNode;
-        createCommentNode(data: string): ASTNode;
-        appendChild(parentNode: ASTNode, newNode: ASTNode): void;
-        insertBefore(parentNode: ASTNode, newNode: ASTNode, referenceNode: ASTNode): void;
-        setTemplateContent(templateElement: ASTNode, contentTemplate: ASTNode): void;
-        getTemplateContent(templateElement: ASTNode): ASTNode;
-        setDocumentType(document: ASTNode, name: string, publicId: string, systemId: string): void;
-        setQuirksMode(document: ASTNode): void;
-        isQuirksMode(document: ASTNode): boolean;
-        detachNode(node: ASTNode): void;
-        insertText(parentNode: ASTNode, text: string): void;
-        insertTextBefore(parentNode: ASTNode, text: string, referenceNode: ASTNode): void;
-        adoptAttributes(recipientNode: ASTNode, attrs: Attribute[]): void;
-        getFirstChild(node: ASTNode): ASTNode;
-        getChildNodes(node: ASTNode): ASTNode[];
-        getParentNode(node: ASTNode): ASTNode;
-        getAttrList(node: ASTNode): Attribute[];
-        getTagName(element: ASTNode): string;
-        getNamespaceURI(element: ASTNode): string;
-        getTextNodeContent(textNode: ASTNode): string;
-        getCommentNodeContent(commentNode: ASTNode): string;
-        getDocumentTypeNodeName(doctypeNode: ASTNode): string;
-        getDocumentTypeNodePublicId(doctypeNode: ASTNode): string;
-        getDocumentTypeNodeSystemId(doctypeNode: ASTNode): string;
-        isTextNode(node: ASTNode): boolean;
-        isCommentNode(node: ASTNode): boolean;
-        isDocumentTypeNode(node: ASTNode): boolean;
-        isElementNode(node: ASTNode): boolean;
-    }
-
-    export interface AttributesLocationInfo {
-        [attributeName: string]: LocationInfo;
-    }
-
-    export interface StartTagLocationInfo extends LocationInfo {
-        /**
-         * Start tag attributes' location info
-         */
-        attrs: AttributesLocationInfo
-    }
-
-    export interface ElementLocationInfo {
-        /**
-         * Element's start tag location info.
-         */
-        startTag: StartTagLocationInfo;
-        /**
-         * Element's end tag location info.
-         */
-        endTag: LocationInfo;
-    }
-    
-    /**
-     * Provides built-in tree adapters that can be used for parsing and serialization.
-     */
-    export var treeAdapters: {
-        /**
-         * Default tree format for parse5.
-         */
-        default: TreeAdapter, 
-        /**
-         * Quite popular htmlparser2 tree format (e.g. used by cheerio and jsdom).
-         */
-        htmlparser2: TreeAdapter
-    };
-
-    export interface ParserOptions {
-        /**
-         * Enables source code location information for the nodes. When enabled, each node (except root node) has the __location property. 
-         * In case the node is not an empty element, __location will be ElementLocationInfo object, otherwise it's LocationInfo.
-         * If the element was implicitly created by *the parser it's __location property will be null.
-         */
-        locationInfo?: boolean;
-        /**
-         * Specifies the resulting tree format.
-         */
-        treeAdapter?: TreeAdapter;
-    }
-
-    export interface SerializerOptions {
-        /***
-         * Specifies input tree format.
-         */
-        treeAdapter: TreeAdapter;
-    }
-    
-    /**
-     * Enables source code location information for the tokens.
-     *  When enabled, each token event handler will receive LocationInfo 
-     * (or StartTagLocationInfo) object as its last argument.
-     */
-    export interface SAXParserOptions {
-        locationInfo?: boolean;
-    }
+export interface ASTAttribute {
+    name: string;
+    value: string;
 }
 
+export interface Attribute {
+    key: string;
+    value: string;
+}
+
+export interface ASTNode {
+    attrs: ASTAttribute[];
+    childNodes?: ASTNode[];
+    namespaceURI?: string;
+    parentNode?: ASTNode;
+    nodeName: string;
+    quirksMode?: boolean;
+    value?: string;
+    __location: LocationInfo | ElementLocationInfo;
+}
+
+export interface LocationInfo {
+    /**
+     * One-based line index
+     */
+    line: number;
+    /**
+     * Zero-based first character index
+     */
+    col: number;
+    /**
+     * Zero-based first character index
+     */
+    startOffset: number;
+    /**
+     * Zero-based last character index
+     */
+    endOffset: number;
+}
+
+
+/**
+ * Streaming AST node to an HTML serializer. A readable stream.
+ */
+declare export class SerializerStream extends stream.Readable {
+    /**
+     * Streaming AST node to an HTML serializer. A readable stream.
+     * 
+     * @param Node to serialize.
+     * @param options Serialization options.
+     */
+    constructor(node: ASTNode, options: SerializerOptions);
+}
+
+/**
+ * Streaming HTML parser with scripting support. A writable stream.
+ */
+declare export class ParserStream extends stream.Writable {
+    /**
+     * @param options Parsing options.
+     */
+    constructor(options?: ParserOptions);
+    /**
+     * The resulting document node.
+     */
+    document: ASTNode;
+    on(event: string, listener: Function): this;
+    /**
+     * Raised then parser encounters a <script> element. If this event has listeners, parsing will be suspended
+     *  once it is emitted. So, if <script> has the src attribute, 
+     * you can fetch it, execute and then resume parsing just like browsers do.
+     * The listener will have 3 parameters:
+     * The script element that caused the event, a function for writing additional html at the current parsing position. Suitable for implementing the DOM document.write and document.writeln methods.
+     * And finally a resume function as a callback to signal the continuation of the parsing
+     */
+    on(event: 'script', listener: (scriptElement: ASTNode, documentWrite: (html: string) => void, resume: Function) => void): this;
+}
+
+declare export class SAXParser extends stream.Transform {
+    constructor(options?: SAXParserOptions);
+    on(event: string, listener: Function): this;
+    /**
+     * Raised when the parser encounters a start tag.
+     * Listener function has 4 parameters:
+     * Tag name, List of attributes in the { key: String, value: String } form, selfClosing boolean 
+     * and start tag source code location info. Available if location info is enabled in SAXParserOptions.
+     */
+    on(event: 'startTag', listener: (name: string, attrs: Attribute[], selfClosing: boolean, location?: StartTagLocationInfo) => void): this;
+    /**
+     * Raised when parser encounters an end tag.
+     * Listener function has 2 parameters:
+     * Tag name and location End tag source code location info. Available if location info is enabled in SAXParserOptions. 
+     */
+    on(event: 'endTag', listener: (name: string, location?: LocationInfo) => void): this;
+    /**
+     * Raised then parser encounters a comment.
+     * Listener function has 2 parameters:
+     * The comment text and the source code location info. Available if location info is enabled in SAXParserOptions.
+     */
+    on(event: 'comment', listener: (text: string, location?: LocationInfo) => void): this;
+    /**
+     * Raised then parser encounters text content.
+     * Listener function has 2 parameters:
+     * The text content and location info. Available if location info is enabled in SAXParserOptions.
+     */
+    on(event: 'text', listener: (text: string, location?: LocationInfo) => void): this;
+    /**
+     * Raised then parser encounters a document type declaration.
+     * Listener function has 4 parameters:
+     * The document type name, document type public identifier, document type system identifier and
+     * location info. Available if location info is enabled in SAXParserOptions.
+     */
+    on(event: 'doctype', listener: (name: string, publicId: string, systemId: string, location?: LocationInfo) => void): this;
+    /**
+     * Stops parsing. Useful if you want the parser to stop consuming CPU time once you've obtained the desired info from the input stream. 
+     * Doesn't prevent piping, so that data will flow through the parser as usual.
+     */
+    stop(): void;
+}
+
+export interface TreeAdapter {
+    createDocument(): ASTNode;
+    createDocumentFragment(): ASTNode;
+    createElement(tagName: string, namespaceURI: string, attrs: Attribute[]): ASTNode;
+    createCommentNode(data: string): ASTNode;
+    appendChild(parentNode: ASTNode, newNode: ASTNode): void;
+    insertBefore(parentNode: ASTNode, newNode: ASTNode, referenceNode: ASTNode): void;
+    setTemplateContent(templateElement: ASTNode, contentTemplate: ASTNode): void;
+    getTemplateContent(templateElement: ASTNode): ASTNode;
+    setDocumentType(document: ASTNode, name: string, publicId: string, systemId: string): void;
+    setQuirksMode(document: ASTNode): void;
+    isQuirksMode(document: ASTNode): boolean;
+    detachNode(node: ASTNode): void;
+    insertText(parentNode: ASTNode, text: string): void;
+    insertTextBefore(parentNode: ASTNode, text: string, referenceNode: ASTNode): void;
+    adoptAttributes(recipientNode: ASTNode, attrs: Attribute[]): void;
+    getFirstChild(node: ASTNode): ASTNode;
+    getChildNodes(node: ASTNode): ASTNode[];
+    getParentNode(node: ASTNode): ASTNode;
+    getAttrList(node: ASTNode): Attribute[];
+    getTagName(element: ASTNode): string;
+    getNamespaceURI(element: ASTNode): string;
+    getTextNodeContent(textNode: ASTNode): string;
+    getCommentNodeContent(commentNode: ASTNode): string;
+    getDocumentTypeNodeName(doctypeNode: ASTNode): string;
+    getDocumentTypeNodePublicId(doctypeNode: ASTNode): string;
+    getDocumentTypeNodeSystemId(doctypeNode: ASTNode): string;
+    isTextNode(node: ASTNode): boolean;
+    isCommentNode(node: ASTNode): boolean;
+    isDocumentTypeNode(node: ASTNode): boolean;
+    isElementNode(node: ASTNode): boolean;
+}
+
+export interface AttributesLocationInfo {
+    [attributeName: string]: LocationInfo;
+}
+
+export interface StartTagLocationInfo extends LocationInfo {
+    /**
+     * Start tag attributes' location info
+     */
+    attrs: AttributesLocationInfo
+}
+
+export interface ElementLocationInfo {
+    /**
+     * Element's start tag location info.
+     */
+    startTag: StartTagLocationInfo;
+    /**
+     * Element's end tag location info.
+     */
+    endTag: LocationInfo;
+}
+
+/**
+ * Provides built-in tree adapters that can be used for parsing and serialization.
+ */
+declare export var treeAdapters: {
+    /**
+     * Default tree format for parse5.
+     */
+    default: TreeAdapter,
+    /**
+     * Quite popular htmlparser2 tree format (e.g. used by cheerio and jsdom).
+     */
+    htmlparser2: TreeAdapter
+};
+
+export interface ParserOptions {
+    /**
+     * Enables source code location information for the nodes. When enabled, each node (except root node) has the __location property. 
+     * In case the node is not an empty element, __location will be ElementLocationInfo object, otherwise it's LocationInfo.
+     * If the element was implicitly created by *the parser it's __location property will be null.
+     */
+    locationInfo?: boolean;
+    /**
+     * Specifies the resulting tree format.
+     */
+    treeAdapter?: TreeAdapter;
+}
+
+export interface SerializerOptions {
+    /***
+     * Specifies input tree format.
+     */
+    treeAdapter: TreeAdapter;
+}
+
+/**
+ * Enables source code location information for the tokens.
+ *  When enabled, each token event handler will receive LocationInfo 
+ * (or StartTagLocationInfo) object as its last argument.
+ */
+export interface SAXParserOptions {
+    locationInfo?: boolean;
+}
diff --git a/parsimmon/parsimmon.d.ts b/parsimmon/parsimmon.d.ts
index ab6ceab4df..aec8aae203 100644
--- a/parsimmon/parsimmon.d.ts
+++ b/parsimmon/parsimmon.d.ts
@@ -5,173 +5,172 @@
 
 // TODO convert to generics
 
-declare module 'parsimmon' {
-	namespace Parsimmon {
 
-		export type StreamType = string;
+declare namespace Parsimmon {
 
-		export interface Mark<T> {
-			start: number;
-			end: number;
-			value: T;
-		}
+    export type StreamType = string;
 
-		export interface Result<T> {
-			status: boolean;
-			value?: T;
-			expected?: string;
-			index?: number;
-		}
+    export interface Mark<T> {
+        start: number;
+        end: number;
+        value: T;
+    }
 
-		export interface Parser<T> {
-			/*
-			 parse the string
-			 */
-			parse(input: string): Result<T>;
-			/*
-			 returns a new parser which tries parser, and if it fails uses otherParser.
-			 */
-			or(otherParser: Parser<T>): Parser<T>;
-			or<U>(otherParser: Parser<U>): Parser<any>;
-			/*
-			 returns a new parser which tries parser, and on success calls the given function with the result of the parse, which is expected to return another parser, which will be tried next
-			 */
-			chain<U>(next: (result: T) => Parser<U>): Parser<U>;
-			/*
-			 returns a new parser which tries parser, and on success calls the given function with the result of the parse, which is expected to return another parser.
-			 */
-			then<U>(call: (result: T) => Parser<U>): Parser<U>;
-			/*
-			 expects anotherParser to follow parser, and yields the result of anotherParser. NB: the result of parser here is ignored.
-			 */
-			then<U>(anotherParser: Parser<U>): Parser<U>;
-			/*
-			 transforms the output of parser with the given function.
-			 */
-			map<U>(call: (result: T) => U): Parser<U>;
-			/*
-			 expects otherParser after parser, but preserves the yield value of parser.
-			 */
-			skip<U>(otherParser: Parser<U>): Parser<T>;
-			/*
-			 returns a new parser with the same behavior, but which yields aResult.
-			 */
-			result<U>(aResult: U): Parser<U>;
-			/*
-			 expects parser zero or more times, and yields an array of the results.
-			 */
-			many(): Parser<T[]>;
-			/*
-			 expects parser exactly n times, and yields an array of the results.
-			 */
-			times(n: number): Parser<T[]>;
-			/*
-			 expects parser between min and max times, and yields an array of the results.
-			 */
-			times(min: number, max: number): Parser<T[]>;
-			/*
-			 expects parser at most n times. Yields an array of the results.
-			 */
-			atMost(n: number): Parser<T[]>;
-			/*
-			 expects parser at least n times. Yields an array of the results.
-			 */
-			atLeast(n: number): Parser<T[]>;
-			/*
-			 returns a new parser whose failure message is the passed description.
-			 */
-			mark(): Parser<Mark<T>>;
+    export interface Result<T> {
+        status: boolean;
+        value?: T;
+        expected?: string;
+        index?: number;
+    }
 
-			desc(description: string): Parser<T>;
-		}
-		/*
-		 is a parser that expects to find "my-string", and will yield the same.
-		 */
-		export function string(mystring: string): Parser<string>;
+    export interface Parser<T> {
+        /*
+         parse the string
+         */
+        parse(input: string): Result<T>;
+        /*
+         returns a new parser which tries parser, and if it fails uses otherParser.
+         */
+        or(otherParser: Parser<T>): Parser<T>;
+        or<U>(otherParser: Parser<U>): Parser<any>;
+        /*
+         returns a new parser which tries parser, and on success calls the given function with the result of the parse, which is expected to return another parser, which will be tried next
+         */
+        chain<U>(next: (result: T) => Parser<U>): Parser<U>;
+        /*
+         returns a new parser which tries parser, and on success calls the given function with the result of the parse, which is expected to return another parser.
+         */
+        then<U>(call: (result: T) => Parser<U>): Parser<U>;
+        /*
+         expects anotherParser to follow parser, and yields the result of anotherParser. NB: the result of parser here is ignored.
+         */
+        then<U>(anotherParser: Parser<U>): Parser<U>;
+        /*
+         transforms the output of parser with the given function.
+         */
+        map<U>(call: (result: T) => U): Parser<U>;
+        /*
+         expects otherParser after parser, but preserves the yield value of parser.
+         */
+        skip<U>(otherParser: Parser<U>): Parser<T>;
+        /*
+         returns a new parser with the same behavior, but which yields aResult.
+         */
+        result<U>(aResult: U): Parser<U>;
+        /*
+         expects parser zero or more times, and yields an array of the results.
+         */
+        many(): Parser<T[]>;
+        /*
+         expects parser exactly n times, and yields an array of the results.
+         */
+        times(n: number): Parser<T[]>;
+        /*
+         expects parser between min and max times, and yields an array of the results.
+         */
+        times(min: number, max: number): Parser<T[]>;
+        /*
+         expects parser at most n times. Yields an array of the results.
+         */
+        atMost(n: number): Parser<T[]>;
+        /*
+         expects parser at least n times. Yields an array of the results.
+         */
+        atLeast(n: number): Parser<T[]>;
+        /*
+         returns a new parser whose failure message is the passed description.
+         */
+        mark(): Parser<Mark<T>>;
 
-		/*
-		 is a parser that expects the stream to match the given regex.
-		 */
-		export function regex(myregex: RegExp): Parser<string>;
+        desc(description: string): Parser<T>;
+    }
+    /*
+     is a parser that expects to find "my-string", and will yield the same.
+     */
+    export function string(mystring: string): Parser<string>;
 
-		/*
-		 is a parser that doesn't consume any of the string, and yields result.
-		 */
-		export function succeed<U>(result: U): Parser<U>;
+    /*
+     is a parser that expects the stream to match the given regex.
+     */
+    export function regex(myregex: RegExp): Parser<string>;
 
-		/*
-		 accepts a variable number of parsers that it expects to find in order, yielding an array of the results.
-		 */
-		export function seq<U>(...parsers: Parser<U>[]): Parser<U[]>;
-		export function seq(...parsers: Parser<any>[]): Parser<any[]>;
+    /*
+     is a parser that doesn't consume any of the string, and yields result.
+     */
+    export function succeed<U>(result: U): Parser<U>;
 
-		export type SuccessFunctionType<U> = (index: number, result: U) => Result<U>;
-		export type FailureFunctionType<U> = (index: number, msg: string) => Result<U>;
-		export type ParseFunctionType<U> = (stream: StreamType, index: number) => Result<U>;
-		/*
-		 allows to add custom primitive parsers.
-		 */
-		export function custom<U>(parsingFunction: (success: SuccessFunctionType<U>, failure: FailureFunctionType<U>) => ParseFunctionType<U>): Parser<U>;
+    /*
+     accepts a variable number of parsers that it expects to find in order, yielding an array of the results.
+     */
+    export function seq<U>(...parsers: Parser<U>[]): Parser<U[]>;
+    export function seq(...parsers: Parser<any>[]): Parser<any[]>;
 
-		/*
-		 accepts a variable number of parsers, and yields the value of the first one that succeeds, backtracking in between.
-		 */
-		export function alt<U>(...parsers: Parser<U>[]): Parser<U>;
-		export function alt(...parsers: Parser<any>[]): Parser<any>;
+    export type SuccessFunctionType<U> = (index: number, result: U) => Result<U>;
+    export type FailureFunctionType<U> = (index: number, msg: string) => Result<U>;
+    export type ParseFunctionType<U> = (stream: StreamType, index: number) => Result<U>;
+    /*
+     allows to add custom primitive parsers.
+     */
+    export function custom<U>(parsingFunction: (success: SuccessFunctionType<U>, failure: FailureFunctionType<U>) => ParseFunctionType<U>): Parser<U>;
 
-		/*
-		 accepts a function that returns a parser, which is evaluated the first time the parser is used. This is useful for referencing parsers that haven't yet been defined.
-		 */
-		export function lazy<U>(f: () => Parser<U>): Parser<U>;
-		export function lazy<U>(description: string, f: () => Parser<U>): Parser<U>;
+    /*
+     accepts a variable number of parsers, and yields the value of the first one that succeeds, backtracking in between.
+     */
+    export function alt<U>(...parsers: Parser<U>[]): Parser<U>;
+    export function alt(...parsers: Parser<any>[]): Parser<any>;
 
-		/*
-		 fail paring with a message
-		 */
-		export function fail(message: string): Parser<void>;
-		export function fail<U>(message: string): Parser<U>;
+    /*
+     accepts a function that returns a parser, which is evaluated the first time the parser is used. This is useful for referencing parsers that haven't yet been defined.
+     */
+    export function lazy<U>(f: () => Parser<U>): Parser<U>;
+    export function lazy<U>(description: string, f: () => Parser<U>): Parser<U>;
 
-		/*
-		 is equivalent to Parsimmon.regex(/[a-z]/i)
-		 */
-		export var letter: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/[a-z]*`/i)
-		 */
-		export var letters: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/[0-9]/)
-		 */
-		export var digit: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/[0-9]*`/)
-		 */
-		export var digits: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/\s+/)
-		 */
-		export var whitespace: Parser<string>;
-		/*
-		 is equivalent to Parsimmon.regex(/\s*`/)
-		 */
-		export var optWhitespace: Parser<string>;
-		/*
-		 consumes and yields the next character of the stream.
-		 */
-		export var any: Parser<string>;
-		/*
-		 consumes and yields the entire remainder of the stream.
-		 */
-		export var all: Parser<string>;
-		/*
-		 expects the end of the stream.
-		 */
-		export var eof: Parser<void>;
-		/*
-		 is a parser that yields the current index of the parse.
-		 */
-		export var index: Parser<number>;
-	}
+    /*
+     fail paring with a message
+     */
+    export function fail(message: string): Parser<void>;
+    export function fail<U>(message: string): Parser<U>;
 
-	export = Parsimmon;
+    /*
+     is equivalent to Parsimmon.regex(/[a-z]/i)
+     */
+    export var letter: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/[a-z]*`/i)
+     */
+    export var letters: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/[0-9]/)
+     */
+    export var digit: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/[0-9]*`/)
+     */
+    export var digits: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/\s+/)
+     */
+    export var whitespace: Parser<string>;
+    /*
+     is equivalent to Parsimmon.regex(/\s*`/)
+     */
+    export var optWhitespace: Parser<string>;
+    /*
+     consumes and yields the next character of the stream.
+     */
+    export var any: Parser<string>;
+    /*
+     consumes and yields the entire remainder of the stream.
+     */
+    export var all: Parser<string>;
+    /*
+     expects the end of the stream.
+     */
+    export var eof: Parser<void>;
+    /*
+     is a parser that yields the current index of the parse.
+     */
+    export var index: Parser<number>;
 }
+
+export = Parsimmon;
diff --git a/pascal-case/pascal-case.d.ts b/pascal-case/pascal-case.d.ts
index 004bdc1a60..2b9ce7ea84 100644
--- a/pascal-case/pascal-case.d.ts
+++ b/pascal-case/pascal-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "pascal-case" {
-	function pascalCase(string: string, locale?: string): string;
-	export = pascalCase;
-}
+
+declare function pascalCase(string: string, locale?: string): string;
+export = pascalCase;
diff --git a/passport-facebook-token/passport-facebook-token.d.ts b/passport-facebook-token/passport-facebook-token.d.ts
index 08fd306219..8aa60bc77a 100644
--- a/passport-facebook-token/passport-facebook-token.d.ts
+++ b/passport-facebook-token/passport-facebook-token.d.ts
@@ -5,34 +5,33 @@
 
 /// <reference path="../passport/passport.d.ts"/>
 
-declare module 'passport-facebook-token' {
 
-    import passport = require('passport');
-    import express = require('express');
 
-    interface Profile extends passport.Profile {
-        gender: string;
-        profileUrl: string;
-    }
+import passport = require('passport');
+import express = require('express');
 
-    interface StrategyOptions {
-        clientID: string;
-        clientSecret: string;
-        authorizationURL?: string;
-        tokenURL?: string;
-        scopeSeparator?: string;
-        passReqToCallback?: Function;
-        enableProof?: boolean;
-        profileFields?: any[];
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(options: StrategyOptions,
-                    verify: (accessToken: string,
-                             refreshToken: string,
-                             profile: Profile,
-                             done: (err: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: any) => void;
-    }
+interface Profile extends passport.Profile {
+    gender: string;
+    profileUrl: string;
+}
+
+interface StrategyOptions {
+    clientID: string;
+    clientSecret: string;
+    authorizationURL?: string;
+    tokenURL?: string;
+    scopeSeparator?: string;
+    passReqToCallback?: Function;
+    enableProof?: boolean;
+    profileFields?: any[];
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(options: StrategyOptions,
+        verify: (accessToken: string,
+            refreshToken: string,
+            profile: Profile,
+            done: (err: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: any) => void;
 }
diff --git a/passport-facebook/passport-facebook.d.ts b/passport-facebook/passport-facebook.d.ts
index 059c3253cd..dad8b7e0db 100644
--- a/passport-facebook/passport-facebook.d.ts
+++ b/passport-facebook/passport-facebook.d.ts
@@ -5,34 +5,33 @@
 
 /// <reference path="../passport/passport.d.ts"/>
 
-declare module 'passport-facebook' {
 
-    import passport = require('passport');
-    import express = require('express');
 
-    interface Profile extends passport.Profile {
-        gender: string;
-        profileUrl: string;
-        username: string;
+import passport = require('passport');
+import express = require('express');
 
-        _raw: string;
-        _json: any;
-    }
+interface Profile extends passport.Profile {
+    gender: string;
+    profileUrl: string;
+    username: string;
 
-    interface IStrategyOption {
-        clientID: string;
-        clientSecret: string;
-        callbackURL: string;
-
-        scopeSeparator?: string;
-        enableProof?: boolean;
-        profileFields?: string[];
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(options: IStrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
+    _raw: string;
+    _json: any;
+}
+
+interface IStrategyOption {
+    clientID: string;
+    clientSecret: string;
+    callbackURL: string;
+
+    scopeSeparator?: string;
+    enableProof?: boolean;
+    profileFields?: string[];
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(options: IStrategyOption,
+        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
 }
diff --git a/passport-google-oauth/passport-google-oauth.d.ts b/passport-google-oauth/passport-google-oauth.d.ts
index 11645c4411..992f29751e 100644
--- a/passport-google-oauth/passport-google-oauth.d.ts
+++ b/passport-google-oauth/passport-google-oauth.d.ts
@@ -5,59 +5,58 @@
 
 /// <reference path="../passport/passport.d.ts"/>
 
-declare module 'passport-google-oauth' {
 
-    import passport = require('passport');
-    import express = require('express');
 
-    interface Profile extends passport.Profile {
-        gender: string;
+import passport = require('passport');
+import express = require('express');
 
-        _raw: string;
-        _json: any;
-    }
+interface Profile extends passport.Profile {
+    gender: string;
 
-    interface IOAuthStrategyOption {
-        consumerKey: string;
-        consumerSecret: string;
-        callbackURL: string;
-
-        reguestTokenURL?: string;
-        accessTokenURL?: string;
-        userAuthorizationURL?: string;
-        sessionKey?: string;
-    }
-
-    class OAuthStrategy implements passport.Strategy {
-        constructor(options: IOAuthStrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
-
-    interface IOAuth2StrategyOption {
-        clientID: string;
-        clientSecret: string;
-        callbackURL: string;
-
-        authorizationURL?: string;
-        tokenURL?: string;
-
-        accessType?: string;
-        approval_prompt?: string;
-        prompt?: string;
-        loginHint?: string;
-        userID?: string;
-        hostedDomain?: string;
-        display?: string;
-        requestVisibleActions?: string;
-        openIDRealm?: string;
-    }
-
-    class OAuth2Strategy implements passport.Strategy {
-        constructor(options: IOAuth2StrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
+    _raw: string;
+    _json: any;
+}
+
+interface IOAuthStrategyOption {
+    consumerKey: string;
+    consumerSecret: string;
+    callbackURL: string;
+
+    reguestTokenURL?: string;
+    accessTokenURL?: string;
+    userAuthorizationURL?: string;
+    sessionKey?: string;
+}
+
+declare class OAuthStrategy implements passport.Strategy {
+    constructor(options: IOAuthStrategyOption,
+        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
+}
+
+interface IOAuth2StrategyOption {
+    clientID: string;
+    clientSecret: string;
+    callbackURL: string;
+
+    authorizationURL?: string;
+    tokenURL?: string;
+
+    accessType?: string;
+    approval_prompt?: string;
+    prompt?: string;
+    loginHint?: string;
+    userID?: string;
+    hostedDomain?: string;
+    display?: string;
+    requestVisibleActions?: string;
+    openIDRealm?: string;
+}
+
+declare class OAuth2Strategy implements passport.Strategy {
+    constructor(options: IOAuth2StrategyOption,
+        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
 }
diff --git a/passport-http-bearer/passport-http-bearer.d.ts b/passport-http-bearer/passport-http-bearer.d.ts
index cb02742b8d..359921bf45 100644
--- a/passport-http-bearer/passport-http-bearer.d.ts
+++ b/passport-http-bearer/passport-http-bearer.d.ts
@@ -6,35 +6,34 @@
 /// <reference path="../passport/passport.d.ts"/>
 /// <reference path="../express/express.d.ts"/>
 
-declare module "passport-http-bearer" {
 
-    import passport = require("passport");
-    import express = require("express");
 
-    interface IStrategyOptions {
-        scope: string | Array<string>;
-        realm: string;
-        passReqToCallback: boolean;
-    }
-    interface IVerifyOptions {
-        message: string;
-        scope: string | Array<string>;
-    }
+import passport = require("passport");
+import express = require("express");
 
-    interface VerifyFunction {
-        (token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
-    }
-
-    interface VerifyFunctionWithRequest {
-        (req: express.Request, token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(verify: VerifyFunction);
-        constructor(options: IStrategyOptions, verify: VerifyFunction);
-        constructor(options: IStrategyOptions, verify: VerifyFunctionWithRequest);
-
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
+interface IStrategyOptions {
+    scope: string | Array<string>;
+    realm: string;
+    passReqToCallback: boolean;
+}
+interface IVerifyOptions {
+    message: string;
+    scope: string | Array<string>;
+}
+
+interface VerifyFunction {
+    (token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
+}
+
+interface VerifyFunctionWithRequest {
+    (req: express.Request, token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(verify: VerifyFunction);
+    constructor(options: IStrategyOptions, verify: VerifyFunction);
+    constructor(options: IStrategyOptions, verify: VerifyFunctionWithRequest);
+
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
 }
diff --git a/passport-jwt/passport-jwt.d.ts b/passport-jwt/passport-jwt.d.ts
index 9f6d91cc41..b403630aab 100644
--- a/passport-jwt/passport-jwt.d.ts
+++ b/passport-jwt/passport-jwt.d.ts
@@ -5,46 +5,45 @@
 /// <reference path="../passport-strategy/passport-strategy.d.ts" />
 /// <reference path="../express/express.d.ts" />
 
-declare module 'passport-jwt' {
-    import {Strategy as PassportStrategy} from 'passport-strategy';
-    import {Request} from 'express';
 
-    export class Strategy extends PassportStrategy {
-        constructor(opt: StrategyOptions, verify: VerifyCallback);
-        constructor(opt: StrategyOptions, verify: VerifyCallbackWithRequest);
-    }
+import {Strategy as PassportStrategy} from 'passport-strategy';
+import {Request} from 'express';
 
-    export interface StrategyOptions {
-        secretOrKey: string;
-        jwtFromRequest: JwtFromRequestFunction;
-        issuer?: string;
-        audience?: string;
-        algorithms?: string[];
-        ignoreExpiration?: boolean;
-        passReqToCallback?: boolean;
-    }
-
-    export interface VerifyCallback {
-        (payload: any, done: VerifiedCallback): void;
-    }
-
-    export interface VerifyCallbackWithRequest {
-        (req: Request, payload: any, done: VerifiedCallback): void;
-    }
-
-    export interface VerifiedCallback {
-        (error: any, user?: any, info?: any): void;
-    }
-
-    export interface JwtFromRequestFunction {
-        (req: Request): string;
-    }
-
-    export namespace ExtractJwt {
-        export function fromHeader(header_name: string): JwtFromRequestFunction;
-        export function fromBodyField(field_name: string): JwtFromRequestFunction;
-        export function fromUrlQueryParameter(param_name: string): JwtFromRequestFunction;
-        export function fromAuthHeaderWithScheme(auth_scheme: string): JwtFromRequestFunction;
-        export function fromAuthHeader(): JwtFromRequestFunction;
-    }
+declare export class Strategy extends PassportStrategy {
+    constructor(opt: StrategyOptions, verify: VerifyCallback);
+    constructor(opt: StrategyOptions, verify: VerifyCallbackWithRequest);
+}
+
+export interface StrategyOptions {
+    secretOrKey: string;
+    jwtFromRequest: JwtFromRequestFunction;
+    issuer?: string;
+    audience?: string;
+    algorithms?: string[];
+    ignoreExpiration?: boolean;
+    passReqToCallback?: boolean;
+}
+
+export interface VerifyCallback {
+    (payload: any, done: VerifiedCallback): void;
+}
+
+export interface VerifyCallbackWithRequest {
+    (req: Request, payload: any, done: VerifiedCallback): void;
+}
+
+export interface VerifiedCallback {
+    (error: any, user?: any, info?: any): void;
+}
+
+export interface JwtFromRequestFunction {
+    (req: Request): string;
+}
+
+declare export namespace ExtractJwt {
+    export function fromHeader(header_name: string): JwtFromRequestFunction;
+    export function fromBodyField(field_name: string): JwtFromRequestFunction;
+    export function fromUrlQueryParameter(param_name: string): JwtFromRequestFunction;
+    export function fromAuthHeaderWithScheme(auth_scheme: string): JwtFromRequestFunction;
+    export function fromAuthHeader(): JwtFromRequestFunction;
 }
diff --git a/passport-local/passport-local.d.ts b/passport-local/passport-local.d.ts
index b230af34cf..99ae2b6a45 100644
--- a/passport-local/passport-local.d.ts
+++ b/passport-local/passport-local.d.ts
@@ -5,41 +5,40 @@
 
 /// <reference path="../passport/passport.d.ts"/>
 
-declare module 'passport-local' {
 
-    import passport = require('passport');
-    import express = require('express');
 
-    interface IStrategyOptions {
-        usernameField?: string;
-        passwordField?: string;
-        passReqToCallback?: boolean;
-    }
+import passport = require('passport');
+import express = require('express');
 
-    interface IStrategyOptionsWithRequest {
-        usernameField?: string;
-        passwordField?: string;
-        passReqToCallback: boolean;
-    }
-
-    interface IVerifyOptions {
-        message: string;
-    }
-
-    interface VerifyFunctionWithRequest {
-        (req: express.Request, username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
-    }
-
-    interface VerifyFunction {
-        (username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(options: IStrategyOptionsWithRequest, verify: VerifyFunctionWithRequest);
-        constructor(options: IStrategyOptions, verify: VerifyFunction);
-        constructor(verify: VerifyFunction);
-
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
+interface IStrategyOptions {
+    usernameField?: string;
+    passwordField?: string;
+    passReqToCallback?: boolean;
+}
+
+interface IStrategyOptionsWithRequest {
+    usernameField?: string;
+    passwordField?: string;
+    passReqToCallback: boolean;
+}
+
+interface IVerifyOptions {
+    message: string;
+}
+
+interface VerifyFunctionWithRequest {
+    (req: express.Request, username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
+}
+
+interface VerifyFunction {
+    (username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(options: IStrategyOptionsWithRequest, verify: VerifyFunctionWithRequest);
+    constructor(options: IStrategyOptions, verify: VerifyFunction);
+    constructor(verify: VerifyFunction);
+
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
 }
diff --git a/passport-strategy/passport-strategy.d.ts b/passport-strategy/passport-strategy.d.ts
index 0a83017e14..1222854c7a 100644
--- a/passport-strategy/passport-strategy.d.ts
+++ b/passport-strategy/passport-strategy.d.ts
@@ -11,88 +11,87 @@
  * inheriting the 'Strategy' class and reimplementing the 'authenticate' method.
  */
 
-declare module 'passport-strategy' {
 
-    import passport = require('passport');
-    import express = require('express');
 
-    class Strategy implements passport.Strategy {
-        /**
-         * Performs authentication for the request.
-         * Note: Virtual function - re-implement in the strategy.
-         * @param req The request to authenticate.
-         * @param options Options passed to the strategy.
-         */
-        authenticate(req: express.Request, options?: any): void;
+import passport = require('passport');
+import express = require('express');
 
-        //
-        // Augmented strategy functions.
-        // These are available only from the 'authenticate' function.
-        // They are added manually by the passport framework.
-        //
+declare class Strategy implements passport.Strategy {
+    /**
+     * Performs authentication for the request.
+     * Note: Virtual function - re-implement in the strategy.
+     * @param req The request to authenticate.
+     * @param options Options passed to the strategy.
+     */
+    authenticate(req: express.Request, options?: any): void;
 
-        /**
-         * Authenticate `user`, with optional `info`.
-         *
-         * Strategies should call this function to successfully authenticate a
-         * user.  `user` should be an object supplied by the application after it
-         * has been given an opportunity to verify credentials.  `info` is an
-         * optional argument containing additional user information.  This is
-         * useful for third-party authentication strategies to pass profile
-         * details.
-         *
-         * @param {Object} user
-         * @param {Object} info
-         * @api public
-         */
-        success(user: any, info: any): void;
+    //
+    // Augmented strategy functions.
+    // These are available only from the 'authenticate' function.
+    // They are added manually by the passport framework.
+    //
 
-        /**
-         * Fail authentication, with optional `challenge` and `status`, defaulting
-         * to 401.
-         *
-         * Strategies should call this function to fail an authentication attempt.
-         *
-         * @param {String} challenge (Can also be an object with 'message' and 'type' fields).
-         * @param {Number} status
-         * @api public
-         */
-        fail(challenge: any, status: number): void;
-        fail(status: number): void;
+    /**
+     * Authenticate `user`, with optional `info`.
+     *
+     * Strategies should call this function to successfully authenticate a
+     * user.  `user` should be an object supplied by the application after it
+     * has been given an opportunity to verify credentials.  `info` is an
+     * optional argument containing additional user information.  This is
+     * useful for third-party authentication strategies to pass profile
+     * details.
+     *
+     * @param {Object} user
+     * @param {Object} info
+     * @api public
+     */
+    success(user: any, info: any): void;
 
-        /**
-         * Redirect to `url` with optional `status`, defaulting to 302.
-         *
-         * Strategies should call this function to redirect the user (via their
-         * user agent) to a third-party website for authentication.
-         *
-         * @param {String} url
-         * @param {Number} status
-         * @api public
-         */
-        redirect(url: string, status?: number): void;
+    /**
+     * Fail authentication, with optional `challenge` and `status`, defaulting
+     * to 401.
+     *
+     * Strategies should call this function to fail an authentication attempt.
+     *
+     * @param {String} challenge (Can also be an object with 'message' and 'type' fields).
+     * @param {Number} status
+     * @api public
+     */
+    fail(challenge: any, status: number): void;
+    fail(status: number): void;
 
-        /**
-         * Pass without making a success or fail decision.
-         *
-         * Under most circumstances, Strategies should not need to call this
-         * function.  It exists primarily to allow previous authentication state
-         * to be restored, for example from an HTTP session.
-         *
-         * @api public
-         */
-        pass(): void;
+    /**
+     * Redirect to `url` with optional `status`, defaulting to 302.
+     *
+     * Strategies should call this function to redirect the user (via their
+     * user agent) to a third-party website for authentication.
+     *
+     * @param {String} url
+     * @param {Number} status
+     * @api public
+     */
+    redirect(url: string, status?: number): void;
 
-        /**
-         * Internal error while performing authentication.
-         *
-         * Strategies should call this function when an internal error occurs
-         * during the process of performing authentication; for example, if the
-         * user directory is not available.
-         *
-         * @param {Error} err
-         * @api public
-         */
-        error(err: Error): void;
-    }
+    /**
+     * Pass without making a success or fail decision.
+     *
+     * Under most circumstances, Strategies should not need to call this
+     * function.  It exists primarily to allow previous authentication state
+     * to be restored, for example from an HTTP session.
+     *
+     * @api public
+     */
+    pass(): void;
+
+    /**
+     * Internal error while performing authentication.
+     *
+     * Strategies should call this function when an internal error occurs
+     * during the process of performing authentication; for example, if the
+     * user directory is not available.
+     *
+     * @param {Error} err
+     * @api public
+     */
+    error(err: Error): void;
 }
diff --git a/passport-twitter/passport-twitter.d.ts b/passport-twitter/passport-twitter.d.ts
index c128ef5ab0..40c1faab09 100644
--- a/passport-twitter/passport-twitter.d.ts
+++ b/passport-twitter/passport-twitter.d.ts
@@ -5,38 +5,37 @@
 
 /// <reference path="../passport/passport.d.ts"/>
 
-declare module 'passport-twitter' {
 
-    import passport = require('passport');
-    import express = require('express');
 
-    interface Profile extends passport.Profile {
-        gender: string;
-        username: string;
+import passport = require('passport');
+import express = require('express');
 
-        _raw: string;
-        _json: any;
-        _accessLevel: string;
-    }
+interface Profile extends passport.Profile {
+    gender: string;
+    username: string;
 
-    interface IStrategyOption {
-        consumerKey: string;
-        consumerSecret: string;
-        callbackURL: string;
-
-        reguestTokenURL?: string;
-        accessTokenURL?: string;
-        userAuthorizationURL?: string;
-        sessionKey?: string;
-
-        userProfileURL?: string;
-        skipExtendedUserProfile?: boolean;
-    }
-
-    class Strategy implements passport.Strategy {
-        constructor(options: IStrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-        name: string;
-        authenticate: (req: express.Request, options?: Object) => void;
-    }
+    _raw: string;
+    _json: any;
+    _accessLevel: string;
+}
+
+interface IStrategyOption {
+    consumerKey: string;
+    consumerSecret: string;
+    callbackURL: string;
+
+    reguestTokenURL?: string;
+    accessTokenURL?: string;
+    userAuthorizationURL?: string;
+    sessionKey?: string;
+
+    userProfileURL?: string;
+    skipExtendedUserProfile?: boolean;
+}
+
+declare class Strategy implements passport.Strategy {
+    constructor(options: IStrategyOption,
+        verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+    name: string;
+    authenticate: (req: express.Request, options?: Object) => void;
 }
diff --git a/password-hash/password-hash.d.ts b/password-hash/password-hash.d.ts
index d2a90abdb2..909c5d9875 100644
--- a/password-hash/password-hash.d.ts
+++ b/password-hash/password-hash.d.ts
@@ -3,14 +3,13 @@
 // Definitions by: TANAKA Koichi <https://github.com/mugeso/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'password-hash' {
-    export function generate(password: string, options?: Options): string;
-    export function verify(password: string, hashedPassword: string): boolean;
-    export function isHashed(password: string): boolean;
 
-    export interface Options {
-        algorithm?: string;
-        saltLength?: number;
-        iterations?: number;
-    }
+declare export function generate(password: string, options?: Options): string;
+declare export function verify(password: string, hashedPassword: string): boolean;
+declare export function isHashed(password: string): boolean;
+
+export interface Options {
+    algorithm?: string;
+    saltLength?: number;
+    iterations?: number;
 }
diff --git a/path-case/path-case.d.ts b/path-case/path-case.d.ts
index c3735c7dd9..246dcbb038 100644
--- a/path-case/path-case.d.ts
+++ b/path-case/path-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "path-case" {
-	function pathCase(string: string, locale?: string): string;
-	export = pathCase;
-}
+
+declare function pathCase(string: string, locale?: string): string;
+export = pathCase;
diff --git a/path-exists/path-exists.d.ts b/path-exists/path-exists.d.ts
index 90d4d0412c..f82d5ba870 100644
--- a/path-exists/path-exists.d.ts
+++ b/path-exists/path-exists.d.ts
@@ -3,12 +3,11 @@
 // Definitions by: Shogo Iwano <https://github.com/shiwano>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "path-exists" {
-    interface PathExists {
-        (path: string, callback: (error: Error, exists: boolean) => void): void;
-        sync(path: string): boolean;
-    }
 
-    var pathExists: PathExists;
-    export = pathExists;
+interface PathExists {
+    (path: string, callback: (error: Error, exists: boolean) => void): void;
+    sync(path: string): boolean;
 }
+
+declare var pathExists: PathExists;
+export = pathExists;
diff --git a/path-parse/path-parse.d.ts b/path-parse/path-parse.d.ts
index d25eff112b..9342880e8a 100644
--- a/path-parse/path-parse.d.ts
+++ b/path-parse/path-parse.d.ts
@@ -5,8 +5,7 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "path-parse" {
-  import { ParsedPath } from "path";
-  const parse: (src: string) => ParsedPath;
-  export = parse;
-}
+
+import { ParsedPath } from "path";
+declare const parse: (src: string) => ParsedPath;
+export = parse;
diff --git a/path-to-regexp/path-to-regexp.d.ts b/path-to-regexp/path-to-regexp.d.ts
index 3cf902b5c1..3ca0d48fb0 100644
--- a/path-to-regexp/path-to-regexp.d.ts
+++ b/path-to-regexp/path-to-regexp.d.ts
@@ -3,20 +3,18 @@
 // Definitions by: xica <https://github.com/xica>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "path-to-regexp" {
 
-    function pathToRegexp(path: string, keys?: string[], options?: pathToRegexp.Options): RegExp;
 
-    namespace pathToRegexp {
+declare function pathToRegexp(path: string, keys?: string[], options?: pathToRegexp.Options): RegExp;
 
-        interface Options {
-            sensitive?: boolean;
-            strict?: boolean;
-            end?: boolean;
-        }
+declare namespace pathToRegexp {
 
+    interface Options {
+        sensitive?: boolean;
+        strict?: boolean;
+        end?: boolean;
     }
 
-    export = pathToRegexp;
-
 }
+
+export = pathToRegexp;
diff --git a/pg/pg.d.ts b/pg/pg.d.ts
index 64a92d96b9..93b32d5b0d 100644
--- a/pg/pg.d.ts
+++ b/pg/pg.d.ts
@@ -5,88 +5,87 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "pg" {
-    import events = require("events");
-    import stream = require("stream");
 
-    export function connect(connection: string, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
-    export function connect(config: ClientConfig, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
-    export function end(): void;
+import events = require("events");
+import stream = require("stream");
 
-    export interface ConnectionConfig {
-        user?: string;
-        database?: string;
-        password?: string;
-        port?: number;
-        host?: string;
-    }
+declare export function connect(connection: string, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
+declare export function connect(config: ClientConfig, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
+declare export function end(): void;
 
-    export interface Defaults extends ConnectionConfig {
-        poolSize?: number;
-        poolIdleTimeout?: number;
-        reapIntervalMillis?: number;
-        binary?: boolean;
-        parseInt8?: boolean;
-    }
-
-    export interface ClientConfig extends ConnectionConfig {
-        ssl?: boolean;
-    }
-
-    export interface QueryConfig {
-        name?: string;
-        text: string;
-        values?: any[];
-    }
-
-    export interface QueryResult {
-        rows: any[];
-    }
-
-    export interface ResultBuilder extends QueryResult {
-        command: string;
-        rowCount: number;
-        oid: number;
-        addRow(row: any): void;
-    }
-
-    export class Client extends events.EventEmitter {
-        constructor(connection: string);
-        constructor(config: ClientConfig);
-
-        connect(callback?: (err:Error) => void): void;
-        end(): void;
-
-        query(queryText: string, callback?: (err: Error, result: QueryResult) => void): Query;
-        query(config: QueryConfig, callback?: (err: Error, result: QueryResult) => void): Query;
-        query(queryText: string, values: any[], callback?: (err: Error, result: QueryResult) => void): Query;
-
-        copyFrom(queryText: string): stream.Writable;
-        copyTo(queryText: string): stream.Readable;
-
-        pauseDrain(): void;
-        resumeDrain(): void;
-
-        public on(event: "drain", listener: () => void): this;
-        public on(event: "error", listener: (err: Error) => void): this;
-        public on(event: "notification", listener: (message: any) => void): this;
-        public on(event: "notice", listener: (message: any) => void): this;
-        public on(event: string, listener: Function): this;
-    }
-
-    export class Query extends events.EventEmitter {
-        public on(event: "row", listener: (row: any, result?: ResultBuilder) => void): this;
-        public on(event: "error", listener: (err: Error) => void): this;
-        public on(event: "end", listener: (result: ResultBuilder) => void): this;
-        public on(event: string, listener: Function): this;
-    }
-
-    export class Events extends events.EventEmitter {
-        public on(event: "error", listener: (err: Error, client: Client) => void): this;
-        public on(event: string, listener: Function): this;
-    }
-
-    namespace types {
-        function setTypeParser<T>(typeId: number, parser: (value: string) => T): void;
-    }
+export interface ConnectionConfig {
+    user?: string;
+    database?: string;
+    password?: string;
+    port?: number;
+    host?: string;
+}
+
+export interface Defaults extends ConnectionConfig {
+    poolSize?: number;
+    poolIdleTimeout?: number;
+    reapIntervalMillis?: number;
+    binary?: boolean;
+    parseInt8?: boolean;
+}
+
+export interface ClientConfig extends ConnectionConfig {
+    ssl?: boolean;
+}
+
+export interface QueryConfig {
+    name?: string;
+    text: string;
+    values?: any[];
+}
+
+export interface QueryResult {
+    rows: any[];
+}
+
+export interface ResultBuilder extends QueryResult {
+    command: string;
+    rowCount: number;
+    oid: number;
+    addRow(row: any): void;
+}
+
+declare export class Client extends events.EventEmitter {
+    constructor(connection: string);
+    constructor(config: ClientConfig);
+
+    connect(callback?: (err: Error) => void): void;
+    end(): void;
+
+    query(queryText: string, callback?: (err: Error, result: QueryResult) => void): Query;
+    query(config: QueryConfig, callback?: (err: Error, result: QueryResult) => void): Query;
+    query(queryText: string, values: any[], callback?: (err: Error, result: QueryResult) => void): Query;
+
+    copyFrom(queryText: string): stream.Writable;
+    copyTo(queryText: string): stream.Readable;
+
+    pauseDrain(): void;
+    resumeDrain(): void;
+
+    public on(event: "drain", listener: () => void): this;
+    public on(event: "error", listener: (err: Error) => void): this;
+    public on(event: "notification", listener: (message: any) => void): this;
+    public on(event: "notice", listener: (message: any) => void): this;
+    public on(event: string, listener: Function): this;
+}
+
+declare export class Query extends events.EventEmitter {
+    public on(event: "row", listener: (row: any, result?: ResultBuilder) => void): this;
+    public on(event: "error", listener: (err: Error) => void): this;
+    public on(event: "end", listener: (result: ResultBuilder) => void): this;
+    public on(event: string, listener: Function): this;
+}
+
+declare export class Events extends events.EventEmitter {
+    public on(event: "error", listener: (err: Error, client: Client) => void): this;
+    public on(event: string, listener: Function): this;
+}
+
+declare namespace types {
+    function setTypeParser<T>(typeId: number, parser: (value: string) => T): void;
 }
diff --git a/phantom/phantom-1.0.0.d.ts b/phantom/phantom-1.0.0.d.ts
index ed20d9a79a..5e96bf963c 100644
--- a/phantom/phantom-1.0.0.d.ts
+++ b/phantom/phantom-1.0.0.d.ts
@@ -3,18 +3,18 @@
 // Definitions by: horiuchi <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "phantom" {
 
-  function create(callback: (ph: PhantomJS) => void): void;
-  function create(options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
-  function create(arg: string, callback: (ph: PhantomJS) => void): void;
-  function create(arg: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
-  function create(arg1: string, arg2: string, callback: (ph: PhantomJS) => void): void;
-  function create(arg1: string, arg2: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
-  function create(arg1: string, arg2: string, arg3: string, callback: (ph: PhantomJS) => void): void;
-  function create(arg1: string, arg2: string, arg3: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
 
-  interface PhantomJS {
+declare function create(callback: (ph: PhantomJS) => void): void;
+declare function create(options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
+declare function create(arg: string, callback: (ph: PhantomJS) => void): void;
+declare function create(arg: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
+declare function create(arg1: string, arg2: string, callback: (ph: PhantomJS) => void): void;
+declare function create(arg1: string, arg2: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
+declare function create(arg1: string, arg2: string, arg3: string, callback: (ph: PhantomJS) => void): void;
+declare function create(arg1: string, arg2: string, arg3: string, options: ICreateOptions, callback: (ph: PhantomJS) => void): void;
+
+interface PhantomJS {
     createPage(callback: (page: WebPage) => void): void;
     exit(returnValue?: number): void;
     injectJs(filename: string, callback?: (result: boolean) => void): void;
@@ -22,9 +22,9 @@ declare module "phantom" {
     addCookie(name: string, value: string, domain: string, callback?: (res: boolean) => void): void;
     clearCookies(callback?: () => void): void;
     getCookies(callback: (cookies: { name: string; value: string; domain?: string; }[]) => void): void;
-  }
+}
 
-  interface WebPage {
+interface WebPage {
     open(url: string, callback: (status: string) => void): void;
     close(): void;
 
@@ -58,21 +58,18 @@ declare module "phantom" {
     getContent(callback: (content: string) => void): void;
     setContent(html: string, url: string, callback?: (status: string) => void): void;
     getCookies(callback: (cookies: { name: string; value: string; domain?: string; }[]) => void): void;
-  }
+}
 
-  interface ICreateOptions {
+interface ICreateOptions {
     binary?: string;
     hostname?: string;
     path?: string;
     port?: number;
-  }
-  interface IPaperSizeOptions {
+}
+interface IPaperSizeOptions {
     width?: string;
     height?: string;
     format?: string;
     orientation?: string;
     margin?: any; // string | { top?: string; left?: string; bottom?: string; right?: string;  }
-  }
-
 }
-
diff --git a/phantom/phantom.d.ts b/phantom/phantom.d.ts
index f87f25782d..b9b211a2c2 100644
--- a/phantom/phantom.d.ts
+++ b/phantom/phantom.d.ts
@@ -3,16 +3,16 @@
 // Definitions by: horiuchi <https://github.com/horiuchi/>, Random <https://github.com/llRandom/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "phantom" {
 
-  function create(args?: string[]): Promise<PhantomJS>;
 
-  interface PhantomJS {
+declare function create(args?: string[]): Promise<PhantomJS>;
+
+interface PhantomJS {
     createPage(): Promise<WebPage>;
     exit(returnValue?: number): void;
-  }
+}
 
-  interface WebPage {
+interface WebPage {
     open(url: string): Promise<string>;
     close(): Promise<void>;
 
@@ -32,32 +32,31 @@ declare module "phantom" {
     renderBase64(type: string): Promise<string>;
 
     setContent(html: string, url: string): Promise<string>;
-    
+
     property<T>(key: string): Promise<T>;
     property<T>(key: string, value: T): Promise<void>;
-    
+
     setting<T>(key: string): Promise<T>;
-    
+
     addCookie(cookie: ICookie): Promise<boolean>;
     deleteCookie(cookieName: string): Promise<boolean>;
     clearCookies(): Promise<void>;
-  }
+}
 
-  interface ICookie {
-      name: string,
-      value: string,
-      domain?: string,
-      path: string,
-      httponly?: boolean,
-      secure?: boolean,
-      expires?: Date
-  }
+interface ICookie {
+    name: string,
+    value: string,
+    domain?: string,
+    path: string,
+    httponly?: boolean,
+    secure?: boolean,
+    expires?: Date
+}
 
-  interface IPaperSizeOptions {
+interface IPaperSizeOptions {
     width?: string;
     height?: string;
     format?: string;
     orientation?: string;
     margin?: any; // string | { top?: string; left?: string; bottom?: string; right?: string;  }
-  }
-}
\ No newline at end of file
+}
diff --git a/pify/pify.d.ts b/pify/pify.d.ts
index a7a3eccab8..b7cdad5332 100644
--- a/pify/pify.d.ts
+++ b/pify/pify.d.ts
@@ -3,19 +3,18 @@
 // Definitions by: Sam Verschueren <https://github.com/samverschueren>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "pify" {
-    interface PifyOptions {
-        multiArgs?: boolean,
-        include?: [string | RegExp],
-        exclude?: [string | RegExp],
-        excludeMain?: boolean
-    }
 
-    function pify(input: Function, promiseModule?: Function, options?: PifyOptions): (...args:any[]) => Promise<any>;
-    function pify(input: any, promiseModule?: Function, options?: PifyOptions): any;
-    function pify(input: Function, options?: PifyOptions): (...args:any[]) => Promise<any>;
-    function pify(input: any, options?: PifyOptions): any;
+interface PifyOptions {
+    multiArgs?: boolean,
+    include?: [string | RegExp],
+    exclude?: [string | RegExp],
+    excludeMain?: boolean
+}
 
-	namespace pify {}
-	export = pify;
-}
\ No newline at end of file
+declare function pify(input: Function, promiseModule?: Function, options?: PifyOptions): (...args: any[]) => Promise<any>;
+declare function pify(input: any, promiseModule?: Function, options?: PifyOptions): any;
+declare function pify(input: Function, options?: PifyOptions): (...args: any[]) => Promise<any>;
+declare function pify(input: any, options?: PifyOptions): any;
+
+declare namespace pify { }
+export = pify;
diff --git a/piwik-tracker/piwik-tracker.d.ts b/piwik-tracker/piwik-tracker.d.ts
index 6ef01fbc58..7c213cbfc3 100644
--- a/piwik-tracker/piwik-tracker.d.ts
+++ b/piwik-tracker/piwik-tracker.d.ts
@@ -5,91 +5,89 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "piwik-tracker" {
-	
-	import events = require('events');
-	
-	export = PiwikTracker;
-	
-	// refer to http://developer.piwik.org/api-reference/tracking-api
-	interface PiwikTrackOptions {
-		// Required parameters
-		url : string;
-		
-		// Recommended parameters
-		action_name? : string;
-		_id? : string;
-		rand? : string;
-		apiv? : number;
-		
-		// Optional User info
-		urlref? : string;
-		_cvar? : string;
-		_idvc? : string;
-		_viewts? : string;
-		_idts? : string;
-		_rcn? : string;
-		_rck? : string;
-		res? : string;
-		h? : number;
-		m? : number;
-		s? : number;
-		ua? : string;
-		lang? : string;
-		uid? : string;
-		cid? : string;
-		new_visit? : number;
-		
-		// Optional Action info
-		cvar? : string;
-		link? : string;
-		download? : string;
-		search? : string;
-		search_cat? : string;
-		search_count? : number;
-		idgoal? : number;
-		revenue? : number;
-		gt_ms? : number;
-		cs? : string;
-		
-		// Optional Event Tracking info
-		e_c? : string;
-		e_a? : string;
-		e_n? : string;
-		e_v? : string;
-		
-		// Optional Content Tracking info
-		c_n? : string;
-		c_p? : string;
-		c_t? : string;
-		c_i? : string;
-		
-		// Optional Ecommerce info
-		ec_id? : string;
-		ec_items? : string;
-		ec_st? : number;
-		ec_tx? : number;
-		ec_sh? : number;
-		ec_dt? : number;
-		_ects? : number;
-		
-		// Other parameters (require authentication via token_auth)
-		token_auth? : string;
-		cip? : string;
-		cdt? : string;
-		country? : string;
-		region? : string;
-		city? : string;
-		lat? : string;
-		long? : string;
-		
-		// Other parameters
-		send_image? : number;
-	}
-	
-	class PiwikTracker extends events.EventEmitter {
-		constructor(siteId : number, trackerUrl : string);
-		track(options : PiwikTrackOptions) : void;
-	}
-	
+
+
+import events = require('events');
+
+export = PiwikTracker;
+
+// refer to http://developer.piwik.org/api-reference/tracking-api
+interface PiwikTrackOptions {
+    // Required parameters
+    url: string;
+
+    // Recommended parameters
+    action_name?: string;
+    _id?: string;
+    rand?: string;
+    apiv?: number;
+
+    // Optional User info
+    urlref?: string;
+    _cvar?: string;
+    _idvc?: string;
+    _viewts?: string;
+    _idts?: string;
+    _rcn?: string;
+    _rck?: string;
+    res?: string;
+    h?: number;
+    m?: number;
+    s?: number;
+    ua?: string;
+    lang?: string;
+    uid?: string;
+    cid?: string;
+    new_visit?: number;
+
+    // Optional Action info
+    cvar?: string;
+    link?: string;
+    download?: string;
+    search?: string;
+    search_cat?: string;
+    search_count?: number;
+    idgoal?: number;
+    revenue?: number;
+    gt_ms?: number;
+    cs?: string;
+
+    // Optional Event Tracking info
+    e_c?: string;
+    e_a?: string;
+    e_n?: string;
+    e_v?: string;
+
+    // Optional Content Tracking info
+    c_n?: string;
+    c_p?: string;
+    c_t?: string;
+    c_i?: string;
+
+    // Optional Ecommerce info
+    ec_id?: string;
+    ec_items?: string;
+    ec_st?: number;
+    ec_tx?: number;
+    ec_sh?: number;
+    ec_dt?: number;
+    _ects?: number;
+
+    // Other parameters (require authentication via token_auth)
+    token_auth?: string;
+    cip?: string;
+    cdt?: string;
+    country?: string;
+    region?: string;
+    city?: string;
+    lat?: string;
+    long?: string;
+
+    // Other parameters
+    send_image?: number;
+}
+
+declare class PiwikTracker extends events.EventEmitter {
+    constructor(siteId: number, trackerUrl: string);
+    track(options: PiwikTrackOptions): void;
 }
diff --git a/png-async/png-async.d.ts b/png-async/png-async.d.ts
index b64172c361..3aefa60745 100644
--- a/png-async/png-async.d.ts
+++ b/png-async/png-async.d.ts
@@ -5,49 +5,48 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'png-async' {
-    import stream = require('stream');
 
-    export interface IImageOptions {
-        width?: number;
-        height?: number;
-        fill?: boolean;
-        checkCRC?: boolean;
-        deflateChunkSize?: number;
-        deflateLevel?: number;
-        deflateStrategy?: EDeflateStrategy;
-        filterType?: EFilterType;
-    }
+import stream = require('stream');
 
-    export enum EDeflateStrategy {
-        DEFAULT_STRATEGY = 0,
-        FILTERED = 1,
-        HUFFMAN_ONLY = 2,
-        RLE = 3,
-        FIXED = 4,
-    }
-
-    export enum EFilterType {
-        Auto = -1,
-        None = 0,
-        Sub = 1,
-        Up = 2,
-        Average = 3,
-        Paeth = 4,
-    }
-
-    export function createImage(option?: IImageOptions): Image;
-
-    export class Image extends stream.Duplex {
-        width: number;
-        height: number;
-        gamma: number;
-        data: Buffer;
-        constructor(option?: IImageOptions);
-        pack(): Image;
-        parse(data: Buffer, callback?: (err: Error, image: Image) => void): Image;
-        write(data: any, cb?: any): boolean;
-        end(data?: any): void;
-        bitblt(dst: Image, sx: number, sy: number, w: number, h: number, dx: number, dy: number): Image;
-    }
+export interface IImageOptions {
+    width?: number;
+    height?: number;
+    fill?: boolean;
+    checkCRC?: boolean;
+    deflateChunkSize?: number;
+    deflateLevel?: number;
+    deflateStrategy?: EDeflateStrategy;
+    filterType?: EFilterType;
+}
+
+declare export enum EDeflateStrategy {
+    DEFAULT_STRATEGY = 0,
+    FILTERED = 1,
+    HUFFMAN_ONLY = 2,
+    RLE = 3,
+    FIXED = 4,
+}
+
+declare export enum EFilterType {
+    Auto = -1,
+    None = 0,
+    Sub = 1,
+    Up = 2,
+    Average = 3,
+    Paeth = 4,
+}
+
+declare export function createImage(option?: IImageOptions): Image;
+
+declare export class Image extends stream.Duplex {
+    width: number;
+    height: number;
+    gamma: number;
+    data: Buffer;
+    constructor(option?: IImageOptions);
+    pack(): Image;
+    parse(data: Buffer, callback?: (err: Error, image: Image) => void): Image;
+    write(data: any, cb?: any): boolean;
+    end(data?: any): void;
+    bitblt(dst: Image, sx: number, sy: number, w: number, h: number, dx: number, dy: number): Image;
 }
diff --git a/pngjs2/pngjs2.d.ts b/pngjs2/pngjs2.d.ts
index ae868ea654..6aef5316a6 100644
--- a/pngjs2/pngjs2.d.ts
+++ b/pngjs2/pngjs2.d.ts
@@ -5,12 +5,12 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "pngjs2" {
-  import fs = require("fs");
-  import events = require("events");
-  import stream = require("stream");
 
-  interface PNGOptions {
+import fs = require("fs");
+import events = require("events");
+import stream = require("stream");
+
+interface PNGOptions {
     width?: number;
     height?: number;
     checkCRC?: boolean;
@@ -18,21 +18,21 @@ declare module "pngjs2" {
     deflateLevel?: number;
     deflateStrategy?: number;
     deflateFactory?: any;
-    filterType?: number|number[];
+    filterType?: number | number[];
     colorType?: number;
     inputHasAlpha?: boolean;
-  }
+}
 
-  interface PNGMetadata {
+interface PNGMetadata {
     width: number;
     height: number;
     palette: boolean;
     color: boolean;
     alpha: boolean;
     interlace: boolean;
-  }
+}
 
-  export class PNG extends stream.Writable {
+declare export class PNG extends stream.Writable {
     constructor(options?: PNGOptions);
 
     width: number;
@@ -45,20 +45,19 @@ declare module "pngjs2" {
     on(event: "parsed", callback: (data: Buffer) => void): this;
     on(event: "error", callback: (err: Error) => void): this;
 
-    parse(data: string|Buffer, callback?: (err: Error, data: Buffer) => void): PNG;
+    parse(data: string | Buffer, callback?: (err: Error, data: Buffer) => void): PNG;
     pack(): PNG;
     pipe(destination: fs.WriteStream): PNG;
 
     static bitblt(src: PNG, dst: PNG, srcX: number, srcY: number,
-                  width: number, height: number, deltaX: number, deltaY: number): void;
+        width: number, height: number, deltaX: number, deltaY: number): void;
 
     bitblt(dst: PNG, srcX: number, srcY: number,
-           width: number, height: number, deltaX: number, deltaY: number): PNG;
-  }
-
-  export namespace PNG {
-    namespace sync {
-      function read(buffer: string|Buffer, options?: PNGOptions): PNG;
-    }
-  }
+        width: number, height: number, deltaX: number, deltaY: number): PNG;
+}
+
+declare export namespace PNG {
+    namespace sync {
+        function read(buffer: string | Buffer, options?: PNGOptions): PNG;
+    }
 }
diff --git a/precise/precise.d.ts b/precise/precise.d.ts
index 19428a201d..80d443aad1 100644
--- a/precise/precise.d.ts
+++ b/precise/precise.d.ts
@@ -3,32 +3,31 @@
 // Definitions by: Peter Harris <https://github.com/codeanimal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "precise" {
-  /**
-   * Precise factory
-   */
-  function _precise(): _precise.Precise;
 
-  module _precise {
+/**
+ * Precise factory
+ */
+declare function _precise(): _precise.Precise;
+
+declare module _precise {
     class Precise {
-      constructor();
+        constructor();
 
-      /**
-       * Starts a timer
-       */
-      start(): Precise;
+        /**
+         * Starts a timer
+         */
+        start(): Precise;
 
-      /**
-       * Stops a timer
-       */
-      stop(): Precise;
+        /**
+         * Stops a timer
+         */
+        stop(): Precise;
 
-      /**
-       * Returns the nanoseconds from `start()` to `stop()`
-       */
-      diff(): number;
+        /**
+         * Returns the nanoseconds from `start()` to `stop()`
+         */
+        diff(): number;
     }
-  }
-
-  export = _precise;
 }
+
+export = _precise;
diff --git a/precond/precond.d.ts b/precond/precond.d.ts
index 27a190482d..d5623f8836 100644
--- a/precond/precond.d.ts
+++ b/precond/precond.d.ts
@@ -3,15 +3,14 @@
 // Definitions by: Oliver Schneider <https://github.com/olsio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "precond" {
-    export function checkArgument(value: any, message?: string, ...formatArgs: any[]): void;
-    export function checkState(value: any, message?: string, ...formatArgs: any[]): void;
-    export function checkIsDef(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsDefAndNotNull(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsString(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsArray(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsNumber(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsBoolean(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsFunction(value: any, message?: string, ...formatArgs: any[]): any;
-    export function checkIsObject(value: any, message?: string, ...formatArgs: any[]): any;
-}
\ No newline at end of file
+
+declare export function checkArgument(value: any, message?: string, ...formatArgs: any[]): void;
+declare export function checkState(value: any, message?: string, ...formatArgs: any[]): void;
+declare export function checkIsDef(value: any, message?: string, ...formatArgs: any[]): any;
+declare export function checkIsDefAndNotNull(value: any, message?: string, ...formatArgs: any[]): any;
+declare export function checkIsString(value: any, message?: string, ...formatArgs: any[]): any;
+declare export function checkIsArray(value: any, message?: string, ...formatArgs: any[]): any;
+declare export function checkIsNumber(value: any, message?: string, ...formatArgs: any[]): any;
+declare export function checkIsBoolean(value: any, message?: string, ...formatArgs: any[]): any;
+declare export function checkIsFunction(value: any, message?: string, ...formatArgs: any[]): any;
+declare export function checkIsObject(value: any, message?: string, ...formatArgs: any[]): any;
diff --git a/prelude-ls/prelude-ls.d.ts b/prelude-ls/prelude-ls.d.ts
index 66efe916f7..bfa85c9bfa 100644
--- a/prelude-ls/prelude-ls.d.ts
+++ b/prelude-ls/prelude-ls.d.ts
@@ -5,336 +5,335 @@
 
 // Change [0]: 2015/06/14 - Marcelo Camargo <https://github.com/haskellcamargo>
 
-declare module "prelude-ls" {
-	namespace PreludeLS {
-		export function id<A>(x: A): A;
-		export function isType<A>(type: string): (x: A) => boolean;
-		export function isType<A>(type: string, x: A): boolean;
-		export function replicate<A>(n: number): (x: A) => A[];
-		export function replicate<A>(n: number, x: A): A[];
+
+declare namespace PreludeLS {
+    export function id<A>(x: A): A;
+    export function isType<A>(type: string): (x: A) => boolean;
+    export function isType<A>(type: string, x: A): boolean;
+    export function replicate<A>(n: number): (x: A) => A[];
+    export function replicate<A>(n: number, x: A): A[];
 
 
-		// List
+    // List
 
-		export function each<A>(f: (x: A) => void): (xs: A[]) => A[];
-		export function each<A>(f: (x: A) => void, xs: A[]): A[];
-		export function map<A, B>(f: (x: A) => B): (xs: A[]) => B[];
-		export function map<A, B>(f: (x: A) => B, xs: A[]): B[];
-		export function compact<A>(xs: A[]): A[];
-		export function filter<A>(f: (x: A) => boolean): (xs: A[]) => A[];
-		export function filter<A>(f: (x: A) => boolean, xs: A[]): A[];
-		export function reject<A>(f: (x: A) => boolean): (xs: A[]) => A[];
-		export function reject<A>(f: (x: A) => boolean, xs: A[]): A[];
-		export function partition<A>(f: (x: A) => Boolean): (xs: A[]) => [A[], A[]];
-		export function partition<A>(f: (x: A) => Boolean, xs: A[]): [A[], A[]];
-		export function find<A>(f: (x: A) => Boolean): (xs: A[]) => A;
-		export function find<A>(f: (x: A) => Boolean, xs: A[]): A;
-		export function head<A>(xs: A[]): A;
-		export function tail<A>(xs: A[]): A[];
-		export function last<A>(xs: A[]): A;
-		export function initial<A>(xs: A[]): A[];
-		export function empty<A>(xs: A[]): boolean;
-		export function reverse<A>(xs: A[]): A[];
-		export function unique<A>(xs: A[]): A[];
-		export function uniqueBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
-		export function uniqueBy<A, B>(f: (x: A) => B, xs: A[]): A[];
-		export function fold<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A;
-		export function fold<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A;
-		export function fold<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A;
-		export function foldl<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A;
-		export function foldl<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A;
-		export function foldl<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A;
-		export function fold1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
-		export function fold1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
-		export function foldl1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
-		export function foldl1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
-		export function foldr<A, B>(f: (x: A) => (y: B) => B): (memo: B) => (xs: A[]) => B;
-		export function foldr<A, B>(f: (x: A) => (y: B) => B, memo: B): (xs: A[]) => B;
-		export function foldr<A, B>(f: (x: A) => (y: B) => B, memo: B, xs: A[]): B;
-		export function foldr1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
-		export function foldr1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
-		export function unfoldr<A, B>(f: (x: B) => ([A, B] | void)): (x: B) => A[];
-		export function unfoldr<A, B>(f: (x: B) => ([A, B] | void), x: B): A[];
-		export function concat<A>(xss: A[][]): A[];
-		export function concatMap<A, B>(f: (x: A) => B[]): (xs: A[]) => B[];
-		export function concatMap<A, B>(f: (x: A) => B[], xs: A[]): B[];
-		export function flatten(xs: any[]): any[];
-		export function difference<A>(...xss: A[][]): A[];
-		export function intersection<A>(...xss: A[][]): A[];
-		export function union<A>(...xss: A[][]): A[];
-		export function countBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
-		export function countBy<A, B>(f: (x: A) => B, xs: A[]): any;
-		export function groupBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
-		export function groupBy<A, B>(f: (x: A) => B, xs: A[]): any;
-		export function andList<A>(xs: A[]): boolean;
-		export function orList<A>(xs: A[]): boolean;
-		export function any<A>(f: (x: A) => boolean): (xs: A[]) => boolean;
-		export function any<A>(f: (x: A) => boolean, xs: A[]): boolean;
-		export function all<A>(f: (x: A) => boolean): (xs: A[]) => boolean;
-		export function all<A>(f: (x: A) => boolean, xs: A[]): boolean;
-		export function sort<A>(xs: A[]): A[];
-		export function sortWith<A>(f: (x: A) => (y: A) => number): (xs: A[]) => A[];
-		export function sortWith<A>(f: (x: A) => (y: A) => number, xs: A[]): A[];
-		export function sortBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
-		export function sortBy<A, B>(f: (x: A) => B, xs: A[]): A[];
-		export function sum(xs: number[]): number;
-		export function product(xs: number[]): number;
-		export function mean(xs: number[]): number;
-		export function maximum<A>(xs: A[]): A;
-		export function minimum<A>(xs: A[]): A;
-		export function maximumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
-		export function maximumBy<A, B>(f: (x: A) => B, xs: A[]): A;
-		export function minimumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
-		export function minimumBy<A, B>(f: (x: A) => B, xs: A[]): A;
-		export function scan<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A[];
-		export function scan<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A[];
-		export function scan<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A[];
-		export function scanl<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A[];
-		export function scanl<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A[];
-		export function scanl<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A[];
-		export function scan1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
-		export function scan1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
-		export function scanl1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
-		export function scanl1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
-		export function scanr<A, B>(f: (x: A) => (y: B) => B): (memo: B) => (xs: A[]) => B[];
-		export function scanr<A, B>(f: (x: A) => (y: B) => B, memo: B): (xs: A[]) => B[];
-		export function scanr<A, B>(f: (x: A) => (y: B) => B, memo: B, xs: A[]): B[];
-		export function scanr1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
-		export function scanr1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
-		export function slice<A>(x: number): (y: number) => (xs: A[]) => A[];
-		export function slice<A>(x: number, y: number): (xs: A[]) => A[];
-		export function slice<A>(x: number, y: number, xs: A[]): A[];
-		export function take<A>(n: number): (xs: A[]) => A[];
-		export function take<A>(n: number, xs: A[]): A[];
-		export function drop<A>(n: number): (xs: A[]) => A[];
-		export function drop<A>(n: number, xs: A[]): A[];
-		export function splitAt<A>(n: number): (xs: A[]) => [A[], A[]];
-		export function splitAt<A>(n: number, xs: A[]): [A[], A[]];
-		export function takeWhile<A>(p: (x: A) => boolean): (xs: A[]) => A[];
-		export function takeWhile<A>(p: (x: A) => boolean, xs: A[]): A[];
-		export function dropWhile<A>(p: (x: A) => boolean): (xs: A[]) => A[];
-		export function dropWhile<A>(p: (x: A) => boolean, xs: A[]): A[];
-		export function span<A>(p: (x: A) => boolean): (xs: A[]) => [A[], A[]];
-		export function span<A>(p: (x: A) => boolean, xs: A[]): [A[], A[]];
-		export function breakList<A>(p: (x: A) => boolean): (xs: A[]) => [A[], A[]];
-		export function breakList<A>(p: (x: A) => boolean, xs: A[]): [A[], A[]];
-		export function zip<A, B>(xs: A[]): (ys: B[]) => [A, B][];
-		export function zip<A, B>(xs: A[], ys: B[]): [A, B][];
-		export function zipWith<A, B, C>(f: (x: A) => (y: B) => C): (xs: A[]) => (ys: B[]) => C[];
-		export function zipWith<A, B, C>(f: (x: A) => (y: B) => C, xs: A[]): (ys: B[]) => C[];
-		export function zipWith<A, B, C>(f: (x: A) => (y: B) => C, xs: A[], ys: B[]): C[];
-		export function zipAll<A>(...xss: A[][]): A[][];
-		export function zipAllWith<A, B>(f: (...xs: A[]) => B, ...xss: A[][]): B[];
-		export function at<A>(n: number): (xs: A[]) => A;
-		export function at<A>(n: number, xs: A[]): A;
-		export function elemIndex<A>(x: A): (xs: A[]) => number;
-		export function elemIndex<A>(x: A, xs: A[]): number;
-		export function elemIndices<A>(x: A): (xs: A[]) => number[];
-		export function elemIndices<A>(x: A, xs: A[]): number[];
-		export function findIndex<A>(f: (x: A) => boolean): (xs: A[]) => number;
-		export function findIndex<A>(f: (x: A) => boolean, xs: A[]): number;
-		export function findIndices<A>(f: (x: A) => boolean): (xs: A[]) => number[];
-		export function findIndices<A>(f: (x: A) => boolean, xs: A[]): number[];
+    export function each<A>(f: (x: A) => void): (xs: A[]) => A[];
+    export function each<A>(f: (x: A) => void, xs: A[]): A[];
+    export function map<A, B>(f: (x: A) => B): (xs: A[]) => B[];
+    export function map<A, B>(f: (x: A) => B, xs: A[]): B[];
+    export function compact<A>(xs: A[]): A[];
+    export function filter<A>(f: (x: A) => boolean): (xs: A[]) => A[];
+    export function filter<A>(f: (x: A) => boolean, xs: A[]): A[];
+    export function reject<A>(f: (x: A) => boolean): (xs: A[]) => A[];
+    export function reject<A>(f: (x: A) => boolean, xs: A[]): A[];
+    export function partition<A>(f: (x: A) => Boolean): (xs: A[]) => [A[], A[]];
+    export function partition<A>(f: (x: A) => Boolean, xs: A[]): [A[], A[]];
+    export function find<A>(f: (x: A) => Boolean): (xs: A[]) => A;
+    export function find<A>(f: (x: A) => Boolean, xs: A[]): A;
+    export function head<A>(xs: A[]): A;
+    export function tail<A>(xs: A[]): A[];
+    export function last<A>(xs: A[]): A;
+    export function initial<A>(xs: A[]): A[];
+    export function empty<A>(xs: A[]): boolean;
+    export function reverse<A>(xs: A[]): A[];
+    export function unique<A>(xs: A[]): A[];
+    export function uniqueBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
+    export function uniqueBy<A, B>(f: (x: A) => B, xs: A[]): A[];
+    export function fold<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A;
+    export function fold<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A;
+    export function fold<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A;
+    export function foldl<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A;
+    export function foldl<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A;
+    export function foldl<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A;
+    export function fold1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
+    export function fold1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
+    export function foldl1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
+    export function foldl1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
+    export function foldr<A, B>(f: (x: A) => (y: B) => B): (memo: B) => (xs: A[]) => B;
+    export function foldr<A, B>(f: (x: A) => (y: B) => B, memo: B): (xs: A[]) => B;
+    export function foldr<A, B>(f: (x: A) => (y: B) => B, memo: B, xs: A[]): B;
+    export function foldr1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A;
+    export function foldr1<A>(f: (x: A) => (y: A) => A, xs: A[]): A;
+    export function unfoldr<A, B>(f: (x: B) => ([A, B] | void)): (x: B) => A[];
+    export function unfoldr<A, B>(f: (x: B) => ([A, B] | void), x: B): A[];
+    export function concat<A>(xss: A[][]): A[];
+    export function concatMap<A, B>(f: (x: A) => B[]): (xs: A[]) => B[];
+    export function concatMap<A, B>(f: (x: A) => B[], xs: A[]): B[];
+    export function flatten(xs: any[]): any[];
+    export function difference<A>(...xss: A[][]): A[];
+    export function intersection<A>(...xss: A[][]): A[];
+    export function union<A>(...xss: A[][]): A[];
+    export function countBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
+    export function countBy<A, B>(f: (x: A) => B, xs: A[]): any;
+    export function groupBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
+    export function groupBy<A, B>(f: (x: A) => B, xs: A[]): any;
+    export function andList<A>(xs: A[]): boolean;
+    export function orList<A>(xs: A[]): boolean;
+    export function any<A>(f: (x: A) => boolean): (xs: A[]) => boolean;
+    export function any<A>(f: (x: A) => boolean, xs: A[]): boolean;
+    export function all<A>(f: (x: A) => boolean): (xs: A[]) => boolean;
+    export function all<A>(f: (x: A) => boolean, xs: A[]): boolean;
+    export function sort<A>(xs: A[]): A[];
+    export function sortWith<A>(f: (x: A) => (y: A) => number): (xs: A[]) => A[];
+    export function sortWith<A>(f: (x: A) => (y: A) => number, xs: A[]): A[];
+    export function sortBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
+    export function sortBy<A, B>(f: (x: A) => B, xs: A[]): A[];
+    export function sum(xs: number[]): number;
+    export function product(xs: number[]): number;
+    export function mean(xs: number[]): number;
+    export function maximum<A>(xs: A[]): A;
+    export function minimum<A>(xs: A[]): A;
+    export function maximumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
+    export function maximumBy<A, B>(f: (x: A) => B, xs: A[]): A;
+    export function minimumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
+    export function minimumBy<A, B>(f: (x: A) => B, xs: A[]): A;
+    export function scan<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A[];
+    export function scan<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A[];
+    export function scan<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A[];
+    export function scanl<A, B>(f: (x: A) => (y: B) => A): (memo: A) => (xs: B[]) => A[];
+    export function scanl<A, B>(f: (x: A) => (y: B) => A, memo: A): (xs: B[]) => A[];
+    export function scanl<A, B>(f: (x: A) => (y: B) => A, memo: A, xs: B[]): A[];
+    export function scan1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
+    export function scan1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
+    export function scanl1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
+    export function scanl1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
+    export function scanr<A, B>(f: (x: A) => (y: B) => B): (memo: B) => (xs: A[]) => B[];
+    export function scanr<A, B>(f: (x: A) => (y: B) => B, memo: B): (xs: A[]) => B[];
+    export function scanr<A, B>(f: (x: A) => (y: B) => B, memo: B, xs: A[]): B[];
+    export function scanr1<A>(f: (x: A) => (y: A) => A): (xs: A[]) => A[];
+    export function scanr1<A>(f: (x: A) => (y: A) => A, xs: A[]): A[];
+    export function slice<A>(x: number): (y: number) => (xs: A[]) => A[];
+    export function slice<A>(x: number, y: number): (xs: A[]) => A[];
+    export function slice<A>(x: number, y: number, xs: A[]): A[];
+    export function take<A>(n: number): (xs: A[]) => A[];
+    export function take<A>(n: number, xs: A[]): A[];
+    export function drop<A>(n: number): (xs: A[]) => A[];
+    export function drop<A>(n: number, xs: A[]): A[];
+    export function splitAt<A>(n: number): (xs: A[]) => [A[], A[]];
+    export function splitAt<A>(n: number, xs: A[]): [A[], A[]];
+    export function takeWhile<A>(p: (x: A) => boolean): (xs: A[]) => A[];
+    export function takeWhile<A>(p: (x: A) => boolean, xs: A[]): A[];
+    export function dropWhile<A>(p: (x: A) => boolean): (xs: A[]) => A[];
+    export function dropWhile<A>(p: (x: A) => boolean, xs: A[]): A[];
+    export function span<A>(p: (x: A) => boolean): (xs: A[]) => [A[], A[]];
+    export function span<A>(p: (x: A) => boolean, xs: A[]): [A[], A[]];
+    export function breakList<A>(p: (x: A) => boolean): (xs: A[]) => [A[], A[]];
+    export function breakList<A>(p: (x: A) => boolean, xs: A[]): [A[], A[]];
+    export function zip<A, B>(xs: A[]): (ys: B[]) => [A, B][];
+    export function zip<A, B>(xs: A[], ys: B[]): [A, B][];
+    export function zipWith<A, B, C>(f: (x: A) => (y: B) => C): (xs: A[]) => (ys: B[]) => C[];
+    export function zipWith<A, B, C>(f: (x: A) => (y: B) => C, xs: A[]): (ys: B[]) => C[];
+    export function zipWith<A, B, C>(f: (x: A) => (y: B) => C, xs: A[], ys: B[]): C[];
+    export function zipAll<A>(...xss: A[][]): A[][];
+    export function zipAllWith<A, B>(f: (...xs: A[]) => B, ...xss: A[][]): B[];
+    export function at<A>(n: number): (xs: A[]) => A;
+    export function at<A>(n: number, xs: A[]): A;
+    export function elemIndex<A>(x: A): (xs: A[]) => number;
+    export function elemIndex<A>(x: A, xs: A[]): number;
+    export function elemIndices<A>(x: A): (xs: A[]) => number[];
+    export function elemIndices<A>(x: A, xs: A[]): number[];
+    export function findIndex<A>(f: (x: A) => boolean): (xs: A[]) => number;
+    export function findIndex<A>(f: (x: A) => boolean, xs: A[]): number;
+    export function findIndices<A>(f: (x: A) => boolean): (xs: A[]) => number[];
+    export function findIndices<A>(f: (x: A) => boolean, xs: A[]): number[];
 
 
-		// Obj
+    // Obj
 
-		export function keys<A>(object: { [key: string]: A }): string[];
-		export function keys<A>(object: { [key: number]: A }): number[];
-		export function values<A>(object: { [key: string]: A }): A[];
-		export function values<A>(object: { [key: number]: A }): A[];
-		export function pairsToObj<A>(object: [string, A][]): { [key: string]: A };
-		export function pairsToObj<A>(object: [number, A][]): { [key: number]: A };
-		export function objToPairs<A>(object: { [ key: string]: A }): [string, A][];
-		export function objToPairs<A>(object: { [ key: number]: A }): [number, A][];
-		export function listsToObj<A>(keys: string[]): (values: A[]) => { [key: string]: A };
-		export function listsToObj<A>(keys: string[], values: A[]): { [key: string]: A };
-		export function listsToObj<A>(keys: number[]): (values: A[]) => { [key: number]: A };
-		export function listsToObj<A>(keys: number[], values: A[]): { [key: number]: A };
-		export function objToLists<A>(object: { [key: string]: A }): [string[], A[]];
-		export function objToLists<A>(object: { [key: number]: A }): [number[], A[]];
-		export function empty<A>(object: any): boolean;
-		export function each<A>(f: (x: A) => void): (object: { [key: string]: A }) => { [key: string]: A };
-		export function each<A>(f: (x: A) => void, object: { [key: string]: A }): { [key: string]: A };
-		export function each<A>(f: (x: A) => void): (object: { [key: number]: A }) => { [key: number]: A };
-		export function each<A>(f: (x: A) => void, object: { [key: number]: A }): { [key: number]: A };
-		export function map<A, B>(f: (x: A) => B): (object: { [key: string]: A }) => { [key: string]: B };
-		export function map<A, B>(f: (x: A) => B, object: { [key: string]: A }): { [key: string]: B };
-		export function map<A, B>(f: (x: A) => B): (object: { [key: number]: A }) => { [key: number]: B };
-		export function map<A, B>(f: (x: A) => B, object: { [key: number]: A }): { [key: number]: B };
-		export function compact<A>(object: { [key: string]: A }): { [key: string]: A };
-		export function compact<A>(object: { [key: number]: A }): { [key: number]: A };
-		export function filter<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
-		export function filter<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
-		export function filter<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
-		export function filter<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
-		export function reject<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
-		export function reject<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
-		export function reject<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
-		export function reject<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
-		export function partition<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => [{ [key: string]: A }, { [key: string]: A}];
-		export function partition<A>(f: (x: A) => boolean, object: { [key: string]: A }): [{ [key: string]: A }, { [key: string]: A}];
-		export function partition<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => [{ [key: number]: A }, { [key: number]: A}];
-		export function partition<A>(f: (x: A) => boolean, object: { [key: number]: A }): [{ [key: number]: A }, { [key: number]: A}];
-		export function find<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => A;
-		export function find<A>(f: (x: A) => boolean, object: { [key: string]: A }): A;
-		export function find<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => A;
-		export function find<A>(f: (x: A) => boolean, object: { [key: number]: A }): A;
+    export function keys<A>(object: { [key: string]: A }): string[];
+    export function keys<A>(object: { [key: number]: A }): number[];
+    export function values<A>(object: { [key: string]: A }): A[];
+    export function values<A>(object: { [key: number]: A }): A[];
+    export function pairsToObj<A>(object: [string, A][]): { [key: string]: A };
+    export function pairsToObj<A>(object: [number, A][]): { [key: number]: A };
+    export function objToPairs<A>(object: { [key: string]: A }): [string, A][];
+    export function objToPairs<A>(object: { [key: number]: A }): [number, A][];
+    export function listsToObj<A>(keys: string[]): (values: A[]) => { [key: string]: A };
+    export function listsToObj<A>(keys: string[], values: A[]): { [key: string]: A };
+    export function listsToObj<A>(keys: number[]): (values: A[]) => { [key: number]: A };
+    export function listsToObj<A>(keys: number[], values: A[]): { [key: number]: A };
+    export function objToLists<A>(object: { [key: string]: A }): [string[], A[]];
+    export function objToLists<A>(object: { [key: number]: A }): [number[], A[]];
+    export function empty<A>(object: any): boolean;
+    export function each<A>(f: (x: A) => void): (object: { [key: string]: A }) => { [key: string]: A };
+    export function each<A>(f: (x: A) => void, object: { [key: string]: A }): { [key: string]: A };
+    export function each<A>(f: (x: A) => void): (object: { [key: number]: A }) => { [key: number]: A };
+    export function each<A>(f: (x: A) => void, object: { [key: number]: A }): { [key: number]: A };
+    export function map<A, B>(f: (x: A) => B): (object: { [key: string]: A }) => { [key: string]: B };
+    export function map<A, B>(f: (x: A) => B, object: { [key: string]: A }): { [key: string]: B };
+    export function map<A, B>(f: (x: A) => B): (object: { [key: number]: A }) => { [key: number]: B };
+    export function map<A, B>(f: (x: A) => B, object: { [key: number]: A }): { [key: number]: B };
+    export function compact<A>(object: { [key: string]: A }): { [key: string]: A };
+    export function compact<A>(object: { [key: number]: A }): { [key: number]: A };
+    export function filter<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
+    export function filter<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
+    export function filter<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
+    export function filter<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
+    export function reject<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
+    export function reject<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
+    export function reject<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
+    export function reject<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
+    export function partition<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => [{ [key: string]: A }, { [key: string]: A }];
+    export function partition<A>(f: (x: A) => boolean, object: { [key: string]: A }): [{ [key: string]: A }, { [key: string]: A }];
+    export function partition<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => [{ [key: number]: A }, { [key: number]: A }];
+    export function partition<A>(f: (x: A) => boolean, object: { [key: number]: A }): [{ [key: number]: A }, { [key: number]: A }];
+    export function find<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => A;
+    export function find<A>(f: (x: A) => boolean, object: { [key: string]: A }): A;
+    export function find<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => A;
+    export function find<A>(f: (x: A) => boolean, object: { [key: number]: A }): A;
 
-		export module Obj {
-			export function empty<A>(object: any): boolean;
-			export function each<A>(f: (x: A) => void): (object: { [key: string]: A }) => { [key: string]: A };
-			export function each<A>(f: (x: A) => void, object: { [key: string]: A }): { [key: string]: A };
-			export function each<A>(f: (x: A) => void): (object: { [key: number]: A }) => { [key: number]: A };
-			export function each<A>(f: (x: A) => void, object: { [key: number]: A }): { [key: number]: A };
-			export function map<A, B>(f: (x: A) => B): (object: { [key: string]: A }) => { [key: string]: B };
-			export function map<A, B>(f: (x: A) => B, object: { [key: string]: A }): { [key: string]: B };
-			export function map<A, B>(f: (x: A) => B): (object: { [key: number]: A }) => { [key: number]: B };
-			export function map<A, B>(f: (x: A) => B, object: { [key: number]: A }): { [key: number]: B };
-			export function compact<A>(object: { [key: string]: A }): { [key: string]: A };
-			export function compact<A>(object: { [key: number]: A }): { [key: number]: A };
-			export function filter<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
-			export function filter<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
-			export function filter<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
-			export function filter<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
-			export function reject<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
-			export function reject<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
-			export function reject<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
-			export function reject<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
-			export function partition<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => [{ [key: string]: A }, { [key: string]: A}];
-			export function partition<A>(f: (x: A) => boolean, object: { [key: string]: A }): [{ [key: string]: A }, { [key: string]: A}];
-			export function partition<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => [{ [key: number]: A }, { [key: number]: A}];
-			export function partition<A>(f: (x: A) => boolean, object: { [key: number]: A }): [{ [key: number]: A }, { [key: number]: A}];
-			export function find<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => A;
-			export function find<A>(f: (x: A) => boolean, object: { [key: string]: A }): A;
-			export function find<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => A;
-			export function find<A>(f: (x: A) => boolean, object: { [key: number]: A }): A;
-		}
+    export module Obj {
+        export function empty<A>(object: any): boolean;
+        export function each<A>(f: (x: A) => void): (object: { [key: string]: A }) => { [key: string]: A };
+        export function each<A>(f: (x: A) => void, object: { [key: string]: A }): { [key: string]: A };
+        export function each<A>(f: (x: A) => void): (object: { [key: number]: A }) => { [key: number]: A };
+        export function each<A>(f: (x: A) => void, object: { [key: number]: A }): { [key: number]: A };
+        export function map<A, B>(f: (x: A) => B): (object: { [key: string]: A }) => { [key: string]: B };
+        export function map<A, B>(f: (x: A) => B, object: { [key: string]: A }): { [key: string]: B };
+        export function map<A, B>(f: (x: A) => B): (object: { [key: number]: A }) => { [key: number]: B };
+        export function map<A, B>(f: (x: A) => B, object: { [key: number]: A }): { [key: number]: B };
+        export function compact<A>(object: { [key: string]: A }): { [key: string]: A };
+        export function compact<A>(object: { [key: number]: A }): { [key: number]: A };
+        export function filter<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
+        export function filter<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
+        export function filter<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
+        export function filter<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
+        export function reject<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => { [key: string]: A };
+        export function reject<A>(f: (x: A) => boolean, object: { [key: string]: A }): { [key: string]: A };
+        export function reject<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => { [key: number]: A };
+        export function reject<A>(f: (x: A) => boolean, object: { [key: number]: A }): { [key: number]: A };
+        export function partition<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => [{ [key: string]: A }, { [key: string]: A }];
+        export function partition<A>(f: (x: A) => boolean, object: { [key: string]: A }): [{ [key: string]: A }, { [key: string]: A }];
+        export function partition<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => [{ [key: number]: A }, { [key: number]: A }];
+        export function partition<A>(f: (x: A) => boolean, object: { [key: number]: A }): [{ [key: number]: A }, { [key: number]: A }];
+        export function find<A>(f: (x: A) => boolean): (object: { [key: string]: A }) => A;
+        export function find<A>(f: (x: A) => boolean, object: { [key: string]: A }): A;
+        export function find<A>(f: (x: A) => boolean): (object: { [key: number]: A }) => A;
+        export function find<A>(f: (x: A) => boolean, object: { [key: number]: A }): A;
+    }
 
 
-		// Str
+    // Str
 
-		export function split(separator: string): (str: string) => string[];
-		export function split(separator: string, str: string): string[];
-		export function join(separator: string): (xs: string[]) => string;
-		export function join(separator: string, xs: string[]): string;
-		export function lines(str: string): string[];
-		export function unlines(xs: string[]): string;
-		export function words(str: string): string[];
-		export function unwords(xs: string[]): string;
-		export function chars(str: string): string[];
-		export function unchars(xs: string[]): string;
-		export function repeat(n: number): (str: string) => string;
-		export function repeat(n: number, str: string): string;
-		export function capitalize(str: string): string;
-		export function camelize(str: string): string;
-		export function dasherize(str: string): string;
-		export function empty(str: string): boolean;
-		export function reverse(str: string): string;
-		export function slice(x: number): (y: number) => (str: string) => string;
-		export function slice(x: number, y: number): (str: string) => string;
-		export function slice(x: number, y: number, str: string): string;
-		export function take(n: number): (str: string) => string;
-		export function take(n: number, str: string): string;
-		export function drop(n: number): (str: string) => string;
-		export function drop(n: number, str: string): string;
-		export function splitAt(n: number): (str: string) => [string, string];
-		export function splitAt(n: number, str: string): [string, string];
-		export function takeWhile(f: (str: string) => boolean): (str: string) => string;
-		export function takeWhile(f: (str: string) => boolean, str: string): string;
-		export function dropWhile(f: (str: string) => boolean): (str: string) => string;
-		export function dropWhile(f: (str: string) => boolean, str: string): string;
-		export function span(f: (str: string) => boolean): (str: string) => [string, string];
-		export function span(f: (str: string) => boolean, str: string): [string, string];
-		export function breakStr(f: (str: string) => boolean): (str: string) => [string, string];
-		export function breakStr(f: (str: string) => boolean, str: string): [string, string];
+    export function split(separator: string): (str: string) => string[];
+    export function split(separator: string, str: string): string[];
+    export function join(separator: string): (xs: string[]) => string;
+    export function join(separator: string, xs: string[]): string;
+    export function lines(str: string): string[];
+    export function unlines(xs: string[]): string;
+    export function words(str: string): string[];
+    export function unwords(xs: string[]): string;
+    export function chars(str: string): string[];
+    export function unchars(xs: string[]): string;
+    export function repeat(n: number): (str: string) => string;
+    export function repeat(n: number, str: string): string;
+    export function capitalize(str: string): string;
+    export function camelize(str: string): string;
+    export function dasherize(str: string): string;
+    export function empty(str: string): boolean;
+    export function reverse(str: string): string;
+    export function slice(x: number): (y: number) => (str: string) => string;
+    export function slice(x: number, y: number): (str: string) => string;
+    export function slice(x: number, y: number, str: string): string;
+    export function take(n: number): (str: string) => string;
+    export function take(n: number, str: string): string;
+    export function drop(n: number): (str: string) => string;
+    export function drop(n: number, str: string): string;
+    export function splitAt(n: number): (str: string) => [string, string];
+    export function splitAt(n: number, str: string): [string, string];
+    export function takeWhile(f: (str: string) => boolean): (str: string) => string;
+    export function takeWhile(f: (str: string) => boolean, str: string): string;
+    export function dropWhile(f: (str: string) => boolean): (str: string) => string;
+    export function dropWhile(f: (str: string) => boolean, str: string): string;
+    export function span(f: (str: string) => boolean): (str: string) => [string, string];
+    export function span(f: (str: string) => boolean, str: string): [string, string];
+    export function breakStr(f: (str: string) => boolean): (str: string) => [string, string];
+    export function breakStr(f: (str: string) => boolean, str: string): [string, string];
 
-		export module Str {
-			export function empty(str: string): boolean;
-			export function reverse(str: string): string;
-			export function slice(x: number): (y: number) => (str: string) => string;
-			export function slice(x: number, y: number): (str: string) => string;
-			export function slice(x: number, y: number, str: string): string;
-			export function take(n: number): (str: string) => string;
-			export function take(n: number, str: string): string;
-			export function drop(n: number): (str: string) => string;
-			export function drop(n: number, str: string): string;
-			export function splitAt(n: number): (str: string) => [string, string];
-			export function splitAt(n: number, str: string): [string, string];
-			export function takeWhile(f: (str: string) => boolean): (str: string) => string;
-			export function takeWhile(f: (str: string) => boolean, str: string): string;
-			export function dropWhile(f: (str: string) => boolean): (str: string) => string;
-			export function dropWhile(f: (str: string) => boolean, str: string): string;
-			export function span(f: (str: string) => boolean): (str: string) => [string, string];
-			export function span(f: (str: string) => boolean, str: string): [string, string];
-			export function breakStr(f: (str: string) => boolean): (str: string) => [string, string];
-			export function breakStr(f: (str: string) => boolean, str: string): [string, string];
-		}
+    export module Str {
+        export function empty(str: string): boolean;
+        export function reverse(str: string): string;
+        export function slice(x: number): (y: number) => (str: string) => string;
+        export function slice(x: number, y: number): (str: string) => string;
+        export function slice(x: number, y: number, str: string): string;
+        export function take(n: number): (str: string) => string;
+        export function take(n: number, str: string): string;
+        export function drop(n: number): (str: string) => string;
+        export function drop(n: number, str: string): string;
+        export function splitAt(n: number): (str: string) => [string, string];
+        export function splitAt(n: number, str: string): [string, string];
+        export function takeWhile(f: (str: string) => boolean): (str: string) => string;
+        export function takeWhile(f: (str: string) => boolean, str: string): string;
+        export function dropWhile(f: (str: string) => boolean): (str: string) => string;
+        export function dropWhile(f: (str: string) => boolean, str: string): string;
+        export function span(f: (str: string) => boolean): (str: string) => [string, string];
+        export function span(f: (str: string) => boolean, str: string): [string, string];
+        export function breakStr(f: (str: string) => boolean): (str: string) => [string, string];
+        export function breakStr(f: (str: string) => boolean, str: string): [string, string];
+    }
 
 
-		// Func
+    // Func
 
-		export function apply<A, B>(f: (...args: A[]) => B): (args: A[]) => B;
-		export function apply<A, B>(f: (...args: A[]) => B, args: A[]): B;
-		export function curry(f: Function): Function;
-		export function flip<A, B, C>(f: (x: A) => (y: B) => C): (y: B) => (x: A) => C;
-		export function flip<A, B, C>(f: (x: A) => (y: B) => C, y: B): (x: A) => C;
-		export function flip<A, B, C>(f: (x: A) => (y: B) => C, y: B, x: A): C;
-		export function fix(f: Function): Function;
-		export function over<A, B, C>(f: (x: B) => (y: B) => C): (g: (x: A) => B) => (x: A) => (y: A) => C;
-		export function over<A, B, C>(f: (x: B, y: B) => C): (g: (x: A) => B) => (x: A, y: A) => C;
-		export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B): (x: A) => (y: A) => C;
-		export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B): (x: A, y: A) => C;
-		export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B, x: A): (y: A) => C;
-		export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B, x: A): (y: A) => C;
-		export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B, x: A, y: A): C;
-		export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B, x: A, y: A): C;
+    export function apply<A, B>(f: (...args: A[]) => B): (args: A[]) => B;
+    export function apply<A, B>(f: (...args: A[]) => B, args: A[]): B;
+    export function curry(f: Function): Function;
+    export function flip<A, B, C>(f: (x: A) => (y: B) => C): (y: B) => (x: A) => C;
+    export function flip<A, B, C>(f: (x: A) => (y: B) => C, y: B): (x: A) => C;
+    export function flip<A, B, C>(f: (x: A) => (y: B) => C, y: B, x: A): C;
+    export function fix(f: Function): Function;
+    export function over<A, B, C>(f: (x: B) => (y: B) => C): (g: (x: A) => B) => (x: A) => (y: A) => C;
+    export function over<A, B, C>(f: (x: B, y: B) => C): (g: (x: A) => B) => (x: A, y: A) => C;
+    export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B): (x: A) => (y: A) => C;
+    export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B): (x: A, y: A) => C;
+    export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B, x: A): (y: A) => C;
+    export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B, x: A): (y: A) => C;
+    export function over<A, B, C>(f: (x: B) => (y: B) => C, g: (x: A) => B, x: A, y: A): C;
+    export function over<A, B, C>(f: (x: B, y: B) => C, g: (x: A) => B, x: A, y: A): C;
 
 
-		// Num
+    // Num
 
-		export function max<Comparable>(x: Comparable): (y: Comparable) => Comparable;
-		export function max<Comparable>(x: Comparable, y: Comparable): Comparable;
-		export function min<Comparable>(x: Comparable): (y: Comparable) => Comparable;
-		export function min<Comparable>(x: Comparable, y: Comparable): Comparable;
-		export function negate(x: number): number;
-		export function abs(x: number): number;
-		export function signum(x: number): number;
-		export function quot(x: number): (y: number) => number;
-		export function quot(x: number, y: number): number;
-		export function rem(x: number): (y: number) => number;
-		export function rem(x: number, y: number): number;
-		export function div(x: number): (y: number) => number;
-		export function div(x: number, y: number): number;
-		export function mod(x: number): (y: number) => number;
-		export function mod(x: number, y: number): number;
-		export function recip(x: number): number;
-		export var pi: number;
-		export var tau: number;
-		export function exp(x: number): number;
-		export function sqrt(x: number): number;
-		export function ln(x: number): number;
-		export function pow(x: number): (y: number) => number;
-		export function pow(x: number, y: number): number;
-		export function sin(x: number): number;
-		export function cos(x: number): number;
-		export function tan(x: number): number;
-		export function asin(x: number): number;
-		export function acos(x: number): number;
-		export function atan(x: number): number;
-		export function atan2(x: number, y: number): number;
-		export function truncate(x: number): number;
-		export function round(x: number): number;
-		export function ceiling(x: number): number;
-		export function floor(x: number): number;
-		export function isItNaN(x: number): boolean;
-		export function even(x: number): boolean;
-		export function odd(x: number): boolean;
-		export function gcd(x: number): (y: number) => number;
-		export function gcd(x: number, y: number): number;
-		export function lcm(x: number): (y: number) => number;
-		export function lcm(x: number, y: number): number;
-	}
-
-	export = PreludeLS;
+    export function max<Comparable>(x: Comparable): (y: Comparable) => Comparable;
+    export function max<Comparable>(x: Comparable, y: Comparable): Comparable;
+    export function min<Comparable>(x: Comparable): (y: Comparable) => Comparable;
+    export function min<Comparable>(x: Comparable, y: Comparable): Comparable;
+    export function negate(x: number): number;
+    export function abs(x: number): number;
+    export function signum(x: number): number;
+    export function quot(x: number): (y: number) => number;
+    export function quot(x: number, y: number): number;
+    export function rem(x: number): (y: number) => number;
+    export function rem(x: number, y: number): number;
+    export function div(x: number): (y: number) => number;
+    export function div(x: number, y: number): number;
+    export function mod(x: number): (y: number) => number;
+    export function mod(x: number, y: number): number;
+    export function recip(x: number): number;
+    export var pi: number;
+    export var tau: number;
+    export function exp(x: number): number;
+    export function sqrt(x: number): number;
+    export function ln(x: number): number;
+    export function pow(x: number): (y: number) => number;
+    export function pow(x: number, y: number): number;
+    export function sin(x: number): number;
+    export function cos(x: number): number;
+    export function tan(x: number): number;
+    export function asin(x: number): number;
+    export function acos(x: number): number;
+    export function atan(x: number): number;
+    export function atan2(x: number, y: number): number;
+    export function truncate(x: number): number;
+    export function round(x: number): number;
+    export function ceiling(x: number): number;
+    export function floor(x: number): number;
+    export function isItNaN(x: number): boolean;
+    export function even(x: number): boolean;
+    export function odd(x: number): boolean;
+    export function gcd(x: number): (y: number) => number;
+    export function gcd(x: number, y: number): number;
+    export function lcm(x: number): (y: number) => number;
+    export function lcm(x: number, y: number): number;
 }
+
+export = PreludeLS;
diff --git a/prettyjson/prettyjson.d.ts b/prettyjson/prettyjson.d.ts
index 252fccf334..7ed23e87e0 100644
--- a/prettyjson/prettyjson.d.ts
+++ b/prettyjson/prettyjson.d.ts
@@ -4,52 +4,51 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare module "prettyjson" {
 
-  /**
-   * Defines prettyjson version
+
+/**
+ * Defines prettyjson version
+ */
+declare export var version: string;
+
+/**
+ * Render pretty json.
+ *
+ * @param data {any} Data to prettify.
+ * @param options {IOptions} Hash with different options to configure the renderer.
+ * @param indentation {number} Indentation size.
+ *
+ * @return {string} pretty serialized json data ready to display.
    */
-  export var version: string;
+declare export function render(data: any, options?: RendererOptions, indentation?: number): string;
 
-  /**
-   * Render pretty json.
-   *
-   * @param data {any} Data to prettify.
-   * @param options {IOptions} Hash with different options to configure the renderer.
-   * @param indentation {number} Indentation size.
-   *
-   * @return {string} pretty serialized json data ready to display.
-     */
-  export function render(data: any, options?: RendererOptions, indentation?: number): string;
+/**
+ * Render pretty json from a string.
+ *
+ * @param data {string} Serialized JSON data to prettify.
+ * @param options {IOptions} Hash with different options to configure the renderer.
+ * @param indentation {number} Indentation size.
+ *
+ * @return {string} pretty serialized json data ready to display.
+   */
+declare export function renderString(data: string, options?: RendererOptions, indentation?: number): string;
 
-  /**
-   * Render pretty json from a string.
-   *
-   * @param data {string} Serialized JSON data to prettify.
-   * @param options {IOptions} Hash with different options to configure the renderer.
-   * @param indentation {number} Indentation size.
-   *
-   * @return {string} pretty serialized json data ready to display.
-     */
-  export function renderString(data: string, options?: RendererOptions, indentation?: number): string;
-
-  export interface RendererOptions {
+export interface RendererOptions {
 
     /**
      * Define behavior for Array objects
      */
-    emptyArrayMsg ?: string;  // default: (empty)
-    inlineArrays ?: boolean;
+    emptyArrayMsg?: string;  // default: (empty)
+    inlineArrays?: boolean;
 
     /**
      * Color definition
      */
-    noColor ?: boolean;
-    keysColor ?: string;
-    dashColor ?: string;
-    numberColor ?: string;
-    stringColor ?: string;
+    noColor?: boolean;
+    keysColor?: string;
+    dashColor?: string;
+    numberColor?: string;
+    stringColor?: string;
 
-    defaultIndentation ?: number;
-  }
+    defaultIndentation?: number;
 }
diff --git a/progress/progress.d.ts b/progress/progress.d.ts
index 6eb55a917e..5e0f07f80c 100644
--- a/progress/progress.d.ts
+++ b/progress/progress.d.ts
@@ -6,116 +6,112 @@
 /// <reference path="../node/node.d.ts"/>
 
 
-declare module "progress"
-{
+
+/**
+ * These are keys in the options object you can pass to the progress bar along with total as seen in the example above.
+ */
+interface ProgressBarOptions {
     /**
-     * These are keys in the options object you can pass to the progress bar along with total as seen in the example above.
+     * Total number of ticks to complete.
      */
-    interface ProgressBarOptions
-    {
-        /**
-         * Total number of ticks to complete.
-         */
-        total:number;
-
-        /**
-         * The displayed width of the progress bar defaulting to total.
-         */
-        width?:number;
-
-        /**
-         * The output stream defaulting to stderr.
-         */
-        stream?:NodeJS.WritableStream;
-
-        /**
-         * Completion character defaulting to "=".
-         */
-        complete?:string;
-
-        /**
-         * Incomplete character defaulting to "-".
-         */
-        incomplete?:string;
-
-        /**
-         * Option to clear the bar on completion defaulting to false.
-         */
-        clear?:boolean;
-
-        /**
-         * Optional function to call when the progress bar completes.
-         */
-        callback?:Function;
-    }
-
+    total: number;
 
     /**
-     * Flexible ascii progress bar.
+     * The displayed width of the progress bar defaulting to total.
      */
-    class ProgressBar
-    {
-        /**
-         * Initialize a `ProgressBar` with the given `fmt` string and `options` or
-         * `total`.
-         *
-         * Options:
-         *   - `total` total number of ticks to complete
-         *   - `width` the displayed width of the progress bar defaulting to total
-         *   - `stream` the output stream defaulting to stderr
-         *   - `complete` completion character defaulting to "="
-         *   - `incomplete` incomplete character defaulting to "-"
-         *   - `renderThrottle` minimum time between updates in milliseconds defaulting to 16
-         *   - `callback` optional function to call when the progress bar completes
-         *   - `clear` will clear the progress bar upon termination
-         *
-         * Tokens:
-         *   - `:bar` the progress bar itself
-         *   - `:current` current tick number
-         *   - `:total` total ticks
-         *   - `:elapsed` time elapsed in seconds
-         *   - `:percent` completion percentage
-         *   - `:eta` eta in seconds
-         */
-        constructor(format:string, total:number);
-        constructor(format:string, options:ProgressBarOptions);
+    width?: number;
 
+    /**
+     * The output stream defaulting to stderr.
+     */
+    stream?: NodeJS.WritableStream;
 
-        /**
-         * "tick" the progress bar with optional `len` and optional `tokens`.
-         */
-        tick(tokens?:any):void;
-        tick(count?:number, tokens?:any):void;
+    /**
+     * Completion character defaulting to "=".
+     */
+    complete?: string;
 
+    /**
+     * Incomplete character defaulting to "-".
+     */
+    incomplete?: string;
 
-        /**
-         * Method to render the progress bar with optional `tokens` to place in the
-         * progress bar's `fmt` field.
-         */
-        render(tokens?:any):void;
+    /**
+     * Option to clear the bar on completion defaulting to false.
+     */
+    clear?: boolean;
 
-
-        /**
-         * "update" the progress bar to represent an exact percentage.
-         * The ratio (between 0 and 1) specified will be multiplied by `total` and
-         * floored, representing the closest available "tick." For example, if a
-         * progress bar has a length of 3 and `update(0.5)` is called, the progress
-         * will be set to 1.
-         *
-         * A ratio of 0.5 will attempt to set the progress to halfway.
-         *
-         * @param ratio The ratio (between 0 and 1 inclusive) to set the
-         *   overall completion to.
-         */
-        update(ratio:number, tokens?:any):void;
-
-
-        /**
-         * Terminates a progress bar.
-         */
-        terminate():void;
-    }
-    namespace ProgressBar { }
-
-    export = ProgressBar;
+    /**
+     * Optional function to call when the progress bar completes.
+     */
+    callback?: Function;
 }
+
+
+/**
+ * Flexible ascii progress bar.
+ */
+declare class ProgressBar {
+    /**
+     * Initialize a `ProgressBar` with the given `fmt` string and `options` or
+     * `total`.
+     *
+     * Options:
+     *   - `total` total number of ticks to complete
+     *   - `width` the displayed width of the progress bar defaulting to total
+     *   - `stream` the output stream defaulting to stderr
+     *   - `complete` completion character defaulting to "="
+     *   - `incomplete` incomplete character defaulting to "-"
+     *   - `renderThrottle` minimum time between updates in milliseconds defaulting to 16
+     *   - `callback` optional function to call when the progress bar completes
+     *   - `clear` will clear the progress bar upon termination
+     *
+     * Tokens:
+     *   - `:bar` the progress bar itself
+     *   - `:current` current tick number
+     *   - `:total` total ticks
+     *   - `:elapsed` time elapsed in seconds
+     *   - `:percent` completion percentage
+     *   - `:eta` eta in seconds
+     */
+    constructor(format: string, total: number);
+    constructor(format: string, options: ProgressBarOptions);
+
+
+    /**
+     * "tick" the progress bar with optional `len` and optional `tokens`.
+     */
+    tick(tokens?: any): void;
+    tick(count?: number, tokens?: any): void;
+
+
+    /**
+     * Method to render the progress bar with optional `tokens` to place in the
+     * progress bar's `fmt` field.
+     */
+    render(tokens?: any): void;
+
+
+    /**
+     * "update" the progress bar to represent an exact percentage.
+     * The ratio (between 0 and 1) specified will be multiplied by `total` and
+     * floored, representing the closest available "tick." For example, if a
+     * progress bar has a length of 3 and `update(0.5)` is called, the progress
+     * will be set to 1.
+     *
+     * A ratio of 0.5 will attempt to set the progress to halfway.
+     *
+     * @param ratio The ratio (between 0 and 1 inclusive) to set the
+     *   overall completion to.
+     */
+    update(ratio: number, tokens?: any): void;
+
+
+    /**
+     * Terminates a progress bar.
+     */
+    terminate(): void;
+}
+declare namespace ProgressBar { }
+
+export = ProgressBar;
diff --git a/project-oxford/project-oxford.d.ts b/project-oxford/project-oxford.d.ts
index 012ec82113..cca0990cfc 100644
--- a/project-oxford/project-oxford.d.ts
+++ b/project-oxford/project-oxford.d.ts
@@ -6,517 +6,516 @@
 /// <reference path="..\bluebird\bluebird.d.ts" />
 /// <reference path="..\node\node.d.ts" />
 
-declare module "project-oxford" {
-    import Promise = require("bluebird");
-    import stream = require("stream");
 
-    export class Client {
-        constructor(apiKey: string);
-        private _key: string;
-        public face: FaceAPI;
-        public vision: VisionAPI;
+import Promise = require("bluebird");
+import stream = require("stream");
+
+declare export class Client {
+    constructor(apiKey: string);
+    private _key: string;
+    public face: FaceAPI;
+    public vision: VisionAPI;
+}
+
+declare export class FaceAPI {
+
+    /**
+     * Call the Face Detected API
+     * Detects human faces in an image and returns face locations, face landmarks, and
+     * optional attributes including head-pose, gender, and age. Detection is an essential
+     * API that provides faceId to other APIs like Identification, Verification,
+     * and Find Similar.
+     *
+     * @param  {object}  options                        - Options object
+     * @param  {string}  options.url                    - URL to image to be used
+     * @param  {string}  options.path                   - Path to image to be used
+     * @param  {stream}  options.stream                 - Stream for image to be used
+     * @param  {boolean} options.analyzesFaceLandmarks  - Analyze face landmarks?
+     * @param  {boolean} options.analyzesAge            - Analyze age?
+     * @param  {boolean} options.analyzesGender         - Analyze gender?
+     * @param  {boolean} options.analyzesHeadPose       - Analyze headpose?
+     * @return {Promise}                                - Promise resolving with the resulting JSON
+     */
+    public detect(options: Options.Detect): Promise<[FaceResponses.Detect]>;
+
+    /**
+     * Detect similar faces using faceIds (as returned from the detect API)
+     * @param  {string} sourceFace          - String of faceId for the source face
+     * @param  {string[]} candidateFaces    - Array of faceIds to use as candidates
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public similar(sourceFaceId: string, candidateFacesIds: string[]): Promise<FaceResponses.Similar>;
+
+    /**
+     * Divides candidate faces into groups based on face similarity using faceIds.
+     * The output is one or more disjointed face groups and a MessyGroup.
+     * A face group contains the faces that have similar looking, often of the same person.
+     * There will be one or more face groups ranked by group size, i.e. number of face.
+     * Faces belonging to the same person might be split into several groups in the result.
+     * The MessyGroup is a special face group that each face is not similar to any other
+     * faces in original candidate faces. The messyGroup will not appear in the result if
+     * all faces found their similar counterparts. The candidate face list has a
+     * limit of 100 faces.
+     *
+     * @param  {string[]} faces     - Array of faceIds to use
+     * @return {Promise}            - Promise resolving with the resulting JSON
+     */
+    public grouping(faces: string[]): Promise<FaceResponses.Grouping>;
+
+    /**
+     * Identifies persons from a person group by one or more input faces.
+     * To recognize which person a face belongs to, Face Identification needs a person group
+     * that contains number of persons. Each person contains one or more faces. After a person
+     * group prepared, it should be trained to make it ready for identification. Then the
+     * identification API compares the input face to those persons' faces in person group and
+     * returns the best-matched candidate persons, ranked by confidence.
+     *
+     * @param  {string[]} faces     - Array of faceIds to use
+     * @return {Promise}            - Promise resolving with the resulting JSON
+     */
+    public identify(faceIDs: string[], options: Options.Identify): Promise<FaceResponses.Identify[]>;
+
+    /**
+     * Analyzes two faces and determine whether they are from the same person.
+     * Verification works well for frontal and near-frontal faces.
+     * For the scenarios that are sensitive to accuracy please use with own judgment.
+     * @param  {string[]} faces     - Array containing two faceIds to use
+     * @return {Promise}            - Promise resolving with the resulting JSON
+     */
+    public verify(faces: string[]): Promise<FaceResponses.Verify>;
+
+    /**
+     * @namespace
+     * @memberof face
+     */
+    public personGroup: PersonGroup;
+    public person: Person;
+}
+
+declare export class VisionAPI {
+    /**
+     * This operation does a deep analysis on the given image and then extracts a
+     * set of rich visual features based on the image content.
+     *
+     * @param  {Object}  options                - Options object describing features to extract
+     * @param  {string}  options.url            - Url to image to be analyzed
+     * @param  {string}  options.path           - Path to image to be analyzed
+     * @param  {boolean} options.ImageType      - Detects if image is clipart or a line drawing.
+     * @param  {boolean} options.Color          - Determines the accent color, dominant color, if image is black&white.
+     * @param  {boolean} options.Faces          - Detects if faces are present. If present, generate coordinates, gender and age.
+     * @param  {boolean} options.Adult          - Detects if image is pornographic in nature (nudity or sex act). Sexually suggestive content is also detected.
+     * @param  {boolean} options.Categories     - Image categorization; taxonomy defined in documentation.
+     * @return {Promise}                        - Promise resolving with the resulting JSON
+     */
+    public analyzeImage(options: Options.Analyze): Promise<VisionResponses.Analyze>;
+
+    /**
+     * Generate a thumbnail image to the user-specified width and height. By default, the
+     * service analyzes the image, identifies the region of interest (ROI), and generates
+     * smart crop coordinates based on the ROI. Smart cropping is designed to help when you
+     * specify an aspect ratio that differs from the input image.
+     *
+     * @param  {Object}  options                - Options object describing features to extract
+     * @param  {string}  options.url            - Url to image to be thumbnailed
+     * @param  {string}  options.path           - Path to image to be thumbnailed
+     * @param  {number}  options.width          - Width of the thumb in pixels
+     * @param  {number}  options.height         - Height of the thumb in pixels
+     * @param  {boolean} options.smartCropping  - Should SmartCropping be enabled?
+     * @param  {Object}  options.pipe           - We'll pipe the returned image to this object
+     * @return {Promise}                        - Promise resolving with the resulting JSON
+     */
+    public thumbnail(options: Options.Thumbnail): Promise<stream.Stream>;
+
+    /**
+     * Optical Character Recognition (OCR) detects text in an image and extracts the recognized
+     * characters into a machine-usable character stream.
+     *
+     * @param  {Object}  options                    - Options object describing features to extract
+     * @param  {string}  options.url                - Url to image to be analyzed
+     * @param  {string}  options.path               - Path to image to be analyzed
+     * @param  {string}  options.language           - BCP-47 language code of the text to be detected in the image. Default value is "unk", then the service will auto detect the language of the text in the image.
+     * @param  {string}  options.detectOrientation  - Detect orientation of text in the image
+     * @return {Promise}                            - Promise resolving with the resulting JSON
+     */
+    public ocr(options: Options.Ocr): Promise<VisionResponses.Ocr>;
+}
+
+declare export class PersonGroup {
+    /**
+     * Creates a new person group with a user-specified ID.
+     * A person group is one of the most important parameters for the Identification API.
+     * The Identification searches person faces in a specified person group.
+     *
+     * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
+     * @param  {string} name                - Person group display name. The maximum length is 128.
+     * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public create(personGroupId: string, name: string, userData: string): Promise<void>;
+
+    /**
+     * Deletes an existing person group.
+     *
+     * @param  {string} personGroupId       - Name of person group to delete
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public delete(personGroupId: string): Promise<void>;
+
+    /**
+     * Gets an existing person group.
+     *
+     * @param  {string} personGroupId       - Name of person group to get
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public get(personGroupId: string): Promise<PersonGroupResponses.PersonGroup>;
+
+    /**
+     * Retrieves the training status of a person group. Training is triggered by the Train PersonGroup API.
+     * The training will process for a while on the server side. This API can query whether the training
+     * is completed or ongoing.
+     *
+     * @param  {string} personGroupId       - Name of person group to get
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public trainingStatus(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
+
+    /**
+     * Starts a person group training.
+         * Training is a necessary preparation process of a person group before identification.
+     * Each person group needs to be trained in order to call Identification. The training
+     * will process for a while on the server side even after this API has responded.
+     *
+     * @param  {string} personGroupId       - Name of person group to get
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public trainingStart(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
+
+    /**
+     * Updates an existing person group's display name and userData.
+     *
+     * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
+     * @param  {string} name                - Person group display name. The maximum length is 128.
+     * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public update(personGroupId: string, name: string, userData: string): Promise<void>;
+
+    /**
+     * Lists all person groups in the current subscription.
+     * @return {Promise}                    - Promise resolving with the resulting JSON
+     */
+    public list(): Promise<PersonGroupResponses.PersonGroup[]>;
+}
+
+declare export class Person {
+    /**
+     * Adds a face to a person for identification. The maximum face count for each person is 32.
+     * The face ID must be added to a person before its expiration. Typically a face ID expires
+     * 24 hours after detection.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person that the face is added to.
+     * @param {string} faceId            - The ID of the face to be added. The maximum face amount for each person is 32.
+     * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public addFace(personGroupId: string, personId: string, faceId: string, userData?: string): Promise<void>;
+
+    /**
+     * Deletes a face from a person.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person that the face is removed from.
+     * @param {string} faceId            - The ID of the face to be deleted.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public deleteFace(personGroupId: string, personId: string, faceId: string): Promise<void>;
+
+    /**
+     * Updates a face for a person.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person that the face is updated on.
+     * @param {string} faceId            - The ID of the face to be updated.
+     * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public updateFace(personGroupId: string, personId: string, faceId: string, userData: string): Promise<void>;
+
+    /**
+     * Get a face for a person.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person that the face is to get from.
+     * @param {string} faceId            - The ID of the face to get.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public getFace(personGroupId: string, personId: string, faceId: string): Promise<PersonResponses.Face>;
+
+    /**
+     * Creates a new person in a specified person group for identification.
+     * The number of persons has a subscription limit. Free subscription amount is 1000 persons.
+     * The maximum face count for each person is 32.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string[]} faces           - Array of face id's for the target person
+     * @param {string} name              - Target person's display name. The maximum length is 128.
+     * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public create(personGroupId: string, faces: string[], name: string, userData: string): Promise<{ personId: string }>;
+
+    /**
+     * Deletes an existing person from a person group.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person to delete.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public delete(personGroupId: string, personId: string): Promise<void>;
+
+    /**
+     * Gets an existing person from a person group.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string} personId          - The target person to get.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public get(personGroupId: string, personId: string): Promise<PersonResponses.Person>;
+
+    /**
+     * Updates a person's information.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @param {string[]} faces           - Array of face id's for the target person
+     * @param {string} name              - Target person's display name. The maximum length is 128.
+     * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public update(personGroupId: string, personId: string, faces: string[], name: string, userData: string): Promise<void>;
+
+    /**
+     * Lists all persons in a person group, with the person information.
+     *
+     * @param {string} personGroupId     - The target person's person group.
+     * @return {Promise}                 - Promise resolving with the resulting JSON
+     */
+    public list(personGroupId: string): Promise<PersonResponses.Person[]>;
+}
+
+declare namespace Options {
+    interface Detect {
+        url?: string; // URL to image to be used
+        path?: string; // Path to image to be used
+        stream?: stream.Stream; // Stream of an image to be used
+        analyzesFaceLandmarks?: boolean; // Analyze face landmarks?
+        analyzesAge?: boolean; // Analyze age?
+        analyzesGender?: boolean; // Analyze gender?
+        analyzesHeadPose?: boolean; //Analyze headpose?
     }
 
-    export class FaceAPI {
-
-        /**
-         * Call the Face Detected API
-         * Detects human faces in an image and returns face locations, face landmarks, and
-         * optional attributes including head-pose, gender, and age. Detection is an essential
-         * API that provides faceId to other APIs like Identification, Verification,
-         * and Find Similar.
-         *
-         * @param  {object}  options                        - Options object
-         * @param  {string}  options.url                    - URL to image to be used
-         * @param  {string}  options.path                   - Path to image to be used
-         * @param  {stream}  options.stream                 - Stream for image to be used
-         * @param  {boolean} options.analyzesFaceLandmarks  - Analyze face landmarks?
-         * @param  {boolean} options.analyzesAge            - Analyze age?
-         * @param  {boolean} options.analyzesGender         - Analyze gender?
-         * @param  {boolean} options.analyzesHeadPose       - Analyze headpose?
-         * @return {Promise}                                - Promise resolving with the resulting JSON
-         */
-        public detect(options: Options.Detect): Promise<[FaceResponses.Detect]>;
-
-        /**
-         * Detect similar faces using faceIds (as returned from the detect API)
-         * @param  {string} sourceFace          - String of faceId for the source face
-         * @param  {string[]} candidateFaces    - Array of faceIds to use as candidates
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public similar(sourceFaceId: string, candidateFacesIds: string[]): Promise<FaceResponses.Similar>;
-
-        /**
-         * Divides candidate faces into groups based on face similarity using faceIds.
-         * The output is one or more disjointed face groups and a MessyGroup.
-         * A face group contains the faces that have similar looking, often of the same person.
-         * There will be one or more face groups ranked by group size, i.e. number of face.
-         * Faces belonging to the same person might be split into several groups in the result.
-         * The MessyGroup is a special face group that each face is not similar to any other
-         * faces in original candidate faces. The messyGroup will not appear in the result if
-         * all faces found their similar counterparts. The candidate face list has a
-         * limit of 100 faces.
-         *
-         * @param  {string[]} faces     - Array of faceIds to use
-         * @return {Promise}            - Promise resolving with the resulting JSON
-         */
-        public grouping(faces: string[]): Promise<FaceResponses.Grouping>;
-
-        /**
-         * Identifies persons from a person group by one or more input faces.
-         * To recognize which person a face belongs to, Face Identification needs a person group
-         * that contains number of persons. Each person contains one or more faces. After a person
-         * group prepared, it should be trained to make it ready for identification. Then the
-         * identification API compares the input face to those persons' faces in person group and
-         * returns the best-matched candidate persons, ranked by confidence.
-         *
-         * @param  {string[]} faces     - Array of faceIds to use
-         * @return {Promise}            - Promise resolving with the resulting JSON
-         */
-        public identify(faceIDs: string[], options: Options.Identify): Promise<FaceResponses.Identify[]>;
-
-        /**
-         * Analyzes two faces and determine whether they are from the same person.
-         * Verification works well for frontal and near-frontal faces.
-         * For the scenarios that are sensitive to accuracy please use with own judgment.
-         * @param  {string[]} faces     - Array containing two faceIds to use
-         * @return {Promise}            - Promise resolving with the resulting JSON
-         */
-        public verify(faces: string[]): Promise<FaceResponses.Verify>;
-
-        /**
-         * @namespace
-         * @memberof face
-         */
-        public personGroup: PersonGroup;
-        public person: Person;
+    interface Identify {
+        personGroupId: string;
+        maxNumOfCandidatesReturned: number; // range is 1-10
     }
 
-    export class VisionAPI {
-        /**
-         * This operation does a deep analysis on the given image and then extracts a
-         * set of rich visual features based on the image content.
-         *
-         * @param  {Object}  options                - Options object describing features to extract
-         * @param  {string}  options.url            - Url to image to be analyzed
-         * @param  {string}  options.path           - Path to image to be analyzed
-         * @param  {boolean} options.ImageType      - Detects if image is clipart or a line drawing.
-         * @param  {boolean} options.Color          - Determines the accent color, dominant color, if image is black&white.
-         * @param  {boolean} options.Faces          - Detects if faces are present. If present, generate coordinates, gender and age.
-         * @param  {boolean} options.Adult          - Detects if image is pornographic in nature (nudity or sex act). Sexually suggestive content is also detected.
-         * @param  {boolean} options.Categories     - Image categorization; taxonomy defined in documentation.
-         * @return {Promise}                        - Promise resolving with the resulting JSON
-         */
-        public analyzeImage(options: Options.Analyze): Promise<VisionResponses.Analyze>;
-
-        /**
-         * Generate a thumbnail image to the user-specified width and height. By default, the
-         * service analyzes the image, identifies the region of interest (ROI), and generates
-         * smart crop coordinates based on the ROI. Smart cropping is designed to help when you
-         * specify an aspect ratio that differs from the input image.
-         *
-         * @param  {Object}  options                - Options object describing features to extract
-         * @param  {string}  options.url            - Url to image to be thumbnailed
-         * @param  {string}  options.path           - Path to image to be thumbnailed
-         * @param  {number}  options.width          - Width of the thumb in pixels
-         * @param  {number}  options.height         - Height of the thumb in pixels
-         * @param  {boolean} options.smartCropping  - Should SmartCropping be enabled?
-         * @param  {Object}  options.pipe           - We'll pipe the returned image to this object
-         * @return {Promise}                        - Promise resolving with the resulting JSON
-         */
-        public thumbnail(options: Options.Thumbnail): Promise<stream.Stream>;
-
-        /**
-         * Optical Character Recognition (OCR) detects text in an image and extracts the recognized
-         * characters into a machine-usable character stream.
-         *
-         * @param  {Object}  options                    - Options object describing features to extract
-         * @param  {string}  options.url                - Url to image to be analyzed
-         * @param  {string}  options.path               - Path to image to be analyzed
-         * @param  {string}  options.language           - BCP-47 language code of the text to be detected in the image. Default value is "unk", then the service will auto detect the language of the text in the image.
-         * @param  {string}  options.detectOrientation  - Detect orientation of text in the image
-         * @return {Promise}                            - Promise resolving with the resulting JSON
-         */
-        public ocr(options: Options.Ocr): Promise<VisionResponses.Ocr>;
+    interface Analyze {
+        url?: string; // Url to image to be analyzed
+        path?: string; // Path to image to be analyzed
+        ImageType?: boolean; // Detects if image is clipart or a line drawing.
+        Color?: boolean; // Determines the accent color, dominant color, if image is black& white.
+        Faces?: boolean; // Detects if faces are present.If present, generate coordinates, gender and age.
+        Adult?: boolean; // Detects if image is pornographic in nature(nudity or sex act).Sexually suggestive content is also detected.
+        Categories?: boolean; // Image categorization; taxonomy defined in documentation.
     }
 
-    export class PersonGroup {
-        /**
-         * Creates a new person group with a user-specified ID.
-         * A person group is one of the most important parameters for the Identification API.
-         * The Identification searches person faces in a specified person group.
-         *
-         * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
-         * @param  {string} name                - Person group display name. The maximum length is 128.
-         * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public create(personGroupId: string, name: string, userData: string): Promise<void>;
-
-        /**
-         * Deletes an existing person group.
-         *
-         * @param  {string} personGroupId       - Name of person group to delete
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public delete(personGroupId: string): Promise<void>;
-
-        /**
-         * Gets an existing person group.
-         *
-         * @param  {string} personGroupId       - Name of person group to get
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public get(personGroupId: string): Promise<PersonGroupResponses.PersonGroup>;
-
-        /**
-         * Retrieves the training status of a person group. Training is triggered by the Train PersonGroup API.
-         * The training will process for a while on the server side. This API can query whether the training
-         * is completed or ongoing.
-         *
-         * @param  {string} personGroupId       - Name of person group to get
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public trainingStatus(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
-
-        /**
-         * Starts a person group training.
-             * Training is a necessary preparation process of a person group before identification.
-         * Each person group needs to be trained in order to call Identification. The training
-         * will process for a while on the server side even after this API has responded.
-         *
-         * @param  {string} personGroupId       - Name of person group to get
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public trainingStart(personGroupId: string): Promise<PersonGroupResponses.TrainingStatus>;
-
-        /**
-         * Updates an existing person group's display name and userData.
-         *
-         * @param  {string} personGroupId       - Numbers, en-us letters in lower case, '-', '_'. Max length: 64
-         * @param  {string} name                - Person group display name. The maximum length is 128.
-         * @param  {string} userData            - User-provided data attached to the group. The size limit is 16KB.
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public update(personGroupId: string, name: string, userData: string): Promise<void>;
-
-        /**
-         * Lists all person groups in the current subscription.
-         * @return {Promise}                    - Promise resolving with the resulting JSON
-         */
-        public list(): Promise<PersonGroupResponses.PersonGroup[]>;
+    interface Thumbnail {
+        url?: string; // Url to image to be thumbnailed
+        path?: string; // Path to image to be thumbnailed
+        width?: number; // Width of the thumb in pixels
+        height?: number; // Height of the thumb in pixels
+        smartCropping?: boolean; // Should SmartCropping be enabled?
+        pipe?: stream.Writable; // We'll pipe the returned image to this object
     }
 
-    export class Person {
-        /**
-         * Adds a face to a person for identification. The maximum face count for each person is 32.
-         * The face ID must be added to a person before its expiration. Typically a face ID expires
-         * 24 hours after detection.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person that the face is added to.
-         * @param {string} faceId            - The ID of the face to be added. The maximum face amount for each person is 32.
-         * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public addFace(personGroupId: string, personId: string, faceId: string, userData?: string): Promise<void>;
-
-        /**
-         * Deletes a face from a person.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person that the face is removed from.
-         * @param {string} faceId            - The ID of the face to be deleted.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public deleteFace(personGroupId: string, personId: string, faceId: string): Promise<void>;
-
-        /**
-         * Updates a face for a person.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person that the face is updated on.
-         * @param {string} faceId            - The ID of the face to be updated.
-         * @param {string} userData          - Optional. Attach user data to person's face. The maximum length is 1024.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public updateFace(personGroupId: string, personId: string, faceId: string, userData: string): Promise<void>;
-
-        /**
-         * Get a face for a person.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person that the face is to get from.
-         * @param {string} faceId            - The ID of the face to get.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public getFace(personGroupId: string, personId: string, faceId: string): Promise<PersonResponses.Face>;
-
-        /**
-         * Creates a new person in a specified person group for identification.
-         * The number of persons has a subscription limit. Free subscription amount is 1000 persons.
-         * The maximum face count for each person is 32.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string[]} faces           - Array of face id's for the target person
-         * @param {string} name              - Target person's display name. The maximum length is 128.
-         * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public create(personGroupId: string, faces: string[], name: string, userData: string): Promise<{ personId: string }>;
-
-        /**
-         * Deletes an existing person from a person group.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person to delete.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public delete(personGroupId: string, personId: string): Promise<void>;
-
-        /**
-         * Gets an existing person from a person group.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string} personId          - The target person to get.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public get(personGroupId: string, personId: string): Promise<PersonResponses.Person>;
-
-        /**
-         * Updates a person's information.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @param {string[]} faces           - Array of face id's for the target person
-         * @param {string} name              - Target person's display name. The maximum length is 128.
-         * @param {string} userData          - Optional fields for user-provided data attached to a person. Size limit is 16KB.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public update(personGroupId: string, personId: string, faces: string[], name: string, userData: string): Promise<void>;
-
-        /**
-         * Lists all persons in a person group, with the person information.
-         *
-         * @param {string} personGroupId     - The target person's person group.
-         * @return {Promise}                 - Promise resolving with the resulting JSON
-         */
-        public list(personGroupId: string): Promise<PersonResponses.Person[]>;
-    }
-
-    namespace Options {
-        interface Detect {
-            url?: string; // URL to image to be used
-            path?: string; // Path to image to be used
-            stream?: stream.Stream; // Stream of an image to be used
-            analyzesFaceLandmarks?: boolean; // Analyze face landmarks?
-            analyzesAge?: boolean; // Analyze age?
-            analyzesGender?: boolean; // Analyze gender?
-            analyzesHeadPose?: boolean; //Analyze headpose?
-        }
-
-        interface Identify {
-            personGroupId: string;
-            maxNumOfCandidatesReturned: number; // range is 1-10
-        }
-
-        interface Analyze {
-            url?: string; // Url to image to be analyzed
-            path?: string; // Path to image to be analyzed
-            ImageType?: boolean; // Detects if image is clipart or a line drawing.
-            Color?: boolean; // Determines the accent color, dominant color, if image is black& white.
-            Faces?: boolean; // Detects if faces are present.If present, generate coordinates, gender and age.
-            Adult?: boolean; // Detects if image is pornographic in nature(nudity or sex act).Sexually suggestive content is also detected.
-            Categories?: boolean; // Image categorization; taxonomy defined in documentation.
-        }
-
-        interface Thumbnail {
-            url?: string; // Url to image to be thumbnailed
-            path?: string; // Path to image to be thumbnailed
-            width?: number; // Width of the thumb in pixels
-            height?: number; // Height of the thumb in pixels
-            smartCropping?: boolean; // Should SmartCropping be enabled?
-            pipe?: stream.Writable; // We'll pipe the returned image to this object
-        }
-
-        interface Ocr {
-            url?: string; // URL to image to be analyzed
-            path?: string; // Path to image to be analyzed
-            language?: string; //BCP - 47 language code of the text to be detected in the image.Default value is "unk", then the service will auto detect the language of the text in the image.
-            detectOrientation?: boolean; // Detect orientation of text in the image
-        }
-    }
-
-    namespace FaceResponses {
-        interface FaceRectangle {
-            top: number;
-            left: number;
-            width: number;
-            height: number;
-        }
-
-        interface point {
-            x: number;
-            y: number;
-        }
-
-        interface FaceLandmarks {
-            "pupilLeft": point;
-            "pupilRight": point;
-            "noseTip": point;
-            "mouthLeft": point;
-            "mouthRight": point;
-            "eyebrowLeftOuter": point;
-            "eyebrowLeftInner": point;
-            "eyeLeftOuter": point;
-            "eyeLeftTop": point;
-            "eyeLeftBottom": point;
-            "eyeLeftInner": point;
-            "eyebrowRightInner": point;
-            "eyebrowRightOuter": point;
-            "eyeRightInner": point;
-            "eyeRightTop": point;
-            "eyeRightBottom": point;
-            "eyeRightOuter": point;
-            "noseRootLeft": point;
-            "noseRootRight": point;
-            "noseLeftAlarTop": point;
-            "noseRightAlarTop": point;
-            "noseLeftAlarOutTip": point;
-            "noseRightAlarOutTip": point;
-            "upperLipTop": point;
-            "upperLipBottom": point;
-            "underLipTop": point;
-            "underLipBottom": point;
-        }
-
-        interface Attributes {
-            "headPose": { "pitch": number, "roll": number, "yaw": number };
-            "gender": string;
-            "age": number;
-        }
-
-        export interface Detect {
-            "faceId": string;
-            "faceRectangle": FaceRectangle;
-            "faceLandmarks": FaceLandmarks;
-            "attributes": Attributes;
-        }
-
-        export interface Similar {
-            "faceIds": string[];
-        }
-
-        export interface Grouping {
-            "groups": string[];
-            "messyGroup": string[];
-        }
-
-        export interface Identify {
-            "faceId": string;
-            "candidates": [{
-                personId: string;
-                confidence: number;
-            }];
-        }
-
-        export interface Verify {
-            "isIdentical": boolean;
-            "confidence": number;
-        }
-    }
-
-    namespace PersonGroupResponses {
-
-        export interface PersonGroup {
-            "personGroupId": string;
-            "name": string;
-            "userData": string;
-        }
-
-        export interface TrainingStatus {
-            "personGroupId": string;
-            "status": string;
-            "startTime": string;
-            "endTime": string;
-        }
-    }
-
-    namespace PersonResponses {
-        export interface Create {
-            "personId": string;
-        }
-
-        export interface Person {
-            "personId": string;
-            "faceIds": string[];
-            "name": string;
-            "userData": string;
-        }
-
-        export interface Face {
-            "faceId": string;
-            "userData": string;
-        }
-    }
-
-    namespace VisionResponses {
-        export interface Analyze {
-            "categories": [{
-                "name": string;
-                "score": number;
-            }],
-            "adult": {
-                "isAdultContent": boolean;
-                "isRacyContent": boolean;
-                "adultScore": number;
-                "racyScore": number;
-            },
-            "requestId": string;
-            "metadata": {
-                "width": number;
-                "height": number;
-                "format": string;
-            },
-            "faces": [
-                {
-                    "age": number;
-                    "gender": string;
-                    "faceRectangle": {
-                        "left": number;
-                        "top": number;
-                        "width": number;
-                        "height": number;
-                    }
-                }
-            ],
-            "color": {
-                "dominantColorForeground": string;
-                "dominantColorBackground": string;
-                "dominantColors": string[];
-                "accentColor": string;
-                "isBWImg": boolean;
-            },
-            "imageType": {
-                "clipArtType": number;
-                "lineDrawingType": number;
-            }
-        }
-
-
-        export interface Ocr {
-            "language": string;
-            "textAngle": number;
-            "orientation": string;
-            "regions": [{
-                "boundingBox": string;
-                "lines": [{
-                    "boundingBox": string;
-                    "words": [{
-                        "boundingBox": string;
-                        "text": string;
-                    }]
-                }]
-            }]
-        }
+    interface Ocr {
+        url?: string; // URL to image to be analyzed
+        path?: string; // Path to image to be analyzed
+        language?: string; //BCP - 47 language code of the text to be detected in the image.Default value is "unk", then the service will auto detect the language of the text in the image.
+        detectOrientation?: boolean; // Detect orientation of text in the image
+    }
+}
+
+declare namespace FaceResponses {
+    interface FaceRectangle {
+        top: number;
+        left: number;
+        width: number;
+        height: number;
+    }
+
+    interface point {
+        x: number;
+        y: number;
+    }
+
+    interface FaceLandmarks {
+        "pupilLeft": point;
+        "pupilRight": point;
+        "noseTip": point;
+        "mouthLeft": point;
+        "mouthRight": point;
+        "eyebrowLeftOuter": point;
+        "eyebrowLeftInner": point;
+        "eyeLeftOuter": point;
+        "eyeLeftTop": point;
+        "eyeLeftBottom": point;
+        "eyeLeftInner": point;
+        "eyebrowRightInner": point;
+        "eyebrowRightOuter": point;
+        "eyeRightInner": point;
+        "eyeRightTop": point;
+        "eyeRightBottom": point;
+        "eyeRightOuter": point;
+        "noseRootLeft": point;
+        "noseRootRight": point;
+        "noseLeftAlarTop": point;
+        "noseRightAlarTop": point;
+        "noseLeftAlarOutTip": point;
+        "noseRightAlarOutTip": point;
+        "upperLipTop": point;
+        "upperLipBottom": point;
+        "underLipTop": point;
+        "underLipBottom": point;
+    }
+
+    interface Attributes {
+        "headPose": { "pitch": number, "roll": number, "yaw": number };
+        "gender": string;
+        "age": number;
+    }
+
+    export interface Detect {
+        "faceId": string;
+        "faceRectangle": FaceRectangle;
+        "faceLandmarks": FaceLandmarks;
+        "attributes": Attributes;
+    }
+
+    export interface Similar {
+        "faceIds": string[];
+    }
+
+    export interface Grouping {
+        "groups": string[];
+        "messyGroup": string[];
+    }
+
+    export interface Identify {
+        "faceId": string;
+        "candidates": [{
+            personId: string;
+            confidence: number;
+        }];
+    }
+
+    export interface Verify {
+        "isIdentical": boolean;
+        "confidence": number;
+    }
+}
+
+declare namespace PersonGroupResponses {
+
+    export interface PersonGroup {
+        "personGroupId": string;
+        "name": string;
+        "userData": string;
+    }
+
+    export interface TrainingStatus {
+        "personGroupId": string;
+        "status": string;
+        "startTime": string;
+        "endTime": string;
+    }
+}
+
+declare namespace PersonResponses {
+    export interface Create {
+        "personId": string;
+    }
+
+    export interface Person {
+        "personId": string;
+        "faceIds": string[];
+        "name": string;
+        "userData": string;
+    }
+
+    export interface Face {
+        "faceId": string;
+        "userData": string;
+    }
+}
+
+declare namespace VisionResponses {
+    export interface Analyze {
+        "categories": [{
+            "name": string;
+            "score": number;
+        }],
+        "adult": {
+            "isAdultContent": boolean;
+            "isRacyContent": boolean;
+            "adultScore": number;
+            "racyScore": number;
+        },
+        "requestId": string;
+        "metadata": {
+            "width": number;
+            "height": number;
+            "format": string;
+        },
+        "faces": [
+            {
+                "age": number;
+                "gender": string;
+                "faceRectangle": {
+                    "left": number;
+                    "top": number;
+                    "width": number;
+                    "height": number;
+                }
+            }
+        ],
+        "color": {
+            "dominantColorForeground": string;
+            "dominantColorBackground": string;
+            "dominantColors": string[];
+            "accentColor": string;
+            "isBWImg": boolean;
+        },
+        "imageType": {
+            "clipArtType": number;
+            "lineDrawingType": number;
+        }
+    }
+
+
+    export interface Ocr {
+        "language": string;
+        "textAngle": number;
+        "orientation": string;
+        "regions": [{
+            "boundingBox": string;
+            "lines": [{
+                "boundingBox": string;
+                "words": [{
+                    "boundingBox": string;
+                    "text": string;
+                }]
+            }]
+        }]
     }
 }
diff --git a/promise-pg/promise-pg.d.ts b/promise-pg/promise-pg.d.ts
index 47321bbf61..a331c42161 100644
--- a/promise-pg/promise-pg.d.ts
+++ b/promise-pg/promise-pg.d.ts
@@ -7,24 +7,24 @@
 /// <reference path="../q/Q.d.ts" />
 /// <reference path="../pg/pg.d.ts" />
 
-declare module "promise-pg" {
-  import * as stream from 'stream';
-  import * as pg from 'pg';
 
-  export {pg as raw};
+import * as stream from 'stream';
+import * as pg from 'pg';
 
-  export interface ClientConfig extends pg.ClientConfig {}
+export {pg as raw};
 
-  export function connect(connection: string): Q.Promise<Client>;
-  export function connect(connection: pg.ClientConfig): Q.Promise<Client>;
+export interface ClientConfig extends pg.ClientConfig { }
 
-  export function end(): Q.Promise<void>;
+declare export function connect(connection: string): Q.Promise<Client>;
+declare export function connect(connection: pg.ClientConfig): Q.Promise<Client>;
 
-  export interface QueryConfig extends pg.QueryConfig {
+declare export function end(): Q.Promise<void>;
+
+export interface QueryConfig extends pg.QueryConfig {
     buffer?: boolean;
-  }
+}
 
-  export class Client {
+declare export class Client {
     constructor(connection: string);
     constructor(config: ClientConfig);
 
@@ -50,12 +50,11 @@ declare module "promise-pg" {
     public on(event: string, listener: Function): Client;
 
     transaction(task: () => Q.Promise<any>): Q.Promise<any>;
-  }
-
-  export interface QueryResult extends pg.QueryResult {}
-  export interface ResultBuilder extends pg.ResultBuilder {}
-
-  export class Query extends pg.Query {
-    promise: Q.Promise<QueryResult>;
-  }
+}
+
+export interface QueryResult extends pg.QueryResult { }
+export interface ResultBuilder extends pg.ResultBuilder { }
+
+declare export class Query extends pg.Query {
+    promise: Q.Promise<QueryResult>;
 }
diff --git a/promise-pool/promise-pool.d.ts b/promise-pool/promise-pool.d.ts
index 37272b409f..bb9f679c82 100644
--- a/promise-pool/promise-pool.d.ts
+++ b/promise-pool/promise-pool.d.ts
@@ -5,120 +5,119 @@
 
 /// <reference path="../q-retry/q-retry.d.ts" />
 
-declare module "promise-pool" {
+
+/**
+* interface for the final result.
+*/
+export interface IResult {
+    fulfilled: number;
+    rejected: number;
+    total: number;
+}
+/**
+* interface for progress data.
+*/
+export interface IProgress {
+    index: number;
+    success: boolean;
+    error: any;
+    retries: number;
+    fulfilled: number;
+    rejected: number;
+    pending: number;
+    total: number;
+}
+/**
+* tasks pool that manages concurrency.
+*/
+declare export class Pool<T> {
     /**
-    * interface for the final result.
+    * (get/set) the max concurrency of this task pool.
     */
-    export interface IResult {
-        fulfilled: number;
-        rejected: number;
-        total: number;
-    }
+    public concurrency: number;
+    private _tasksData;
     /**
-    * interface for progress data.
+    * (get/set) the processor function that handles tasks data.
     */
-    export interface IProgress {
-        index: number;
-        success: boolean;
-        error: any;
-        retries: number;
-        fulfilled: number;
-        rejected: number;
-        pending: number;
-        total: number;
-    }
+    public processor: (data: T, index: number) => Q.IPromise<void>;
+    private _deferred;
+    private _pauseDeferred;
     /**
-    * tasks pool that manages concurrency.
+    * (get) the number of successful tasks.
     */
-    export class Pool<T> {
-        /**
-        * (get/set) the max concurrency of this task pool.
-        */
-        public concurrency: number;
-        private _tasksData;
-        /**
-        * (get/set) the processor function that handles tasks data.
-        */
-        public processor: (data: T, index: number) => Q.IPromise<void>;
-        private _deferred;
-        private _pauseDeferred;
-        /**
-        * (get) the number of successful tasks.
-        */
-        public fulfilled: number;
-        /**
-        * (get) the number of failed tasks.
-        */
-        public rejected: number;
-        /**
-        * (get) the number of pending tasks.
-        */
-        public pending: number;
-        /**
-        * (get) the number of completed tasks and pending tasks in total.
-        */
-        public total: number;
-        /**
-        * (get/set) indicates whether this task pool is endless, if so, tasks can still be added even after all previous tasks have been fulfilled.
-        */
-        public endless: boolean;
-        /**
-        * (get/set) defaults to 0, the number or retries that this task pool will take for every single task, could be Infinity.
-        */
-        public retries: number;
-        /**
-        * (get/set) defaults to 0, interval (milliseconds) between each retries.
-        */
-        public retryInterval: number;
-        /**
-        * (get/set) defaults to Infinity, max retry interval when retry interval multiplier applied.
-        */
-        public maxRetryInterval: number;
-        /**
-        * (get/set) defaults to 1, the multiplier applies to interval after every retry.
-        */
-        public retryIntervalMultiplier: number;
-        private _index;
-        private _currentConcurrency;
-        public onProgress: (progress: IProgress) => void;
-        /**
-        * initialize a task pool.
-        * @param processor a function takes the data and index as parameters and returns a promise.
-        * @param concurrency the concurrency of this task pool.
-        * @param endless defaults to false. indicates whether this task pool is endless, if so, tasks can still be added even after all previous tasks have been fulfilled.
-        * @param tasksData an initializing array of task data.
-        */
-        constructor(processor: (data: T, index: number) => Q.IPromise<void>, concurrency: number, endless?: boolean, tasksData?: T[]);
-        /**
-        * add a data item.
-        * @param taskData task data to add.
-        */
-        public add(taskData: T): void;
-        /**
-        * add data items.
-        * @param tasskData tasks data to add.
-        */
-        public add(tasksData: T[]): void;
-        /**
-        * start tasks, return a promise that will be fulfilled after all tasks accomplish if endless is false.
-        * @param onProgress a callback that will be triggered every time when a single task is fulfilled.
-        */
-        public start(onProgress?: (progress: IProgress) => void): Q.Promise<IResult>;
-        private _start();
-        private _process(data, index);
-        private _notifyProgress(index, success, err, retries);
-        private _next();
-        /**
-        * pause tasks and return a promise that will be fulfilled after the running tasks accomplish. this will wait for running tasks to complete instead of aborting them.
-        */
-        public pause(): Q.Promise<void>;
-        /**
-        * resume tasks.
-        */
-        public resume(): void;
-        /**
-        * pause tasks, then clear pending tasks data and reset counters. return a promise that will be fulfilled after resetting accomplish.
-        */
-        public reset(): Q.Promise<void>;
-    }
-}
\ No newline at end of file
+    public fulfilled: number;
+    /**
+    * (get) the number of failed tasks.
+    */
+    public rejected: number;
+    /**
+    * (get) the number of pending tasks.
+    */
+    public pending: number;
+    /**
+    * (get) the number of completed tasks and pending tasks in total.
+    */
+    public total: number;
+    /**
+    * (get/set) indicates whether this task pool is endless, if so, tasks can still be added even after all previous tasks have been fulfilled.
+    */
+    public endless: boolean;
+    /**
+    * (get/set) defaults to 0, the number or retries that this task pool will take for every single task, could be Infinity.
+    */
+    public retries: number;
+    /**
+    * (get/set) defaults to 0, interval (milliseconds) between each retries.
+    */
+    public retryInterval: number;
+    /**
+    * (get/set) defaults to Infinity, max retry interval when retry interval multiplier applied.
+    */
+    public maxRetryInterval: number;
+    /**
+    * (get/set) defaults to 1, the multiplier applies to interval after every retry.
+    */
+    public retryIntervalMultiplier: number;
+    private _index;
+    private _currentConcurrency;
+    public onProgress: (progress: IProgress) => void;
+    /**
+    * initialize a task pool.
+    * @param processor a function takes the data and index as parameters and returns a promise.
+    * @param concurrency the concurrency of this task pool.
+    * @param endless defaults to false. indicates whether this task pool is endless, if so, tasks can still be added even after all previous tasks have been fulfilled.
+    * @param tasksData an initializing array of task data.
+    */
+    constructor(processor: (data: T, index: number) => Q.IPromise<void>, concurrency: number, endless?: boolean, tasksData?: T[]);
+    /**
+    * add a data item.
+    * @param taskData task data to add.
+    */
+    public add(taskData: T): void;
+    /**
+    * add data items.
+    * @param tasskData tasks data to add.
+    */
+    public add(tasksData: T[]): void;
+    /**
+    * start tasks, return a promise that will be fulfilled after all tasks accomplish if endless is false.
+    * @param onProgress a callback that will be triggered every time when a single task is fulfilled.
+    */
+    public start(onProgress?: (progress: IProgress) => void): Q.Promise<IResult>;
+    private _start();
+    private _process(data, index);
+    private _notifyProgress(index, success, err, retries);
+    private _next();
+    /**
+    * pause tasks and return a promise that will be fulfilled after the running tasks accomplish. this will wait for running tasks to complete instead of aborting them.
+    */
+    public pause(): Q.Promise<void>;
+    /**
+    * resume tasks.
+    */
+    public resume(): void;
+    /**
+    * pause tasks, then clear pending tasks data and reset counters. return a promise that will be fulfilled after resetting accomplish.
+    */
+    public reset(): Q.Promise<void>;
+}
diff --git a/promisify-supertest/promisify-supertest.d.ts b/promisify-supertest/promisify-supertest.d.ts
index 54a03f198f..7250468bd7 100644
--- a/promisify-supertest/promisify-supertest.d.ts
+++ b/promisify-supertest/promisify-supertest.d.ts
@@ -6,40 +6,39 @@
 /// <reference path='../superagent/superagent.d.ts' />
 /// <reference path="../express/express.d.ts" />
 
-declare module 'promisify-supertest' {
-  // Mostly copy-pasted from supertest.d.ts
 
-  import * as superagent from 'superagent';
-  import * as express from 'express';
+// Mostly copy-pasted from supertest.d.ts
 
-  type CallbackHandler = (err: any, res: supertest.Response) => void;
+import * as superagent from 'superagent';
+import * as express from 'express';
 
-  function supertest(app: express.Express): supertest.SuperTest;
+type CallbackHandler = (err: any, res: supertest.Response) => void;
 
-  namespace supertest {
+declare function supertest(app: express.Express): supertest.SuperTest;
+
+declare namespace supertest {
     function agent(app?: any): supertest.SuperTest;
 
     interface SuperTest extends superagent.SuperAgent<Test> {
     }
 
     interface Test extends superagent.Request<Test> {
-      url: string;
-      serverAddress(app: any, path: string): string;
-      expect(status: number, callback?: CallbackHandler): Test;
-      expect(status: number, body: string, callback?: CallbackHandler): Test;
-      expect(body: string, callback?: CallbackHandler): Test;
-      expect(body: RegExp, callback?: CallbackHandler): Test;
-      expect(body: Object, callback?: CallbackHandler): Test;
-      expect(field: string, val: string, callback?: CallbackHandler): Test;
-      expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
-      expect(checker: (res: Response) => any): Test;
-      end(callback: CallbackHandler): Test;
-      end(): Promise<Response>;
+        url: string;
+        serverAddress(app: any, path: string): string;
+        expect(status: number, callback?: CallbackHandler): Test;
+        expect(status: number, body: string, callback?: CallbackHandler): Test;
+        expect(body: string, callback?: CallbackHandler): Test;
+        expect(body: RegExp, callback?: CallbackHandler): Test;
+        expect(body: Object, callback?: CallbackHandler): Test;
+        expect(field: string, val: string, callback?: CallbackHandler): Test;
+        expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
+        expect(checker: (res: Response) => any): Test;
+        end(callback: CallbackHandler): Test;
+        end(): Promise<Response>;
     }
 
     interface Response extends superagent.Response {
     }
-  }
-
-  export = supertest;
 }
+
+export = supertest;
diff --git a/promptly/promptly.d.ts b/promptly/promptly.d.ts
index d0b68a3f23..6c47c03b27 100644
--- a/promptly/promptly.d.ts
+++ b/promptly/promptly.d.ts
@@ -5,14 +5,14 @@
 
 ///<reference path="../node/node.d.ts"/>
 
-declare module "promptly" {
-  import stream = require('stream');
 
-  interface Callback {
+import stream = require('stream');
+
+interface Callback {
     (err: Error, value: string): void;
-  }
+}
 
-  export interface Options {
+export interface Options {
     default?: string;
     trim?: boolean;
     validator?: any;
@@ -20,18 +20,16 @@ declare module "promptly" {
     silent?: boolean;
     input?: NodeJS.ReadableStream;
     output?: NodeJS.WritableStream;
-  }
-
-  export function prompt(message: string, fn?: Callback):any;
-  export function prompt(message: string, opts: Options, fn?: Callback):any;
-
-  export function password(message: string, fn?: Callback):any;
-  export function password(message: string, opts: Options, fn?: Callback):any;
-
-  export function confirm(message: string, fn?: Callback):any;
-  export function confirm(message: string, opts: Options, fn?: Callback):any;
-
-  export function choose(message: string, choices: string[], fn?: Callback):any;
-  export function choose(message: string, choices: string[], opts: Options, fn?: Callback):any;
-
 }
+
+declare export function prompt(message: string, fn?: Callback): any;
+declare export function prompt(message: string, opts: Options, fn?: Callback): any;
+
+declare export function password(message: string, fn?: Callback): any;
+declare export function password(message: string, opts: Options, fn?: Callback): any;
+
+declare export function confirm(message: string, fn?: Callback): any;
+declare export function confirm(message: string, opts: Options, fn?: Callback): any;
+
+declare export function choose(message: string, choices: string[], fn?: Callback): any;
+declare export function choose(message: string, choices: string[], opts: Options, fn?: Callback): any;
diff --git a/pty.js/pty.js.d.ts b/pty.js/pty.js.d.ts
index 957134e466..11f43b3e37 100644
--- a/pty.js/pty.js.d.ts
+++ b/pty.js/pty.js.d.ts
@@ -5,131 +5,128 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'pty.js' {
-    /** Options that can be used when creating a new pseudo-terminal. */
-    interface TerminalOptions {
-        name?: string;
-        cols?: number;
-        rows?: number;
-        cwd?: string;
-        env?: any;
-        uid?: number;
-        gid?: number;
-    }
 
-    import stream = require('stream');
-    import net = require('net');
+/** Options that can be used when creating a new pseudo-terminal. */
+interface TerminalOptions {
+    name?: string;
+    cols?: number;
+    rows?: number;
+    cwd?: string;
+    env?: any;
+    uid?: number;
+    gid?: number;
+}
 
-    export class Terminal implements stream.Stream {
-        /** Read-only name of the terminal. */
-        name: string;
-        /** Read-only number of columns in the terminal. */
-        cols: number;
-        /** Read-only number of rows in the terminal. */
-        rows: number;
-        /**
-         * Read-only identifier of the spawned process associated with the slave end of the 
-         * pseudo-terminal. This will be null if the terminal was created via [[Terminal.open]].
-         */
-        pid: number;
-        /** Read-only file descriptor of the master end of the pseudo-terminal. */
-        fd: number;
-        /** Read-only name of the slave end of the pseudo-terminal. */
-        pty: string;
-        /** Read-only filename of the executable associated with the slave end of the pseudo-terminal. */
-        file: string;
-        /** Read-only name of the process associated with the slave end of the pseudo-terminal. */
-        process: string;
-        stdout: Terminal;
-        /** Note that an exception will be thrown if an attempt is made to access this property. */
-        stderr: Terminal;
-        stdin: Terminal;
-        socket: net.Socket;
+import stream = require('stream');
+import net = require('net');
 
-        /** 
-         * Creates a new pseudo-terminal, spawns a child process, and associates it with the slave 
-         * end of the pseudo-terminal.
-         */
-        constructor(file?: string, args?: string[], opt?: TerminalOptions);
-
-        resize(cols?: number, rows?: number): void;
-        /** 
-         * Sends a signal to the spawned process associated with the slave end of the
-         * pseudo-terminal (this only works if [[pid]] is not null).
-         */
-        kill(signal?: string): void;
-        redraw(): void;
-    
-        // NodeJS Socket-like interface (wrappers for this.socket)
-        
-        write(data: any): boolean;
-        end(data: any): void;
-        pause(): void;
-        resume(): void;
-        setEncoding(encoding: string): void;
-        /** 
-         * Closes the master end of the pseudo-terminal, and attempts to kill the spawned process
-         * associated with the slave end of the pseudo-terminal (but only if [[pid]] is not null).
-         */
-        destroy(): void;
-
-        // NodeJS Stream interface
-    
-        pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
-    
-        // NodeJS EventEmitter interface
-
-        addListener(event: string, listener: Function): this;
-        on(event: string, listener: Function): this;
-        once(event: string, listener: Function): this;
-        removeListener(event: string, listener: Function): this;
-        removeAllListeners(event?: string): this;
-        // NOTE: this method is not actually defined in pty.js
-        setMaxListeners(n: number): this;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-    }
+declare export class Terminal implements stream.Stream {
+    /** Read-only name of the terminal. */
+    name: string;
+    /** Read-only number of columns in the terminal. */
+    cols: number;
+    /** Read-only number of rows in the terminal. */
+    rows: number;
+    /**
+     * Read-only identifier of the spawned process associated with the slave end of the 
+     * pseudo-terminal. This will be null if the terminal was created via [[Terminal.open]].
+     */
+    pid: number;
+    /** Read-only file descriptor of the master end of the pseudo-terminal. */
+    fd: number;
+    /** Read-only name of the slave end of the pseudo-terminal. */
+    pty: string;
+    /** Read-only filename of the executable associated with the slave end of the pseudo-terminal. */
+    file: string;
+    /** Read-only name of the process associated with the slave end of the pseudo-terminal. */
+    process: string;
+    stdout: Terminal;
+    /** Note that an exception will be thrown if an attempt is made to access this property. */
+    stderr: Terminal;
+    stdin: Terminal;
+    socket: net.Socket;
 
     /** 
      * Creates a new pseudo-terminal, spawns a child process, and associates it with the slave 
      * end of the pseudo-terminal.
      */
-    export function createTerminal(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
-    /** Alias for [[createTerminal]]. */
-    export function fork(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
-    /** Alias for [[createTerminal]]. */
-    export function spawn(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
+    constructor(file?: string, args?: string[], opt?: TerminalOptions);
+
+    resize(cols?: number, rows?: number): void;
     /** 
-     * Creates a new pseudo-terminal.
-     * This function is not available on Windows, use [[fork]] there instead.
+     * Sends a signal to the spawned process associated with the slave end of the
+     * pseudo-terminal (this only works if [[pid]] is not null).
      */
-    export function open(opt?: { cols?: number; rows?: number }): Terminal;
-    
-    // Internal stuff that probably isn't very useful but is exported by pty.js
-    export module native {
-        /** Unix-only. */
-        export function fork(
-            file: string, args: string[], env: any, cwd: string, cols: number, rows: number,
-            uid?: number, gid?: number
-        ): { fd: number; pid: number; pty: string };
-        /** Unix-only. */
-        export function open(
-            cols: number, rows: number
-        ): { master: number; slave: number; pty: string };
-        /** Unix-only. */
-        export function process(fd: number, tty: string): string;
-        /** Windows-only. */
-        export function open(
-            dataPipe: string, cols: number, rows: number, debug: boolean
-        ): { pid: number; pty: number; fd: number };
-        /** Windows-only. */
-        export function startProcess(
-            pid: number, file: string, cmdline: string, env: string[], cwd: string
-        ): void;
-        /** Windows-only. */
-        export function kill(pid: number): void;
-        export function resize(fd: number, cols: number, rows: number): void;
-    }
+    kill(signal?: string): void;
+    redraw(): void;
+
+    // NodeJS Socket-like interface (wrappers for this.socket)
+      write(data: any): boolean;
+    end(data: any): void;
+    pause(): void;
+    resume(): void;
+    setEncoding(encoding: string): void;
+    /** 
+     * Closes the master end of the pseudo-terminal, and attempts to kill the spawned process
+     * associated with the slave end of the pseudo-terminal (but only if [[pid]] is not null).
+     */
+    destroy(): void;
+
+    // NodeJS Stream interface
+      pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
+
+    // NodeJS EventEmitter interface
+
+    addListener(event: string, listener: Function): this;
+    on(event: string, listener: Function): this;
+    once(event: string, listener: Function): this;
+    removeListener(event: string, listener: Function): this;
+    removeAllListeners(event?: string): this;
+    // NOTE: this method is not actually defined in pty.js
+    setMaxListeners(n: number): this;
+    getMaxListeners(): number;
+    listeners(event: string): Function[];
+    emit(event: string, ...args: any[]): boolean;
+    listenerCount(type: string): number;
+}
+
+/** 
+ * Creates a new pseudo-terminal, spawns a child process, and associates it with the slave 
+ * end of the pseudo-terminal.
+ */
+declare export function createTerminal(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
+/** Alias for [[createTerminal]]. */
+declare export function fork(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
+/** Alias for [[createTerminal]]. */
+declare export function spawn(file?: string, args?: string[], opt?: TerminalOptions): Terminal;
+/** 
+ * Creates a new pseudo-terminal.
+ * This function is not available on Windows, use [[fork]] there instead.
+ */
+declare export function open(opt?: { cols?: number; rows?: number }): Terminal;
+
+// Internal stuff that probably isn't very useful but is exported by pty.js
+declare export module native {
+    /** Unix-only. */
+    export function fork(
+        file: string, args: string[], env: any, cwd: string, cols: number, rows: number,
+        uid?: number, gid?: number
+    ): { fd: number; pid: number; pty: string };
+    /** Unix-only. */
+    export function open(
+        cols: number, rows: number
+    ): { master: number; slave: number; pty: string };
+    /** Unix-only. */
+    export function process(fd: number, tty: string): string;
+    /** Windows-only. */
+    export function open(
+        dataPipe: string, cols: number, rows: number, debug: boolean
+    ): { pid: number; pty: number; fd: number };
+    /** Windows-only. */
+    export function startProcess(
+        pid: number, file: string, cmdline: string, env: string[], cwd: string
+    ): void;
+    /** Windows-only. */
+    export function kill(pid: number): void;
+    export function resize(fd: number, cols: number, rows: number): void;
 }
diff --git a/pure-render-decorator/pure-render-decorator.d.ts b/pure-render-decorator/pure-render-decorator.d.ts
index d24e842b60..7cc6832040 100644
--- a/pure-render-decorator/pure-render-decorator.d.ts
+++ b/pure-render-decorator/pure-render-decorator.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sean Kelley <https://github.com/seansfkelley/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'pure-render-decorator' {
-  var PureRender: ClassDecorator;
-  export = PureRender;
-}
+
+declare var PureRender: ClassDecorator;
+export = PureRender;
diff --git a/pusher-js/pusher-js.d.ts b/pusher-js/pusher-js.d.ts
index 0a6dc18d24..e4ebfee975 100644
--- a/pusher-js/pusher-js.d.ts
+++ b/pusher-js/pusher-js.d.ts
@@ -3,229 +3,228 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "pusher-js" {
-
-    namespace pusher {
-        interface PusherStatic {
-            new(apiKey: string, config?: Config): Pusher;
-        }
-
-        interface Pusher {
-            subscribe(name: string): Channel;
-            subscribeAll(): void;
-            unsubscribe(name: string): void;
-            channel(name: string): Channel;
-            allChannels(): Channel[];
-            bind(eventName: string, callback: Function): Pusher;
-            bind_all(callback: Function): Pusher;
-            disconnect(): void;
-            key: string;
-            config: Config; //TODO: add GlobalConfig typings
-            channels: any; //TODO: Type this
-            global_emitter: EventsDispatcher;
-            sessionId: number;
-            timeline: any; //TODO: Type this
-            connection: ConnectionManager;
-        }
-
-        interface Config {
-            /**
-             * Forces the connection to use encrypted transports.
-             */
-            encrypted?: boolean;
-
-            /**
-             * Endpoint on your server that will return the authentication signature needed for private channels.
-             */
-            authEndpoint?: string;
-
-            /**
-             * Defines how the authentication endpoint, defined using authEndpoint, will be called.
-             * There are two options available: ajax and jsonp.
-             */
-            authTransport?: string;
-
-            /**
-             * Allows passing additional data to authorizers. Supports query string params and headers (AJAX only).
-             * For example, following will pass foo=bar via the query string and baz: boo via headers:
-             */
-            auth?: AuthConfig;
 
 
-            /**
-             * Allows connecting to a different datacenter by setting up correct hostnames and ports for the connection.
-             */
-            cluster?: string;
-
-
-            /**
-             * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers.
-             */
-            disableStats?: boolean;
-
-            /**
-             * Specifies which transports should be used by Pusher to establish a connection.
-             * Useful for applications running in controlled, well-behaving environments.
-             * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
-             * Additional transports may be added in the future and without adding them to this list, they will be disabled.
-             */
-            enabledTransports?: string[];
-
-
-            /**
-             * Specified which transports must not be used by Pusher to establish a connection.
-             * This settings overwrites transports whitelisted via the enabledTransports options.
-             * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
-             * Additional transports may be added in the future and without adding them to this list, they will be enabled.
-             */
-            disabledTransports?: string[];
-
-            /**
-             * Ignores null origin checks for HTTP fallbacks. Use with care, it should be disabled only if necessary (i.e. PhoneGap).
-             */
-            ignoreNullOrigin?: boolean;
-
-            /**
-             * After this time (in miliseconds) without any messages received from the server,
-             * a ping message will be sent to check if the connection is still working.
-             * Default value is is supplied by the server, low values will result in unnecessary traffic.
-             */
-            activityTimeout?: number;
-
-            /**
-             * Time before the connection is terminated after sending a ping message.
-             * Default is 30000 (30s). Low values will cause false disconnections, if latency is high.
-             */
-            pongTimeout?: number;
-
-            wsHost?: string;
-            wsPort?: number;
-            wssPort?: number;
-            httpHost?: string;
-            httpPort?: number;
-            httpsPort?: number;
-        }
-
-        interface AuthConfig {
-            params?: { [key: string]: any };
-            headers?: { [key: string]: any };
-        }
-
-        interface GenericEventsDispatcher<Self extends EventsDispatcher> extends EventsDispatcher {
-            bind(eventName: string, callback: Function, context?: any): Self;
-            bind_all(callback: Function): Self;
-            unbind(eventName?: string, callback?: Function, context?: any): Self;
-            unbind_all(eventName?: string, callback?: Function): Self;
-            emit(eventName: string, data?: any): Self;
-        }
-
-        interface Channel extends GenericEventsDispatcher<Channel> {
-            /** Triggers an event */
-            trigger(eventName: string, data?: any): boolean;
-            pusher: Pusher;
-            name: string;
-            subscribed: boolean;
-            /**
-             * Authenticates the connection as a member of the channel.
-             * @param  {String} socketId
-             * @param  {Function} callback
-             */
-            authorize(socketId: string, callback: (data: any) => void): void;
-        }
-
-        interface EventsDispatcher {
-            bind(eventName: string, callback: Function, context?: any): EventsDispatcher;
-            bind_all(callback: Function): EventsDispatcher;
-            unbind(eventName?: string, callback?: Function, context?: any): EventsDispatcher;
-            unbind_all(eventName?: string, callback?: Function): EventsDispatcher;
-            emit(eventName: string, data?: any): EventsDispatcher;
-        }
-
-        interface ConnectionManager extends GenericEventsDispatcher<ConnectionManager> {
-            key: string;
-            options: any; //TODO: Timeline.js
-            state: string;
-            connection: any; //TODO: Type this
-            encrypted: boolean;
-            timeline: any; //TODO: Type this
-            connectionCallbacks: {
-                message: (message: string) => void;
-                ping: () => void;
-                activity: () => void;
-                error: (error: any) => void;
-                closed: () => void;
-            };
-            errorCallbacks: {
-                ssl_only: () => void;
-                refused: () => void;
-                backoff: () => void;
-                retry: () => void;
-            };
-            handshakeCallbacks: {
-                ssl_only: () => void;
-                refused: () => void;
-                backoff: () => void;
-                retry: () => void;
-                connected: (handshake: any) => void; //TODO: Type this
-            };
-            /**
-             * Establishes a connection to Pusher.
-             *
-             * Does nothing when connection is already established. See top-level doc
-             * to find events emitted on connection attempts.
-             */
-            connect(): void;
-            /**
-             * Sends raw data.
-             * @param {String} data
-             */
-            send(data: string): boolean;
-            /** Sends an event.
-             *
-             * @param {String} name
-             * @param {String} data
-             * @param {String} [channel]
-             * @returns {Boolean} whether message was sent or not
-             */
-            send_event(name: string, data: string, channel: string): boolean;
-            /** Closes the connection. */
-            disconnect(): void;
-            isEncrypted(): boolean;
-        }
-
-        interface PresenceChannel<T> extends Channel {
-            members: Members<T>;
-        }
-
-        interface Members<T> {
-            /**
-             * Returns member's info for given id.
-             *
-             * Resulting object containts two fields - id and info.
-             *
-             * @param {Number} id
-             * @return {Object} member's info or null
-             */
-            get(id: number): T;
-            /**
-             * Calls back for each member in unspecified order.
-             *
-             * @param  {Function} callback
-             */
-            each(callback: (member: any) => void): void;
-            members: { [id: number]: UserInfo<T> };
-            count: number;
-            myID: number;
-            me: UserInfo<T>;
-        }
-
-        interface UserInfo<T> {
-            id: number;
-            info: T;
-        }
+declare namespace pusher {
+    interface PusherStatic {
+        new (apiKey: string, config?: Config): Pusher;
     }
 
-    var pusher: pusher.PusherStatic;
+    interface Pusher {
+        subscribe(name: string): Channel;
+        subscribeAll(): void;
+        unsubscribe(name: string): void;
+        channel(name: string): Channel;
+        allChannels(): Channel[];
+        bind(eventName: string, callback: Function): Pusher;
+        bind_all(callback: Function): Pusher;
+        disconnect(): void;
+        key: string;
+        config: Config; //TODO: add GlobalConfig typings
+        channels: any; //TODO: Type this
+        global_emitter: EventsDispatcher;
+        sessionId: number;
+        timeline: any; //TODO: Type this
+        connection: ConnectionManager;
+    }
 
-    export = pusher;
+    interface Config {
+        /**
+         * Forces the connection to use encrypted transports.
+         */
+        encrypted?: boolean;
+
+        /**
+         * Endpoint on your server that will return the authentication signature needed for private channels.
+         */
+        authEndpoint?: string;
+
+        /**
+         * Defines how the authentication endpoint, defined using authEndpoint, will be called.
+         * There are two options available: ajax and jsonp.
+         */
+        authTransport?: string;
+
+        /**
+         * Allows passing additional data to authorizers. Supports query string params and headers (AJAX only).
+         * For example, following will pass foo=bar via the query string and baz: boo via headers:
+         */
+        auth?: AuthConfig;
+
+
+        /**
+         * Allows connecting to a different datacenter by setting up correct hostnames and ports for the connection.
+         */
+        cluster?: string;
+
+
+        /**
+         * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers.
+         */
+        disableStats?: boolean;
+
+        /**
+         * Specifies which transports should be used by Pusher to establish a connection.
+         * Useful for applications running in controlled, well-behaving environments.
+         * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
+         * Additional transports may be added in the future and without adding them to this list, they will be disabled.
+         */
+        enabledTransports?: string[];
+
+
+        /**
+         * Specified which transports must not be used by Pusher to establish a connection.
+         * This settings overwrites transports whitelisted via the enabledTransports options.
+         * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
+         * Additional transports may be added in the future and without adding them to this list, they will be enabled.
+         */
+        disabledTransports?: string[];
+
+        /**
+         * Ignores null origin checks for HTTP fallbacks. Use with care, it should be disabled only if necessary (i.e. PhoneGap).
+         */
+        ignoreNullOrigin?: boolean;
+
+        /**
+         * After this time (in miliseconds) without any messages received from the server,
+         * a ping message will be sent to check if the connection is still working.
+         * Default value is is supplied by the server, low values will result in unnecessary traffic.
+         */
+        activityTimeout?: number;
+
+        /**
+         * Time before the connection is terminated after sending a ping message.
+         * Default is 30000 (30s). Low values will cause false disconnections, if latency is high.
+         */
+        pongTimeout?: number;
+
+        wsHost?: string;
+        wsPort?: number;
+        wssPort?: number;
+        httpHost?: string;
+        httpPort?: number;
+        httpsPort?: number;
+    }
+
+    interface AuthConfig {
+        params?: { [key: string]: any };
+        headers?: { [key: string]: any };
+    }
+
+    interface GenericEventsDispatcher<Self extends EventsDispatcher> extends EventsDispatcher {
+        bind(eventName: string, callback: Function, context?: any): Self;
+        bind_all(callback: Function): Self;
+        unbind(eventName?: string, callback?: Function, context?: any): Self;
+        unbind_all(eventName?: string, callback?: Function): Self;
+        emit(eventName: string, data?: any): Self;
+    }
+
+    interface Channel extends GenericEventsDispatcher<Channel> {
+        /** Triggers an event */
+        trigger(eventName: string, data?: any): boolean;
+        pusher: Pusher;
+        name: string;
+        subscribed: boolean;
+        /**
+         * Authenticates the connection as a member of the channel.
+         * @param  {String} socketId
+         * @param  {Function} callback
+         */
+        authorize(socketId: string, callback: (data: any) => void): void;
+    }
+
+    interface EventsDispatcher {
+        bind(eventName: string, callback: Function, context?: any): EventsDispatcher;
+        bind_all(callback: Function): EventsDispatcher;
+        unbind(eventName?: string, callback?: Function, context?: any): EventsDispatcher;
+        unbind_all(eventName?: string, callback?: Function): EventsDispatcher;
+        emit(eventName: string, data?: any): EventsDispatcher;
+    }
+
+    interface ConnectionManager extends GenericEventsDispatcher<ConnectionManager> {
+        key: string;
+        options: any; //TODO: Timeline.js
+        state: string;
+        connection: any; //TODO: Type this
+        encrypted: boolean;
+        timeline: any; //TODO: Type this
+        connectionCallbacks: {
+            message: (message: string) => void;
+            ping: () => void;
+            activity: () => void;
+            error: (error: any) => void;
+            closed: () => void;
+        };
+        errorCallbacks: {
+            ssl_only: () => void;
+            refused: () => void;
+            backoff: () => void;
+            retry: () => void;
+        };
+        handshakeCallbacks: {
+            ssl_only: () => void;
+            refused: () => void;
+            backoff: () => void;
+            retry: () => void;
+            connected: (handshake: any) => void; //TODO: Type this
+        };
+        /**
+         * Establishes a connection to Pusher.
+         *
+         * Does nothing when connection is already established. See top-level doc
+         * to find events emitted on connection attempts.
+         */
+        connect(): void;
+        /**
+         * Sends raw data.
+         * @param {String} data
+         */
+        send(data: string): boolean;
+        /** Sends an event.
+         *
+         * @param {String} name
+         * @param {String} data
+         * @param {String} [channel]
+         * @returns {Boolean} whether message was sent or not
+         */
+        send_event(name: string, data: string, channel: string): boolean;
+        /** Closes the connection. */
+        disconnect(): void;
+        isEncrypted(): boolean;
+    }
+
+    interface PresenceChannel<T> extends Channel {
+        members: Members<T>;
+    }
+
+    interface Members<T> {
+        /**
+         * Returns member's info for given id.
+         *
+         * Resulting object containts two fields - id and info.
+         *
+         * @param {Number} id
+         * @return {Object} member's info or null
+         */
+        get(id: number): T;
+        /**
+         * Calls back for each member in unspecified order.
+         *
+         * @param  {Function} callback
+         */
+        each(callback: (member: any) => void): void;
+        members: { [id: number]: UserInfo<T> };
+        count: number;
+        myID: number;
+        me: UserInfo<T>;
+    }
+
+    interface UserInfo<T> {
+        id: number;
+        info: T;
+    }
 }
+
+declare var pusher: pusher.PusherStatic;
+
+export = pusher;
diff --git a/query-string/query-string.d.ts b/query-string/query-string.d.ts
index 807b38935a..ea797e3f8e 100644
--- a/query-string/query-string.d.ts
+++ b/query-string/query-string.d.ts
@@ -3,25 +3,24 @@
 // Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "query-string" {
-    /**
-     * Parse a query string into an object.
-     * Leading ? or # are ignored, so you can pass location.search or location.hash directly.
-     * @param str
-     */
-    export function parse(str: string): any;
 
-    /**
-     * Stringify an object into a query string, sorting the keys.
-     *
-     * @param obj
-     */
-    export function stringify(obj: any, options?: {strict: boolean}): string;
+/**
+ * Parse a query string into an object.
+ * Leading ? or # are ignored, so you can pass location.search or location.hash directly.
+ * @param str
+ */
+declare export function parse(str: string): any;
 
-    /**
-     * Extract a query string from a URL that can be passed into .parse().
-     *
-     * @param str
-     */
-    export function extract(str: string): string;
-}
+/**
+ * Stringify an object into a query string, sorting the keys.
+ *
+ * @param obj
+ */
+declare export function stringify(obj: any, options?: { strict: boolean }): string;
+
+/**
+ * Extract a query string from a URL that can be passed into .parse().
+ *
+ * @param str
+ */
+declare export function extract(str: string): string;
diff --git a/rabbit.js/rabbit.js.d.ts b/rabbit.js/rabbit.js.d.ts
index 7e09cfe14a..a0cbb02d77 100644
--- a/rabbit.js/rabbit.js.d.ts
+++ b/rabbit.js/rabbit.js.d.ts
@@ -5,32 +5,32 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "rabbit.js" {
-  import events = require('events');
-  import stream = require('stream');
 
-  export function createContext(url?: string): Context;
+import events = require('events');
+import stream = require('stream');
 
-  export class Context extends events.EventEmitter {
-    public socket<T>(type: string, options?: SocketOptions):T;
+declare export function createContext(url?: string): Context;
+
+declare export class Context extends events.EventEmitter {
+    public socket<T>(type: string, options?: SocketOptions): T;
     public close(callback: Function): any;
-  }
+}
 
-  export interface SocketOptions {
+export interface SocketOptions {
     prefetch?: any;
     expiration?: any;
     persistent?: any;
     topic?: any;
     task?: any;
-  }
+}
 
-  export interface Socket {
+export interface Socket {
     connect(destination: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
     close(): any;
-  }
+}
 
-  export class PubSocket extends stream.Writable implements Socket {
+declare export class PubSocket extends stream.Writable implements Socket {
     constructor(channel: string, opts: SocketOptions);
     connect(destination: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
@@ -38,30 +38,30 @@ declare module "rabbit.js" {
 
     publish(topic: string, chunk: string, encoding?: string): any;
     publish(topic: string, chunk: Buffer, encoding?: string): any;
-  }
+}
 
-  export class SubSocket extends stream.Readable implements Socket {
+declare export class SubSocket extends stream.Readable implements Socket {
     constructor(channel: string, opts: SocketOptions);
     connect(source: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
     close(): any;
-  }
+}
 
-  export class PushSocket extends stream.Writable implements Socket {
+declare export class PushSocket extends stream.Writable implements Socket {
     constructor(channel: string, opts: SocketOptions);
     connect(destination: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
     close(): any;
-  }
+}
 
-  export class PullSocket extends stream.Readable implements Socket {
+declare export class PullSocket extends stream.Readable implements Socket {
     constructor(channel: string, opts: SocketOptions);
     connect(source: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
     close(): any;
-  }
+}
 
-  export class WorkerSocket extends stream.Readable implements Socket {
+declare export class WorkerSocket extends stream.Readable implements Socket {
     constructor(channel: string, opts: SocketOptions);
     connect(source: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
@@ -70,23 +70,23 @@ declare module "rabbit.js" {
     ack(): any;
     requeue(): any;
     discard(): any;
-  }
+}
 
-  export interface RequestMessage {
+export interface RequestMessage {
     properties: { correlationId: number };
     content: any;
-  }
+}
 
-  export class ReqSocket extends stream.Duplex implements Socket {
+declare export class ReqSocket extends stream.Duplex implements Socket {
     constructor(channel: string, opts: SocketOptions);
     connect(destination: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
     close(): any;
 
     handleReply(msg: RequestMessage): any;
-  }
+}
 
-  export class RepSocket extends stream.Duplex implements Socket {
+declare export class RepSocket extends stream.Duplex implements Socket {
     constructor(channel: string, opts: SocketOptions);
     connect(source: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
@@ -94,9 +94,9 @@ declare module "rabbit.js" {
 
     requeue(): any;
     discard(): any;
-  }
+}
 
-  export class TaskSocket extends stream.Writable implements Socket {
+declare export class TaskSocket extends stream.Writable implements Socket {
     constructor(channel: string, opts: SocketOptions);
     connect(destination: string, callback?: Function): any;
     setsockopt(opt: string, value: string): any;
@@ -104,5 +104,4 @@ declare module "rabbit.js" {
 
     post(task: string, chunk: string, encoding?: string): any;
     post(task: string, chunk: Buffer, encoding?: string): any;
-  }
 }
diff --git a/radium/radium.d.ts b/radium/radium.d.ts
index 438d07aee4..dbd4543c0f 100644
--- a/radium/radium.d.ts
+++ b/radium/radium.d.ts
@@ -5,16 +5,15 @@
 
 /// <reference path="../react/react.d.ts"/>
 
-declare module 'radium' {
-    import React = require('react');
 
-    interface ReactComponent<P, S> {
-        new (p: P): React.Component<P, S>;
-    }
+import React = require('react');
 
-    var Radium: {
-        <T extends ReactComponent<any, any>>(comp: T): T;
-    };
-
-    export = Radium;
+interface ReactComponent<P, S> {
+    new (p: P): React.Component<P, S>;
 }
+
+declare var Radium: {
+    <T extends ReactComponent<any, any>>(comp: T): T;
+};
+
+export = Radium;
diff --git a/radius/radius.d.ts b/radius/radius.d.ts
index 4e4b41c048..4c297f1eb3 100644
--- a/radius/radius.d.ts
+++ b/radius/radius.d.ts
@@ -5,102 +5,101 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "radius" {
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusdecodeargs} for more info.
-     **/
-    export function decode(args: DecodeArgsWithSecret): RadiusPacket;
 
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusdecode_without_secretargs} for more info.
-     **/
-    export function decode_without_secret(args: DecodeArgs): RadiusPacket;
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusdecodeargs} for more info.
+ **/
+declare export function decode(args: DecodeArgsWithSecret): RadiusPacket;
 
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusencodeargs} for more info.
-     **/
-    export function encode(args: EncodeArgs): Buffer;
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusdecode_without_secretargs} for more info.
+ **/
+declare export function decode_without_secret(args: DecodeArgs): RadiusPacket;
 
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusencode_responseargs} for more info.
-     **/
-    export function encode_response(args: EncodeResponseArgs): Buffer;
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusencodeargs} for more info.
+ **/
+declare export function encode(args: EncodeArgs): Buffer;
 
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusverify_responseargs} for more info.
-     **/
-    export function verify_response(args: VerifyResponseArgs):boolean;
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusencode_responseargs} for more info.
+ **/
+declare export function encode_response(args: EncodeResponseArgs): Buffer;
 
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusverify_responseargs} for more info.
+ **/
+declare export function verify_response(args: VerifyResponseArgs): boolean;
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusadd_dictionarypath} for more info.
+ * 
+ * @param path Can be either a path to a file or a directory.
+ **/
+declare export function add_dictionary(path: string): void;
+
+declare export function unload_dictionaries(): void;
+
+
+
+
+
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusdecode_without_secretargs} for more info.
+ **/
+interface DecodeArgs {
+    packet: Buffer;
+}
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusdecodeargs} for more info.
+ **/
+interface DecodeArgsWithSecret extends DecodeArgs {
+    secret: string;
+}
+
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusencodeargs} for more info.
+ **/
+interface EncodeArgs {
+    code: string;
+    secret: string;
+    identifier?: number;
     /**
-     * {@link https://github.com/retailnext/node-radius#radiusadd_dictionarypath} for more info.
+     * This can be an object: { attribute_name: attribute_value, ... }, 
+     * an array within an array: [ [ attribute_name, attribute_value ], ... ],
+     * or if you haven't loaded a dictionary for the attributes: [ [ attribute_id, Buffer ], ... ].
      * 
-     * @param path Can be either a path to a file or a directory.
+     * Tag field-attributes can be specified like so: [ [ attribute_name, tag_number, attribute_value ] ... ]
      **/
-    export function add_dictionary(path:string): void;
+    attributes?: any;
+    add_message_authenticator?: boolean;
+}
 
-    export function unload_dictionaries(): void;
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusencode_responseargs} for more info.
+ **/
+interface EncodeResponseArgs {
+    packet: RadiusPacket;
+    code: string;
+    secret: string;
+    attributes?: any;
+}
 
+/**
+ * {@link https://github.com/retailnext/node-radius#radiusverify_responseargs} for more info.
+ **/
+interface VerifyResponseArgs {
+    request: Buffer;
+    response: Buffer;
+    secret: string;
+}
 
-
-
-
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusdecode_without_secretargs} for more info.
-     **/
-    interface DecodeArgs {
-        packet: Buffer;
-    }
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusdecodeargs} for more info.
-     **/
-    interface DecodeArgsWithSecret extends DecodeArgs {
-        secret: string;
-    }
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusencodeargs} for more info.
-     **/
-    interface EncodeArgs {
-        code: string;
-        secret: string;
-        identifier?: number;
-        /**
-         * This can be an object: { attribute_name: attribute_value, ... }, 
-         * an array within an array: [ [ attribute_name, attribute_value ], ... ],
-         * or if you haven't loaded a dictionary for the attributes: [ [ attribute_id, Buffer ], ... ].
-         * 
-         * Tag field-attributes can be specified like so: [ [ attribute_name, tag_number, attribute_value ] ... ]
-         **/
-        attributes?: any;
-        add_message_authenticator?: boolean;
-    }
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusencode_responseargs} for more info.
-     **/
-    interface EncodeResponseArgs {
-        packet: RadiusPacket;
-        code: string;
-        secret: string;
-        attributes?: any;
-    }
-
-    /**
-     * {@link https://github.com/retailnext/node-radius#radiusverify_responseargs} for more info.
-     **/
-    interface VerifyResponseArgs {
-        request: Buffer;
-        response: Buffer;
-        secret: string;
-    }
-
-    interface RadiusPacket {
-        code: string;
-        identifier: number;
-        length: number;
-        attributes: any;
-        raw_attributes: Array<Array<any>>
-    }
-}
\ No newline at end of file
+interface RadiusPacket {
+    code: string;
+    identifier: number;
+    length: number;
+    attributes: any;
+    raw_attributes: Array<Array<any>>
+}
diff --git a/random-string/random-string.d.ts b/random-string/random-string.d.ts
index 5fc955adfa..0297e67ce1 100644
--- a/random-string/random-string.d.ts
+++ b/random-string/random-string.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "random-string" {
-	function randomString(opts?: Object): string;
-	export = randomString;
-}
+
+declare function randomString(opts?: Object): string;
+export = randomString;
diff --git a/ratelimiter/ratelimiter.d.ts b/ratelimiter/ratelimiter.d.ts
index 4ea3a43fa1..e5c3b72e7e 100644
--- a/ratelimiter/ratelimiter.d.ts
+++ b/ratelimiter/ratelimiter.d.ts
@@ -5,57 +5,56 @@
 
 /// <reference path="../redis/redis.d.ts" />
 
-declare module "ratelimiter" {
-	import { RedisClient } from 'redis';
 
-	interface LimiterOption {
-		/**
-		 * The identifier to limit against (typically a user id)
-		 */
-		id: string;
+import { RedisClient } from 'redis';
 
-		/**
-		 * Redis connection instance
-		 */
-		db: RedisClient;
+interface LimiterOption {
+    /**
+     * The identifier to limit against (typically a user id)
+     */
+    id: string;
 
-		/**
-		 * Max requests within duration
-		 */
-		max?: number;
+    /**
+     * Redis connection instance
+     */
+    db: RedisClient;
 
-		/**
-		 * Duration of limit in milliseconds
-		 */
-		duration?: number;
-	}
+    /**
+     * Max requests within duration
+     */
+    max?: number;
 
-	interface LimiterInfo {
-		/**
-		 * max value
-		 */
-		total: number;
-
-		/**
-		 * Number of calls left in current duration without decreasing current get
-		 */
-		remaining: number;
-
-		/**
-		 * Time in milliseconds until the end of current duration
-		 */
-		reset: number;
-	}
-
-	class Limiter {
-		constructor(opts: LimiterOption);
-
-		inspect(): string;
-
-		get(fn: (err: any, info: LimiterInfo) => void): void;
-	}
-
-	namespace Limiter {}
-
-	export = Limiter;
+    /**
+     * Duration of limit in milliseconds
+     */
+    duration?: number;
 }
+
+interface LimiterInfo {
+    /**
+     * max value
+     */
+    total: number;
+
+    /**
+     * Number of calls left in current duration without decreasing current get
+     */
+    remaining: number;
+
+    /**
+     * Time in milliseconds until the end of current duration
+     */
+    reset: number;
+}
+
+declare class Limiter {
+    constructor(opts: LimiterOption);
+
+    inspect(): string;
+
+    get(fn: (err: any, info: LimiterInfo) => void): void;
+}
+
+declare namespace Limiter { }
+
+export = Limiter;
diff --git a/rcloader/rcloader.d.ts b/rcloader/rcloader.d.ts
index edba798419..72e3f1f8cc 100644
--- a/rcloader/rcloader.d.ts
+++ b/rcloader/rcloader.d.ts
@@ -3,16 +3,15 @@
 // Definitions by: Panu Horsmalahti <https://github.com/panuhorsmalahti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "rcloader" {
-    interface Options {
-        [property: string]: any;
-        lookup?: boolean;
-    }
 
-    class RcLoader {
-        constructor(configfilename: string, options: string | Options);
-        for(path: string, callback?: (error: any, fileOpts: any) => void): void;
-    }
-
-    export = RcLoader;
+interface Options {
+    [property: string]: any;
+    lookup?: boolean;
 }
+
+declare class RcLoader {
+    constructor(configfilename: string, options: string | Options);
+    for(path: string, callback?: (error: any, fileOpts: any) => void): void;
+}
+
+export = RcLoader;
diff --git a/react-bootstrap-table/react-bootstrap-table.d.ts b/react-bootstrap-table/react-bootstrap-table.d.ts
index a93b716fbb..9c08e8872e 100644
--- a/react-bootstrap-table/react-bootstrap-table.d.ts
+++ b/react-bootstrap-table/react-bootstrap-table.d.ts
@@ -6,110 +6,109 @@
 /// <reference path="../react/react.d.ts" />
 /// <reference path="../node/node.d.ts" />
 
-declare module "react-bootstrap-table" {
-	import { ComponentClass, Props, ReactElement } from 'react';
-	import { EventEmitter } from 'events';
 
-	interface SelectRow {
-		mode?: string;
-		bgColor?: string;
-		selected?: any[];
-		onSelect?: Function;
-		onSelectAll?: Function;
-		clickToSelect?: boolean;
-		hideSelectColumn?: boolean;
-		clickToSelectAndEditCell?: boolean;
-		showOnlySelected?: boolean;
-	}
+import { ComponentClass, Props, ReactElement } from 'react';
+import { EventEmitter } from 'events';
 
-	interface CellEdit {
-		mode?: string;
-		blurToSave?: boolean;
-		afterSaveCell?: Function;
-	}
-
-	interface Options {
-		sortName?: string;
-		sortOrder?: string;
-		afterTableComplete?: Function;
-		afterDeleteRow?: Function;
-		afterInsertRow?: Function;
-		afterSearch?: Function;
-		afterColumnFilter?: Function;
-		onRowClick?: Function;
-		page?: number;
-		sizePerPageList?: number[];
-		sizePerPage?: number;
-		paginationSize?: number;
-		onSortChange?: Function;
-		onPageChange?: Function;
-		onSizePerPageList?: Function;
-		noDataText?: string;
-		handleConfirmDeleteRow?: Function;
-	}
-
-	interface FetchInfo {
-		dataTotalSize?: number;
-	}
-
-	interface BootstrapTableProps extends Props<BootstrapTable> {
-		keyField?: string;
-		height?: string;
-		maxHeight?: string;
-		data?: any;
-		remote?: boolean;
-		striped?: boolean;
-		bordered?: boolean;
-		hover?: boolean;
-		condensed?: boolean;
-		pagination?: boolean;
-		searchPlaceholder?: string;
-		selectRow?: SelectRow;
-		cellEdit?: CellEdit;
-		insertRow?: boolean;
-		deleteRow?: boolean;
-		search?: boolean;
-		columnFilter?: boolean;
-		trClassName?: any;
-		options?: Options;
-		fetchInfo?: FetchInfo;
-		exportCSV?: boolean;
-		csvFileName?: string;
-	}
-
-	interface BootstrapTable extends ComponentClass<BootstrapTableProps> { }
-	const BootstrapTable: BootstrapTable;
-
-	interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
-		dataField?: string;
-		dataAlign?: string;
-		dataSort?: boolean;
-		onSort?: Function;
-		dataFormat?: Function;
-		isKey?: boolean;
-		editable?: any;
-		hidden?: boolean;
-		className?: string;
-		width?: string;
-		sortFunc?: Function;
-		columnClassName?: any;
-		filterFormatted?: boolean;
-		sort?: string;
-	}
-
-	interface TableHeaderColumn extends ComponentClass<TableHeaderColumnProps> { }
-	const TableHeaderColumn: TableHeaderColumn;
-
-	class TableDataSet extends EventEmitter {
-		constructor(data: any);
-		setData(data: any): void;
-		clear(): void;
-		getData(): any;
-	}
-
-	export {
-		BootstrapTable,
-		TableHeaderColumn,
-		TableDataSet
-	}
+interface SelectRow {
+    mode?: string;
+    bgColor?: string;
+    selected?: any[];
+    onSelect?: Function;
+    onSelectAll?: Function;
+    clickToSelect?: boolean;
+    hideSelectColumn?: boolean;
+    clickToSelectAndEditCell?: boolean;
+    showOnlySelected?: boolean;
+}
+
+interface CellEdit {
+    mode?: string;
+    blurToSave?: boolean;
+    afterSaveCell?: Function;
+}
+
+interface Options {
+    sortName?: string;
+    sortOrder?: string;
+    afterTableComplete?: Function;
+    afterDeleteRow?: Function;
+    afterInsertRow?: Function;
+    afterSearch?: Function;
+    afterColumnFilter?: Function;
+    onRowClick?: Function;
+    page?: number;
+    sizePerPageList?: number[];
+    sizePerPage?: number;
+    paginationSize?: number;
+    onSortChange?: Function;
+    onPageChange?: Function;
+    onSizePerPageList?: Function;
+    noDataText?: string;
+    handleConfirmDeleteRow?: Function;
+}
+
+interface FetchInfo {
+    dataTotalSize?: number;
+}
+
+interface BootstrapTableProps extends Props<BootstrapTable> {
+    keyField?: string;
+    height?: string;
+    maxHeight?: string;
+    data?: any;
+    remote?: boolean;
+    striped?: boolean;
+    bordered?: boolean;
+    hover?: boolean;
+    condensed?: boolean;
+    pagination?: boolean;
+    searchPlaceholder?: string;
+    selectRow?: SelectRow;
+    cellEdit?: CellEdit;
+    insertRow?: boolean;
+    deleteRow?: boolean;
+    search?: boolean;
+    columnFilter?: boolean;
+    trClassName?: any;
+    options?: Options;
+    fetchInfo?: FetchInfo;
+    exportCSV?: boolean;
+    csvFileName?: string;
+}
+
+interface BootstrapTable extends ComponentClass<BootstrapTableProps> { }
+declare const BootstrapTable: BootstrapTable;
+
+interface TableHeaderColumnProps extends Props<TableHeaderColumn> {
+    dataField?: string;
+    dataAlign?: string;
+    dataSort?: boolean;
+    onSort?: Function;
+    dataFormat?: Function;
+    isKey?: boolean;
+    editable?: any;
+    hidden?: boolean;
+    className?: string;
+    width?: string;
+    sortFunc?: Function;
+    columnClassName?: any;
+    filterFormatted?: boolean;
+    sort?: string;
+}
+
+interface TableHeaderColumn extends ComponentClass<TableHeaderColumnProps> { }
+declare const TableHeaderColumn: TableHeaderColumn;
+
+declare class TableDataSet extends EventEmitter {
+    constructor(data: any);
+    setData(data: any): void;
+    clear(): void;
+    getData(): any;
+}
+
+export {
+BootstrapTable,
+TableHeaderColumn,
+TableDataSet
 }
diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts
index e64f831de5..bebe00815d 100644
--- a/react-bootstrap/react-bootstrap.d.ts
+++ b/react-bootstrap/react-bootstrap.d.ts
@@ -5,760 +5,759 @@
 
 ///<reference path="../react/react.d.ts"/>
 
-declare module "react-bootstrap" {
-    // Import React
-    import React = require("react");
+
+// Import React
+import React = require("react");
 
 
-    // <Button />
-    // ----------------------------------------
-    interface ButtonProps extends React.HTMLAttributes {
+// <Button />
+// ----------------------------------------
+interface ButtonProps extends React.HTMLAttributes {
 
-        // Optional
-        active?: boolean;
-        block?: boolean;
-        bsStyle?: string;
-        bsSize?: string;
-        navItem?: boolean;
-        navDropdown?: boolean;
-        componentClass?: string;
-    }
-    type Button = React.ClassicComponent<ButtonProps, {}>;
-    var Button: React.ClassicComponentClass<ButtonProps>;
-
-    // <ButtonToolbar />
-    // ----------------------------------------
-    interface ButtonToolbarProps extends React.HTMLAttributes {
-
-        // Optional
-        block?: boolean;
-        bsSize?: string;
-        bsStyle?: string;
-        justified?: boolean;
-        vertical?: boolean;
-    }
-    type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps, {}>;
-    var ButtonToolbar: React.ClassicComponentClass<ButtonToolbarProps>;
-
-    // <ButtonGroup />
-    // ----------------------------------------
-    interface ButtonGroupProps extends React.HTMLAttributes {
-        // Optional
-        block?: boolean;
-        bsSize?: string;
-        bsStyle?: string;
-        justified?: boolean;
-        vertical?: boolean;
-    }
-    type ButtonGroup = React.ClassicComponent<ButtonGroupProps, {}>;
-    var ButtonGroup: React.ClassicComponentClass<ButtonGroupProps>;
-
-    // <DropdownButton />
-    // ----------------------------------------
-    interface DropdownButtonProps extends React.HTMLAttributes {
-        bsStyle?: string;
-        bsSize?: string;
-        buttonClassName?: string;
-        dropup?: boolean;
-        navItem?: boolean;
-        noCaret?: boolean;
-        pullRight?: boolean;
-    }
-    class DropdownButton extends React.Component<DropdownButtonProps, {}> {
-    }
-
-    // <SplitButton />
-    // ----------------------------------------
-    interface SplitButtonProps extends React.HTMLAttributes {
-        bsStyle?: string;
-        bsSize?: string;
-        dropdownTitle?: any; // TODO: Add more specific type
-        dropup?: boolean;
-        pullRight?: boolean;
-    }
-    class SplitButton extends React.Component<SplitButtonProps, {}> {
-    }
-
-    // <MenuItem />
-    // ----------------------------------------
-    interface MenuItemProps extends React.HTMLAttributes {
-        active?: boolean;
-        divider?: boolean;
-        eventKey?: any;
-        header?: boolean;
-    }
-    class MenuItem extends React.Component<MenuItemProps, {}> {
-    }
-
-    // <Panel />
-    // ----------------------------------------
-    interface PanelProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-        collapsible?: boolean;
-        defaultExpanded?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        footer?: any; // TODO: Add more specific type
-        header?: any; // TODO: Add more specific type
-    }
-    type Panel = React.ClassicComponent<PanelProps, {}>;
-    var Panel: React.ClassicComponentClass<PanelProps>;
-
-    // <Accordion />
-    // ----------------------------------------
-    interface AccordionProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-        collapsible?: boolean;
-        defaultExpanded?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        footer?: any; // TODO: Add more specific type
-        header?: any; // TODO: Add more specific type
-    }
-    type Accordion = React.ClassicComponent<AccordionProps, {}>;
-    var Accordion: React.ClassicComponentClass<AccordionProps>;
-
-    // <PanelGroup />
-    // ----------------------------------------
-    interface PanelGroupProps extends React.HTMLAttributes {
-        accordion?: boolean;
-        activeKey?: any;
-        bsSize?: string;
-        bsStyle?: string;
-        defaultActiveKey?: any;
-    }
-    type PanelGroup = React.ClassicComponent<PanelGroupProps, {}>;
-    var PanelGroup: React.ClassicComponentClass<PanelGroupProps>;
-
-    // <Modal.Dialog />
-    // ----------------------------------------
-    interface ModalDialogProps extends React.HTMLAttributes {
-        // TODO: Add more specific type
-    }
-    type ModalDialog = React.ClassicComponent<ModalDialogProps, {}>;
-    var ModalDialog: React.ClassicComponentClass<ModalDialogProps>;
-
-    // <Modal.Header />
-    // ----------------------------------------
-  interface ModalHeaderProps extends React.HTMLAttributes {
-        closeButton?: boolean;
-        modalClassName?: string;
-        onHide?: Function;
-        // undefined?: string;
-    }
-    class ModalHeader extends React.Component<ModalHeaderProps, {}> {
-    }
-
-    // <Modal.Title/>
-    // ----------------------------------------
-    interface ModalTitleProps extends React.HTMLAttributes {
-        modalClassName?: string;
-    }
-    class ModalTitle extends React.Component<ModalTitleProps, {}> {
-    }
-
-    // <Modal.Body />
-    // ----------------------------------------
-    interface ModalBodyProps extends React.HTMLAttributes {
-        modalClassName?: string;
-    }
-    class ModalBody extends React.Component<ModalBodyProps, {}> {
-    }
-
-    // <Modal.Footer />
-    // ----------------------------------------
-    interface ModalFooterProps extends React.HTMLAttributes {
-        modalClassName?: string;
-    }
-    class ModalFooter extends React.Component<ModalFooterProps, {}> {
-    }
-
-    // <Modal />
-    // ----------------------------------------
-    interface ModalProps extends React.HTMLAttributes {
-        // Required
-        onHide: Function;
-
-        // Optional
-        animation?: boolean;
-        backdrop?: boolean|string;
-        bsSize?: string;
-        container?: any; // TODO: Add more specific type
-        dialogClassName?: string;
-        dialogComponent?: any; // TODO: Add more specific type
-        enforceFocus?: boolean;
-        keyboard?: boolean;
-        show?: boolean;
-    }
-    interface ModalClass extends React.ClassicComponentClass<ModalProps> {
-        Body: typeof ModalBody;
-        Header: typeof ModalHeader;
-        Title: typeof ModalTitle;
-        Footer: typeof ModalFooter;
-        Dialog: typeof ModalDialog;
-    }
-    type Modal = React.ClassicComponent<ModalProps, {}>;
-    var Modal: ModalClass;
-
-
-    // <OverlayTrigger />
-    // ----------------------------------------
-    interface OverlayTriggerProps {
-        // Required
-        overlay: any; // TODO: Add more specific type
-
-        // Optional
-        animation?: any; // TODO: Add more specific type
-        container?: any; // TODO: Add more specific type
-        containerPadding?: number;
-        defaultOverlayShown?: boolean;
-        delay?: number;
-        delayHide?: number;
-        delayShow?: number;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        placement?: string;
-        rootClose?: boolean;
-        trigger?: string | string[];
-    }
-    type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps, {}>;
-    var OverlayTrigger: React.ClassicComponentClass<OverlayTriggerProps>;
-
-    // <Tooltip />
-    // ----------------------------------------
-    interface TooltipProps extends React.HTMLAttributes {
-        // Optional
-        arrowOffsetLeft?: number | string;
-        arrowOffsetTop?: number | string;
-        bsSize?: string;
-        bsStyle?: string;
-        placement?: string;
-        positionLeft?: number;
-        positionTop?: number;
-    }
-    type Tooltip = React.ClassicComponent<TooltipProps, {}>;
-    var Tooltip: React.ClassicComponentClass<TooltipProps>;
-
-    // <Popover/>
-    // ----------------------------------------
-    interface PopoverProps  extends React.HTMLAttributes {
-        // Optional
-        arrowOffsetLeft?: number | string;
-        arrowOffsetTop?: number | string;
-        bsSize?: string;
-        bsStyle?: string;
-        placement?: string;
-        positionLeft?: number;
-        positionTop?: number;
-    }
-    type Popover = React.ClassicComponent<PopoverProps, {}>;
-    var Popover: React.ClassicComponentClass<PopoverProps>;
-
-    // <Overlay />
-    // ----------------------------------------
-    interface OverlayProps {
-        // Optional
-        animation?: any; // TODO: Add more specific type
-        container?: any; // TODO: Add more specific type
-        containerPadding?: number; // TODO: Add more specific type
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        onHide?: Function;
-        placement?: string;
-        rootClose?: boolean;
-        show?: boolean;
-        target?: Function;
-    }
-    class Overlay extends React.Component<OverlayProps, {}> {
-    }
-
-    // <ProgressBar />
-    // ----------------------------------------
-    interface ProgressBarProps extends React.HTMLAttributes {
-        // Optional
-        active?: boolean;
-        bsSize?: string;
-        bsStyle?: string;
-        interpolatedClass?: any; // TODO: Add more specific type
-        max?: number;
-        min?: number;
-        now?: number;
-        srOnly?: boolean;
-        striped?: boolean;
-    }
-    class ProgressBar extends React.Component<ProgressBarProps, {}> {
-    }
-
-    // <Nav />
-    // ----------------------------------------
-    // TODO: This one turned into a union of two different types
-    interface NavProps extends React.HTMLAttributes {
-        // Optional
-        activeHref?: string;
-        activeKey?: any;
-        bsSize?: string;
-        bsStyle?: string;
-        collapsible?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        justified?: boolean;
-        navbar?: boolean;
-        pullRight?: boolean;
-        right?: boolean;
-        stacked?: boolean;
-        ulClassName?: string;
-        ulId?: string;
-    }
-    class Nav extends React.Component<NavProps, {}> {
-    }
-
-    // <NavItem />
-    // ----------------------------------------
-    interface NavItemProps extends React.HTMLAttributes {
-        active?: boolean;
-        brand?: any; // TODO: Add more specific type
-        bsSize?: string;
-        bsStyle?: string;
-        componentClass?: any; // TODO: Add more specific type
-        defaultNavExpanded?: boolean;
-        eventKey?: any;
-        fixedBottom?: boolean;
-        fixedTop?: boolean;
-        fluid?: boolean;
-        inverse?: boolean;
-        linkId?: string;
-        navExpanded?: boolean;
-        onToggle?: Function;
-        staticTop?: boolean;
-        toggleButton?: any; // TODO: Add more specific type
-        toggleNavKey?: string | number;
-    }
-    type NavItem = React.ClassicComponent<NavItemProps, {}>;
-    var NavItem: React.ClassicComponentClass<NavItemProps>;
-
-    // <Navbar.Brand />
-    // ----------------------------------------
-    interface NavbarBrandProps extends React.HTMLAttributes {
-    }
-    class NavbarBrand extends React.Component<NavbarBrandProps, {}> {
-    }
-
-    // <Navbar.Collapse />
-    // ----------------------------------------
-    interface NavbarCollapseProps {
-    }
-    type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps, {}>;
-    var NavbarCollapse: React.ClassicComponentClass<NavbarCollapseProps>;
-
-    // <Navbar.Header />
-    // ----------------------------------------
-    interface NavbarHeaderProps extends React.HTMLAttributes {
-    }
-    type NavbarHeader = React.ClassicComponent<NavbarHeaderProps, {}>;
-    var NavbarHeader: React.ClassicComponentClass<NavbarHeaderProps>;
-
-    // <Navbar.Toggle />
-    // ----------------------------------------
-    interface NavbarToggleProps {
-    }
-    type NavbarToggle = React.ClassicComponent<NavbarToggleProps, {}>;
-    var NavbarToggle: React.ClassicComponentClass<NavbarToggleProps>;
-
-    // <Navbar />
-    // ----------------------------------------
-    interface NavbarProps extends React.HTMLAttributes {
-        brand?: any; // TODO: Add more specific type
-        bsSize?: string;
-        bsStyle?: string;
-        componentClass?: any; // TODO: Add more specific type
-        defaultNavExpanded?: boolean;
-        fixedBottom?: boolean;
-        fixedTop?: boolean;
-        fluid?: boolean;
-        inverse?: boolean;
-        navExpanded?: boolean;
-        onToggle?: Function;
-        staticTop?: boolean;
-        toggleButton?: any; // TODO: Add more specific type
-        toggleNavKey?: string | number;
-    }
-    interface NavbarClass extends React.ClassicComponentClass<NavbarProps> {
-        Brand: typeof NavbarBrand;
-        Collapse: typeof NavbarCollapse;
-        Header: typeof NavbarHeader;
-        Toggle: typeof NavbarToggle;
-    }
-    type Navbar = React.ClassicComponent<NavbarProps, {}>;
-    var Navbar: NavbarClass;
-
-    // <NavDropdown />
-    // ----------------------------------------
-    interface NavDropdownProps extends React.HTMLAttributes {
-        eventKey?: any;
-    }
-    class NavDropdown extends React.Component<NavDropdownProps, {}> {
-    }
-
-    // <Tabs />
-    // ----------------------------------------
-    interface TabsProps extends React.HTMLAttributes {
-        activeKey?: any;
-        animation?: boolean;
-        bsStyle?: string;
-        defaultActiveKey?: any;
-        paneWidth?: any; // TODO: Add more specific type
-        position?: string;
-        tabWidth?: any; // TODO: Add more specific type
-    }
-    type Tabs = React.ClassicComponent<TabsProps, {}>;
-    var Tabs: React.ClassicComponentClass<TabsProps>;
-
-    // <Tab />
-    // ----------------------------------------
-    interface TabProps extends React.HTMLAttributes {
-        animation?: boolean;
-        eventKey?: any; // TODO: Add more specific type
-    }
-    type Tab = React.ClassicComponent<TabProps, {}>;
-    var Tab: React.ClassicComponentClass<TabProps>;
-
-    // <Pager />
-    // ----------------------------------------
-    interface PagerProps extends React.HTMLAttributes {
-    }
-    type Pager = React.ClassicComponent<PagerProps, {}>;
-    var Pager: React.ClassicComponentClass<PagerProps>;
-
-    // <PageItem />
-    // ----------------------------------------
-    interface PageItemProps extends React.HTMLAttributes {
-        eventKey?: any;
-        next?: boolean;
-        previous?: boolean;
-    }
-    type PageItem = React.ClassicComponent<PageItemProps, {}>;
-    var PageItem: React.ClassicComponentClass<PageItemProps>;
-
-    // <Pagination />
-    // ----------------------------------------
-    interface PaginationProps extends React.HTMLAttributes {
-        activePage?: number;
-        bsSize?: string;
-        bsStyle?: string;
-        buttonComponentClass?: any; // TODO: Add more specific type
-        ellipsis?: boolean;
-        first?: boolean;
-        items?: number;
-        last?: boolean;
-        maxButtons?: number;
-        next?: boolean;
-        prev?: boolean;
-    }
-    type Pagination = React.ClassicComponent<PaginationProps, {}>;
-    var Pagination: React.ClassicComponentClass<PaginationProps>;
-
-    // <Alert />
-    // ----------------------------------------
-    interface AlertProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-        closeLabel?: string;
-        dismissAfter?: number;
-        onDismiss?: Function;
-    }
-    type Alert = React.ClassicComponent<AlertProps, {}>;
-    var Alert: React.ClassicComponentClass<AlertProps>;
-
-    // <Carousel />
-    // ----------------------------------------
-    interface CarouselProps extends React.HTMLAttributes {
-        activeIndex?: number;
-        bsSize?: string;
-        bsStyle?: string;
-        controls?: boolean;
-        defaultActiveIndex?: number;
-        direction?: string;
-        indicators?: boolean;
-        interval?: number;
-        nextIcon?: any; // TODO: Add more specific type
-        onSlideEnd?: Function;
-        pauseOnHover?: boolean;
-        prevIcon?: any; // TODO: Add more specific type
-        slide?: boolean;
-    }
-    type Carousel = React.ClassicComponent<CarouselProps, {}>;
-    var Carousel: React.ClassicComponentClass<CarouselProps>;
-
-    // <CarouselItem />
-    // ----------------------------------------
-    interface CarouselItemProps extends React.HTMLAttributes {
-        active?: boolean;
-        animtateIn?: boolean;
-        animateOut?: boolean;
-        caption?: any; // TODO: Add more specific type
-        direction?: string;
-        index?: number;
-        onAnimateOutEnd?: Function;
-    }
-    type CarouselItem = React.ClassicComponent<CarouselItemProps, {}>;
-    var CarouselItem: React.ClassicComponentClass<CarouselItemProps>;
-
-    // <Grid />
-    // ----------------------------------------
-    interface GridProps extends React.HTMLAttributes {
-        componentClass?: any; // TODO: Add more specific type
-        fluid?: boolean;
-    }
-    type Grid = React.ClassicComponent<GridProps, {}>;
-    var Grid: React.ClassicComponentClass<GridProps>;
-
-    // <Row />
-    // ----------------------------------------
-    interface RowProps extends React.HTMLAttributes {
-        componentClass?: any; // TODO: Add more specific type
-    }
-    type Row = React.ClassicComponent<RowProps, {}>;
-    var Row: React.ClassicComponentClass<RowProps>;
-
-    // <Col />
-    // ----------------------------------------
-    interface ColProps extends React.HTMLAttributes {
-        componentClass?: any; // TODO: Add more specific type
-        lg?: number;
-        lgHidden?: boolean;
-        lgOffset?: number;
-        lgPull?: number;
-        lgPush?: number;
-        md?: number;
-        mdHidden?: boolean;
-        mdOffset?: number;
-        mdPull?: number;
-        mdPush?: number;
-        sm?: number;
-        smHidden?: boolean;
-        smOffset?: number;
-        smPull?: number;
-        smPush?: number;
-        xs?: number;
-        xsHidden?: boolean;
-        xsOffset?: number;
-        xsPull?: number;
-        xsPush?: number;
-    }
-    type Col = React.ClassicComponent<ColProps, {}>;
-    var Col: React.ClassicComponentClass<ColProps>;
-
-    // <Thumbnail />
-    // ----------------------------------------
-    interface ThumbnailProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-    }
-    type Thumbnail = React.ClassicComponent<ThumbnailProps, {}>;
-    var Thumbnail: React.ClassicComponentClass<ThumbnailProps>;
-
-    // <ListGroup />
-    // ----------------------------------------
-    interface ListGroupProps extends React.HTMLAttributes {
-        fill?: boolean; // TODO: Add more specific type
-    }
-    class ListGroup extends React.Component<ListGroupProps, {}> {
-    }
-
-    // <ListGroupItem />
-    // ----------------------------------------
-    interface ListGroupItemProps extends React.HTMLAttributes {
-        active?: any;
-        bsSize?: string;
-        bsStyle?: string;
-        eventKey?: any;
-        header?: any; // TODO: Add more specific type
-        key?: any; // TODO: Add more specific type
-        listItem?: boolean;
-    }
-    class ListGroupItem extends React.Component<ListGroupItemProps, {}> {
-    }
-
-    // <Label />
-    // ----------------------------------------
-    interface LabelProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-    }
-    class Label extends React.Component<LabelProps, {}> {
-    }
-
-    // <Badge />
-    // ----------------------------------------
-    interface BadgeProps extends React.HTMLAttributes {
-        pullRight?: boolean;
-    }
-    type Badge = React.ClassicComponent<BadgeProps, {}>;
-    var Badge: React.ClassicComponentClass<BadgeProps>;
-
-    // <Jumbotron />
-    // ----------------------------------------
-    interface JumbotronProps extends React.HTMLAttributes {
-        componentClass?: any; // TODO: Add more specific type
-    }
-    type Jumbotron = React.ClassicComponent<JumbotronProps, {}>;
-    var Jumbotron: React.ClassicComponentClass<JumbotronProps>;
-
-    // <PageHeader />
-    // ----------------------------------------
-    interface PageHeaderProps extends React.HTMLAttributes {
-    }
-    class PageHeader extends React.Component<PageHeaderProps, {}> {
-    }
-
-    // <Well />
-    // ----------------------------------------
-    interface WellProps extends React.HTMLAttributes {
-        bsSize?: string;
-        bsStyle?: string;
-    }
-    class Well extends React.Component<WellProps, {}> {
-    }
-
-    // <Glyphicon />
-    // ----------------------------------------
-    interface GlyphiconProps extends React.HTMLAttributes {
-        // Required
-        glyph: string;
-    }
-    type Glyphicon = React.ClassicComponent<GlyphiconProps, {}>;
-    var Glyphicon: React.ClassicComponentClass<GlyphiconProps>;
-
-    // <Table />
-    // ----------------------------------------
-    interface TableProps extends React.HTMLAttributes {
-        bordered?: boolean;
-        condensed?: boolean;
-        hover?: boolean;
-        responsive?: boolean;
-        striped?: boolean;
-    }
-    type Table = React.ClassicComponent<TableProps, {}>;
-    var Table: React.ClassicComponentClass<TableProps>;
-
-    // <Input />
-    // ----------------------------------------
-    interface InputProps extends React.HTMLAttributes {
-        defaultValue?:string;
-        addonAfter?: any; // TODO: Add more specific type
-        addonBefore?: any; // TODO: Add more specific type
-        bsSize?: string;
-        bsStyle?: string;
-        buttonAfter?: any; // TODO: Add more specific type
-        buttonBefore?: any; // TODO: Add more specific type
-        feedbackIcon?: any; // TODO: Add more specific type
-        groupClassName?: string;
-        hasFeedback?: boolean;
-        help?: any; // TODO: Add more specific type
-        labelClassName?: string;
-        wrapperClassName?: string;
-    }
-    // TODO: extends InputBase
-    class Input extends React.Component<InputProps, {}> {
-    }
-
-    // <ButtonInput />
-    // ----------------------------------------
-    interface ButtonInputProps extends React.HTMLAttributes {
-        addonAfter?: any; // TODO: Add more specific type
-        addonBefore?: any; // TODO: Add more specific type
-        bsSize?: string;
-        bsStyle?: string;
-        buttonAfter?: any; // TODO: Add more specific type
-        buttonBefore?: any; // TODO: Add more specific type
-        feedbackIcon?: any; // TODO: Add more specific type
-        groupClassName?: string;
-        hasFeedback?: boolean;
-        help?: any; // TODO: Add more specific type
-        labelClassName?: string;
-        wrapperClassName?: string;
-    }
-    // TODO: extends InputBase
-    class ButtonInput extends React.Component<ButtonInputProps, {}> {
-    }
-
-
-    // <FormControls.Static />
-    // ----------------------------------------
-
-    interface StaticProps extends React.HTMLAttributes {}
-    interface Static extends React.ReactElement<StaticProps> { }
-    interface StaticClass extends React.ComponentClass<StaticProps> { }
-    interface FormControlsClass {
-      Static: StaticClass;
-    }
-    var FormControls: FormControlsClass;
-
-
-    // <Portal />
-    // ----------------------------------------
-    interface PortalProps {
-        dimension?: string | Function;
-        getDimensionValue?: Function;
-        in?: boolean;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        role?: string;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    type Portal = React.ClassicComponent<PortalProps, {}>;
-    var Portal: React.ClassicComponentClass<PortalProps>;
-
-    // <Position />
-    // ----------------------------------------
-    interface PositionProps {
-        dimension?: string | Function;
-        getDimensionValue?: Function;
-        in?: boolean;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        role?: string;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    class Position extends React.Component<PositionProps, {}> {
-    }
-
-    // <Fade />
-    // ----------------------------------------
-    interface FadeProps {
-        in?: boolean;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    class Fade extends React.Component<FadeProps, {}> {
-    }
+    // Optional
+    active?: boolean;
+    block?: boolean;
+    bsStyle?: string;
+    bsSize?: string;
+    navItem?: boolean;
+    navDropdown?: boolean;
+    componentClass?: string;
+}
+type Button = React.ClassicComponent<ButtonProps, {}>;
+declare var Button: React.ClassicComponentClass<ButtonProps>;
+
+// <ButtonToolbar />
+// ----------------------------------------
+interface ButtonToolbarProps extends React.HTMLAttributes {
+
+    // Optional
+    block?: boolean;
+    bsSize?: string;
+    bsStyle?: string;
+    justified?: boolean;
+    vertical?: boolean;
+}
+type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps, {}>;
+declare var ButtonToolbar: React.ClassicComponentClass<ButtonToolbarProps>;
+
+// <ButtonGroup />
+// ----------------------------------------
+interface ButtonGroupProps extends React.HTMLAttributes {
+    // Optional
+    block?: boolean;
+    bsSize?: string;
+    bsStyle?: string;
+    justified?: boolean;
+    vertical?: boolean;
+}
+type ButtonGroup = React.ClassicComponent<ButtonGroupProps, {}>;
+declare var ButtonGroup: React.ClassicComponentClass<ButtonGroupProps>;
+
+// <DropdownButton />
+// ----------------------------------------
+interface DropdownButtonProps extends React.HTMLAttributes {
+    bsStyle?: string;
+    bsSize?: string;
+    buttonClassName?: string;
+    dropup?: boolean;
+    navItem?: boolean;
+    noCaret?: boolean;
+    pullRight?: boolean;
+}
+declare class DropdownButton extends React.Component<DropdownButtonProps, {}> {
+}
+
+// <SplitButton />
+// ----------------------------------------
+interface SplitButtonProps extends React.HTMLAttributes {
+    bsStyle?: string;
+    bsSize?: string;
+    dropdownTitle?: any; // TODO: Add more specific type
+    dropup?: boolean;
+    pullRight?: boolean;
+}
+declare class SplitButton extends React.Component<SplitButtonProps, {}> {
+}
+
+// <MenuItem />
+// ----------------------------------------
+interface MenuItemProps extends React.HTMLAttributes {
+    active?: boolean;
+    divider?: boolean;
+    eventKey?: any;
+    header?: boolean;
+}
+declare class MenuItem extends React.Component<MenuItemProps, {}> {
+}
+
+// <Panel />
+// ----------------------------------------
+interface PanelProps extends React.HTMLAttributes {
+    bsSize?: string;
+    bsStyle?: string;
+    collapsible?: boolean;
+    defaultExpanded?: boolean;
+    eventKey?: any;
+    expanded?: boolean;
+    footer?: any; // TODO: Add more specific type
+    header?: any; // TODO: Add more specific type
+}
+type Panel = React.ClassicComponent<PanelProps, {}>;
+declare var Panel: React.ClassicComponentClass<PanelProps>;
+
+// <Accordion />
+// ----------------------------------------
+interface AccordionProps extends React.HTMLAttributes {
+    bsSize?: string;
+    bsStyle?: string;
+    collapsible?: boolean;
+    defaultExpanded?: boolean;
+    eventKey?: any;
+    expanded?: boolean;
+    footer?: any; // TODO: Add more specific type
+    header?: any; // TODO: Add more specific type
+}
+type Accordion = React.ClassicComponent<AccordionProps, {}>;
+declare var Accordion: React.ClassicComponentClass<AccordionProps>;
+
+// <PanelGroup />
+// ----------------------------------------
+interface PanelGroupProps extends React.HTMLAttributes {
+    accordion?: boolean;
+    activeKey?: any;
+    bsSize?: string;
+    bsStyle?: string;
+    defaultActiveKey?: any;
+}
+type PanelGroup = React.ClassicComponent<PanelGroupProps, {}>;
+declare var PanelGroup: React.ClassicComponentClass<PanelGroupProps>;
+
+// <Modal.Dialog />
+// ----------------------------------------
+interface ModalDialogProps extends React.HTMLAttributes {
+    // TODO: Add more specific type
+}
+type ModalDialog = React.ClassicComponent<ModalDialogProps, {}>;
+declare var ModalDialog: React.ClassicComponentClass<ModalDialogProps>;
+
+// <Modal.Header />
+// ----------------------------------------
+interface ModalHeaderProps extends React.HTMLAttributes {
+    closeButton?: boolean;
+    modalClassName?: string;
+    onHide?: Function;
+    // undefined?: string;
+}
+declare class ModalHeader extends React.Component<ModalHeaderProps, {}> {
+}
+
+// <Modal.Title/>
+// ----------------------------------------
+interface ModalTitleProps extends React.HTMLAttributes {
+    modalClassName?: string;
+}
+declare class ModalTitle extends React.Component<ModalTitleProps, {}> {
+}
+
+// <Modal.Body />
+// ----------------------------------------
+interface ModalBodyProps extends React.HTMLAttributes {
+    modalClassName?: string;
+}
+declare class ModalBody extends React.Component<ModalBodyProps, {}> {
+}
+
+// <Modal.Footer />
+// ----------------------------------------
+interface ModalFooterProps extends React.HTMLAttributes {
+    modalClassName?: string;
+}
+declare class ModalFooter extends React.Component<ModalFooterProps, {}> {
+}
+
+// <Modal />
+// ----------------------------------------
+interface ModalProps extends React.HTMLAttributes {
+    // Required
+    onHide: Function;
+
+    // Optional
+    animation?: boolean;
+    backdrop?: boolean | string;
+    bsSize?: string;
+    container?: any; // TODO: Add more specific type
+    dialogClassName?: string;
+    dialogComponent?: any; // TODO: Add more specific type
+    enforceFocus?: boolean;
+    keyboard?: boolean;
+    show?: boolean;
+}
+interface ModalClass extends React.ClassicComponentClass<ModalProps> {
+    Body: typeof ModalBody;
+    Header: typeof ModalHeader;
+    Title: typeof ModalTitle;
+    Footer: typeof ModalFooter;
+    Dialog: typeof ModalDialog;
+}
+type Modal = React.ClassicComponent<ModalProps, {}>;
+declare var Modal: ModalClass;
+
+
+// <OverlayTrigger />
+// ----------------------------------------
+interface OverlayTriggerProps {
+    // Required
+    overlay: any; // TODO: Add more specific type
+
+    // Optional
+    animation?: any; // TODO: Add more specific type
+    container?: any; // TODO: Add more specific type
+    containerPadding?: number;
+    defaultOverlayShown?: boolean;
+    delay?: number;
+    delayHide?: number;
+    delayShow?: number;
+    onEnter?: Function;
+    onEntered?: Function;
+    onEntering?: Function;
+    onExit?: Function;
+    onExited?: Function;
+    onExiting?: Function;
+    placement?: string;
+    rootClose?: boolean;
+    trigger?: string | string[];
+}
+type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps, {}>;
+declare var OverlayTrigger: React.ClassicComponentClass<OverlayTriggerProps>;
+
+// <Tooltip />
+// ----------------------------------------
+interface TooltipProps extends React.HTMLAttributes {
+    // Optional
+    arrowOffsetLeft?: number | string;
+    arrowOffsetTop?: number | string;
+    bsSize?: string;
+    bsStyle?: string;
+    placement?: string;
+    positionLeft?: number;
+    positionTop?: number;
+}
+type Tooltip = React.ClassicComponent<TooltipProps, {}>;
+declare var Tooltip: React.ClassicComponentClass<TooltipProps>;
+
+// <Popover/>
+// ----------------------------------------
+interface PopoverProps extends React.HTMLAttributes {
+    // Optional
+    arrowOffsetLeft?: number | string;
+    arrowOffsetTop?: number | string;
+    bsSize?: string;
+    bsStyle?: string;
+    placement?: string;
+    positionLeft?: number;
+    positionTop?: number;
+}
+type Popover = React.ClassicComponent<PopoverProps, {}>;
+declare var Popover: React.ClassicComponentClass<PopoverProps>;
+
+// <Overlay />
+// ----------------------------------------
+interface OverlayProps {
+    // Optional
+    animation?: any; // TODO: Add more specific type
+    container?: any; // TODO: Add more specific type
+    containerPadding?: number; // TODO: Add more specific type
+    onEnter?: Function;
+    onEntered?: Function;
+    onEntering?: Function;
+    onExit?: Function;
+    onExited?: Function;
+    onExiting?: Function;
+    onHide?: Function;
+    placement?: string;
+    rootClose?: boolean;
+    show?: boolean;
+    target?: Function;
+}
+declare class Overlay extends React.Component<OverlayProps, {}> {
+}
+
+// <ProgressBar />
+// ----------------------------------------
+interface ProgressBarProps extends React.HTMLAttributes {
+    // Optional
+    active?: boolean;
+    bsSize?: string;
+    bsStyle?: string;
+    interpolatedClass?: any; // TODO: Add more specific type
+    max?: number;
+    min?: number;
+    now?: number;
+    srOnly?: boolean;
+    striped?: boolean;
+}
+declare class ProgressBar extends React.Component<ProgressBarProps, {}> {
+}
+
+// <Nav />
+// ----------------------------------------
+// TODO: This one turned into a union of two different types
+interface NavProps extends React.HTMLAttributes {
+    // Optional
+    activeHref?: string;
+    activeKey?: any;
+    bsSize?: string;
+    bsStyle?: string;
+    collapsible?: boolean;
+    eventKey?: any;
+    expanded?: boolean;
+    justified?: boolean;
+    navbar?: boolean;
+    pullRight?: boolean;
+    right?: boolean;
+    stacked?: boolean;
+    ulClassName?: string;
+    ulId?: string;
+}
+declare class Nav extends React.Component<NavProps, {}> {
+}
+
+// <NavItem />
+// ----------------------------------------
+interface NavItemProps extends React.HTMLAttributes {
+    active?: boolean;
+    brand?: any; // TODO: Add more specific type
+    bsSize?: string;
+    bsStyle?: string;
+    componentClass?: any; // TODO: Add more specific type
+    defaultNavExpanded?: boolean;
+    eventKey?: any;
+    fixedBottom?: boolean;
+    fixedTop?: boolean;
+    fluid?: boolean;
+    inverse?: boolean;
+    linkId?: string;
+    navExpanded?: boolean;
+    onToggle?: Function;
+    staticTop?: boolean;
+    toggleButton?: any; // TODO: Add more specific type
+    toggleNavKey?: string | number;
+}
+type NavItem = React.ClassicComponent<NavItemProps, {}>;
+declare var NavItem: React.ClassicComponentClass<NavItemProps>;
+
+// <Navbar.Brand />
+// ----------------------------------------
+interface NavbarBrandProps extends React.HTMLAttributes {
+}
+declare class NavbarBrand extends React.Component<NavbarBrandProps, {}> {
+}
+
+// <Navbar.Collapse />
+// ----------------------------------------
+interface NavbarCollapseProps {
+}
+type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps, {}>;
+declare var NavbarCollapse: React.ClassicComponentClass<NavbarCollapseProps>;
+
+// <Navbar.Header />
+// ----------------------------------------
+interface NavbarHeaderProps extends React.HTMLAttributes {
+}
+type NavbarHeader = React.ClassicComponent<NavbarHeaderProps, {}>;
+declare var NavbarHeader: React.ClassicComponentClass<NavbarHeaderProps>;
+
+// <Navbar.Toggle />
+// ----------------------------------------
+interface NavbarToggleProps {
+}
+type NavbarToggle = React.ClassicComponent<NavbarToggleProps, {}>;
+declare var NavbarToggle: React.ClassicComponentClass<NavbarToggleProps>;
+
+// <Navbar />
+// ----------------------------------------
+interface NavbarProps extends React.HTMLAttributes {
+    brand?: any; // TODO: Add more specific type
+    bsSize?: string;
+    bsStyle?: string;
+    componentClass?: any; // TODO: Add more specific type
+    defaultNavExpanded?: boolean;
+    fixedBottom?: boolean;
+    fixedTop?: boolean;
+    fluid?: boolean;
+    inverse?: boolean;
+    navExpanded?: boolean;
+    onToggle?: Function;
+    staticTop?: boolean;
+    toggleButton?: any; // TODO: Add more specific type
+    toggleNavKey?: string | number;
+}
+interface NavbarClass extends React.ClassicComponentClass<NavbarProps> {
+    Brand: typeof NavbarBrand;
+    Collapse: typeof NavbarCollapse;
+    Header: typeof NavbarHeader;
+    Toggle: typeof NavbarToggle;
+}
+type Navbar = React.ClassicComponent<NavbarProps, {}>;
+declare var Navbar: NavbarClass;
+
+// <NavDropdown />
+// ----------------------------------------
+interface NavDropdownProps extends React.HTMLAttributes {
+    eventKey?: any;
+}
+declare class NavDropdown extends React.Component<NavDropdownProps, {}> {
+}
+
+// <Tabs />
+// ----------------------------------------
+interface TabsProps extends React.HTMLAttributes {
+    activeKey?: any;
+    animation?: boolean;
+    bsStyle?: string;
+    defaultActiveKey?: any;
+    paneWidth?: any; // TODO: Add more specific type
+    position?: string;
+    tabWidth?: any; // TODO: Add more specific type
+}
+type Tabs = React.ClassicComponent<TabsProps, {}>;
+declare var Tabs: React.ClassicComponentClass<TabsProps>;
+
+// <Tab />
+// ----------------------------------------
+interface TabProps extends React.HTMLAttributes {
+    animation?: boolean;
+    eventKey?: any; // TODO: Add more specific type
+}
+type Tab = React.ClassicComponent<TabProps, {}>;
+declare var Tab: React.ClassicComponentClass<TabProps>;
+
+// <Pager />
+// ----------------------------------------
+interface PagerProps extends React.HTMLAttributes {
+}
+type Pager = React.ClassicComponent<PagerProps, {}>;
+declare var Pager: React.ClassicComponentClass<PagerProps>;
+
+// <PageItem />
+// ----------------------------------------
+interface PageItemProps extends React.HTMLAttributes {
+    eventKey?: any;
+    next?: boolean;
+    previous?: boolean;
+}
+type PageItem = React.ClassicComponent<PageItemProps, {}>;
+declare var PageItem: React.ClassicComponentClass<PageItemProps>;
+
+// <Pagination />
+// ----------------------------------------
+interface PaginationProps extends React.HTMLAttributes {
+    activePage?: number;
+    bsSize?: string;
+    bsStyle?: string;
+    buttonComponentClass?: any; // TODO: Add more specific type
+    ellipsis?: boolean;
+    first?: boolean;
+    items?: number;
+    last?: boolean;
+    maxButtons?: number;
+    next?: boolean;
+    prev?: boolean;
+}
+type Pagination = React.ClassicComponent<PaginationProps, {}>;
+declare var Pagination: React.ClassicComponentClass<PaginationProps>;
+
+// <Alert />
+// ----------------------------------------
+interface AlertProps extends React.HTMLAttributes {
+    bsSize?: string;
+    bsStyle?: string;
+    closeLabel?: string;
+    dismissAfter?: number;
+    onDismiss?: Function;
+}
+type Alert = React.ClassicComponent<AlertProps, {}>;
+declare var Alert: React.ClassicComponentClass<AlertProps>;
+
+// <Carousel />
+// ----------------------------------------
+interface CarouselProps extends React.HTMLAttributes {
+    activeIndex?: number;
+    bsSize?: string;
+    bsStyle?: string;
+    controls?: boolean;
+    defaultActiveIndex?: number;
+    direction?: string;
+    indicators?: boolean;
+    interval?: number;
+    nextIcon?: any; // TODO: Add more specific type
+    onSlideEnd?: Function;
+    pauseOnHover?: boolean;
+    prevIcon?: any; // TODO: Add more specific type
+    slide?: boolean;
+}
+type Carousel = React.ClassicComponent<CarouselProps, {}>;
+declare var Carousel: React.ClassicComponentClass<CarouselProps>;
+
+// <CarouselItem />
+// ----------------------------------------
+interface CarouselItemProps extends React.HTMLAttributes {
+    active?: boolean;
+    animtateIn?: boolean;
+    animateOut?: boolean;
+    caption?: any; // TODO: Add more specific type
+    direction?: string;
+    index?: number;
+    onAnimateOutEnd?: Function;
+}
+type CarouselItem = React.ClassicComponent<CarouselItemProps, {}>;
+declare var CarouselItem: React.ClassicComponentClass<CarouselItemProps>;
+
+// <Grid />
+// ----------------------------------------
+interface GridProps extends React.HTMLAttributes {
+    componentClass?: any; // TODO: Add more specific type
+    fluid?: boolean;
+}
+type Grid = React.ClassicComponent<GridProps, {}>;
+declare var Grid: React.ClassicComponentClass<GridProps>;
+
+// <Row />
+// ----------------------------------------
+interface RowProps extends React.HTMLAttributes {
+    componentClass?: any; // TODO: Add more specific type
+}
+type Row = React.ClassicComponent<RowProps, {}>;
+declare var Row: React.ClassicComponentClass<RowProps>;
+
+// <Col />
+// ----------------------------------------
+interface ColProps extends React.HTMLAttributes {
+    componentClass?: any; // TODO: Add more specific type
+    lg?: number;
+    lgHidden?: boolean;
+    lgOffset?: number;
+    lgPull?: number;
+    lgPush?: number;
+    md?: number;
+    mdHidden?: boolean;
+    mdOffset?: number;
+    mdPull?: number;
+    mdPush?: number;
+    sm?: number;
+    smHidden?: boolean;
+    smOffset?: number;
+    smPull?: number;
+    smPush?: number;
+    xs?: number;
+    xsHidden?: boolean;
+    xsOffset?: number;
+    xsPull?: number;
+    xsPush?: number;
+}
+type Col = React.ClassicComponent<ColProps, {}>;
+declare var Col: React.ClassicComponentClass<ColProps>;
+
+// <Thumbnail />
+// ----------------------------------------
+interface ThumbnailProps extends React.HTMLAttributes {
+    bsSize?: string;
+    bsStyle?: string;
+}
+type Thumbnail = React.ClassicComponent<ThumbnailProps, {}>;
+declare var Thumbnail: React.ClassicComponentClass<ThumbnailProps>;
+
+// <ListGroup />
+// ----------------------------------------
+interface ListGroupProps extends React.HTMLAttributes {
+    fill?: boolean; // TODO: Add more specific type
+}
+declare class ListGroup extends React.Component<ListGroupProps, {}> {
+}
+
+// <ListGroupItem />
+// ----------------------------------------
+interface ListGroupItemProps extends React.HTMLAttributes {
+    active?: any;
+    bsSize?: string;
+    bsStyle?: string;
+    eventKey?: any;
+    header?: any; // TODO: Add more specific type
+    key?: any; // TODO: Add more specific type
+    listItem?: boolean;
+}
+declare class ListGroupItem extends React.Component<ListGroupItemProps, {}> {
+}
+
+// <Label />
+// ----------------------------------------
+interface LabelProps extends React.HTMLAttributes {
+    bsSize?: string;
+    bsStyle?: string;
+}
+declare class Label extends React.Component<LabelProps, {}> {
+}
+
+// <Badge />
+// ----------------------------------------
+interface BadgeProps extends React.HTMLAttributes {
+    pullRight?: boolean;
+}
+type Badge = React.ClassicComponent<BadgeProps, {}>;
+declare var Badge: React.ClassicComponentClass<BadgeProps>;
+
+// <Jumbotron />
+// ----------------------------------------
+interface JumbotronProps extends React.HTMLAttributes {
+    componentClass?: any; // TODO: Add more specific type
+}
+type Jumbotron = React.ClassicComponent<JumbotronProps, {}>;
+declare var Jumbotron: React.ClassicComponentClass<JumbotronProps>;
+
+// <PageHeader />
+// ----------------------------------------
+interface PageHeaderProps extends React.HTMLAttributes {
+}
+declare class PageHeader extends React.Component<PageHeaderProps, {}> {
+}
+
+// <Well />
+// ----------------------------------------
+interface WellProps extends React.HTMLAttributes {
+    bsSize?: string;
+    bsStyle?: string;
+}
+declare class Well extends React.Component<WellProps, {}> {
+}
+
+// <Glyphicon />
+// ----------------------------------------
+interface GlyphiconProps extends React.HTMLAttributes {
+    // Required
+    glyph: string;
+}
+type Glyphicon = React.ClassicComponent<GlyphiconProps, {}>;
+declare var Glyphicon: React.ClassicComponentClass<GlyphiconProps>;
+
+// <Table />
+// ----------------------------------------
+interface TableProps extends React.HTMLAttributes {
+    bordered?: boolean;
+    condensed?: boolean;
+    hover?: boolean;
+    responsive?: boolean;
+    striped?: boolean;
+}
+type Table = React.ClassicComponent<TableProps, {}>;
+declare var Table: React.ClassicComponentClass<TableProps>;
+
+// <Input />
+// ----------------------------------------
+interface InputProps extends React.HTMLAttributes {
+    defaultValue?: string;
+    addonAfter?: any; // TODO: Add more specific type
+    addonBefore?: any; // TODO: Add more specific type
+    bsSize?: string;
+    bsStyle?: string;
+    buttonAfter?: any; // TODO: Add more specific type
+    buttonBefore?: any; // TODO: Add more specific type
+    feedbackIcon?: any; // TODO: Add more specific type
+    groupClassName?: string;
+    hasFeedback?: boolean;
+    help?: any; // TODO: Add more specific type
+    labelClassName?: string;
+    wrapperClassName?: string;
+}
+// TODO: extends InputBase
+declare class Input extends React.Component<InputProps, {}> {
+}
+
+// <ButtonInput />
+// ----------------------------------------
+interface ButtonInputProps extends React.HTMLAttributes {
+    addonAfter?: any; // TODO: Add more specific type
+    addonBefore?: any; // TODO: Add more specific type
+    bsSize?: string;
+    bsStyle?: string;
+    buttonAfter?: any; // TODO: Add more specific type
+    buttonBefore?: any; // TODO: Add more specific type
+    feedbackIcon?: any; // TODO: Add more specific type
+    groupClassName?: string;
+    hasFeedback?: boolean;
+    help?: any; // TODO: Add more specific type
+    labelClassName?: string;
+    wrapperClassName?: string;
+}
+// TODO: extends InputBase
+declare class ButtonInput extends React.Component<ButtonInputProps, {}> {
+}
+
+
+// <FormControls.Static />
+// ----------------------------------------
+
+interface StaticProps extends React.HTMLAttributes { }
+interface Static extends React.ReactElement<StaticProps> { }
+interface StaticClass extends React.ComponentClass<StaticProps> { }
+interface FormControlsClass {
+    Static: StaticClass;
+}
+declare var FormControls: FormControlsClass;
+
+
+// <Portal />
+// ----------------------------------------
+interface PortalProps {
+    dimension?: string | Function;
+    getDimensionValue?: Function;
+    in?: boolean;
+    onEnter?: Function;
+    onEntered?: Function;
+    onEntering?: Function;
+    onExit?: Function;
+    onExited?: Function;
+    onExiting?: Function;
+    role?: string;
+    timeout?: number;
+    transitionAppear?: boolean;
+    unmountOnExit?: boolean;
+}
+type Portal = React.ClassicComponent<PortalProps, {}>;
+declare var Portal: React.ClassicComponentClass<PortalProps>;
+
+// <Position />
+// ----------------------------------------
+interface PositionProps {
+    dimension?: string | Function;
+    getDimensionValue?: Function;
+    in?: boolean;
+    onEnter?: Function;
+    onEntered?: Function;
+    onEntering?: Function;
+    onExit?: Function;
+    onExited?: Function;
+    onExiting?: Function;
+    role?: string;
+    timeout?: number;
+    transitionAppear?: boolean;
+    unmountOnExit?: boolean;
+}
+declare class Position extends React.Component<PositionProps, {}> {
+}
+
+// <Fade />
+// ----------------------------------------
+interface FadeProps {
+    in?: boolean;
+    onEnter?: Function;
+    onEntered?: Function;
+    onEntering?: Function;
+    onExit?: Function;
+    onExited?: Function;
+    onExiting?: Function;
+    timeout?: number;
+    transitionAppear?: boolean;
+    unmountOnExit?: boolean;
+}
+declare class Fade extends React.Component<FadeProps, {}> {
 }
diff --git a/react-cropper/react-cropper.d.ts b/react-cropper/react-cropper.d.ts
index 11775d0187..453addacdd 100644
--- a/react-cropper/react-cropper.d.ts
+++ b/react-cropper/react-cropper.d.ts
@@ -6,148 +6,147 @@
 /// <reference path="../react/react.d.ts"/>
 /// <reference path="../cropperjs/cropperjs.d.ts"/>
 
-declare module 'react-cropper' {
-    import Data = cropperjs.Data;
-    import ContainerData = cropperjs.ContainerData;
-    import ImageData = cropperjs.ImageData;
-    import CanvasData = cropperjs.CanvasData;
-    import CropBoxData = cropperjs.CropBoxData;
-    import CroppedCanvasOptions = cropperjs.CroppedCanvasOptions;
-    type ReactCropperProps = cropperjs.CropperOptions & __React.HTMLProps<HTMLImageElement>;
 
-    class ReactCropper extends __React.Component<ReactCropperProps, {}> implements cropperjs.Cropper {
+import Data = cropperjs.Data;
+import ContainerData = cropperjs.ContainerData;
+import ImageData = cropperjs.ImageData;
+import CanvasData = cropperjs.CanvasData;
+import CropBoxData = cropperjs.CropBoxData;
+import CroppedCanvasOptions = cropperjs.CroppedCanvasOptions;
+type ReactCropperProps = cropperjs.CropperOptions & __React.HTMLProps<HTMLImageElement>;
 
+declare class ReactCropper extends __React.Component<ReactCropperProps, {}> implements cropperjs.Cropper {
+
+    /**
+     * Show the crop box manually.
+     */
+    crop(): void;
+
+    /**
+    * Clear the crop box.
+    */
+    reset(): void;
+
+    /**
+    * Replace the image's src and rebuild the cropper.
+    * @param url A new image url
+    */
+    replace(url: string): void;
+
+    /**
+    * Enable (unfreeze) the cropper.
+    */
+    enable(): void;
+
+    /**
+    * Disable (freeze) the cropper
+    */
+    disable(): void;
+
+    /**
+    * Destroy the cropper and remove the instance from the image.
+    */
+    destroy(): void;
+
+    /**
+    * Move the canvas (image wrapper) with relative offsets.
+    * @param offsetX Moving size (px) in the horizontal direction.
+    * @param offsetY Moving size (px) in the vertical direction.
+    * If not present, its default value is offsetX.
+    */
+    move(offsetX: number, offsetY?: number): void;
+
+    /**
+    * Move the canvas (image wrapper) to an absolute point.
+    * @param x The left value of the canvas
+    * @param y The top value of the canvas
+    * If not present, its default value is x.
+    */
+    moveTo(x: number, y?: number): void;
+
+    /**
+    * Zoom the canvas (image wrapper) with a relative ratio.
+    * Zoom in: requires a positive number (ratio > 0)
+    * Zoom out: requires a negative number (ratio < 0)
+    */
+    zoom(ratio: number): void;
+
+    /**
+    * Rotate the canvas (image wrapper) with a relative degree.
+    * Rotate right: requires a positive number (degree > 0)
+    * Rotate left: requires a negative number (degree < 0)
+    */
+    rotate(degree: number): void;
+
+    /**
+    * Clear the crop box.
+    */
+    clear(): void;
+
+    /**
+    * Output the cropped area position and size data (base on the original image).
+    */
+    getData(rounded?: boolean): Data;
+
+    /**
+    * Change the cropped area position and size with new data (base on the original image).
+    */
+    setData(data: Data): void;
+
+    /**
+    * Output the container size data.
+    */
+    getContainerData(): ContainerData;
+
+    /**
+    * Output the image position, size and other related data.
+    */
+    getImageData(): ImageData;
+
+    /**
+    * Output the canvas (image wrapper) position and size data.
+    */
+    getCanvasData(): CanvasData & {
         /**
-         * Show the crop box manually.
-         */
-        crop(): void;
-
-        /**
-        * Clear the crop box.
+        * the natural width of the canvas (read only)
         */
-        reset(): void;
-
+        naturalWidth: number;
         /**
-        * Replace the image's src and rebuild the cropper.
-        * @param url A new image url
+        * the natural height of the canvas (read only)
         */
-        replace(url: string): void;
+        naturalHeight: number;
+    };
 
-        /**
-        * Enable (unfreeze) the cropper.
-        */
-        enable(): void;
+    /**
+    * Change the canvas (image wrapper) position and size with new data.
+    */
+    setCanvasData(data: CanvasData): void;
 
-        /**
-        * Disable (freeze) the cropper
-        */
-        disable(): void;
+    /**
+    * Output the crop box position and size data.
+    */
+    getCropBoxData(): CropBoxData;
 
-        /**
-        * Destroy the cropper and remove the instance from the image.
-        */
-        destroy(): void;
+    /**
+    * Change the crop box position and size with new data.
+    */
+    setCropBoxData(data: CropBoxData): void;
 
-        /**
-        * Move the canvas (image wrapper) with relative offsets.
-        * @param offsetX Moving size (px) in the horizontal direction.
-        * @param offsetY Moving size (px) in the vertical direction.
-        * If not present, its default value is offsetX.
-        */
-        move(offsetX: number, offsetY?: number): void;
+    /**
+    * Get a canvas drawn the cropped image.
+    */
+    getCroppedCanvas(options?: CroppedCanvasOptions): HTMLCanvasElement;
 
-        /**
-        * Move the canvas (image wrapper) to an absolute point.
-        * @param x The left value of the canvas
-        * @param y The top value of the canvas
-        * If not present, its default value is x.
-        */
-        moveTo(x: number, y?: number): void;
+    /**
+    * Change the aspect ratio of the crop box.
+    */
+    setAspectRatio(aspectRatio: number): void;
 
-        /**
-        * Zoom the canvas (image wrapper) with a relative ratio.
-        * Zoom in: requires a positive number (ratio > 0)
-        * Zoom out: requires a negative number (ratio < 0)
-        */
-        zoom(ratio: number): void;
+    /**
+    * Change the drag mode.
+    */
+    setDragMode(mode?: 'none' | 'crop' | 'move'): void;
 
-        /**
-        * Rotate the canvas (image wrapper) with a relative degree.
-        * Rotate right: requires a positive number (degree > 0)
-        * Rotate left: requires a negative number (degree < 0)
-        */
-        rotate(degree: number): void;
-
-        /**
-        * Clear the crop box.
-        */
-        clear(): void;
-
-        /**
-        * Output the cropped area position and size data (base on the original image).
-        */
-        getData(rounded?: boolean): Data;
-
-        /**
-        * Change the cropped area position and size with new data (base on the original image).
-        */
-        setData(data: Data): void;
-
-        /**
-        * Output the container size data.
-        */
-        getContainerData(): ContainerData;
-
-        /**
-        * Output the image position, size and other related data.
-        */
-        getImageData(): ImageData;
-
-        /**
-        * Output the canvas (image wrapper) position and size data.
-        */
-        getCanvasData(): CanvasData & {
-            /**
-            * the natural width of the canvas (read only)
-            */
-            naturalWidth: number;
-            /**
-            * the natural height of the canvas (read only)
-            */
-            naturalHeight: number;
-        };
-
-        /**
-        * Change the canvas (image wrapper) position and size with new data.
-        */
-        setCanvasData(data: CanvasData): void;
-
-        /**
-        * Output the crop box position and size data.
-        */
-        getCropBoxData(): CropBoxData;
-
-        /**
-        * Change the crop box position and size with new data.
-        */
-        setCropBoxData(data: CropBoxData): void;
-
-        /**
-        * Get a canvas drawn the cropped image.
-        */
-        getCroppedCanvas(options?: CroppedCanvasOptions): HTMLCanvasElement;
-
-        /**
-        * Change the aspect ratio of the crop box.
-        */
-        setAspectRatio(aspectRatio: number): void;
-
-        /**
-        * Change the drag mode.
-        */
-        setDragMode(mode?: 'none' | 'crop' | 'move'): void;
-
-        on(eventname: string, callback: () => void): void;
-    }
-    export default ReactCropper;
+    on(eventname: string, callback: () => void): void;
 }
+export default ReactCropper;
diff --git a/react-fa/react-fa.d.ts b/react-fa/react-fa.d.ts
index 0b6b166a22..ac2f031e9e 100644
--- a/react-fa/react-fa.d.ts
+++ b/react-fa/react-fa.d.ts
@@ -5,24 +5,23 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "react-fa" {
-	import { ComponentClass, Props } from 'react';
 
-	interface IconProps extends Props<Icon> {
-		name: string;
-		className?: string;
-		size?: string;
-		spin?: boolean;
-		rotate?: string;
-		flip?: string;
-		fixedWidth?: boolean;
-		pulse?: boolean;
-		stack?: string;
-		inverse?: boolean;
-	}
+import { ComponentClass, Props } from 'react';
 
-	interface Icon extends ComponentClass<IconProps> { }
-	const Icon: Icon;
-
-	export = Icon;
+interface IconProps extends Props<Icon> {
+    name: string;
+    className?: string;
+    size?: string;
+    spin?: boolean;
+    rotate?: string;
+    flip?: string;
+    fixedWidth?: boolean;
+    pulse?: boolean;
+    stack?: string;
+    inverse?: boolean;
 }
+
+interface Icon extends ComponentClass<IconProps> { }
+declare const Icon: Icon;
+
+export = Icon;
diff --git a/react-helmet/react-helmet.d.ts b/react-helmet/react-helmet.d.ts
index 8cae272f98..8d3b625e8b 100644
--- a/react-helmet/react-helmet.d.ts
+++ b/react-helmet/react-helmet.d.ts
@@ -5,35 +5,34 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module 'react-helmet' {
-    import { Component } from 'react';
 
-    interface HelmetProps {
-        title?: string;
-        titleTemplate?: string;
-        base?: any;
-        link?: Array<any>;
-        meta?: Array<any>;
-        script?: Array<any>;
-        onChangeClientState?: (newState: any) => void;
-    }
+import { Component } from 'react';
 
-    interface HelmetData {
-        title: HelmetDatum;
-        base: HelmetDatum;
-        link: HelmetDatum;
-        meta: HelmetDatum;
-        script: HelmetDatum;
-    }
-
-    interface HelmetDatum {
-        toString(): string;
-        toComponent(): Component<any, any>;
-    }
-
-    class Helmet extends Component<HelmetProps, any> {
-        static rewind(): HelmetData
-    }
-
-    export default Helmet;
+interface HelmetProps {
+    title?: string;
+    titleTemplate?: string;
+    base?: any;
+    link?: Array<any>;
+    meta?: Array<any>;
+    script?: Array<any>;
+    onChangeClientState?: (newState: any) => void;
 }
+
+interface HelmetData {
+    title: HelmetDatum;
+    base: HelmetDatum;
+    link: HelmetDatum;
+    meta: HelmetDatum;
+    script: HelmetDatum;
+}
+
+interface HelmetDatum {
+    toString(): string;
+    toComponent(): Component<any, any>;
+}
+
+declare class Helmet extends Component<HelmetProps, any> {
+    static rewind(): HelmetData
+}
+
+export default Helmet;
diff --git a/react-holder/react-holder.d.ts b/react-holder/react-holder.d.ts
index 126734c973..7635ae81b2 100644
--- a/react-holder/react-holder.d.ts
+++ b/react-holder/react-holder.d.ts
@@ -5,11 +5,11 @@
 
 ///<reference path="../react/react.d.ts"/>
 
-declare module "react-holder" {
 
-  import React = __React;
 
-  interface ReactHolderProp extends React.HTMLAttributes {
+import React = __React;
+
+interface ReactHolderProp extends React.HTMLAttributes {
     width: string | number;
     height: string | number;
     updateOnResize: boolean;
@@ -25,10 +25,9 @@ declare module "react-holder" {
     align?: string;
     outline?: boolean;
     lineWrap?: number;
-  }
-
-  class ReactHolder extends React.Component<ReactHolderProp, any> {
-
-  }
-  export default ReactHolder;
 }
+
+declare class ReactHolder extends React.Component<ReactHolderProp, any> {
+
+}
+export default ReactHolder;
diff --git a/react-mixin/react-mixin.d.ts b/react-mixin/react-mixin.d.ts
index 6285ad02ec..3059bb3168 100644
--- a/react-mixin/react-mixin.d.ts
+++ b/react-mixin/react-mixin.d.ts
@@ -5,23 +5,21 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "react-mixin" {
-    import * as React from 'react';
 
-    namespace reactMixin {
-        export interface ClassDecorator {
-            <TFunction extends Function>(target: TFunction): TFunction|void;
-        }
+import * as React from 'react';
 
-        interface ReactMixin {
-            decorate(mixin: React.Mixin<any, any>): ClassDecorator;
-            onClass<S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
-            <S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
-        }
+declare namespace reactMixin {
+    export interface ClassDecorator {
+        <TFunction extends Function>(target: TFunction): TFunction | void;
     }
 
-    var reactMixin: reactMixin.ReactMixin;
-
-    export = reactMixin;
+    interface ReactMixin {
+        decorate(mixin: React.Mixin<any, any>): ClassDecorator;
+        onClass<S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
+        <S>(clazz: any, mixin: React.Mixin<any, any>): React.ComponentClass<S>;
+    }
 }
 
+declare var reactMixin: reactMixin.ReactMixin;
+
+export = reactMixin;
diff --git a/react-motion/react-motion.d.ts b/react-motion/react-motion.d.ts
index f868d084d2..296e9dbfd6 100644
--- a/react-motion/react-motion.d.ts
+++ b/react-motion/react-motion.d.ts
@@ -5,83 +5,82 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "react-motion" {
-    import { Component } from 'react';
-
-    // your typical style object given in props. Maps to a number or a spring config
-    export type Style = { [key: string]: number | OpaqueConfig };
-    // the interpolating style object, with the same keys as the above Style object,
-    // with the values mapped to numbers, naturally
-    export type PlainStyle = { [key: string]: number };
-    // internal velocity object. Similar to PlainStyle, but whose numbers represent
-    // speed. Might be exposed one day.
-    export type Velocity = { [key: string]: number };
-    interface SpringHelperConfig {
-        stiffness: number;
-        damping: number;
-        /**
-        * Specifies both the rounding of the interpolated value and the speed (internal).
-        */
-        precision?: number;
-        // TODO: add onRest. Not public yet
-    }
-
-    export interface OpaqueConfig {
-        val: number;
-        stiffness: number;
-        damping: number;
-        precision: number;
-        // TODO: add onRest. Not public yet
-    }
-
-    interface MotionProps {
-        defaultStyle?: any;
-        style: any;
-    }
-
-    export class Motion extends Component<MotionProps, any> { }
-
-    // === TransitionMotion ===
-    interface TransitionStyle {
-        key: any; // unique ID to identify component across render animations
-        data?: any; // optional data you want to carry along the style, e.g. itemText
-        style: Style; // actual style you're passing
-    }
-    interface TransitionPlainStyle {
-        key: any;
-        data?: any;
-        // same as TransitionStyle, passed as argument to style/children function
-        style: PlainStyle;
-    }
-    type InterpolateFunction = (previousInterpolatedStyles?: Array<TransitionPlainStyle>) => Array<TransitionStyle>;
-    type Styles = Array<TransitionStyle> | InterpolateFunction;
-    interface TransitionProps {
-        defaultStyles?: Array<TransitionPlainStyle>;
-        styles: Styles;
-        children: (interpolatedStyles: Array<TransitionPlainStyle>) => __React.ReactElement<any>;
-        willEnter?: (styleThatEntered: TransitionStyle) => PlainStyle;
-        willLeave?: (styleThatLeft: TransitionStyle) => Style;
-    }
-    export class TransitionMotion extends Component<any, any> { }
-
-    interface StaggeredMotionProps {
-        defaultStyles?: Array<PlainStyle>;
-        styles: (previousInterpolatedStyles?: Array<PlainStyle>) => Array<Style>;
-    }
-    export class StaggeredMotion extends Component<StaggeredMotionProps, any> { }
 
+import { Component } from 'react';
 
+// your typical style object given in props. Maps to a number or a spring config
+export type Style = { [key: string]: number | OpaqueConfig };
+// the interpolating style object, with the same keys as the above Style object,
+// with the values mapped to numbers, naturally
+export type PlainStyle = { [key: string]: number };
+// internal velocity object. Similar to PlainStyle, but whose numbers represent
+// speed. Might be exposed one day.
+export type Velocity = { [key: string]: number };
+interface SpringHelperConfig {
+    stiffness: number;
+    damping: number;
     /**
-    * Used in conjunction with the components below. Specifies the how to animate to the destination value, e.g. spring(10, {stiffness: 120, damping: 17}) means "animate to value 10, with a spring of stiffness 120 and damping 17".
+    * Specifies both the rounding of the interpolated value and the speed (internal).
     */
-    export function spring(val: number, config?: SpringHelperConfig): OpaqueConfig;
-
-    export class Presets {
-        noWobble: OpaqueConfig; // the default, if nothing provided
-        gentle: OpaqueConfig;
-        wobbly: OpaqueConfig;
-        stiff: OpaqueConfig;
-    }
-
-    export const presets: Presets;
+    precision?: number;
+    // TODO: add onRest. Not public yet
 }
+
+export interface OpaqueConfig {
+    val: number;
+    stiffness: number;
+    damping: number;
+    precision: number;
+    // TODO: add onRest. Not public yet
+}
+
+interface MotionProps {
+    defaultStyle?: any;
+    style: any;
+}
+
+declare export class Motion extends Component<MotionProps, any> { }
+
+// === TransitionMotion ===
+interface TransitionStyle {
+    key: any; // unique ID to identify component across render animations
+    data?: any; // optional data you want to carry along the style, e.g. itemText
+    style: Style; // actual style you're passing
+}
+interface TransitionPlainStyle {
+    key: any;
+    data?: any;
+    // same as TransitionStyle, passed as argument to style/children function
+    style: PlainStyle;
+}
+type InterpolateFunction = (previousInterpolatedStyles?: Array<TransitionPlainStyle>) => Array<TransitionStyle>;
+type Styles = Array<TransitionStyle> | InterpolateFunction;
+interface TransitionProps {
+    defaultStyles?: Array<TransitionPlainStyle>;
+    styles: Styles;
+    children: (interpolatedStyles: Array<TransitionPlainStyle>) => __React.ReactElement<any>;
+    willEnter?: (styleThatEntered: TransitionStyle) => PlainStyle;
+    willLeave?: (styleThatLeft: TransitionStyle) => Style;
+}
+declare export class TransitionMotion extends Component<any, any> { }
+
+interface StaggeredMotionProps {
+    defaultStyles?: Array<PlainStyle>;
+    styles: (previousInterpolatedStyles?: Array<PlainStyle>) => Array<Style>;
+}
+declare export class StaggeredMotion extends Component<StaggeredMotionProps, any> { }
+
+
+/**
+* Used in conjunction with the components below. Specifies the how to animate to the destination value, e.g. spring(10, {stiffness: 120, damping: 17}) means "animate to value 10, with a spring of stiffness 120 and damping 17".
+*/
+declare export function spring(val: number, config?: SpringHelperConfig): OpaqueConfig;
+
+declare export class Presets {
+    noWobble: OpaqueConfig; // the default, if nothing provided
+    gentle: OpaqueConfig;
+    wobbly: OpaqueConfig;
+    stiff: OpaqueConfig;
+}
+
+declare export const presets: Presets;
diff --git a/react-props-decorators/react-props-decorators.d.ts b/react-props-decorators/react-props-decorators.d.ts
index c5233af400..99b507a140 100644
--- a/react-props-decorators/react-props-decorators.d.ts
+++ b/react-props-decorators/react-props-decorators.d.ts
@@ -5,19 +5,17 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "react-props-decorators" {
-    import * as React from 'react';
 
-    export interface ClassDecorator {
-        <TFunction extends Function>(target:TFunction): TFunction|void;
-    }
+import * as React from 'react';
 
-    var propTypes: (map: React.ValidationMap<any>) => ClassDecorator;
-    var defaultProps: (defaultProps: any) => ClassDecorator;
-
-    export {
-        propTypes,
-        defaultProps
-    }
+export interface ClassDecorator {
+    <TFunction extends Function>(target: TFunction): TFunction | void;
 }
 
+declare var propTypes: (map: React.ValidationMap<any>) => ClassDecorator;
+declare var defaultProps: (defaultProps: any) => ClassDecorator;
+
+export {
+propTypes,
+defaultProps
+}
diff --git a/react-redux/react-redux-2.1.2.d.ts b/react-redux/react-redux-2.1.2.d.ts
index fa67b1b2e9..c96de2d3ba 100644
--- a/react-redux/react-redux-2.1.2.d.ts
+++ b/react-redux/react-redux-2.1.2.d.ts
@@ -6,44 +6,44 @@
 /// <reference path="../react/react.d.ts" />
 /// <reference path="../redux/redux.d.ts" />
 
-declare module "react-redux" {
-  import { Component } from 'react';
-  import { Store, Dispatch, ActionCreator } from 'redux';
 
-  export class ElementClass extends Component<any, any> { }
-  export interface ClassDecorator {
+import { Component } from 'react';
+import { Store, Dispatch, ActionCreator } from 'redux';
+
+declare export class ElementClass extends Component<any, any> { }
+export interface ClassDecorator {
     <T extends (typeof ElementClass)>(component: T): T
-  }
+}
 
-  /**
-   * Connects a React component to a Redux store.
-   * @param mapStateToProps
-   * @param mapDispatchToProps
-   * @param mergeProps
-   * @param options
-     */
-  export function connect(mapStateToProps?: MapStateToProps,
-                          mapDispatchToProps?: MapDispatchToPropsFunction|MapDispatchToPropsObject,
-                          mergeProps?: MergeProps,
-                          options?: Options): ClassDecorator;
+/**
+ * Connects a React component to a Redux store.
+ * @param mapStateToProps
+ * @param mapDispatchToProps
+ * @param mergeProps
+ * @param options
+   */
+declare export function connect(mapStateToProps?: MapStateToProps,
+    mapDispatchToProps?: MapDispatchToPropsFunction | MapDispatchToPropsObject,
+    mergeProps?: MergeProps,
+    options?: Options): ClassDecorator;
 
-  interface MapStateToProps {
+interface MapStateToProps {
     (state: any, ownProps?: any): any;
-  }
+}
 
-  interface MapDispatchToPropsFunction {
+interface MapDispatchToPropsFunction {
     (dispatch: Dispatch, ownProps?: any): any;
-  }
+}
 
-  interface MapDispatchToPropsObject {
+interface MapDispatchToPropsObject {
     [name: string]: ActionCreator;
-  }
+}
 
-  interface MergeProps {
+interface MergeProps {
     (stateProps: any, dispatchProps: any, ownProps: any): any;
-  }
+}
 
-  interface Options {
+interface Options {
     /**
      * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
      * preventing unnecessary updates, assuming that the component is a “pure� component
@@ -52,18 +52,17 @@ declare module "react-redux" {
      * @default true
      */
     pure: boolean;
-  }
+}
 
-  export interface Property {
+export interface Property {
     /**
      * The single Redux store in your application.
      */
     store?: Store;
     children?: Function;
-  }
-
-  /**
-   * Makes the Redux store available to the connect() calls in the component hierarchy below.
-   */
-  export class Provider extends Component<Property, {}> { }
 }
+
+/**
+ * Makes the Redux store available to the connect() calls in the component hierarchy below.
+ */
+declare export class Provider extends Component<Property, {}> { }
diff --git a/react-redux/react-redux.d.ts b/react-redux/react-redux.d.ts
index 2e3e69dc68..e6be31aa14 100644
--- a/react-redux/react-redux.d.ts
+++ b/react-redux/react-redux.d.ts
@@ -6,73 +6,73 @@
 /// <reference path="../react/react.d.ts" />
 /// <reference path="../redux/redux.d.ts" />
 
-declare module "react-redux" {
-  import { ComponentClass, Component, StatelessComponent, ReactNode } from 'react';
-  import { Store, Dispatch, ActionCreator } from 'redux';
 
-  interface ComponentDecorator<TOriginalProps, TOwnProps> {
-    (component: ComponentClass<TOriginalProps>|StatelessComponent<TOriginalProps>): ComponentClass<TOwnProps>;
-  }
+import { ComponentClass, Component, StatelessComponent, ReactNode } from 'react';
+import { Store, Dispatch, ActionCreator } from 'redux';
 
-  /**
-   * Decorator that infers the type from the original component
-   *
-   * Can't use the above decorator because it would default the type to {}
-   */
-  export interface InferableComponentDecorator {
-    <P, TComponentConstruct extends (ComponentClass<P>|StatelessComponent<P>)>(component: TComponentConstruct): TComponentConstruct;
-  }
+interface ComponentDecorator<TOriginalProps, TOwnProps> {
+    (component: ComponentClass<TOriginalProps> | StatelessComponent<TOriginalProps>): ComponentClass<TOwnProps>;
+}
 
-  /**
-   * Connects a React component to a Redux store.
-   *
-   * - Without arguments, just wraps the component, without changing the behavior / props
-   *
-   * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
-   * is to override ownProps (as stated in the docs), so what remains is everything that's
-   * not a state or dispatch prop
-   *
-   * - When 3rd param is passed, we don't know if ownProps propagate and whether they
-   * should be valid component props, because it depends on mergeProps implementation.
-   * As such, it is the user's responsibility to extend ownProps interface from state or
-   * dispatch props or both when applicable
-   *
-   * @param mapStateToProps
-   * @param mapDispatchToProps
-   * @param mergeProps
-   * @param options
-   */
-  export function connect(): InferableComponentDecorator;
+/**
+ * Decorator that infers the type from the original component
+ *
+ * Can't use the above decorator because it would default the type to {}
+ */
+export interface InferableComponentDecorator {
+    <P, TComponentConstruct extends (ComponentClass<P> | StatelessComponent<P>)>(component: TComponentConstruct): TComponentConstruct;
+}
 
-  export function connect<TStateProps, TDispatchProps, TOwnProps>(
+/**
+ * Connects a React component to a Redux store.
+ *
+ * - Without arguments, just wraps the component, without changing the behavior / props
+ *
+ * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
+ * is to override ownProps (as stated in the docs), so what remains is everything that's
+ * not a state or dispatch prop
+ *
+ * - When 3rd param is passed, we don't know if ownProps propagate and whether they
+ * should be valid component props, because it depends on mergeProps implementation.
+ * As such, it is the user's responsibility to extend ownProps interface from state or
+ * dispatch props or both when applicable
+ *
+ * @param mapStateToProps
+ * @param mapDispatchToProps
+ * @param mergeProps
+ * @param options
+ */
+declare export function connect(): InferableComponentDecorator;
+
+declare export function connect<TStateProps, TDispatchProps, TOwnProps>(
     mapStateToProps: MapStateToProps<TStateProps, TOwnProps>,
-    mapDispatchToProps?: MapDispatchToPropsFunction<TDispatchProps, TOwnProps>|MapDispatchToPropsObject
-  ): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
+    mapDispatchToProps?: MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject
+): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
 
-  export function connect<TStateProps, TDispatchProps, TOwnProps>(
+declare export function connect<TStateProps, TDispatchProps, TOwnProps>(
     mapStateToProps: MapStateToProps<TStateProps, TOwnProps>,
-    mapDispatchToProps: MapDispatchToPropsFunction<TDispatchProps, TOwnProps>|MapDispatchToPropsObject,
+    mapDispatchToProps: MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject,
     mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps>,
     options?: Options
-  ): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
+): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
 
-  interface MapStateToProps<TStateProps, TOwnProps> {
+interface MapStateToProps<TStateProps, TOwnProps> {
     (state: any, ownProps?: TOwnProps): TStateProps;
-  }
+}
 
-  interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
+interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
     (dispatch: Dispatch, ownProps?: TOwnProps): TDispatchProps;
-  }
+}
 
-  interface MapDispatchToPropsObject {
+interface MapDispatchToPropsObject {
     [name: string]: ActionCreator;
-  }
+}
 
-  interface MergeProps<TStateProps, TDispatchProps, TOwnProps> {
+interface MergeProps<TStateProps, TDispatchProps, TOwnProps> {
     (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps): TStateProps & TDispatchProps;
-  }
+}
 
-  interface Options {
+interface Options {
     /**
      * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
      * preventing unnecessary updates, assuming that the component is a “pure� component
@@ -81,18 +81,17 @@ declare module "react-redux" {
      * @default true
      */
     pure: boolean;
-  }
+}
 
-  export interface ProviderProps {
+export interface ProviderProps {
     /**
      * The single Redux store in your application.
      */
     store?: Store;
     children?: ReactNode;
-  }
-
-  /**
-   * Makes the Redux store available to the connect() calls in the component hierarchy below.
-   */
-  export class Provider extends Component<ProviderProps, {}> { }
 }
+
+/**
+ * Makes the Redux store available to the connect() calls in the component hierarchy below.
+ */
+declare export class Provider extends Component<ProviderProps, {}> { }
diff --git a/react-scroll/react-scroll.d.ts b/react-scroll/react-scroll.d.ts
index 27d7dd2104..2166bd4349 100644
--- a/react-scroll/react-scroll.d.ts
+++ b/react-scroll/react-scroll.d.ts
@@ -5,34 +5,33 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "react-scroll" {
-    import React = __React
 
-    interface Link extends React.ClassicComponentClass<any> {}
-    interface Element extends React.ClassicComponentClass<any> {}
+import React = __React
 
-    interface scrollEvnt {
-        register(evtName: string, callback: Function) : void,
-        remove(evtName: string) : void
-    }
+interface Link extends React.ClassicComponentClass<any> { }
+interface Element extends React.ClassicComponentClass<any> { }
 
-    interface Events {
-        scrollEvent: scrollEvnt
-    }
+interface scrollEvnt {
+    register(evtName: string, callback: Function): void,
+    remove(evtName: string): void
+}
 
-    interface scroller {
-        scrollTo(to: any, animate?: any, duration?: any, offset?: any) : void
-    }
+interface Events {
+    scrollEvent: scrollEvnt
+}
 
-    const Link: Link;
-    const Element: Element;
-    const Events: Events;
-    const scroller: scroller;
+interface scroller {
+    scrollTo(to: any, animate?: any, duration?: any, offset?: any): void
+}
 
-    export {
-        Link,
-        Element,
-        Events,
-        scroller
-    }
-}
\ No newline at end of file
+declare const Link: Link;
+declare const Element: Element;
+declare const Events: Events;
+declare const scroller: scroller;
+
+export {
+Link,
+Element,
+Events,
+scroller
+}
diff --git a/react-spinkit/react-spinkit.d.ts b/react-spinkit/react-spinkit.d.ts
index 25f28625f5..1c373f5735 100644
--- a/react-spinkit/react-spinkit.d.ts
+++ b/react-spinkit/react-spinkit.d.ts
@@ -5,15 +5,13 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "react-spinkit" {
-    import { Component } from 'react';
 
-    interface Props {
-        spinnerName?: string;
-    }
+import { Component } from 'react';
 
-    class Spinner extends Component<Props, {}> { }
-
-    export default Spinner;
+interface Props {
+    spinnerName?: string;
 }
 
+declare class Spinner extends Component<Props, {}> { }
+
+export default Spinner;
diff --git a/react-tap-event-plugin/react-tap-event-plugin.d.ts b/react-tap-event-plugin/react-tap-event-plugin.d.ts
index 073164f5bf..25ec13d43d 100644
--- a/react-tap-event-plugin/react-tap-event-plugin.d.ts
+++ b/react-tap-event-plugin/react-tap-event-plugin.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Michael Ledin <https://github.com/mxl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'react-tap-event-plugin'{
-    var exports:()=>any;
-    export = exports;
-}
+
+declare var exports: () => any;
+export = exports;
diff --git a/read/read.d.ts b/read/read.d.ts
index 851470d050..2a8b26f825 100644
--- a/read/read.d.ts
+++ b/read/read.d.ts
@@ -3,22 +3,21 @@
 // Definitions by: Tim JK <https://github.com/timjk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'read' {
-	function Read(options: Read.Options, callback: (error: any, result: string, isDefault: boolean) => any): void;
 
-	namespace Read {
-		interface Options {
-			prompt?: string;
-			silent?: boolean;
-			replace?: string;
-			timeout?: number;
-			default?: string;
-			edit?: boolean;
-			terminal?: boolean;
-			input?: any;
-			output?: any;
-		}
-	}
+declare function Read(options: Read.Options, callback: (error: any, result: string, isDefault: boolean) => any): void;
 
-	export = Read;
+declare namespace Read {
+    interface Options {
+        prompt?: string;
+        silent?: boolean;
+        replace?: string;
+        timeout?: number;
+        default?: string;
+        edit?: boolean;
+        terminal?: boolean;
+        input?: any;
+        output?: any;
+    }
 }
+
+export = Read;
diff --git a/readdir-stream/readdir-stream.d.ts b/readdir-stream/readdir-stream.d.ts
index 9c4f9aef62..a3e7036159 100644
--- a/readdir-stream/readdir-stream.d.ts
+++ b/readdir-stream/readdir-stream.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'readdir-stream' {
-	function readdir(dir: string): NodeJS.ReadableStream;
-	export = readdir;
-}
+
+declare function readdir(dir: string): NodeJS.ReadableStream;
+export = readdir;
diff --git a/rebass/rebass.d.ts b/rebass/rebass.d.ts
index e774b6f186..1cf694eea8 100644
--- a/rebass/rebass.d.ts
+++ b/rebass/rebass.d.ts
@@ -5,493 +5,492 @@
 
 ///<reference path='../react/react.d.ts' />
 
-declare module "rebass" {
-	export import React = __React;
 
-	export interface BaseProps<C> extends React.Props<C> {
-		tagName?: string;
-		className?: string;
-		baseStyle?: Object;
-		style?: Object;
-		m?: number;
-		mt?: number;
-		mr?: number;
-		mb?: number;
-		ml?: number;
-		mx?: number;
-		my?: number;
-		p?: number;
-		pt?: number;
-		pr?: number;
-		pb?: number;
-		pl?: number;
-		px?: number;
-		py?: number;
-		color?: string;
-		backgroundColor?: string;
-		inverted?: boolean;
-		rounded?: boolean | "top" | "right" | "bottom" | "left";
-		circle?: boolean;
-		pill?: boolean;
-	}
+export import React = __React;
 
-	export interface ArrowProps extends BaseProps<ArrowClass> {
-		direction?: "up" | "down";
-	}
-	type ArrowClass = React.StatelessComponent<ArrowProps>
-	export const Arrow: ArrowClass;
-
-	export interface AvatarProps extends BaseProps<AvatarClass> {
-		size?: number;
-		src?: string;
-	}
-	type AvatarClass = React.StatelessComponent<AvatarProps>
-	export const Avatar: AvatarClass;
-
-	export interface BadgeProps extends BaseProps<BadgeClass> {
-		theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
-		rounded?: boolean | "top" | "right" | "bottom" | "left";
-		pill?: boolean;
-		circle?: boolean;
-	}
-	type BadgeClass = React.StatelessComponent<BadgeProps>
-	export const Badge: BadgeClass;
-
-	export interface BannerProps extends BaseProps<BannerClass> {
-		align?: "left" | "center" | "right";
-		backgroundImage: string;
-	}
-	type BannerClass = React.StatelessComponent<BannerProps>
-	export const Banner: BannerClass;
-
-	export interface BlockProps extends BaseProps<BlockClass> {
-		m?: number;
-		mt?: number;
-		mr?: number;
-		mb?: number;
-		ml?: number;
-		mx?: number;
-		my?: number;
-		p?: number;
-		pt?: number;
-		pr?: number;
-		pb?: number;
-		pl?: number;
-		px?: number;
-		py?: number;
-		color?: string;
-		backgroundColor?: string;
-		borderColor?: string;
-		border?: boolean;
-		borderTop?: boolean;
-		borderRight?: boolean;
-		borderBottom?: boolean;
-		borderLeft?: boolean;
-		rounded?: boolean | "top" | "right" | "bottom" | "left";
-	}
-	type BlockClass = React.StatelessComponent<BlockProps>
-	export const Block: BlockClass;
-
-	export interface BlockquoteProps extends BaseProps<BlockquoteClass> {
-		source: string;
-		href: string;
-	}
-	type BlockquoteClass = React.StatelessComponent<BlockquoteProps>
-	export const Blockquote: BlockquoteClass;
-
-	export interface BreadcrumbsProps extends BaseProps<BreadcrumbsClass> {
-		links: {
-			children: any;
-			href: string;
-		}[];
-	}
-	type BreadcrumbsClass = React.StatelessComponent<BreadcrumbsProps>
-	export const Breadcrumbs: BreadcrumbsClass;
-
-	export interface ButtonProps extends BaseProps<ButtonClass> {
-		href?: string;
-		color?: string;
-		backgroundColor?: string;
-		rounded?: boolean | "top" | "right" | "bottom" | "left";
-		pill?: boolean;
-		big?: boolean;
-		theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
-	}
-	type ButtonClass = React.StatelessComponent<ButtonProps>
-	export const Button: ButtonClass;
-
-	export interface ButtonCircleProps extends BaseProps<ButtonCircleClass> {
-		title?: string;
-		href?: string;
-		color?: string;
-		backgroundColor?: string;
-		size?: number;
-	}
-	type ButtonCircleClass = React.StatelessComponent<ButtonCircleProps>
-	export const ButtonCircle: ButtonCircleClass;
-
-	export interface ButtonOutlineProps extends BaseProps<ButtonOutlineClass> {
-		href?: string;
-		color?: string;
-		rounded?: boolean | "top" | "right" | "bottom" | "left";
-		pill?: boolean;
-		big?: boolean;
-	}
-	type ButtonOutlineClass = React.StatelessComponent<ButtonOutlineProps>
-	export const ButtonOutline: ButtonOutlineClass;
-
-	export interface CardProps extends BaseProps<CardClass> {
-		width?: number | string;
-	}
-	type CardClass = React.StatelessComponent<CardProps>
-	export const Card: CardClass;
-
-	export interface CardImageProps extends BaseProps<CardImageClass> {
-		src?: string;
-	}
-	type CardImageClass = React.StatelessComponent<CardImageProps>
-	export const CardImage: CardImageClass;
-
-	export interface CheckboxProps extends BaseProps<CheckboxClass> {
-		label?: string;
-		checked?: boolean;
-		name?: string;
-		readOnly?: boolean;
-		theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
-	}
-	type CheckboxClass = React.StatelessComponent<CheckboxProps>
-	export const Checkbox: CheckboxClass;
-
-	export interface CloseProps extends BaseProps<CloseClass> {
-	}
-	type CloseClass = React.StatelessComponent<CloseProps>
-	export const Close: CloseClass;
-
-	export interface ContainerProps extends BaseProps<ContainerClass> {
-	}
-	type ContainerClass = React.StatelessComponent<ContainerProps>
-	export const Container: ContainerClass;
-
-	export interface DividerProps extends BaseProps<DividerClass> {
-		width?: number;
-	}
-	type DividerClass = React.StatelessComponent<DividerProps>
-	export const Divider: DividerClass;
-
-	export interface DonutProps extends BaseProps<DonutClass> {
-		value?: number;
-		size?: number;
-		strokeWidth?: number;
-		color?: string;
-	}
-	type DonutClass = React.StatelessComponent<DonutProps>
-	export const Donut: DonutClass;
-
-	export interface DotIndicatorProps extends BaseProps<DotIndicatorClass> {
-		length?: number;
-		active?: number;
-		onClick?: Function;
-	}
-	type DotIndicatorClass = React.StatelessComponent<DotIndicatorProps>
-	export const DotIndicator: DotIndicatorClass;
-
-	export interface DrawerProps extends BaseProps<DrawerClass> {
-		size?: number;
-		open?: boolean;
-		position?: "top" | "right" | "bottom" | "left";
-		onDismiss?: Function;
-	}
-	type DrawerClass = React.StatelessComponent<DrawerProps>
-	export const Drawer: DrawerClass;
-
-	export interface DropdownProps extends BaseProps<DropdownClass> {
-	}
-	type DropdownClass = React.StatelessComponent<DropdownProps>
-	export const Dropdown: DropdownClass;
-
-	export interface DropdownMenuProps extends BaseProps<DropdownMenuClass> {
-		open?: boolean;
-		right?: boolean;
-		top?: boolean;
-		onDismiss?: Function;
-	}
-	type DropdownMenuClass = React.StatelessComponent<DropdownMenuProps>
-	export const DropdownMenu: DropdownMenuClass;
-
-	export interface EmbedProps extends BaseProps<EmbedClass> {
-		ratio?: number;
-	}
-	type EmbedClass = React.StatelessComponent<EmbedProps>
-	export const Embed: EmbedClass;
-
-	export interface FixedProps extends BaseProps<FixedClass> {
-		top?: boolean;
-		right?: boolean;
-		bottom?: boolean;
-		left?: boolean;
-		zIndex?: number;
-	}
-	type FixedClass = React.StatelessComponent<FixedProps>
-	export const Fixed: FixedClass;
-
-	export interface FooterProps extends BaseProps<FooterClass> {
-	}
-	type FooterClass = React.StatelessComponent<FooterProps>
-	export const Footer: FooterClass;
-
-	export interface HeadingProps extends BaseProps<HeadingClass> {
-		big?: boolean;
-		level?: number;
-		size?: number;
-		alt?: boolean;
-	}
-	type HeadingClass = React.StatelessComponent<HeadingProps>
-	export const Heading: HeadingClass;
-
-	export interface HeadingLinkProps extends BaseProps<HeadingLinkClass> {
-		level?: number;
-		size?: number;
-		href?: string;
-	}
-	type HeadingLinkClass = React.StatelessComponent<HeadingLinkProps>
-	export const HeadingLink: HeadingLinkClass;
-
-	export interface InlineFormProps extends BaseProps<InlineFormClass> {
-		label?: string;
-		name?: string;
-		value?: number | string;
-		placeholder?: string;
-		onChange?: Function;
-		buttonLabel?: string;
-		onClick?: Function;
-	}
-	type InlineFormClass = React.StatelessComponent<InlineFormProps>
-	export const InlineForm: InlineFormClass;
-
-	export interface InputProps extends BaseProps<InputClass> {
-		label?: string;
-		name?: string;
-		type?: string;
-		message?: string;
-		hideLabel?: boolean;
-		rounded?: boolean | "top" | "right" | "bottom" | "left";
-		placeholder?: string;
-	}
-	type InputClass = React.StatelessComponent<InputProps>
-	export const Input: InputClass;
-
-	export interface LabelProps extends BaseProps<LabelClass> {
-		hide?: boolean;
-	}
-	type LabelClass = React.StatelessComponent<LabelProps>
-	export const Label: LabelClass;
-
-	export interface LinkBlockProps extends BaseProps<LinkBlockClass> {
-		is?: string | Object | Function;
-		href?: string;
-	}
-	type LinkBlockClass = React.StatelessComponent<LinkBlockProps>
-	export const LinkBlock: LinkBlockClass;
-
-	export interface MediaProps extends BaseProps<MediaClass> {
-		img?: string;
-		right?: boolean;
-		align?: "top" | "center" | "bottom";
-	}
-	type MediaClass = React.StatelessComponent<MediaProps>
-	export const Media: MediaClass;
-
-	export interface MenuProps extends BaseProps<MenuClass> {
-	}
-	type MenuClass = React.StatelessComponent<MenuProps>
-	export const Menu: MenuClass;
-
-	export interface MessageProps extends BaseProps<MessageClass> {
-		theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
-	}
-	type MessageClass = React.StatelessComponent<MessageProps>
-	export const Message: MessageClass;
-
-	export interface NavItemProps extends BaseProps<NavItemClass> {
-		small?: boolean;
-		is?: string | Object | Function;
-	}
-	type NavItemClass = React.StatelessComponent<NavItemProps>
-	export const NavItem: NavItemClass;
-
-	export interface OverlayProps extends BaseProps<OverlayClass> {
-		open?: boolean;
-		dark?: boolean;
-		box?: boolean;
-		fullWidth?: boolean;
-		onDismiss?: Function;
-	}
-	type OverlayClass = React.StatelessComponent<OverlayProps>
-	export const Overlay: OverlayClass;
-
-	export interface PageHeaderProps extends BaseProps<PageHeaderClass> {
-		heading?: string;
-		description?: string;
-	}
-	type PageHeaderClass = React.StatelessComponent<PageHeaderProps>
-	export const PageHeader: PageHeaderClass;
-
-	export interface PanelProps extends BaseProps<PanelClass> {
-		theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
-	}
-	type PanelClass = React.StatelessComponent<PanelProps>
-	export const Panel: PanelClass;
-
-	export interface PanelFooterProps extends BaseProps<PanelFooterClass> {
-		theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
-	}
-	type PanelFooterClass = React.StatelessComponent<PanelFooterProps>
-	export const PanelFooter: PanelFooterClass;
-
-	export interface PanelHeaderProps extends BaseProps<PanelHeaderClass> {
-		theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
-	}
-	type PanelHeaderClass = React.StatelessComponent<PanelHeaderProps>
-	export const PanelHeader: PanelHeaderClass;
-
-	export interface PreProps extends BaseProps<PreClass> {
-	}
-	type PreClass = React.StatelessComponent<PreProps>
-	export const Pre: PreClass;
-
-	export interface ProgressProps extends BaseProps<ProgressClass> {
-		value?: number;
-		color?: string;
-	}
-	type ProgressClass = React.StatelessComponent<ProgressProps>
-	export const Progress: ProgressClass;
-
-	export interface RadioProps extends BaseProps<RadioClass> {
-		checked?: boolean;
-		group?: string;
-		label?: string;
-		name?: string;
-		readOnly?: boolean;
-	}
-	type RadioClass = React.StatelessComponent<RadioProps>
-	export const Radio: RadioClass;
-
-	export interface RatingProps extends BaseProps<RatingClass> {
-		value?: number;
-		onClick?: Function;
-	}
-	type RatingClass = React.StatelessComponent<RatingProps>
-	export const Rating: RatingClass;
-
-	export interface SectionProps extends BaseProps<SectionClass> {
-	}
-	type SectionClass = React.StatelessComponent<SectionProps>
-	export const Section: SectionClass;
-
-	export interface SectionHeaderProps extends BaseProps<SectionHeaderClass> {
-		heading?: string;
-		href?: string;
-		description?: string;
-	}
-	type SectionHeaderClass = React.StatelessComponent<SectionHeaderProps>
-	export const SectionHeader: SectionHeaderClass;
-
-	export interface SelectProps extends BaseProps<SelectClass> {
-		label?: string;
-		name?: string;
-		options?: {
-			children: any;
-			value: any;
-		}[];
-		message?: string;
-		hideLabel?: boolean;
-	}
-	type SelectClass = React.StatelessComponent<SelectProps>
-	export const Select: SelectClass;
-
-	export interface SequenceMapProps extends BaseProps<SequenceMapClass> {
-		steps?: {
-			children: any;
-			href: string;
-		}[];
-		active?: number;
-	}
-	type SequenceMapClass = React.StatelessComponent<SequenceMapProps>
-	export const SequenceMap: SequenceMapClass;
-
-	export interface SequenceMapStepProps extends BaseProps<SequenceMapStepClass> {
-		width?: string;
-		first?: boolean;
-		active?: boolean;
-	}
-	type SequenceMapStepClass = React.StatelessComponent<SequenceMapStepProps>
-	export const SequenceMapStep: SequenceMapStepClass;
-
-	export interface SliderProps extends BaseProps<SliderClass> {
-		label?: string;
-		name?: string;
-		fill?: boolean;
-		hideLabel?: boolean;
-		value?: number;
-		defaultValue?: number;
-		readOnly?: boolean;
-	}
-	type SliderClass = React.StatelessComponent<SliderProps>
-	export const Slider: SliderClass;
-
-	export interface SpaceProps extends BaseProps<SpaceClass> {
-		x?: number;
-		auto?: boolean;
-	}
-	type SpaceClass = React.StatelessComponent<SpaceProps>
-	export const Space: SpaceClass;
-
-	export interface StatProps extends BaseProps<StatClass> {
-		value?: number | string;
-		unit?: string;
-		label?: string;
-		topLabel?: boolean;
-	}
-	type StatClass = React.StatelessComponent<StatProps>
-	export const Stat: StatClass;
-
-	export interface SwitchProps extends BaseProps<SwitchClass> {
-		checked?: boolean;
-	}
-	type SwitchClass = React.StatelessComponent<SwitchProps>
-	export const Switch: SwitchClass;
-
-	export interface TableProps extends BaseProps<TableClass> {
-		headings?: any[];
-		data?: any[][];
-	}
-	type TableClass = React.StatelessComponent<TableProps>
-	export const Table: TableClass;
-
-	export interface TextProps extends BaseProps<TextClass> {
-		small?: boolean;
-		bold?: boolean;
-	}
-	type TextClass = React.StatelessComponent<TextProps>
-	export const Text: TextClass;
-
-	export interface TextareaProps extends BaseProps<TextareaClass> {
-		label?: string;
-		name?: string;
-		message?: string;
-		hideLabel?: boolean;
-	}
-	type TextareaClass = React.StatelessComponent<TextareaProps>
-	export const Textarea: TextareaClass;
-
-	export interface ToolbarProps extends BaseProps<ToolbarClass> {
-	}
-	type ToolbarClass = React.StatelessComponent<ToolbarProps>
-	export const Toolbar: ToolbarClass;
-
-	export interface TooltipProps extends BaseProps<TooltipClass> {
-		title?: string;
-	}
-	type TooltipClass = React.StatelessComponent<TooltipProps>
-	export const Tooltip: TooltipClass;
+export interface BaseProps<C> extends React.Props<C> {
+    tagName?: string;
+    className?: string;
+    baseStyle?: Object;
+    style?: Object;
+    m?: number;
+    mt?: number;
+    mr?: number;
+    mb?: number;
+    ml?: number;
+    mx?: number;
+    my?: number;
+    p?: number;
+    pt?: number;
+    pr?: number;
+    pb?: number;
+    pl?: number;
+    px?: number;
+    py?: number;
+    color?: string;
+    backgroundColor?: string;
+    inverted?: boolean;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    circle?: boolean;
+    pill?: boolean;
 }
+
+export interface ArrowProps extends BaseProps<ArrowClass> {
+    direction?: "up" | "down";
+}
+type ArrowClass = React.StatelessComponent<ArrowProps>
+declare export const Arrow: ArrowClass;
+
+export interface AvatarProps extends BaseProps<AvatarClass> {
+    size?: number;
+    src?: string;
+}
+type AvatarClass = React.StatelessComponent<AvatarProps>
+declare export const Avatar: AvatarClass;
+
+export interface BadgeProps extends BaseProps<BadgeClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    pill?: boolean;
+    circle?: boolean;
+}
+type BadgeClass = React.StatelessComponent<BadgeProps>
+declare export const Badge: BadgeClass;
+
+export interface BannerProps extends BaseProps<BannerClass> {
+    align?: "left" | "center" | "right";
+    backgroundImage: string;
+}
+type BannerClass = React.StatelessComponent<BannerProps>
+declare export const Banner: BannerClass;
+
+export interface BlockProps extends BaseProps<BlockClass> {
+    m?: number;
+    mt?: number;
+    mr?: number;
+    mb?: number;
+    ml?: number;
+    mx?: number;
+    my?: number;
+    p?: number;
+    pt?: number;
+    pr?: number;
+    pb?: number;
+    pl?: number;
+    px?: number;
+    py?: number;
+    color?: string;
+    backgroundColor?: string;
+    borderColor?: string;
+    border?: boolean;
+    borderTop?: boolean;
+    borderRight?: boolean;
+    borderBottom?: boolean;
+    borderLeft?: boolean;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+}
+type BlockClass = React.StatelessComponent<BlockProps>
+declare export const Block: BlockClass;
+
+export interface BlockquoteProps extends BaseProps<BlockquoteClass> {
+    source: string;
+    href: string;
+}
+type BlockquoteClass = React.StatelessComponent<BlockquoteProps>
+declare export const Blockquote: BlockquoteClass;
+
+export interface BreadcrumbsProps extends BaseProps<BreadcrumbsClass> {
+    links: {
+        children: any;
+        href: string;
+    }[];
+}
+type BreadcrumbsClass = React.StatelessComponent<BreadcrumbsProps>
+declare export const Breadcrumbs: BreadcrumbsClass;
+
+export interface ButtonProps extends BaseProps<ButtonClass> {
+    href?: string;
+    color?: string;
+    backgroundColor?: string;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    pill?: boolean;
+    big?: boolean;
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type ButtonClass = React.StatelessComponent<ButtonProps>
+declare export const Button: ButtonClass;
+
+export interface ButtonCircleProps extends BaseProps<ButtonCircleClass> {
+    title?: string;
+    href?: string;
+    color?: string;
+    backgroundColor?: string;
+    size?: number;
+}
+type ButtonCircleClass = React.StatelessComponent<ButtonCircleProps>
+declare export const ButtonCircle: ButtonCircleClass;
+
+export interface ButtonOutlineProps extends BaseProps<ButtonOutlineClass> {
+    href?: string;
+    color?: string;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    pill?: boolean;
+    big?: boolean;
+}
+type ButtonOutlineClass = React.StatelessComponent<ButtonOutlineProps>
+declare export const ButtonOutline: ButtonOutlineClass;
+
+export interface CardProps extends BaseProps<CardClass> {
+    width?: number | string;
+}
+type CardClass = React.StatelessComponent<CardProps>
+declare export const Card: CardClass;
+
+export interface CardImageProps extends BaseProps<CardImageClass> {
+    src?: string;
+}
+type CardImageClass = React.StatelessComponent<CardImageProps>
+declare export const CardImage: CardImageClass;
+
+export interface CheckboxProps extends BaseProps<CheckboxClass> {
+    label?: string;
+    checked?: boolean;
+    name?: string;
+    readOnly?: boolean;
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type CheckboxClass = React.StatelessComponent<CheckboxProps>
+declare export const Checkbox: CheckboxClass;
+
+export interface CloseProps extends BaseProps<CloseClass> {
+}
+type CloseClass = React.StatelessComponent<CloseProps>
+declare export const Close: CloseClass;
+
+export interface ContainerProps extends BaseProps<ContainerClass> {
+}
+type ContainerClass = React.StatelessComponent<ContainerProps>
+declare export const Container: ContainerClass;
+
+export interface DividerProps extends BaseProps<DividerClass> {
+    width?: number;
+}
+type DividerClass = React.StatelessComponent<DividerProps>
+declare export const Divider: DividerClass;
+
+export interface DonutProps extends BaseProps<DonutClass> {
+    value?: number;
+    size?: number;
+    strokeWidth?: number;
+    color?: string;
+}
+type DonutClass = React.StatelessComponent<DonutProps>
+declare export const Donut: DonutClass;
+
+export interface DotIndicatorProps extends BaseProps<DotIndicatorClass> {
+    length?: number;
+    active?: number;
+    onClick?: Function;
+}
+type DotIndicatorClass = React.StatelessComponent<DotIndicatorProps>
+declare export const DotIndicator: DotIndicatorClass;
+
+export interface DrawerProps extends BaseProps<DrawerClass> {
+    size?: number;
+    open?: boolean;
+    position?: "top" | "right" | "bottom" | "left";
+    onDismiss?: Function;
+}
+type DrawerClass = React.StatelessComponent<DrawerProps>
+declare export const Drawer: DrawerClass;
+
+export interface DropdownProps extends BaseProps<DropdownClass> {
+}
+type DropdownClass = React.StatelessComponent<DropdownProps>
+declare export const Dropdown: DropdownClass;
+
+export interface DropdownMenuProps extends BaseProps<DropdownMenuClass> {
+    open?: boolean;
+    right?: boolean;
+    top?: boolean;
+    onDismiss?: Function;
+}
+type DropdownMenuClass = React.StatelessComponent<DropdownMenuProps>
+declare export const DropdownMenu: DropdownMenuClass;
+
+export interface EmbedProps extends BaseProps<EmbedClass> {
+    ratio?: number;
+}
+type EmbedClass = React.StatelessComponent<EmbedProps>
+declare export const Embed: EmbedClass;
+
+export interface FixedProps extends BaseProps<FixedClass> {
+    top?: boolean;
+    right?: boolean;
+    bottom?: boolean;
+    left?: boolean;
+    zIndex?: number;
+}
+type FixedClass = React.StatelessComponent<FixedProps>
+declare export const Fixed: FixedClass;
+
+export interface FooterProps extends BaseProps<FooterClass> {
+}
+type FooterClass = React.StatelessComponent<FooterProps>
+declare export const Footer: FooterClass;
+
+export interface HeadingProps extends BaseProps<HeadingClass> {
+    big?: boolean;
+    level?: number;
+    size?: number;
+    alt?: boolean;
+}
+type HeadingClass = React.StatelessComponent<HeadingProps>
+declare export const Heading: HeadingClass;
+
+export interface HeadingLinkProps extends BaseProps<HeadingLinkClass> {
+    level?: number;
+    size?: number;
+    href?: string;
+}
+type HeadingLinkClass = React.StatelessComponent<HeadingLinkProps>
+declare export const HeadingLink: HeadingLinkClass;
+
+export interface InlineFormProps extends BaseProps<InlineFormClass> {
+    label?: string;
+    name?: string;
+    value?: number | string;
+    placeholder?: string;
+    onChange?: Function;
+    buttonLabel?: string;
+    onClick?: Function;
+}
+type InlineFormClass = React.StatelessComponent<InlineFormProps>
+declare export const InlineForm: InlineFormClass;
+
+export interface InputProps extends BaseProps<InputClass> {
+    label?: string;
+    name?: string;
+    type?: string;
+    message?: string;
+    hideLabel?: boolean;
+    rounded?: boolean | "top" | "right" | "bottom" | "left";
+    placeholder?: string;
+}
+type InputClass = React.StatelessComponent<InputProps>
+declare export const Input: InputClass;
+
+export interface LabelProps extends BaseProps<LabelClass> {
+    hide?: boolean;
+}
+type LabelClass = React.StatelessComponent<LabelProps>
+declare export const Label: LabelClass;
+
+export interface LinkBlockProps extends BaseProps<LinkBlockClass> {
+    is?: string | Object | Function;
+    href?: string;
+}
+type LinkBlockClass = React.StatelessComponent<LinkBlockProps>
+declare export const LinkBlock: LinkBlockClass;
+
+export interface MediaProps extends BaseProps<MediaClass> {
+    img?: string;
+    right?: boolean;
+    align?: "top" | "center" | "bottom";
+}
+type MediaClass = React.StatelessComponent<MediaProps>
+declare export const Media: MediaClass;
+
+export interface MenuProps extends BaseProps<MenuClass> {
+}
+type MenuClass = React.StatelessComponent<MenuProps>
+declare export const Menu: MenuClass;
+
+export interface MessageProps extends BaseProps<MessageClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type MessageClass = React.StatelessComponent<MessageProps>
+declare export const Message: MessageClass;
+
+export interface NavItemProps extends BaseProps<NavItemClass> {
+    small?: boolean;
+    is?: string | Object | Function;
+}
+type NavItemClass = React.StatelessComponent<NavItemProps>
+declare export const NavItem: NavItemClass;
+
+export interface OverlayProps extends BaseProps<OverlayClass> {
+    open?: boolean;
+    dark?: boolean;
+    box?: boolean;
+    fullWidth?: boolean;
+    onDismiss?: Function;
+}
+type OverlayClass = React.StatelessComponent<OverlayProps>
+declare export const Overlay: OverlayClass;
+
+export interface PageHeaderProps extends BaseProps<PageHeaderClass> {
+    heading?: string;
+    description?: string;
+}
+type PageHeaderClass = React.StatelessComponent<PageHeaderProps>
+declare export const PageHeader: PageHeaderClass;
+
+export interface PanelProps extends BaseProps<PanelClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type PanelClass = React.StatelessComponent<PanelProps>
+declare export const Panel: PanelClass;
+
+export interface PanelFooterProps extends BaseProps<PanelFooterClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type PanelFooterClass = React.StatelessComponent<PanelFooterProps>
+declare export const PanelFooter: PanelFooterClass;
+
+export interface PanelHeaderProps extends BaseProps<PanelHeaderClass> {
+    theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
+}
+type PanelHeaderClass = React.StatelessComponent<PanelHeaderProps>
+declare export const PanelHeader: PanelHeaderClass;
+
+export interface PreProps extends BaseProps<PreClass> {
+}
+type PreClass = React.StatelessComponent<PreProps>
+declare export const Pre: PreClass;
+
+export interface ProgressProps extends BaseProps<ProgressClass> {
+    value?: number;
+    color?: string;
+}
+type ProgressClass = React.StatelessComponent<ProgressProps>
+declare export const Progress: ProgressClass;
+
+export interface RadioProps extends BaseProps<RadioClass> {
+    checked?: boolean;
+    group?: string;
+    label?: string;
+    name?: string;
+    readOnly?: boolean;
+}
+type RadioClass = React.StatelessComponent<RadioProps>
+declare export const Radio: RadioClass;
+
+export interface RatingProps extends BaseProps<RatingClass> {
+    value?: number;
+    onClick?: Function;
+}
+type RatingClass = React.StatelessComponent<RatingProps>
+declare export const Rating: RatingClass;
+
+export interface SectionProps extends BaseProps<SectionClass> {
+}
+type SectionClass = React.StatelessComponent<SectionProps>
+declare export const Section: SectionClass;
+
+export interface SectionHeaderProps extends BaseProps<SectionHeaderClass> {
+    heading?: string;
+    href?: string;
+    description?: string;
+}
+type SectionHeaderClass = React.StatelessComponent<SectionHeaderProps>
+declare export const SectionHeader: SectionHeaderClass;
+
+export interface SelectProps extends BaseProps<SelectClass> {
+    label?: string;
+    name?: string;
+    options?: {
+        children: any;
+        value: any;
+    }[];
+    message?: string;
+    hideLabel?: boolean;
+}
+type SelectClass = React.StatelessComponent<SelectProps>
+declare export const Select: SelectClass;
+
+export interface SequenceMapProps extends BaseProps<SequenceMapClass> {
+    steps?: {
+        children: any;
+        href: string;
+    }[];
+    active?: number;
+}
+type SequenceMapClass = React.StatelessComponent<SequenceMapProps>
+declare export const SequenceMap: SequenceMapClass;
+
+export interface SequenceMapStepProps extends BaseProps<SequenceMapStepClass> {
+    width?: string;
+    first?: boolean;
+    active?: boolean;
+}
+type SequenceMapStepClass = React.StatelessComponent<SequenceMapStepProps>
+declare export const SequenceMapStep: SequenceMapStepClass;
+
+export interface SliderProps extends BaseProps<SliderClass> {
+    label?: string;
+    name?: string;
+    fill?: boolean;
+    hideLabel?: boolean;
+    value?: number;
+    defaultValue?: number;
+    readOnly?: boolean;
+}
+type SliderClass = React.StatelessComponent<SliderProps>
+declare export const Slider: SliderClass;
+
+export interface SpaceProps extends BaseProps<SpaceClass> {
+    x?: number;
+    auto?: boolean;
+}
+type SpaceClass = React.StatelessComponent<SpaceProps>
+declare export const Space: SpaceClass;
+
+export interface StatProps extends BaseProps<StatClass> {
+    value?: number | string;
+    unit?: string;
+    label?: string;
+    topLabel?: boolean;
+}
+type StatClass = React.StatelessComponent<StatProps>
+declare export const Stat: StatClass;
+
+export interface SwitchProps extends BaseProps<SwitchClass> {
+    checked?: boolean;
+}
+type SwitchClass = React.StatelessComponent<SwitchProps>
+declare export const Switch: SwitchClass;
+
+export interface TableProps extends BaseProps<TableClass> {
+    headings?: any[];
+    data?: any[][];
+}
+type TableClass = React.StatelessComponent<TableProps>
+declare export const Table: TableClass;
+
+export interface TextProps extends BaseProps<TextClass> {
+    small?: boolean;
+    bold?: boolean;
+}
+type TextClass = React.StatelessComponent<TextProps>
+declare export const Text: TextClass;
+
+export interface TextareaProps extends BaseProps<TextareaClass> {
+    label?: string;
+    name?: string;
+    message?: string;
+    hideLabel?: boolean;
+}
+type TextareaClass = React.StatelessComponent<TextareaProps>
+declare export const Textarea: TextareaClass;
+
+export interface ToolbarProps extends BaseProps<ToolbarClass> {
+}
+type ToolbarClass = React.StatelessComponent<ToolbarProps>
+declare export const Toolbar: ToolbarClass;
+
+export interface TooltipProps extends BaseProps<TooltipClass> {
+    title?: string;
+}
+type TooltipClass = React.StatelessComponent<TooltipProps>
+declare export const Tooltip: TooltipClass;
diff --git a/recursive-readdir/recursive-readdir.d.ts b/recursive-readdir/recursive-readdir.d.ts
index d156911b23..d6901cd26b 100644
--- a/recursive-readdir/recursive-readdir.d.ts
+++ b/recursive-readdir/recursive-readdir.d.ts
@@ -5,17 +5,16 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "recursive-readdir" {
-    import * as fs from "fs";
-    namespace RecursiveReaddir {
-        interface readdir {
-            (path: string, callback: (error: Error, files: string[]) => any): void;
-            // ignorePattern supports glob syntax via https://github.com/isaacs/minimatch
-            (path: string, ignorePattern: (string | ((file: string, stats: fs.Stats) => void))[], callback: (error: Error, files: string[]) => any): void;
-            (path: string, ignoreFunction: (file: string, stats: fs.Stats) => void, callback: (error: Error, files: string[]) => any): void;
-        }
-    }
 
-    var r: RecursiveReaddir.readdir;
-    export = r;
+import * as fs from "fs";
+declare namespace RecursiveReaddir {
+    interface readdir {
+        (path: string, callback: (error: Error, files: string[]) => any): void;
+        // ignorePattern supports glob syntax via https://github.com/isaacs/minimatch
+        (path: string, ignorePattern: (string | ((file: string, stats: fs.Stats) => void))[], callback: (error: Error, files: string[]) => any): void;
+        (path: string, ignoreFunction: (file: string, stats: fs.Stats) => void, callback: (error: Error, files: string[]) => any): void;
+    }
 }
+
+declare var r: RecursiveReaddir.readdir;
+export = r;
diff --git a/redis/redis.d.ts b/redis/redis.d.ts
index d76b35f501..76ded67641 100644
--- a/redis/redis.d.ts
+++ b/redis/redis.d.ts
@@ -7,636 +7,635 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "redis" {
-    export function createClient(port_arg:number, host_arg?:string, options?:ClientOpts):RedisClient;
-    export function createClient(unix_socket:string, options?:ClientOpts):RedisClient;
-    export function createClient(options?:ClientOpts):RedisClient;
 
-    export function print(err:Error, reply:any):void;
+declare export function createClient(port_arg: number, host_arg?: string, options?: ClientOpts): RedisClient;
+declare export function createClient(unix_socket: string, options?: ClientOpts): RedisClient;
+declare export function createClient(options?: ClientOpts): RedisClient;
 
-    export var debug_mode:boolean;
+declare export function print(err: Error, reply: any): void;
 
-    export interface MessageHandler<M> {
-        (channel:string, message:M): void;
-    }
+declare export var debug_mode: boolean;
 
-    export interface CommandT<R> { //This is a placeholder to be used eventually, to not have to define each command twice, or four times if all caps versions are to be implemented.
-        (args:any[], callback?:ResCallbackT<R>): void;
-        (...args:any[]): void;
-    }
-
-    export interface ResCallbackT<R> {
-        (err:Error, res:R): void;
-    }
-
-    export interface ServerInfo {
-        redis_version: string;
-        versions: number[];
-    }
-
-    export interface ClientOpts {
-        parser?: string;
-        return_buffers?: boolean;
-        detect_buffers?: boolean;
-        socket_nodelay?: boolean;
-        socket_keepalive?: boolean;
-        no_ready_check?: boolean;
-        enable_offline_queue?: boolean;
-        retry_max_delay?: number;
-        connect_timeout?: number;
-        max_attempts?: number;
-        auth_pass?: string;
-        password?: string;
-        family?: string;
-        command_queue_high_water?: number;
-        command_queue_low_water?: number;
-    }
-
-    export interface RedisClient extends NodeJS.EventEmitter {
-        // event: connect
-        // event: error
-        // event: message
-        // event: pmessage
-        // event: subscribe
-        // event: psubscribe
-        // event: unsubscribe
-        // event: punsubscribe
-
-        connected: boolean;
-        retry_delay: number;
-        retry_backoff: number;
-        command_queue: any[];
-        offline_queue: any[];
-        server_info: ServerInfo;
-
-        end(): void;
-        unref(): void;
-
-        // Low level command execution
-        send_command(command:string, ...args:any[]): boolean;
-
-        // Connection (http://redis.io/commands#connection)
-        auth(password:string, callback?:ResCallbackT<any>): boolean;
-        ping(callback?:ResCallbackT<number>): boolean;
-
-        // Strings (http://redis.io/commands#strings)
-        append(key:string, value:string, callback?:ResCallbackT<number>): boolean;
-        bitcount(key:string, callback?:ResCallbackT<number>): boolean;
-        bitcount(key:string, start:number, end:number, callback?:ResCallbackT<number>): boolean;
-        set(key:string, value:string, callback?:ResCallbackT<string>): boolean;
-        get(key:string, callback?:ResCallbackT<string>): boolean;
-        exists(key:string, value:string, callback?:ResCallbackT<number>): boolean;
-
-        publish(channel:string, value:any): boolean;
-        subscribe(channel:string): boolean;
-
-        /*
-         commands = set_union([
-         "get", "set", "setnx", "setex", "append", "strlen", "del", "exists", "setbit", "getbit", "setrange", "getrange", "substr",
-         "incr", "decr", "mget", "rpush", "lpush", "rpushx", "lpushx", "linsert", "rpop", "lpop", "brpop", "brpoplpush", "blpop", "llen", "lindex",
-         "lset", "lrange", "ltrim", "lrem", "rpoplpush", "sadd", "srem", "smove", "sismember", "scard", "spop", "srandmember", "sinter", "sinterstore",
-         "sunion", "sunionstore", "sdiff", "sdiffstore", "smembers", "zadd", "zincrby", "zrem", "zremrangebyscore", "zremrangebyrank", "zunionstore",
-         "zinterstore", "zrange", "zrangebyscore", "zrevrangebyscore", "zcount", "zrevrange", "zcard", "zscore", "zrank", "zrevrank", "hset", "hsetnx",
-         "hget", "hmset", "hmget", "hincrby", "hdel", "hlen", "hkeys", "hvals", "hgetall", "hexists", "incrby", "decrby", "getset", "mset", "msetnx",
-         "randomkey", "select", "move", "rename", "renamenx", "expire", "expireat", "keys", "dbsize", "auth", "ping", "echo", "save", "bgsave",
-         "bgrewriteaof", "shutdown", "lastsave", "type", "multi", "exec", "discard", "sync", "flushdb", "flushall", "sort", "info", "monitor", "ttl",
-         "persist", "slaveof", "debug", "config", "subscribe", "unsubscribe", "psubscribe", "punsubscribe", "publish", "watch", "unwatch", "cluster",
-         "restore", "migrate", "dump", "object", "client", "eval", "evalsha"], require("./lib/commands"));
-         */
-
-        get(args:any[], callback?:ResCallbackT<string>): boolean;
-        get(...args:any[]): boolean;
-        set(args:any[], callback?:ResCallbackT<string>): boolean;
-        set(...args:any[]): boolean;
-        setnx(args:any[], callback?:ResCallbackT<any>): boolean;
-        setnx(...args:any[]): boolean;
-        setex(args:any[], callback?:ResCallbackT<any>): boolean;
-        setex(...args:any[]): boolean;
-        append(args:any[], callback?:ResCallbackT<any>): boolean;
-        append(...args:any[]): boolean;
-        strlen(args:any[], callback?:ResCallbackT<any>): boolean;
-        strlen(...args:any[]): boolean;
-        del(args:any[], callback?:ResCallbackT<any>): boolean;
-        del(...args:any[]): boolean;
-        exists(args:any[], callback?:ResCallbackT<any>): boolean;
-        exists(...args:any[]): boolean;
-        setbit(args:any[], callback?:ResCallbackT<any>): boolean;
-        setbit(...args:any[]): boolean;
-        getbit(args:any[], callback?:ResCallbackT<any>): boolean;
-        getbit(...args:any[]): boolean;
-        setrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        setrange(...args:any[]): boolean;
-        getrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        getrange(...args:any[]): boolean;
-        substr(args:any[], callback?:ResCallbackT<any>): boolean;
-        substr(...args:any[]): boolean;
-        incr(args:any[], callback?:ResCallbackT<any>): boolean;
-        incr(...args:any[]): boolean;
-        decr(args:any[], callback?:ResCallbackT<any>): boolean;
-        decr(...args:any[]): boolean;
-        mget(args:any[], callback?:ResCallbackT<any>): boolean;
-        mget(...args:any[]): boolean;
-        rpush(...args:any[]): boolean;
-        lpush(args:any[], callback?:ResCallbackT<any>): boolean;
-        lpush(...args:any[]): boolean;
-        rpushx(args:any[], callback?:ResCallbackT<any>): boolean;
-        rpushx(...args:any[]): boolean;
-        lpushx(args:any[], callback?:ResCallbackT<any>): boolean;
-        lpushx(...args:any[]): boolean;
-        linsert(args:any[], callback?:ResCallbackT<any>): boolean;
-        linsert(...args:any[]): boolean;
-        rpop(args:any[], callback?:ResCallbackT<any>): boolean;
-        rpop(...args:any[]): boolean;
-        lpop(args:any[], callback?:ResCallbackT<any>): boolean;
-        lpop(...args:any[]): boolean;
-        brpop(args:any[], callback?:ResCallbackT<any>): boolean;
-        brpop(...args:any[]): boolean;
-        brpoplpush(args:any[], callback?:ResCallbackT<any>): boolean;
-        brpoplpush(...args:any[]): boolean;
-        blpop(args:any[], callback?:ResCallbackT<any>): boolean;
-        blpop(...args:any[]): boolean;
-        llen(args:any[], callback?:ResCallbackT<any>): boolean;
-        llen(...args:any[]): boolean;
-        lindex(args:any[], callback?:ResCallbackT<any>): boolean;
-        lindex(...args:any[]): boolean;
-        lset(args:any[], callback?:ResCallbackT<any>): boolean;
-        lset(...args:any[]): boolean;
-        lrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        lrange(...args:any[]): boolean;
-        ltrim(args:any[], callback?:ResCallbackT<any>): boolean;
-        ltrim(...args:any[]): boolean;
-        lrem(args:any[], callback?:ResCallbackT<any>): boolean;
-        lrem(...args:any[]): boolean;
-        rpoplpush(args:any[], callback?:ResCallbackT<any>): boolean;
-        rpoplpush(...args:any[]): boolean;
-        sadd(args:any[], callback?:ResCallbackT<any>): boolean;
-        sadd(...args:any[]): boolean;
-        srem(args:any[], callback?:ResCallbackT<any>): boolean;
-        srem(...args:any[]): boolean;
-        smove(args:any[], callback?:ResCallbackT<any>): boolean;
-        smove(...args:any[]): boolean;
-        sismember(args:any[], callback?:ResCallbackT<any>): boolean;
-        sismember(...args:any[]): boolean;
-        scard(args:any[], callback?:ResCallbackT<any>): boolean;
-        scard(...args:any[]): boolean;
-        spop(args:any[], callback?:ResCallbackT<any>): boolean;
-        spop(...args:any[]): boolean;
-        srandmember(args:any[], callback?:ResCallbackT<any>): boolean;
-        srandmember(...args:any[]): boolean;
-        sinter(args:any[], callback?:ResCallbackT<any>): boolean;
-        sinter(...args:any[]): boolean;
-        sinterstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        sinterstore(...args:any[]): boolean;
-        sunion(args:any[], callback?:ResCallbackT<any>): boolean;
-        sunion(...args:any[]): boolean;
-        sunionstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        sunionstore(...args:any[]): boolean;
-        sdiff(args:any[], callback?:ResCallbackT<any>): boolean;
-        sdiff(...args:any[]): boolean;
-        sdiffstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        sdiffstore(...args:any[]): boolean;
-        smembers(args:any[], callback?:ResCallbackT<any>): boolean;
-        smembers(...args:any[]): boolean;
-        zadd(args:any[], callback?:ResCallbackT<any>): boolean;
-        zadd(...args:any[]): boolean;
-        zincrby(args:any[], callback?:ResCallbackT<any>): boolean;
-        zincrby(...args:any[]): boolean;
-        zrem(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrem(...args:any[]): boolean;
-        zremrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zremrangebyscore(...args:any[]): boolean;
-        zremrangebyrank(args:any[], callback?:ResCallbackT<any>): boolean;
-        zremrangebyrank(...args:any[]): boolean;
-        zunionstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zunionstore(...args:any[]): boolean;
-        zinterstore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zinterstore(...args:any[]): boolean;
-        zrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrange(...args:any[]): boolean;
-        zrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrangebyscore(...args:any[]): boolean;
-        zrevrangebyscore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrevrangebyscore(...args:any[]): boolean;
-        zcount(args:any[], callback?:ResCallbackT<any>): boolean;
-        zcount(...args:any[]): boolean;
-        zrevrange(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrevrange(...args:any[]): boolean;
-        zcard(args:any[], callback?:ResCallbackT<any>): boolean;
-        zcard(...args:any[]): boolean;
-        zscore(args:any[], callback?:ResCallbackT<any>): boolean;
-        zscore(...args:any[]): boolean;
-        zrank(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrank(...args:any[]): boolean;
-        zrevrank(args:any[], callback?:ResCallbackT<any>): boolean;
-        zrevrank(...args:any[]): boolean;
-        hset(args:any[], callback?:ResCallbackT<any>): boolean;
-        hset(...args:any[]): boolean;
-        hsetnx(args:any[], callback?:ResCallbackT<any>): boolean;
-        hsetnx(...args:any[]): boolean;
-        hget(args:any[], callback?:ResCallbackT<any>): boolean;
-        hget(...args:any[]): boolean;
-        hmset(args:any[], callback?:ResCallbackT<any>): boolean;
-        hmset(key:string, hash:any, callback?:ResCallbackT<any>): boolean;
-        hmset(...args:any[]): boolean;
-        hmget(args:any[], callback?:ResCallbackT<any>): boolean;
-        hmget(...args:any[]): boolean;
-        hincrby(args:any[], callback?:ResCallbackT<any>): boolean;
-        hincrby(...args:any[]): boolean;
-        hdel(args:any[], callback?:ResCallbackT<any>): boolean;
-        hdel(...args:any[]): boolean;
-        hlen(args:any[], callback?:ResCallbackT<any>): boolean;
-        hlen(...args:any[]): boolean;
-        hkeys(args:any[], callback?:ResCallbackT<any>): boolean;
-        hkeys(...args:any[]): boolean;
-        hvals(args:any[], callback?:ResCallbackT<any>): boolean;
-        hvals(...args:any[]): boolean;
-        hgetall(args:any[], callback?:ResCallbackT<any>): boolean;
-        hgetall(...args:any[]): boolean;
-        hgetall(key:string, callback?:ResCallbackT<any>): boolean;
-        hexists(args:any[], callback?:ResCallbackT<any>): boolean;
-        hexists(...args:any[]): boolean;
-        incrby(args:any[], callback?:ResCallbackT<any>): boolean;
-        incrby(...args:any[]): boolean;
-        decrby(args:any[], callback?:ResCallbackT<any>): boolean;
-        decrby(...args:any[]): boolean;
-        getset(args:any[], callback?:ResCallbackT<any>): boolean;
-        getset(...args:any[]): boolean;
-        mset(args:any[], callback?:ResCallbackT<any>): boolean;
-        mset(...args:any[]): boolean;
-        msetnx(args:any[], callback?:ResCallbackT<any>): boolean;
-        msetnx(...args:any[]): boolean;
-        randomkey(args:any[], callback?:ResCallbackT<any>): boolean;
-        randomkey(...args:any[]): boolean;
-        select(args:any[], callback?:ResCallbackT<any>): void;
-        select(...args:any[]): void;
-        move(args:any[], callback?:ResCallbackT<any>): boolean;
-        move(...args:any[]): boolean;
-        rename(args:any[], callback?:ResCallbackT<any>): boolean;
-        rename(...args:any[]): boolean;
-        renamenx(args:any[], callback?:ResCallbackT<any>): boolean;
-        renamenx(...args:any[]): boolean;
-        expire(args:any[], callback?:ResCallbackT<any>): boolean;
-        expire(...args:any[]): boolean;
-        expireat(args:any[], callback?:ResCallbackT<any>): boolean;
-        expireat(...args:any[]): boolean;
-        keys(args:any[], callback?:ResCallbackT<any>): boolean;
-        keys(...args:any[]): boolean;
-        dbsize(args:any[], callback?:ResCallbackT<any>): boolean;
-        dbsize(...args:any[]): boolean;
-        auth(args:any[], callback?:ResCallbackT<any>): void;
-        auth(...args:any[]): void;
-        ping(args:any[], callback?:ResCallbackT<any>): boolean;
-        ping(...args:any[]): boolean;
-        echo(args:any[], callback?:ResCallbackT<any>): boolean;
-        echo(...args:any[]): boolean;
-        save(args:any[], callback?:ResCallbackT<any>): boolean;
-        save(...args:any[]): boolean;
-        bgsave(args:any[], callback?:ResCallbackT<any>): boolean;
-        bgsave(...args:any[]): boolean;
-        bgrewriteaof(args:any[], callback?:ResCallbackT<any>): boolean;
-        bgrewriteaof(...args:any[]): boolean;
-        shutdown(args:any[], callback?:ResCallbackT<any>): boolean;
-        shutdown(...args:any[]): boolean;
-        lastsave(args:any[], callback?:ResCallbackT<any>): boolean;
-        lastsave(...args:any[]): boolean;
-        type(args:any[], callback?:ResCallbackT<any>): boolean;
-        type(...args:any[]): boolean;
-        multi(args:any[], callback?:ResCallbackT<any>): Multi;
-        multi(...args:any[]): Multi;
-        exec(args:any[], callback?:ResCallbackT<any>): boolean;
-        exec(...args:any[]): boolean;
-        discard(args:any[], callback?:ResCallbackT<any>): boolean;
-        discard(...args:any[]): boolean;
-        sync(args:any[], callback?:ResCallbackT<any>): boolean;
-        sync(...args:any[]): boolean;
-        flushdb(args:any[], callback?:ResCallbackT<any>): boolean;
-        flushdb(...args:any[]): boolean;
-        flushall(args:any[], callback?:ResCallbackT<any>): boolean;
-        flushall(...args:any[]): boolean;
-        sort(args:any[], callback?:ResCallbackT<any>): boolean;
-        sort(...args:any[]): boolean;
-        info(args:any[], callback?:ResCallbackT<any>): boolean;
-        info(...args:any[]): boolean;
-        monitor(args:any[], callback?:ResCallbackT<any>): boolean;
-        monitor(...args:any[]): boolean;
-        ttl(args:any[], callback?:ResCallbackT<any>): boolean;
-        ttl(...args:any[]): boolean;
-        persist(args:any[], callback?:ResCallbackT<any>): boolean;
-        persist(...args:any[]): boolean;
-        slaveof(args:any[], callback?:ResCallbackT<any>): boolean;
-        slaveof(...args:any[]): boolean;
-        debug(args:any[], callback?:ResCallbackT<any>): boolean;
-        debug(...args:any[]): boolean;
-        config(args:any[], callback?:ResCallbackT<any>): boolean;
-        config(...args:any[]): boolean;
-        subscribe(args:any[], callback?:ResCallbackT<any>): boolean;
-        subscribe(...args:any[]): boolean;
-        unsubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
-        unsubscribe(...args:any[]): boolean;
-        psubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
-        psubscribe(...args:any[]): boolean;
-        punsubscribe(args:any[], callback?:ResCallbackT<any>): boolean;
-        punsubscribe(...args:any[]): boolean;
-        publish(args:any[], callback?:ResCallbackT<any>): boolean;
-        publish(...args:any[]): boolean;
-        watch(args:any[], callback?:ResCallbackT<any>): boolean;
-        watch(...args:any[]): boolean;
-        unwatch(args:any[], callback?:ResCallbackT<any>): boolean;
-        unwatch(...args:any[]): boolean;
-        cluster(args:any[], callback?:ResCallbackT<any>): boolean;
-        cluster(...args:any[]): boolean;
-        restore(args:any[], callback?:ResCallbackT<any>): boolean;
-        restore(...args:any[]): boolean;
-        migrate(args:any[], callback?:ResCallbackT<any>): boolean;
-        migrate(...args:any[]): boolean;
-        dump(args:any[], callback?:ResCallbackT<any>): boolean;
-        dump(...args:any[]): boolean;
-        object(args:any[], callback?:ResCallbackT<any>): boolean;
-        object(...args:any[]): boolean;
-        client(args:any[], callback?:ResCallbackT<any>): boolean;
-        client(...args:any[]): boolean;
-        eval(args:any[], callback?:ResCallbackT<any>): boolean;
-        eval(...args:any[]): boolean;
-        evalsha(args:any[], callback?:ResCallbackT<any>): boolean;
-        evalsha(...args:any[]): boolean;
-        script(args:any[], callback?:ResCallbackT<any>): boolean;
-        script(...args: any[]): boolean;
-        script(key: string, callback?: ResCallbackT<any>): boolean;
-        quit(args:any[], callback?:ResCallbackT<any>): boolean;
-        quit(...args:any[]): boolean;
-        scan(...args:any[]): boolean;
-        scan(args:any[], callback?:ResCallbackT<any>): boolean;
-        hscan(...args:any[]): boolean;
-        hscan(args:any[], callback?:ResCallbackT<any>): boolean;
-        zscan(...args:any[]): boolean;
-        zscan(args:any[], callback?:ResCallbackT<any>): boolean;
-    }
-
-    export interface Multi {
-        exec(callback?:ResCallbackT<any[]>): boolean;
-
-        get(args:any[], callback?:ResCallbackT<string>): Multi;
-        get(...args:any[]): Multi;
-        set(args:any[], callback?:ResCallbackT<string>): Multi;
-        set(...args:any[]): Multi;
-        setnx(args:any[], callback?:ResCallbackT<any>): Multi;
-        setnx(...args:any[]): Multi;
-        setex(args:any[], callback?:ResCallbackT<any>): Multi;
-        setex(...args:any[]): Multi;
-        append(args:any[], callback?:ResCallbackT<any>): Multi;
-        append(...args:any[]): Multi;
-        strlen(args:any[], callback?:ResCallbackT<any>): Multi;
-        strlen(...args:any[]): Multi;
-        del(args:any[], callback?:ResCallbackT<any>): Multi;
-        del(...args:any[]): Multi;
-        exists(args:any[], callback?:ResCallbackT<any>): Multi;
-        exists(...args:any[]): Multi;
-        setbit(args:any[], callback?:ResCallbackT<any>): Multi;
-        setbit(...args:any[]): Multi;
-        getbit(args:any[], callback?:ResCallbackT<any>): Multi;
-        getbit(...args:any[]): Multi;
-        setrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        setrange(...args:any[]): Multi;
-        getrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        getrange(...args:any[]): Multi;
-        substr(args:any[], callback?:ResCallbackT<any>): Multi;
-        substr(...args:any[]): Multi;
-        incr(args:any[], callback?:ResCallbackT<any>): Multi;
-        incr(...args:any[]): Multi;
-        decr(args:any[], callback?:ResCallbackT<any>): Multi;
-        decr(...args:any[]): Multi;
-        mget(args:any[], callback?:ResCallbackT<any>): Multi;
-        mget(...args:any[]): Multi;
-        rpush(...args:any[]): Multi;
-        lpush(args:any[], callback?:ResCallbackT<any>): Multi;
-        lpush(...args:any[]): Multi;
-        rpushx(args:any[], callback?:ResCallbackT<any>): Multi;
-        rpushx(...args:any[]): Multi;
-        lpushx(args:any[], callback?:ResCallbackT<any>): Multi;
-        lpushx(...args:any[]): Multi;
-        linsert(args:any[], callback?:ResCallbackT<any>): Multi;
-        linsert(...args:any[]): Multi;
-        rpop(args:any[], callback?:ResCallbackT<any>): Multi;
-        rpop(...args:any[]): Multi;
-        lpop(args:any[], callback?:ResCallbackT<any>): Multi;
-        lpop(...args:any[]): Multi;
-        brpop(args:any[], callback?:ResCallbackT<any>): Multi;
-        brpop(...args:any[]): Multi;
-        brpoplpush(args:any[], callback?:ResCallbackT<any>): Multi;
-        brpoplpush(...args:any[]): Multi;
-        blpop(args:any[], callback?:ResCallbackT<any>): Multi;
-        blpop(...args:any[]): Multi;
-        llen(args:any[], callback?:ResCallbackT<any>): Multi;
-        llen(...args:any[]): Multi;
-        lindex(args:any[], callback?:ResCallbackT<any>): Multi;
-        lindex(...args:any[]): Multi;
-        lset(args:any[], callback?:ResCallbackT<any>): Multi;
-        lset(...args:any[]): Multi;
-        lrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        lrange(...args:any[]): Multi;
-        ltrim(args:any[], callback?:ResCallbackT<any>): Multi;
-        ltrim(...args:any[]): Multi;
-        lrem(args:any[], callback?:ResCallbackT<any>): Multi;
-        lrem(...args:any[]): Multi;
-        rpoplpush(args:any[], callback?:ResCallbackT<any>): Multi;
-        rpoplpush(...args:any[]): Multi;
-        sadd(args:any[], callback?:ResCallbackT<any>): Multi;
-        sadd(...args:any[]): Multi;
-        srem(args:any[], callback?:ResCallbackT<any>): Multi;
-        srem(...args:any[]): Multi;
-        smove(args:any[], callback?:ResCallbackT<any>): Multi;
-        smove(...args:any[]): Multi;
-        sismember(args:any[], callback?:ResCallbackT<any>): Multi;
-        sismember(...args:any[]): Multi;
-        scard(args:any[], callback?:ResCallbackT<any>): Multi;
-        scard(...args:any[]): Multi;
-        spop(args:any[], callback?:ResCallbackT<any>): Multi;
-        spop(...args:any[]): Multi;
-        srandmember(args:any[], callback?:ResCallbackT<any>): Multi;
-        srandmember(...args:any[]): Multi;
-        sinter(args:any[], callback?:ResCallbackT<any>): Multi;
-        sinter(...args:any[]): Multi;
-        sinterstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        sinterstore(...args:any[]): Multi;
-        sunion(args:any[], callback?:ResCallbackT<any>): Multi;
-        sunion(...args:any[]): Multi;
-        sunionstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        sunionstore(...args:any[]): Multi;
-        sdiff(args:any[], callback?:ResCallbackT<any>): Multi;
-        sdiff(...args:any[]): Multi;
-        sdiffstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        sdiffstore(...args:any[]): Multi;
-        smembers(args:any[], callback?:ResCallbackT<any>): Multi;
-        smembers(...args:any[]): Multi;
-        zadd(args:any[], callback?:ResCallbackT<any>): Multi;
-        zadd(...args:any[]): Multi;
-        zincrby(args:any[], callback?:ResCallbackT<any>): Multi;
-        zincrby(...args:any[]): Multi;
-        zrem(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrem(...args:any[]): Multi;
-        zremrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zremrangebyscore(...args:any[]): Multi;
-        zremrangebyrank(args:any[], callback?:ResCallbackT<any>): Multi;
-        zremrangebyrank(...args:any[]): Multi;
-        zunionstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zunionstore(...args:any[]): Multi;
-        zinterstore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zinterstore(...args:any[]): Multi;
-        zrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrange(...args:any[]): Multi;
-        zrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrangebyscore(...args:any[]): Multi;
-        zrevrangebyscore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrevrangebyscore(...args:any[]): Multi;
-        zcount(args:any[], callback?:ResCallbackT<any>): Multi;
-        zcount(...args:any[]): Multi;
-        zrevrange(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrevrange(...args:any[]): Multi;
-        zcard(args:any[], callback?:ResCallbackT<any>): Multi;
-        zcard(...args:any[]): Multi;
-        zscore(args:any[], callback?:ResCallbackT<any>): Multi;
-        zscore(...args:any[]): Multi;
-        zrank(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrank(...args:any[]): Multi;
-        zrevrank(args:any[], callback?:ResCallbackT<any>): Multi;
-        zrevrank(...args:any[]): Multi;
-        hset(args:any[], callback?:ResCallbackT<any>): Multi;
-        hset(...args:any[]): Multi;
-        hsetnx(args:any[], callback?:ResCallbackT<any>): Multi;
-        hsetnx(...args:any[]): Multi;
-        hget(args:any[], callback?:ResCallbackT<any>): Multi;
-        hget(...args:any[]): Multi;
-        hmset(args:any[], callback?:ResCallbackT<any>): Multi;
-        hmset(key:string, hash:any, callback?:ResCallbackT<any>): Multi;
-        hmset(...args:any[]): Multi;
-        hmget(args:any[], callback?:ResCallbackT<any>): Multi;
-        hmget(...args:any[]): Multi;
-        hincrby(args:any[], callback?:ResCallbackT<any>): Multi;
-        hincrby(...args:any[]): Multi;
-        hdel(args:any[], callback?:ResCallbackT<any>): Multi;
-        hdel(...args:any[]): Multi;
-        hlen(args:any[], callback?:ResCallbackT<any>): Multi;
-        hlen(...args:any[]): Multi;
-        hkeys(args:any[], callback?:ResCallbackT<any>): Multi;
-        hkeys(...args:any[]): Multi;
-        hvals(args:any[], callback?:ResCallbackT<any>): Multi;
-        hvals(...args:any[]): Multi;
-        hgetall(args:any[], callback?:ResCallbackT<any>): Multi;
-        hgetall(...args:any[]): Multi;
-        hgetall(key:string, callback?:ResCallbackT<any>): Multi;
-        hexists(args:any[], callback?:ResCallbackT<any>): Multi;
-        hexists(...args:any[]): Multi;
-        incrby(args:any[], callback?:ResCallbackT<any>): Multi;
-        incrby(...args:any[]): Multi;
-        decrby(args:any[], callback?:ResCallbackT<any>): Multi;
-        decrby(...args:any[]): Multi;
-        getset(args:any[], callback?:ResCallbackT<any>): Multi;
-        getset(...args:any[]): Multi;
-        mset(args:any[], callback?:ResCallbackT<any>): Multi;
-        mset(...args:any[]): Multi;
-        msetnx(args:any[], callback?:ResCallbackT<any>): Multi;
-        msetnx(...args:any[]): Multi;
-        randomkey(args:any[], callback?:ResCallbackT<any>): Multi;
-        randomkey(...args:any[]): Multi;
-        select(args:any[], callback?:ResCallbackT<any>): void;
-        select(...args:any[]): Multi;
-        move(args:any[], callback?:ResCallbackT<any>): Multi;
-        move(...args:any[]): Multi;
-        rename(args:any[], callback?:ResCallbackT<any>): Multi;
-        rename(...args:any[]): Multi;
-        renamenx(args:any[], callback?:ResCallbackT<any>): Multi;
-        renamenx(...args:any[]): Multi;
-        expire(args:any[], callback?:ResCallbackT<any>): Multi;
-        expire(...args:any[]): Multi;
-        expireat(args:any[], callback?:ResCallbackT<any>): Multi;
-        expireat(...args:any[]): Multi;
-        keys(args:any[], callback?:ResCallbackT<any>): Multi;
-        keys(...args:any[]): Multi;
-        dbsize(args:any[], callback?:ResCallbackT<any>): Multi;
-        dbsize(...args:any[]): Multi;
-        auth(args:any[], callback?:ResCallbackT<any>): void;
-        auth(...args:any[]): void;
-        ping(args:any[], callback?:ResCallbackT<any>): Multi;
-        ping(...args:any[]): Multi;
-        echo(args:any[], callback?:ResCallbackT<any>): Multi;
-        echo(...args:any[]): Multi;
-        save(args:any[], callback?:ResCallbackT<any>): Multi;
-        save(...args:any[]): Multi;
-        bgsave(args:any[], callback?:ResCallbackT<any>): Multi;
-        bgsave(...args:any[]): Multi;
-        bgrewriteaof(args:any[], callback?:ResCallbackT<any>): Multi;
-        bgrewriteaof(...args:any[]): Multi;
-        shutdown(args:any[], callback?:ResCallbackT<any>): Multi;
-        shutdown(...args:any[]): Multi;
-        lastsave(args:any[], callback?:ResCallbackT<any>): Multi;
-        lastsave(...args:any[]): Multi;
-        type(args:any[], callback?:ResCallbackT<any>): Multi;
-        type(...args:any[]): Multi;
-        multi(args:any[], callback?:ResCallbackT<any>): Multi;
-        multi(...args:any[]): Multi;
-        exec(args:any[], callback?:ResCallbackT<any>): Multi;
-        exec(...args:any[]): Multi;
-        discard(args:any[], callback?:ResCallbackT<any>): Multi;
-        discard(...args:any[]): Multi;
-        sync(args:any[], callback?:ResCallbackT<any>): Multi;
-        sync(...args:any[]): Multi;
-        flushdb(args:any[], callback?:ResCallbackT<any>): Multi;
-        flushdb(...args:any[]): Multi;
-        flushall(args:any[], callback?:ResCallbackT<any>): Multi;
-        flushall(...args:any[]): Multi;
-        sort(args:any[], callback?:ResCallbackT<any>): Multi;
-        sort(...args:any[]): Multi;
-        info(args:any[], callback?:ResCallbackT<any>): Multi;
-        info(...args:any[]): Multi;
-        monitor(args:any[], callback?:ResCallbackT<any>): Multi;
-        monitor(...args:any[]): Multi;
-        ttl(args:any[], callback?:ResCallbackT<any>): Multi;
-        ttl(...args:any[]): Multi;
-        persist(args:any[], callback?:ResCallbackT<any>): Multi;
-        persist(...args:any[]): Multi;
-        slaveof(args:any[], callback?:ResCallbackT<any>): Multi;
-        slaveof(...args:any[]): Multi;
-        debug(args:any[], callback?:ResCallbackT<any>): Multi;
-        debug(...args:any[]): Multi;
-        config(args:any[], callback?:ResCallbackT<any>): Multi;
-        config(...args:any[]): Multi;
-        subscribe(args:any[], callback?:ResCallbackT<any>): Multi;
-        subscribe(...args:any[]): Multi;
-        unsubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
-        unsubscribe(...args:any[]): Multi;
-        psubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
-        psubscribe(...args:any[]): Multi;
-        punsubscribe(args:any[], callback?:ResCallbackT<any>): Multi;
-        punsubscribe(...args:any[]): Multi;
-        publish(args:any[], callback?:ResCallbackT<any>): Multi;
-        publish(...args:any[]): Multi;
-        watch(args:any[], callback?:ResCallbackT<any>): Multi;
-        watch(...args:any[]): Multi;
-        unwatch(args:any[], callback?:ResCallbackT<any>): Multi;
-        unwatch(...args:any[]): Multi;
-        cluster(args:any[], callback?:ResCallbackT<any>): Multi;
-        cluster(...args:any[]): Multi;
-        restore(args:any[], callback?:ResCallbackT<any>): Multi;
-        restore(...args:any[]): Multi;
-        migrate(args:any[], callback?:ResCallbackT<any>): Multi;
-        migrate(...args:any[]): Multi;
-        dump(args:any[], callback?:ResCallbackT<any>): Multi;
-        dump(...args:any[]): Multi;
-        object(args:any[], callback?:ResCallbackT<any>): Multi;
-        object(...args:any[]): Multi;
-        client(args:any[], callback?:ResCallbackT<any>): Multi;
-        client(...args:any[]): Multi;
-        eval(args:any[], callback?:ResCallbackT<any>): Multi;
-        eval(...args:any[]): Multi;
-        evalsha(args:any[], callback?:ResCallbackT<any>): Multi;
-        evalsha(...args:any[]): Multi;
-        quit(args:any[], callback?:ResCallbackT<any>): Multi;
-        quit(...args:any[]): Multi;
-        scan(...args:any[]): Multi;
-        scan(args:any[], callback?:ResCallbackT<any>): Multi;
-        hscan(...args:any[]): Multi;
-        hscan(args:any[], callback?:ResCallbackT<any>): Multi;
-        zscan(...args:any[]): Multi;
-        zscan(args:any[], callback?:ResCallbackT<any>): Multi;
-    }
+export interface MessageHandler<M> {
+    (channel: string, message: M): void;
+}
+
+export interface CommandT<R> { //This is a placeholder to be used eventually, to not have to define each command twice, or four times if all caps versions are to be implemented.
+    (args: any[], callback?: ResCallbackT<R>): void;
+    (...args: any[]): void;
+}
+
+export interface ResCallbackT<R> {
+    (err: Error, res: R): void;
+}
+
+export interface ServerInfo {
+    redis_version: string;
+    versions: number[];
+}
+
+export interface ClientOpts {
+    parser?: string;
+    return_buffers?: boolean;
+    detect_buffers?: boolean;
+    socket_nodelay?: boolean;
+    socket_keepalive?: boolean;
+    no_ready_check?: boolean;
+    enable_offline_queue?: boolean;
+    retry_max_delay?: number;
+    connect_timeout?: number;
+    max_attempts?: number;
+    auth_pass?: string;
+    password?: string;
+    family?: string;
+    command_queue_high_water?: number;
+    command_queue_low_water?: number;
+}
+
+export interface RedisClient extends NodeJS.EventEmitter {
+    // event: connect
+    // event: error
+    // event: message
+    // event: pmessage
+    // event: subscribe
+    // event: psubscribe
+    // event: unsubscribe
+    // event: punsubscribe
+
+    connected: boolean;
+    retry_delay: number;
+    retry_backoff: number;
+    command_queue: any[];
+    offline_queue: any[];
+    server_info: ServerInfo;
+
+    end(): void;
+    unref(): void;
+
+    // Low level command execution
+    send_command(command: string, ...args: any[]): boolean;
+
+    // Connection (http://redis.io/commands#connection)
+    auth(password: string, callback?: ResCallbackT<any>): boolean;
+    ping(callback?: ResCallbackT<number>): boolean;
+
+    // Strings (http://redis.io/commands#strings)
+    append(key: string, value: string, callback?: ResCallbackT<number>): boolean;
+    bitcount(key: string, callback?: ResCallbackT<number>): boolean;
+    bitcount(key: string, start: number, end: number, callback?: ResCallbackT<number>): boolean;
+    set(key: string, value: string, callback?: ResCallbackT<string>): boolean;
+    get(key: string, callback?: ResCallbackT<string>): boolean;
+    exists(key: string, value: string, callback?: ResCallbackT<number>): boolean;
+
+    publish(channel: string, value: any): boolean;
+    subscribe(channel: string): boolean;
+
+    /*
+     commands = set_union([
+     "get", "set", "setnx", "setex", "append", "strlen", "del", "exists", "setbit", "getbit", "setrange", "getrange", "substr",
+     "incr", "decr", "mget", "rpush", "lpush", "rpushx", "lpushx", "linsert", "rpop", "lpop", "brpop", "brpoplpush", "blpop", "llen", "lindex",
+     "lset", "lrange", "ltrim", "lrem", "rpoplpush", "sadd", "srem", "smove", "sismember", "scard", "spop", "srandmember", "sinter", "sinterstore",
+     "sunion", "sunionstore", "sdiff", "sdiffstore", "smembers", "zadd", "zincrby", "zrem", "zremrangebyscore", "zremrangebyrank", "zunionstore",
+     "zinterstore", "zrange", "zrangebyscore", "zrevrangebyscore", "zcount", "zrevrange", "zcard", "zscore", "zrank", "zrevrank", "hset", "hsetnx",
+     "hget", "hmset", "hmget", "hincrby", "hdel", "hlen", "hkeys", "hvals", "hgetall", "hexists", "incrby", "decrby", "getset", "mset", "msetnx",
+     "randomkey", "select", "move", "rename", "renamenx", "expire", "expireat", "keys", "dbsize", "auth", "ping", "echo", "save", "bgsave",
+     "bgrewriteaof", "shutdown", "lastsave", "type", "multi", "exec", "discard", "sync", "flushdb", "flushall", "sort", "info", "monitor", "ttl",
+     "persist", "slaveof", "debug", "config", "subscribe", "unsubscribe", "psubscribe", "punsubscribe", "publish", "watch", "unwatch", "cluster",
+     "restore", "migrate", "dump", "object", "client", "eval", "evalsha"], require("./lib/commands"));
+     */
+
+    get(args: any[], callback?: ResCallbackT<string>): boolean;
+    get(...args: any[]): boolean;
+    set(args: any[], callback?: ResCallbackT<string>): boolean;
+    set(...args: any[]): boolean;
+    setnx(args: any[], callback?: ResCallbackT<any>): boolean;
+    setnx(...args: any[]): boolean;
+    setex(args: any[], callback?: ResCallbackT<any>): boolean;
+    setex(...args: any[]): boolean;
+    append(args: any[], callback?: ResCallbackT<any>): boolean;
+    append(...args: any[]): boolean;
+    strlen(args: any[], callback?: ResCallbackT<any>): boolean;
+    strlen(...args: any[]): boolean;
+    del(args: any[], callback?: ResCallbackT<any>): boolean;
+    del(...args: any[]): boolean;
+    exists(args: any[], callback?: ResCallbackT<any>): boolean;
+    exists(...args: any[]): boolean;
+    setbit(args: any[], callback?: ResCallbackT<any>): boolean;
+    setbit(...args: any[]): boolean;
+    getbit(args: any[], callback?: ResCallbackT<any>): boolean;
+    getbit(...args: any[]): boolean;
+    setrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    setrange(...args: any[]): boolean;
+    getrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    getrange(...args: any[]): boolean;
+    substr(args: any[], callback?: ResCallbackT<any>): boolean;
+    substr(...args: any[]): boolean;
+    incr(args: any[], callback?: ResCallbackT<any>): boolean;
+    incr(...args: any[]): boolean;
+    decr(args: any[], callback?: ResCallbackT<any>): boolean;
+    decr(...args: any[]): boolean;
+    mget(args: any[], callback?: ResCallbackT<any>): boolean;
+    mget(...args: any[]): boolean;
+    rpush(...args: any[]): boolean;
+    lpush(args: any[], callback?: ResCallbackT<any>): boolean;
+    lpush(...args: any[]): boolean;
+    rpushx(args: any[], callback?: ResCallbackT<any>): boolean;
+    rpushx(...args: any[]): boolean;
+    lpushx(args: any[], callback?: ResCallbackT<any>): boolean;
+    lpushx(...args: any[]): boolean;
+    linsert(args: any[], callback?: ResCallbackT<any>): boolean;
+    linsert(...args: any[]): boolean;
+    rpop(args: any[], callback?: ResCallbackT<any>): boolean;
+    rpop(...args: any[]): boolean;
+    lpop(args: any[], callback?: ResCallbackT<any>): boolean;
+    lpop(...args: any[]): boolean;
+    brpop(args: any[], callback?: ResCallbackT<any>): boolean;
+    brpop(...args: any[]): boolean;
+    brpoplpush(args: any[], callback?: ResCallbackT<any>): boolean;
+    brpoplpush(...args: any[]): boolean;
+    blpop(args: any[], callback?: ResCallbackT<any>): boolean;
+    blpop(...args: any[]): boolean;
+    llen(args: any[], callback?: ResCallbackT<any>): boolean;
+    llen(...args: any[]): boolean;
+    lindex(args: any[], callback?: ResCallbackT<any>): boolean;
+    lindex(...args: any[]): boolean;
+    lset(args: any[], callback?: ResCallbackT<any>): boolean;
+    lset(...args: any[]): boolean;
+    lrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    lrange(...args: any[]): boolean;
+    ltrim(args: any[], callback?: ResCallbackT<any>): boolean;
+    ltrim(...args: any[]): boolean;
+    lrem(args: any[], callback?: ResCallbackT<any>): boolean;
+    lrem(...args: any[]): boolean;
+    rpoplpush(args: any[], callback?: ResCallbackT<any>): boolean;
+    rpoplpush(...args: any[]): boolean;
+    sadd(args: any[], callback?: ResCallbackT<any>): boolean;
+    sadd(...args: any[]): boolean;
+    srem(args: any[], callback?: ResCallbackT<any>): boolean;
+    srem(...args: any[]): boolean;
+    smove(args: any[], callback?: ResCallbackT<any>): boolean;
+    smove(...args: any[]): boolean;
+    sismember(args: any[], callback?: ResCallbackT<any>): boolean;
+    sismember(...args: any[]): boolean;
+    scard(args: any[], callback?: ResCallbackT<any>): boolean;
+    scard(...args: any[]): boolean;
+    spop(args: any[], callback?: ResCallbackT<any>): boolean;
+    spop(...args: any[]): boolean;
+    srandmember(args: any[], callback?: ResCallbackT<any>): boolean;
+    srandmember(...args: any[]): boolean;
+    sinter(args: any[], callback?: ResCallbackT<any>): boolean;
+    sinter(...args: any[]): boolean;
+    sinterstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    sinterstore(...args: any[]): boolean;
+    sunion(args: any[], callback?: ResCallbackT<any>): boolean;
+    sunion(...args: any[]): boolean;
+    sunionstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    sunionstore(...args: any[]): boolean;
+    sdiff(args: any[], callback?: ResCallbackT<any>): boolean;
+    sdiff(...args: any[]): boolean;
+    sdiffstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    sdiffstore(...args: any[]): boolean;
+    smembers(args: any[], callback?: ResCallbackT<any>): boolean;
+    smembers(...args: any[]): boolean;
+    zadd(args: any[], callback?: ResCallbackT<any>): boolean;
+    zadd(...args: any[]): boolean;
+    zincrby(args: any[], callback?: ResCallbackT<any>): boolean;
+    zincrby(...args: any[]): boolean;
+    zrem(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrem(...args: any[]): boolean;
+    zremrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zremrangebyscore(...args: any[]): boolean;
+    zremrangebyrank(args: any[], callback?: ResCallbackT<any>): boolean;
+    zremrangebyrank(...args: any[]): boolean;
+    zunionstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zunionstore(...args: any[]): boolean;
+    zinterstore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zinterstore(...args: any[]): boolean;
+    zrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrange(...args: any[]): boolean;
+    zrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrangebyscore(...args: any[]): boolean;
+    zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrevrangebyscore(...args: any[]): boolean;
+    zcount(args: any[], callback?: ResCallbackT<any>): boolean;
+    zcount(...args: any[]): boolean;
+    zrevrange(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrevrange(...args: any[]): boolean;
+    zcard(args: any[], callback?: ResCallbackT<any>): boolean;
+    zcard(...args: any[]): boolean;
+    zscore(args: any[], callback?: ResCallbackT<any>): boolean;
+    zscore(...args: any[]): boolean;
+    zrank(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrank(...args: any[]): boolean;
+    zrevrank(args: any[], callback?: ResCallbackT<any>): boolean;
+    zrevrank(...args: any[]): boolean;
+    hset(args: any[], callback?: ResCallbackT<any>): boolean;
+    hset(...args: any[]): boolean;
+    hsetnx(args: any[], callback?: ResCallbackT<any>): boolean;
+    hsetnx(...args: any[]): boolean;
+    hget(args: any[], callback?: ResCallbackT<any>): boolean;
+    hget(...args: any[]): boolean;
+    hmset(args: any[], callback?: ResCallbackT<any>): boolean;
+    hmset(key: string, hash: any, callback?: ResCallbackT<any>): boolean;
+    hmset(...args: any[]): boolean;
+    hmget(args: any[], callback?: ResCallbackT<any>): boolean;
+    hmget(...args: any[]): boolean;
+    hincrby(args: any[], callback?: ResCallbackT<any>): boolean;
+    hincrby(...args: any[]): boolean;
+    hdel(args: any[], callback?: ResCallbackT<any>): boolean;
+    hdel(...args: any[]): boolean;
+    hlen(args: any[], callback?: ResCallbackT<any>): boolean;
+    hlen(...args: any[]): boolean;
+    hkeys(args: any[], callback?: ResCallbackT<any>): boolean;
+    hkeys(...args: any[]): boolean;
+    hvals(args: any[], callback?: ResCallbackT<any>): boolean;
+    hvals(...args: any[]): boolean;
+    hgetall(args: any[], callback?: ResCallbackT<any>): boolean;
+    hgetall(...args: any[]): boolean;
+    hgetall(key: string, callback?: ResCallbackT<any>): boolean;
+    hexists(args: any[], callback?: ResCallbackT<any>): boolean;
+    hexists(...args: any[]): boolean;
+    incrby(args: any[], callback?: ResCallbackT<any>): boolean;
+    incrby(...args: any[]): boolean;
+    decrby(args: any[], callback?: ResCallbackT<any>): boolean;
+    decrby(...args: any[]): boolean;
+    getset(args: any[], callback?: ResCallbackT<any>): boolean;
+    getset(...args: any[]): boolean;
+    mset(args: any[], callback?: ResCallbackT<any>): boolean;
+    mset(...args: any[]): boolean;
+    msetnx(args: any[], callback?: ResCallbackT<any>): boolean;
+    msetnx(...args: any[]): boolean;
+    randomkey(args: any[], callback?: ResCallbackT<any>): boolean;
+    randomkey(...args: any[]): boolean;
+    select(args: any[], callback?: ResCallbackT<any>): void;
+    select(...args: any[]): void;
+    move(args: any[], callback?: ResCallbackT<any>): boolean;
+    move(...args: any[]): boolean;
+    rename(args: any[], callback?: ResCallbackT<any>): boolean;
+    rename(...args: any[]): boolean;
+    renamenx(args: any[], callback?: ResCallbackT<any>): boolean;
+    renamenx(...args: any[]): boolean;
+    expire(args: any[], callback?: ResCallbackT<any>): boolean;
+    expire(...args: any[]): boolean;
+    expireat(args: any[], callback?: ResCallbackT<any>): boolean;
+    expireat(...args: any[]): boolean;
+    keys(args: any[], callback?: ResCallbackT<any>): boolean;
+    keys(...args: any[]): boolean;
+    dbsize(args: any[], callback?: ResCallbackT<any>): boolean;
+    dbsize(...args: any[]): boolean;
+    auth(args: any[], callback?: ResCallbackT<any>): void;
+    auth(...args: any[]): void;
+    ping(args: any[], callback?: ResCallbackT<any>): boolean;
+    ping(...args: any[]): boolean;
+    echo(args: any[], callback?: ResCallbackT<any>): boolean;
+    echo(...args: any[]): boolean;
+    save(args: any[], callback?: ResCallbackT<any>): boolean;
+    save(...args: any[]): boolean;
+    bgsave(args: any[], callback?: ResCallbackT<any>): boolean;
+    bgsave(...args: any[]): boolean;
+    bgrewriteaof(args: any[], callback?: ResCallbackT<any>): boolean;
+    bgrewriteaof(...args: any[]): boolean;
+    shutdown(args: any[], callback?: ResCallbackT<any>): boolean;
+    shutdown(...args: any[]): boolean;
+    lastsave(args: any[], callback?: ResCallbackT<any>): boolean;
+    lastsave(...args: any[]): boolean;
+    type(args: any[], callback?: ResCallbackT<any>): boolean;
+    type(...args: any[]): boolean;
+    multi(args: any[], callback?: ResCallbackT<any>): Multi;
+    multi(...args: any[]): Multi;
+    exec(args: any[], callback?: ResCallbackT<any>): boolean;
+    exec(...args: any[]): boolean;
+    discard(args: any[], callback?: ResCallbackT<any>): boolean;
+    discard(...args: any[]): boolean;
+    sync(args: any[], callback?: ResCallbackT<any>): boolean;
+    sync(...args: any[]): boolean;
+    flushdb(args: any[], callback?: ResCallbackT<any>): boolean;
+    flushdb(...args: any[]): boolean;
+    flushall(args: any[], callback?: ResCallbackT<any>): boolean;
+    flushall(...args: any[]): boolean;
+    sort(args: any[], callback?: ResCallbackT<any>): boolean;
+    sort(...args: any[]): boolean;
+    info(args: any[], callback?: ResCallbackT<any>): boolean;
+    info(...args: any[]): boolean;
+    monitor(args: any[], callback?: ResCallbackT<any>): boolean;
+    monitor(...args: any[]): boolean;
+    ttl(args: any[], callback?: ResCallbackT<any>): boolean;
+    ttl(...args: any[]): boolean;
+    persist(args: any[], callback?: ResCallbackT<any>): boolean;
+    persist(...args: any[]): boolean;
+    slaveof(args: any[], callback?: ResCallbackT<any>): boolean;
+    slaveof(...args: any[]): boolean;
+    debug(args: any[], callback?: ResCallbackT<any>): boolean;
+    debug(...args: any[]): boolean;
+    config(args: any[], callback?: ResCallbackT<any>): boolean;
+    config(...args: any[]): boolean;
+    subscribe(args: any[], callback?: ResCallbackT<any>): boolean;
+    subscribe(...args: any[]): boolean;
+    unsubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
+    unsubscribe(...args: any[]): boolean;
+    psubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
+    psubscribe(...args: any[]): boolean;
+    punsubscribe(args: any[], callback?: ResCallbackT<any>): boolean;
+    punsubscribe(...args: any[]): boolean;
+    publish(args: any[], callback?: ResCallbackT<any>): boolean;
+    publish(...args: any[]): boolean;
+    watch(args: any[], callback?: ResCallbackT<any>): boolean;
+    watch(...args: any[]): boolean;
+    unwatch(args: any[], callback?: ResCallbackT<any>): boolean;
+    unwatch(...args: any[]): boolean;
+    cluster(args: any[], callback?: ResCallbackT<any>): boolean;
+    cluster(...args: any[]): boolean;
+    restore(args: any[], callback?: ResCallbackT<any>): boolean;
+    restore(...args: any[]): boolean;
+    migrate(args: any[], callback?: ResCallbackT<any>): boolean;
+    migrate(...args: any[]): boolean;
+    dump(args: any[], callback?: ResCallbackT<any>): boolean;
+    dump(...args: any[]): boolean;
+    object(args: any[], callback?: ResCallbackT<any>): boolean;
+    object(...args: any[]): boolean;
+    client(args: any[], callback?: ResCallbackT<any>): boolean;
+    client(...args: any[]): boolean;
+    eval(args: any[], callback?: ResCallbackT<any>): boolean;
+    eval(...args: any[]): boolean;
+    evalsha(args: any[], callback?: ResCallbackT<any>): boolean;
+    evalsha(...args: any[]): boolean;
+    script(args: any[], callback?: ResCallbackT<any>): boolean;
+    script(...args: any[]): boolean;
+    script(key: string, callback?: ResCallbackT<any>): boolean;
+    quit(args: any[], callback?: ResCallbackT<any>): boolean;
+    quit(...args: any[]): boolean;
+    scan(...args: any[]): boolean;
+    scan(args: any[], callback?: ResCallbackT<any>): boolean;
+    hscan(...args: any[]): boolean;
+    hscan(args: any[], callback?: ResCallbackT<any>): boolean;
+    zscan(...args: any[]): boolean;
+    zscan(args: any[], callback?: ResCallbackT<any>): boolean;
+}
+
+export interface Multi {
+    exec(callback?: ResCallbackT<any[]>): boolean;
+
+    get(args: any[], callback?: ResCallbackT<string>): Multi;
+    get(...args: any[]): Multi;
+    set(args: any[], callback?: ResCallbackT<string>): Multi;
+    set(...args: any[]): Multi;
+    setnx(args: any[], callback?: ResCallbackT<any>): Multi;
+    setnx(...args: any[]): Multi;
+    setex(args: any[], callback?: ResCallbackT<any>): Multi;
+    setex(...args: any[]): Multi;
+    append(args: any[], callback?: ResCallbackT<any>): Multi;
+    append(...args: any[]): Multi;
+    strlen(args: any[], callback?: ResCallbackT<any>): Multi;
+    strlen(...args: any[]): Multi;
+    del(args: any[], callback?: ResCallbackT<any>): Multi;
+    del(...args: any[]): Multi;
+    exists(args: any[], callback?: ResCallbackT<any>): Multi;
+    exists(...args: any[]): Multi;
+    setbit(args: any[], callback?: ResCallbackT<any>): Multi;
+    setbit(...args: any[]): Multi;
+    getbit(args: any[], callback?: ResCallbackT<any>): Multi;
+    getbit(...args: any[]): Multi;
+    setrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    setrange(...args: any[]): Multi;
+    getrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    getrange(...args: any[]): Multi;
+    substr(args: any[], callback?: ResCallbackT<any>): Multi;
+    substr(...args: any[]): Multi;
+    incr(args: any[], callback?: ResCallbackT<any>): Multi;
+    incr(...args: any[]): Multi;
+    decr(args: any[], callback?: ResCallbackT<any>): Multi;
+    decr(...args: any[]): Multi;
+    mget(args: any[], callback?: ResCallbackT<any>): Multi;
+    mget(...args: any[]): Multi;
+    rpush(...args: any[]): Multi;
+    lpush(args: any[], callback?: ResCallbackT<any>): Multi;
+    lpush(...args: any[]): Multi;
+    rpushx(args: any[], callback?: ResCallbackT<any>): Multi;
+    rpushx(...args: any[]): Multi;
+    lpushx(args: any[], callback?: ResCallbackT<any>): Multi;
+    lpushx(...args: any[]): Multi;
+    linsert(args: any[], callback?: ResCallbackT<any>): Multi;
+    linsert(...args: any[]): Multi;
+    rpop(args: any[], callback?: ResCallbackT<any>): Multi;
+    rpop(...args: any[]): Multi;
+    lpop(args: any[], callback?: ResCallbackT<any>): Multi;
+    lpop(...args: any[]): Multi;
+    brpop(args: any[], callback?: ResCallbackT<any>): Multi;
+    brpop(...args: any[]): Multi;
+    brpoplpush(args: any[], callback?: ResCallbackT<any>): Multi;
+    brpoplpush(...args: any[]): Multi;
+    blpop(args: any[], callback?: ResCallbackT<any>): Multi;
+    blpop(...args: any[]): Multi;
+    llen(args: any[], callback?: ResCallbackT<any>): Multi;
+    llen(...args: any[]): Multi;
+    lindex(args: any[], callback?: ResCallbackT<any>): Multi;
+    lindex(...args: any[]): Multi;
+    lset(args: any[], callback?: ResCallbackT<any>): Multi;
+    lset(...args: any[]): Multi;
+    lrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    lrange(...args: any[]): Multi;
+    ltrim(args: any[], callback?: ResCallbackT<any>): Multi;
+    ltrim(...args: any[]): Multi;
+    lrem(args: any[], callback?: ResCallbackT<any>): Multi;
+    lrem(...args: any[]): Multi;
+    rpoplpush(args: any[], callback?: ResCallbackT<any>): Multi;
+    rpoplpush(...args: any[]): Multi;
+    sadd(args: any[], callback?: ResCallbackT<any>): Multi;
+    sadd(...args: any[]): Multi;
+    srem(args: any[], callback?: ResCallbackT<any>): Multi;
+    srem(...args: any[]): Multi;
+    smove(args: any[], callback?: ResCallbackT<any>): Multi;
+    smove(...args: any[]): Multi;
+    sismember(args: any[], callback?: ResCallbackT<any>): Multi;
+    sismember(...args: any[]): Multi;
+    scard(args: any[], callback?: ResCallbackT<any>): Multi;
+    scard(...args: any[]): Multi;
+    spop(args: any[], callback?: ResCallbackT<any>): Multi;
+    spop(...args: any[]): Multi;
+    srandmember(args: any[], callback?: ResCallbackT<any>): Multi;
+    srandmember(...args: any[]): Multi;
+    sinter(args: any[], callback?: ResCallbackT<any>): Multi;
+    sinter(...args: any[]): Multi;
+    sinterstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    sinterstore(...args: any[]): Multi;
+    sunion(args: any[], callback?: ResCallbackT<any>): Multi;
+    sunion(...args: any[]): Multi;
+    sunionstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    sunionstore(...args: any[]): Multi;
+    sdiff(args: any[], callback?: ResCallbackT<any>): Multi;
+    sdiff(...args: any[]): Multi;
+    sdiffstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    sdiffstore(...args: any[]): Multi;
+    smembers(args: any[], callback?: ResCallbackT<any>): Multi;
+    smembers(...args: any[]): Multi;
+    zadd(args: any[], callback?: ResCallbackT<any>): Multi;
+    zadd(...args: any[]): Multi;
+    zincrby(args: any[], callback?: ResCallbackT<any>): Multi;
+    zincrby(...args: any[]): Multi;
+    zrem(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrem(...args: any[]): Multi;
+    zremrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zremrangebyscore(...args: any[]): Multi;
+    zremrangebyrank(args: any[], callback?: ResCallbackT<any>): Multi;
+    zremrangebyrank(...args: any[]): Multi;
+    zunionstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zunionstore(...args: any[]): Multi;
+    zinterstore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zinterstore(...args: any[]): Multi;
+    zrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrange(...args: any[]): Multi;
+    zrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrangebyscore(...args: any[]): Multi;
+    zrevrangebyscore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrevrangebyscore(...args: any[]): Multi;
+    zcount(args: any[], callback?: ResCallbackT<any>): Multi;
+    zcount(...args: any[]): Multi;
+    zrevrange(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrevrange(...args: any[]): Multi;
+    zcard(args: any[], callback?: ResCallbackT<any>): Multi;
+    zcard(...args: any[]): Multi;
+    zscore(args: any[], callback?: ResCallbackT<any>): Multi;
+    zscore(...args: any[]): Multi;
+    zrank(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrank(...args: any[]): Multi;
+    zrevrank(args: any[], callback?: ResCallbackT<any>): Multi;
+    zrevrank(...args: any[]): Multi;
+    hset(args: any[], callback?: ResCallbackT<any>): Multi;
+    hset(...args: any[]): Multi;
+    hsetnx(args: any[], callback?: ResCallbackT<any>): Multi;
+    hsetnx(...args: any[]): Multi;
+    hget(args: any[], callback?: ResCallbackT<any>): Multi;
+    hget(...args: any[]): Multi;
+    hmset(args: any[], callback?: ResCallbackT<any>): Multi;
+    hmset(key: string, hash: any, callback?: ResCallbackT<any>): Multi;
+    hmset(...args: any[]): Multi;
+    hmget(args: any[], callback?: ResCallbackT<any>): Multi;
+    hmget(...args: any[]): Multi;
+    hincrby(args: any[], callback?: ResCallbackT<any>): Multi;
+    hincrby(...args: any[]): Multi;
+    hdel(args: any[], callback?: ResCallbackT<any>): Multi;
+    hdel(...args: any[]): Multi;
+    hlen(args: any[], callback?: ResCallbackT<any>): Multi;
+    hlen(...args: any[]): Multi;
+    hkeys(args: any[], callback?: ResCallbackT<any>): Multi;
+    hkeys(...args: any[]): Multi;
+    hvals(args: any[], callback?: ResCallbackT<any>): Multi;
+    hvals(...args: any[]): Multi;
+    hgetall(args: any[], callback?: ResCallbackT<any>): Multi;
+    hgetall(...args: any[]): Multi;
+    hgetall(key: string, callback?: ResCallbackT<any>): Multi;
+    hexists(args: any[], callback?: ResCallbackT<any>): Multi;
+    hexists(...args: any[]): Multi;
+    incrby(args: any[], callback?: ResCallbackT<any>): Multi;
+    incrby(...args: any[]): Multi;
+    decrby(args: any[], callback?: ResCallbackT<any>): Multi;
+    decrby(...args: any[]): Multi;
+    getset(args: any[], callback?: ResCallbackT<any>): Multi;
+    getset(...args: any[]): Multi;
+    mset(args: any[], callback?: ResCallbackT<any>): Multi;
+    mset(...args: any[]): Multi;
+    msetnx(args: any[], callback?: ResCallbackT<any>): Multi;
+    msetnx(...args: any[]): Multi;
+    randomkey(args: any[], callback?: ResCallbackT<any>): Multi;
+    randomkey(...args: any[]): Multi;
+    select(args: any[], callback?: ResCallbackT<any>): void;
+    select(...args: any[]): Multi;
+    move(args: any[], callback?: ResCallbackT<any>): Multi;
+    move(...args: any[]): Multi;
+    rename(args: any[], callback?: ResCallbackT<any>): Multi;
+    rename(...args: any[]): Multi;
+    renamenx(args: any[], callback?: ResCallbackT<any>): Multi;
+    renamenx(...args: any[]): Multi;
+    expire(args: any[], callback?: ResCallbackT<any>): Multi;
+    expire(...args: any[]): Multi;
+    expireat(args: any[], callback?: ResCallbackT<any>): Multi;
+    expireat(...args: any[]): Multi;
+    keys(args: any[], callback?: ResCallbackT<any>): Multi;
+    keys(...args: any[]): Multi;
+    dbsize(args: any[], callback?: ResCallbackT<any>): Multi;
+    dbsize(...args: any[]): Multi;
+    auth(args: any[], callback?: ResCallbackT<any>): void;
+    auth(...args: any[]): void;
+    ping(args: any[], callback?: ResCallbackT<any>): Multi;
+    ping(...args: any[]): Multi;
+    echo(args: any[], callback?: ResCallbackT<any>): Multi;
+    echo(...args: any[]): Multi;
+    save(args: any[], callback?: ResCallbackT<any>): Multi;
+    save(...args: any[]): Multi;
+    bgsave(args: any[], callback?: ResCallbackT<any>): Multi;
+    bgsave(...args: any[]): Multi;
+    bgrewriteaof(args: any[], callback?: ResCallbackT<any>): Multi;
+    bgrewriteaof(...args: any[]): Multi;
+    shutdown(args: any[], callback?: ResCallbackT<any>): Multi;
+    shutdown(...args: any[]): Multi;
+    lastsave(args: any[], callback?: ResCallbackT<any>): Multi;
+    lastsave(...args: any[]): Multi;
+    type(args: any[], callback?: ResCallbackT<any>): Multi;
+    type(...args: any[]): Multi;
+    multi(args: any[], callback?: ResCallbackT<any>): Multi;
+    multi(...args: any[]): Multi;
+    exec(args: any[], callback?: ResCallbackT<any>): Multi;
+    exec(...args: any[]): Multi;
+    discard(args: any[], callback?: ResCallbackT<any>): Multi;
+    discard(...args: any[]): Multi;
+    sync(args: any[], callback?: ResCallbackT<any>): Multi;
+    sync(...args: any[]): Multi;
+    flushdb(args: any[], callback?: ResCallbackT<any>): Multi;
+    flushdb(...args: any[]): Multi;
+    flushall(args: any[], callback?: ResCallbackT<any>): Multi;
+    flushall(...args: any[]): Multi;
+    sort(args: any[], callback?: ResCallbackT<any>): Multi;
+    sort(...args: any[]): Multi;
+    info(args: any[], callback?: ResCallbackT<any>): Multi;
+    info(...args: any[]): Multi;
+    monitor(args: any[], callback?: ResCallbackT<any>): Multi;
+    monitor(...args: any[]): Multi;
+    ttl(args: any[], callback?: ResCallbackT<any>): Multi;
+    ttl(...args: any[]): Multi;
+    persist(args: any[], callback?: ResCallbackT<any>): Multi;
+    persist(...args: any[]): Multi;
+    slaveof(args: any[], callback?: ResCallbackT<any>): Multi;
+    slaveof(...args: any[]): Multi;
+    debug(args: any[], callback?: ResCallbackT<any>): Multi;
+    debug(...args: any[]): Multi;
+    config(args: any[], callback?: ResCallbackT<any>): Multi;
+    config(...args: any[]): Multi;
+    subscribe(args: any[], callback?: ResCallbackT<any>): Multi;
+    subscribe(...args: any[]): Multi;
+    unsubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
+    unsubscribe(...args: any[]): Multi;
+    psubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
+    psubscribe(...args: any[]): Multi;
+    punsubscribe(args: any[], callback?: ResCallbackT<any>): Multi;
+    punsubscribe(...args: any[]): Multi;
+    publish(args: any[], callback?: ResCallbackT<any>): Multi;
+    publish(...args: any[]): Multi;
+    watch(args: any[], callback?: ResCallbackT<any>): Multi;
+    watch(...args: any[]): Multi;
+    unwatch(args: any[], callback?: ResCallbackT<any>): Multi;
+    unwatch(...args: any[]): Multi;
+    cluster(args: any[], callback?: ResCallbackT<any>): Multi;
+    cluster(...args: any[]): Multi;
+    restore(args: any[], callback?: ResCallbackT<any>): Multi;
+    restore(...args: any[]): Multi;
+    migrate(args: any[], callback?: ResCallbackT<any>): Multi;
+    migrate(...args: any[]): Multi;
+    dump(args: any[], callback?: ResCallbackT<any>): Multi;
+    dump(...args: any[]): Multi;
+    object(args: any[], callback?: ResCallbackT<any>): Multi;
+    object(...args: any[]): Multi;
+    client(args: any[], callback?: ResCallbackT<any>): Multi;
+    client(...args: any[]): Multi;
+    eval(args: any[], callback?: ResCallbackT<any>): Multi;
+    eval(...args: any[]): Multi;
+    evalsha(args: any[], callback?: ResCallbackT<any>): Multi;
+    evalsha(...args: any[]): Multi;
+    quit(args: any[], callback?: ResCallbackT<any>): Multi;
+    quit(...args: any[]): Multi;
+    scan(...args: any[]): Multi;
+    scan(args: any[], callback?: ResCallbackT<any>): Multi;
+    hscan(...args: any[]): Multi;
+    hscan(args: any[], callback?: ResCallbackT<any>): Multi;
+    zscan(...args: any[]): Multi;
+    zscan(args: any[], callback?: ResCallbackT<any>): Multi;
 }
diff --git a/redux-action-utils/redux-action-utils.d.ts b/redux-action-utils/redux-action-utils.d.ts
index 50419c2e70..785bcf7e6b 100644
--- a/redux-action-utils/redux-action-utils.d.ts
+++ b/redux-action-utils/redux-action-utils.d.ts
@@ -3,35 +3,33 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "redux-action-utils" {
-    export interface Action {
-        type: string;
-    }
 
-    export interface ActionCreator<T> {
-        (...data: any[]): Action & T;
-    }
-
-    export interface OptionsActionCreator<T> {
-        (data: T): Action & T;
-    }
-
-    /**
-     * Creates an action creator which will create an action object with the given type.
-     */
-    export function actionCreator<T>(type: string, ...props: string[]): ActionCreator<T>;
-    /**
-     * Creates an action creator which will create an action object with the given type.
-     */
-    export function actionCreator<T>(type: string, props: string[]): ActionCreator<T>;
-
-    /**
-     * Creates an action creator which takes a single object argument and adds its properties to the action object.
-     */
-    export function optionsActionCreator<T>(type: string, ...props: string[]): OptionsActionCreator<T>;
-    /**
-     * Creates an action creator which takes a single object argument and adds its properties to the action object.
-     */
-    export function optionsActionCreator<T>(type: string, props: string[]): OptionsActionCreator<T>;
+export interface Action {
+    type: string;
 }
 
+export interface ActionCreator<T> {
+    (...data: any[]): Action & T;
+}
+
+export interface OptionsActionCreator<T> {
+    (data: T): Action & T;
+}
+
+/**
+ * Creates an action creator which will create an action object with the given type.
+ */
+declare export function actionCreator<T>(type: string, ...props: string[]): ActionCreator<T>;
+/**
+ * Creates an action creator which will create an action object with the given type.
+ */
+declare export function actionCreator<T>(type: string, props: string[]): ActionCreator<T>;
+
+/**
+ * Creates an action creator which takes a single object argument and adds its properties to the action object.
+ */
+declare export function optionsActionCreator<T>(type: string, ...props: string[]): OptionsActionCreator<T>;
+/**
+ * Creates an action creator which takes a single object argument and adds its properties to the action object.
+ */
+declare export function optionsActionCreator<T>(type: string, props: string[]): OptionsActionCreator<T>;
diff --git a/redux-debounced/redux-debounced.d.ts b/redux-debounced/redux-debounced.d.ts
index c3e4344f33..fcd591ea14 100644
--- a/redux-debounced/redux-debounced.d.ts
+++ b/redux-debounced/redux-debounced.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../redux/redux.d.ts" />
 
-declare module "redux-debounced" {
-  import { Middleware } from 'redux';
-  export default function createDebounce(): Middleware;
-}
+
+import { Middleware } from 'redux';
+declare export default function createDebounce(): Middleware;
diff --git a/redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts b/redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts
index 09e3d96036..1819c988d5 100644
--- a/redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts
+++ b/redux-devtools-dock-monitor/redux-devtools-dock-monitor.d.ts
@@ -5,10 +5,10 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "redux-devtools-dock-monitor" {
-  import * as React from 'react'
 
-  interface IDockMonitorProps {
+import * as React from 'react'
+
+interface IDockMonitorProps {
     /**
      * Any valid Redux DevTools monitor.
      */
@@ -53,7 +53,6 @@ declare module "redux-devtools-dock-monitor" {
      * @default true
      */
     defaultIsVisible?: boolean
-  }
+}
 
-  export default class DockMonitor extends React.Component<IDockMonitorProps, any> {}
-}
\ No newline at end of file
+declare export default class DockMonitor extends React.Component<IDockMonitorProps, any> { }
diff --git a/redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts b/redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts
index 8c96c804da..d13742aefe 100644
--- a/redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts
+++ b/redux-devtools-log-monitor/redux-devtools-log-monitor.d.ts
@@ -5,10 +5,10 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "redux-devtools-log-monitor" {
-  import * as React from 'react'
 
-  interface ILogMonitorProps {
+import * as React from 'react'
+
+interface ILogMonitorProps {
     /**
      * Either a string referring to one of the themes provided by 
      * redux-devtools-themes or a custom object of the same format.
@@ -33,7 +33,6 @@ declare module "redux-devtools-log-monitor" {
      * @default true
      */
     preserveScrollTop?: boolean
-  }
+}
 
-  export default class LogMonitor extends React.Component<ILogMonitorProps, any> {}
-}
\ No newline at end of file
+declare export default class LogMonitor extends React.Component<ILogMonitorProps, any> { }
diff --git a/redux-devtools/redux-devtools-2.1.4.d.ts b/redux-devtools/redux-devtools-2.1.4.d.ts
index cc2aa1d7a0..17027d3a6d 100644
--- a/redux-devtools/redux-devtools-2.1.4.d.ts
+++ b/redux-devtools/redux-devtools-2.1.4.d.ts
@@ -6,104 +6,6 @@
 /// <reference path="../redux/redux.d.ts" />
 /// <reference path="../react/react.d.ts" />
 
-declare module "redux-devtools" {
-    export function devTools(): Function;
-    export function persistState(sessionId: any, stateDeserializer?: Function, actionDeserializer?: Function): Function;
-}
-
-declare module "redux-devtools/lib/react" {
-    import * as React from 'react';
-
-    export class DevTools extends React.Component<any, any> {
-
-    }
-
-    export interface DevToolsProps {
-        monitor: Function;
-        store: Store;
-    }
-
-    export interface Store {
-        devToolStore: DevToolStore;
-    }
-
-    export class DevToolStore extends React.Component<any, any> {
-        dispatch: Function;
-    }
-
-    export class DebugPanel extends React.Component<DebugPanelProps, any> { }
-
-    export interface DebugPanelProps {
-        position?: string;
-        zIndex?: number;
-        fontSize?: string;
-        overflow?: string;
-        opacity?: number;
-        color?: string;
-        left?: boolean|number;
-        right?: boolean|number;
-        top?: boolean|number;
-        bottom?: boolean|number;
-        maxHeight?: string;
-        maxWidth?: string;
-        wordWrap?: string;
-        boxSizing?: string;
-        boxShadow?: string;
-        getStyle?: () => DebugPanelProps;
-    }
-
-    export class LogMonitor extends React.Component<LogMonitorProps, any> { }
-
-    export interface LogMonitorProps {
-        computedStates?: ComputedState[];
-        currentStateIndex?: number;
-        monitorState?: MonitorState;
-        stagedActions?: Action[];
-        skippedActions?: boolean[];
-        reset?: Function;
-        commit?: Function;
-        rollback?: Function;
-        sweep?: Function;
-        toggleAction?: Function;
-        jumpToState?: Function;
-        setMonitorState?: Function;
-        select?: Function;
-        visibleOnLoad?: boolean;
-        theme?: Theme|string;
-    }
-
-    export interface ComputedState {
-        state?: any;
-        error?: string;
-    }
-
-    export interface MonitorState {
-        isViaible?: boolean;
-    }
-
-    export interface Action {
-        type: string;
-    }
-
-    export interface Theme {
-        scheme: string;
-        author: string;
-        base00: string;
-        base01: string;
-        base02: string;
-        base03: string;
-        base04: string;
-        base05: string;
-        base06: string;
-        base07: string;
-        base08: string;
-        base09: string;
-        base0A: string;
-        base0B: string;
-        base0C: string;
-        base0D: string;
-        base0E: string;
-        base0F: string;
-    }
-}
 
+declare export function devTools(): Function;
+declare export function persistState(sessionId: any, stateDeserializer?: Function, actionDeserializer?: Function): Function;
diff --git a/redux-devtools/redux-devtools.d.ts b/redux-devtools/redux-devtools.d.ts
index 47ad2198d9..a1536e52aa 100644
--- a/redux-devtools/redux-devtools.d.ts
+++ b/redux-devtools/redux-devtools.d.ts
@@ -5,18 +5,17 @@
 
 /// <reference path="../react/react.d.ts" />
 
-declare module "redux-devtools" {
-  import * as React from 'react'
 
-  interface IDevTools {
+import * as React from 'react'
+
+interface IDevTools {
     new (): JSX.ElementClass
     instrument(): Function
-  }
+}
 
-  export function createDevTools(el: React.ReactElement<any>): IDevTools
-  export function persistState(debugSessionKey: string): Function
+declare export function createDevTools(el: React.ReactElement<any>): IDevTools
+declare export function persistState(debugSessionKey: string): Function
 
-  var factory: { instrument(): Function }
+declare var factory: { instrument(): Function }
 
-  export default factory;
-}
\ No newline at end of file
+export default factory;
diff --git a/redux-form/redux-form.d.ts b/redux-form/redux-form.d.ts
index 1e631ceac4..36ae0f8ccc 100644
--- a/redux-form/redux-form.d.ts
+++ b/redux-form/redux-form.d.ts
@@ -7,15 +7,15 @@
 /// <reference path="../react/react.d.ts" />
 /// <reference path="../redux/redux.d.ts" />
 
-declare module 'redux-form' {
-  import { Component, SyntheticEvent, FormEventHandler } from 'react';
-  import { Dispatch, ActionCreator, Reducer } from 'redux';
 
-  export type FieldValue = any;
+import { Component, SyntheticEvent, FormEventHandler } from 'react';
+import { Dispatch, ActionCreator, Reducer } from 'redux';
 
-  export type FormData = {[fieldName:string]: FieldValue};
+export type FieldValue = any;
 
-  export interface FieldProp {
+export type FormData = { [fieldName: string]: FieldValue };
+
+export interface FieldProp {
     /**
      * true if this field currently has focus. It will only work if you are
      * passing onFocus to your input element.
@@ -64,38 +64,38 @@ declare module 'redux-form' {
      * either receive the React SyntheticEvent or the current value of the
      * field.
      */
-    onBlur(eventOrValue:SyntheticEvent|FieldValue):void;
+    onBlur(eventOrValue: SyntheticEvent | FieldValue): void;
 
     /**
      * A function to call when the form field is changed. It expects to either
      * receive the React SyntheticEvent or the new value of the field.
      * @param eventOrValue
      */
-    onChange(eventOrValue:SyntheticEvent|FieldValue):void;
+    onChange(eventOrValue: SyntheticEvent | FieldValue): void;
 
     /**
      * A function to call when the form field receives a 'dragStart' event.
      * Saves the field value in the event for giving the field it is dropped
      * into.
      */
-    onDragStart():void;
+    onDragStart(): void;
 
     /**
      * A function to call when the form field receives a drop event.
      */
-    onDrop():void;
+    onDrop(): void;
 
     /**
      * A function to call when the form field receives focus.
      */
-    onFocus():void;
+    onFocus(): void;
 
     /**
      * An alias for onChange. Provided for convenience of destructuring the
      * whole field object into the props of a form element. Added to provide
      * out-of-the-box support for Belle components' onUpdate API.
      */
-    onUpdate():void;
+    onUpdate(): void;
 
     /**
      * true if the field value is the same as its initialized value. Opposite
@@ -126,9 +126,9 @@ declare module 'redux-form' {
      * passing onFocus to your input element.
      */
     visited: boolean;
-  }
+}
 
-  export interface ReduxFormProps {
+export interface ReduxFormProps {
     /**
      * The name of the currently active (with focus) field.
      */
@@ -150,7 +150,7 @@ declare module 'redux-form' {
      * Destroys the form state in the Redux store. By default, this will be
      * called for you in componentWillUnmount().
      */
-    destroyForm?():void;
+    destroyForm?(): void;
 
     /**
      * true if the form data has changed from its initialized values. Opposite
@@ -171,7 +171,7 @@ declare module 'redux-form' {
      * props, e.g. <input type="text" {...field.name}/>. Each field Object has
      * the following properties:
      */
-    fields?: {[field:string]: FieldProp};
+    fields?: { [field: string]: FieldProp };
 
     /**
      * A function meant to be passed to <form onSubmit={handleSubmit}> or to
@@ -190,10 +190,10 @@ declare module 'redux-form' {
      * that as if it were the error for a field called _error, and it will be
      * given as the error prop.
      */
-    handleSubmit?(event:SyntheticEvent):void;
+    handleSubmit?(event: SyntheticEvent): void;
 
-    handleSubmit?(submit:(data:FormData, dispatch?:Dispatch)
-      => Promise<any>|void):FormEventHandler;
+    handleSubmit?(submit: (data: FormData, dispatch?: Dispatch)
+        => Promise<any> | void): FormEventHandler;
 
     /**
      * Initializes the form data to the given values. All dirty and pristine
@@ -201,7 +201,7 @@ declare module 'redux-form' {
      * initialized values.
      * @param data
      */
-    initializeForm?(data:FormData):void;
+    initializeForm?(data: FormData): void;
 
     /**
      * true if the form has validation errors. Opposite of valid.
@@ -218,7 +218,7 @@ declare module 'redux-form' {
      * Resets all the values in the form to the initialized state, making it
      * pristine again.
      */
-    resetForm?():void;
+    resetForm?(): void;
 
     /**
      * The same formKey prop that was passed in. See Editing Multiple Records.
@@ -243,24 +243,24 @@ declare module 'redux-form' {
      * Marks the given fields as "touched" to show errors.
      * @param field
      */
-    touch?(...field:string[]):void;
+    touch?(...field: string[]): void;
 
     /**
      * Marks all fields as "touched" to show errors. This will automatically
      * happen on form submission.
      */
-    touchAll?():void;
+    touchAll?(): void;
 
     /**
      * Clears the "touched" flag for the given fields
      * @param field
      */
-    untouch?(...field:string[]):void;
+    untouch?(...field: string[]): void;
 
     /**
      * Clears the "touched" flag for the all fields
      */
-    untouchAll?():void;
+    untouchAll?(): void;
 
     /**
      * true if the form passes validation (has no validation errors). Opposite
@@ -272,31 +272,31 @@ declare module 'redux-form' {
      * All of your values in the form { field1: <string>, field2: <string> }.
      */
     values?: FormData;
-  }
+}
 
-  class ElementClass extends Component<any, any> {
-  }
-  interface ClassDecorator {
-    <T extends (typeof ElementClass)>(component:T): T;
-  }
+declare class ElementClass extends Component<any, any> {
+}
+interface ClassDecorator {
+    <T extends (typeof ElementClass)>(component: T): T;
+}
 
-  interface MapStateToProps {
-    (state:any, ownProps?:any): any;
-  }
+interface MapStateToProps {
+    (state: any, ownProps?: any): any;
+}
 
-  interface MapDispatchToPropsFunction {
-    (dispatch:Dispatch, ownProps?:any): any;
-  }
+interface MapDispatchToPropsFunction {
+    (dispatch: Dispatch, ownProps?: any): any;
+}
 
-  interface MapDispatchToPropsObject {
+interface MapDispatchToPropsObject {
     [name: string]: ActionCreator;
-  }
+}
 
-  export function reduxForm(config:ReduxFormConfig,
-                            mapStateToProps?:MapStateToProps,
-                            mapDispatchToProps?:MapDispatchToPropsFunction|MapDispatchToPropsObject):ClassDecorator;
+declare export function reduxForm(config: ReduxFormConfig,
+    mapStateToProps?: MapStateToProps,
+    mapDispatchToProps?: MapDispatchToPropsFunction | MapDispatchToPropsObject): ClassDecorator;
 
-  export interface ReduxFormConfig {
+export interface ReduxFormConfig {
     /**
      * a list of all your fields in your form. You may change these dynamically
      * at runtime.
@@ -325,8 +325,8 @@ declare module 'redux-form' {
      *
      * See Asynchronous Blur Validation Example for more details.
      */
-    asyncValidate?(values:FormData, dispatch:Dispatch, props:Object):
-      Promise<any>;
+    asyncValidate?(values: FormData, dispatch: Dispatch, props: Object):
+        Promise<any>;
 
     /**
      * Whether or not to automatically destroy your form's state in the Redux
@@ -349,7 +349,7 @@ declare module 'redux-form' {
      * state as something other than plain javascript objects, e.g. an
      * Immutable.Map.
      */
-    getFormState?(state:any, reduxMountPoint:string): any;
+    getFormState?(state: any, reduxMountPoint: string): any;
 
     /**
      * The values with which to initialize your form in componentWillMount().
@@ -357,7 +357,7 @@ declare module 'redux-form' {
      * with single-record forms. The values should be in the form
      * { field1: 'value1', field2: 'value2' }.
      */
-    initialValues?: {[field:string]: FieldValue};
+    initialValues?: { [field: string]: FieldValue };
 
     /**
      * The function to call with the form data when the handleSubmit() is fired
@@ -365,7 +365,7 @@ declare module 'redux-form' {
      * you must pass it as a parameter to handleSubmit() inside your form
      * component.
      */
-    onSubmit?(values:FormData, dispatch?:Dispatch):any;
+    onSubmit?(values: FormData, dispatch?: Dispatch): any;
 
     /**
      * If specified, all the props normally passed into your decorated
@@ -418,23 +418,23 @@ declare module 'redux-form' {
      * { field1: <String>, field2: <String> }.
      * Defaults to (values, props) => ({}).
      */
-    validate?(values:FormData, props:{[fieldName:string]: FieldProp}):Object;
-  }
+    validate?(values: FormData, props: { [fieldName: string]: FieldProp }): Object;
+}
 
-  /**
-   * @param value The current value of the field.
-   * @param previousValue The previous value of the field before the current
-   * action was dispatched.
-   * @param allValues All the values of the current form.
-   * @param previousAllValues All the values of the form before the current
-   * change. Useful to change one field based on a change in another.
-   */
-  export type Normalizer =
-    (value:FieldValue, previousValue:FieldValue,
-     allValues:FormData, previousAllValues:FormData) => any;
+/**
+ * @param value The current value of the field.
+ * @param previousValue The previous value of the field before the current
+ * action was dispatched.
+ * @param allValues All the values of the current form.
+ * @param previousAllValues All the values of the form before the current
+ * change. Useful to change one field based on a change in another.
+ */
+export type Normalizer =
+    (value: FieldValue, previousValue: FieldValue,
+        allValues: FormData, previousAllValues: FormData) => any;
 
-  export const reducer:{
-    (state:any, action:any): any;
+declare export const reducer: {
+    (state: any, action: any): any;
 
     /**
      * Returns a form reducer that will also pass each form value through the
@@ -443,11 +443,11 @@ declare module 'redux-form' {
      * The normalizer function is given four parameters and expected to return
      * the normalized value of the field.
      */
-    normalize(normalizers:{
-      [formName:string]: {
-        [fieldName:string]: Normalizer
-      }
-    }):Reducer;
+    normalize(normalizers: {
+        [formName: string]: {
+            [fieldName: string]: Normalizer
+        }
+    }): Reducer;
 
     /**
      * Returns a form reducer that will also pass each action through
@@ -456,6 +456,5 @@ declare module 'redux-form' {
      * passed to each reducer will only be the slice that pertains to that
      * form.
      */
-    plugin(reducers:{[formName:string]: Reducer}):Reducer;
-  }
+    plugin(reducers: { [formName: string]: Reducer }): Reducer;
 }
diff --git a/redux-immutable-state-invariant/redux-immutable-state-invariant.d.ts b/redux-immutable-state-invariant/redux-immutable-state-invariant.d.ts
index 4943d36ce3..53c8533592 100644
--- a/redux-immutable-state-invariant/redux-immutable-state-invariant.d.ts
+++ b/redux-immutable-state-invariant/redux-immutable-state-invariant.d.ts
@@ -5,9 +5,8 @@
 
 /// <reference path="../redux/redux.d.ts" />
 
-declare module "redux-immutable-state-invariant" {
-    type isImmutableDefault = (value: any) => boolean;
-    type immutableStateInvariantMiddlewareInterface = (isImmutable?: isImmutableDefault) => Redux.Middleware;
-    let immutableStateInvariantMiddleware: immutableStateInvariantMiddlewareInterface;
-    export = immutableStateInvariantMiddleware;
-}
+
+type isImmutableDefault = (value: any) => boolean;
+type immutableStateInvariantMiddlewareInterface = (isImmutable?: isImmutableDefault) => Redux.Middleware;
+declare let immutableStateInvariantMiddleware: immutableStateInvariantMiddlewareInterface;
+export = immutableStateInvariantMiddleware;
diff --git a/redux-immutable/redux-immutable.d.ts b/redux-immutable/redux-immutable.d.ts
index 21c9096846..cc54a5046c 100644
--- a/redux-immutable/redux-immutable.d.ts
+++ b/redux-immutable/redux-immutable.d.ts
@@ -3,6 +3,5 @@
 // Definitions by: Pedro Pereira <https://github.com/oizie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "redux-immutable" {
-    export function combineReducers(reducers : Object): Object;
-}
\ No newline at end of file
+
+declare export function combineReducers(reducers: Object): Object;
diff --git a/redux-logger/redux-logger.d.ts b/redux-logger/redux-logger.d.ts
index f97ff95447..4532b18bca 100644
--- a/redux-logger/redux-logger.d.ts
+++ b/redux-logger/redux-logger.d.ts
@@ -5,30 +5,30 @@
 
 /// <reference path="../redux/redux.d.ts" />
 
-declare module 'redux-logger' {
 
-  type LoggerPredicate = (getState: () => any, action: any) => boolean;
 
-  type StateToString = (state: any) => string;
-  type ActionToString = (action: any) => string;
-  type ErrorToString = (error: any, prevState: any) => string;
+type LoggerPredicate = (getState: () => any, action: any) => boolean;
 
-  interface ColorsObject {
+type StateToString = (state: any) => string;
+type ActionToString = (action: any) => string;
+type ErrorToString = (error: any, prevState: any) => string;
+
+interface ColorsObject {
     title?: boolean | ActionToString;
     prevState?: boolean | StateToString;
     action?: boolean | ActionToString;
     nextState?: boolean | StateToString;
     error?: boolean | ErrorToString;
-  }
+}
 
-  interface LevelObject {
+interface LevelObject {
     prevState?: string | boolean | StateToString;
     action?: string | boolean | ActionToString;
     nextState?: string | boolean | StateToString;
     error?: string | boolean | ErrorToString;
-  }
+}
 
-  interface ReduxLoggerOptions {
+interface ReduxLoggerOptions {
     level?: string | ActionToString | LevelObject;
     duration?: boolean;
     timestamp?: boolean;
@@ -40,11 +40,10 @@ declare module 'redux-logger' {
     stateTransformer?: (state: any) => any;
     actionTransformer?: (action: any) => any;
     errorTransformer?: (error: any) => any;
-  }
-
-  // Trickery to get TypeScript to accept that our anonymous, non-default export is a function.
-  // see https://github.com/Microsoft/TypeScript/issues/3612 for more
-  namespace createLogger {}
-  function createLogger(options?: ReduxLoggerOptions): Redux.Middleware;
-  export = createLogger;
 }
+
+// Trickery to get TypeScript to accept that our anonymous, non-default export is a function.
+// see https://github.com/Microsoft/TypeScript/issues/3612 for more
+declare namespace createLogger { }
+declare function createLogger(options?: ReduxLoggerOptions): Redux.Middleware;
+export = createLogger;
diff --git a/ref-array/ref-array.d.ts b/ref-array/ref-array.d.ts
index 42636573d4..4e9383b884 100644
--- a/ref-array/ref-array.d.ts
+++ b/ref-array/ref-array.d.ts
@@ -6,48 +6,61 @@
 /// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
 /// <reference path="../ref/ref.d.ts" />
 
-declare module "ref-array" {
-	import ref = require('ref');
 
-	interface ArrayType<T> extends ref.Type {
-		BYTES_PER_ELEMENT: number;
-		fixedLength: number;
-		/** The reference to the base type. */
-		type: ref.Type;
+import ref = require('ref');
 
-		/**
-		 * Accepts a Buffer instance that should be an already-populated with data
-		 * for the ArrayType. The "length" of the Array is determined by searching
-		 * through the buffer's contents until an aligned NULL pointer is encountered.
-		 */
-		untilZeros(buffer: Buffer): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
+interface ArrayType<T> extends ref.Type {
+    BYTES_PER_ELEMENT: number;
+    fixedLength: number;
+    /** The reference to the base type. */
+    type: ref.Type;
 
-		new (length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		new (data: number[], length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		new (data: Buffer, length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		(length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		(data: number[], length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-		(data: Buffer, length?: number): { [i: number]: T; length: number; toArray(): T[];
-			toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer; };
-	}
+    /**
+     * Accepts a Buffer instance that should be an already-populated with data
+     * for the ArrayType. The "length" of the Array is determined by searching
+     * through the buffer's contents until an aligned NULL pointer is encountered.
+     */
+    untilZeros(buffer: Buffer): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
 
-	/**
-	 * The array type meta-constructor.
-	 * The returned constructor's API is highly influenced by the WebGL
-	 * TypedArray API.
-	 */
-	var ArrayType: {
-		new <T>(type: ref.Type, length?: number): ArrayType<T>;
-		new <T>(type: string, length?: number): ArrayType<T>;
-		<T>(type: ref.Type, length?: number): ArrayType<T>;
-		<T>(type: string, length?: number): ArrayType<T>;
-	};
+    new (length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    new (data: number[], length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    new (data: Buffer, length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (data: number[], length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (data: Buffer, length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+}
+
+/**
+ * The array type meta-constructor.
+ * The returned constructor's API is highly influenced by the WebGL
+ * TypedArray API.
+ */
+declare var ArrayType: {
+    new <T>(type: ref.Type, length?: number): ArrayType<T>;
+    new <T>(type: string, length?: number): ArrayType<T>;
+    <T>(type: ref.Type, length?: number): ArrayType<T>;
+    <T>(type: string, length?: number): ArrayType<T>;
+};
 
 export = ArrayType;
-}
diff --git a/ref-struct/ref-struct.d.ts b/ref-struct/ref-struct.d.ts
index 3ba558e993..2fa6f028f4 100644
--- a/ref-struct/ref-struct.d.ts
+++ b/ref-struct/ref-struct.d.ts
@@ -6,59 +6,58 @@
 /// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
 /// <reference path="../ref/ref.d.ts" />
 
-declare module "ref-struct" {
-	import ref = require('ref');
 
-	/**
-	 * This is the `constructor` of the Struct type that gets returned.
-	 *
-	 * Invoke it with `new` to create a new Buffer instance backing the struct.
-	 * Pass it an existing Buffer instance to use that as the backing buffer.
-	 * Pass in an Object containing the struct fields to auto-populate the
-	 * struct with the data.
-	 *
-	 * @constructor
-	 */
-	interface StructType extends ref.Type {
-		/** Pass it an existing Buffer instance to use that as the backing buffer. */
-		new (arg: Buffer, data?: {}): any;
-		new (data?: {}): any;
-		/** Pass it an existing Buffer instance to use that as the backing buffer. */
-		(arg: Buffer, data?: {}): any;
-		(data?: {}): any;
+import ref = require('ref');
 
-		fields: {[key: string]: {type: ref.Type}};
+/**
+ * This is the `constructor` of the Struct type that gets returned.
+ *
+ * Invoke it with `new` to create a new Buffer instance backing the struct.
+ * Pass it an existing Buffer instance to use that as the backing buffer.
+ * Pass in an Object containing the struct fields to auto-populate the
+ * struct with the data.
+ *
+ * @constructor
+ */
+interface StructType extends ref.Type {
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    new (arg: Buffer, data?: {}): any;
+    new (data?: {}): any;
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    (arg: Buffer, data?: {}): any;
+    (data?: {}): any;
 
-		/**
-		 * Adds a new field to the struct instance with the given name and type.
-		 * Note that this function will throw an Error if any instances of the struct
-		 * type have already been created, therefore this function must be called at the
-		 * beginning, before any instances are created.
-		 */
-		defineProperty(name: string, type: ref.Type): void;
+    fields: { [key: string]: { type: ref.Type } };
 
-		/**
-		 * Adds a new field to the struct instance with the given name and type.
-		 * Note that this function will throw an Error if any instances of the struct
-		 * type have already been created, therefore this function must be called at the
-		 * beginning, before any instances are created.
-		 */
-		defineProperty(name: string, type: string): void;
+    /**
+     * Adds a new field to the struct instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the struct
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: ref.Type): void;
 
-		/**
-		 * Custom for struct type instances.
-		 * @override
-		 */
-		toString(): string;
-	}
+    /**
+     * Adds a new field to the struct instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the struct
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: string): void;
 
-	/** The struct type meta-constructor. */
-	var StructType: {
-		new (fields?: {}): StructType;
-		new (fields?: any[]): StructType;
-		(fields?: {}): StructType;
-		(fields?: any[]): StructType;
-	}
+    /**
+     * Custom for struct type instances.
+     * @override
+     */
+    toString(): string;
+}
+
+/** The struct type meta-constructor. */
+declare var StructType: {
+    new (fields?: {}): StructType;
+    new (fields?: any[]): StructType;
+    (fields?: {}): StructType;
+    (fields?: any[]): StructType;
+}
 
 export = StructType;
-}
diff --git a/ref-union/ref-union.d.ts b/ref-union/ref-union.d.ts
index c26ad1216d..08fe8aa332 100644
--- a/ref-union/ref-union.d.ts
+++ b/ref-union/ref-union.d.ts
@@ -6,59 +6,58 @@
 /// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
 /// <reference path="../ref/ref.d.ts" />
 
-declare module "ref-union" {
-	import ref = require('ref');
 
-	/**
-	 * This is the `constructor` of the Struct type that gets returned.
-	 *
-	 * Invoke it with `new` to create a new Buffer instance backing the union.
-	 * Pass it an existing Buffer instance to use that as the backing buffer.
-	 * Pass in an Object containing the union fields to auto-populate the
-	 * union with the data.
-	 *
-	 * @constructor
-	 */
-	interface UnionType extends ref.Type {
-		/** Pass it an existing Buffer instance to use that as the backing buffer. */
-		new (arg: Buffer, data?: {}): any;
-		new (data?: {}): any;
-		/** Pass it an existing Buffer instance to use that as the backing buffer. */
-		(arg: Buffer, data?: {}): any;
-		(data?: {}): any;
+import ref = require('ref');
 
-		fields: {[key: string]: {type: ref.Type}};
+/**
+ * This is the `constructor` of the Struct type that gets returned.
+ *
+ * Invoke it with `new` to create a new Buffer instance backing the union.
+ * Pass it an existing Buffer instance to use that as the backing buffer.
+ * Pass in an Object containing the union fields to auto-populate the
+ * union with the data.
+ *
+ * @constructor
+ */
+interface UnionType extends ref.Type {
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    new (arg: Buffer, data?: {}): any;
+    new (data?: {}): any;
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    (arg: Buffer, data?: {}): any;
+    (data?: {}): any;
 
-		/**
-		 * Adds a new field to the union instance with the given name and type.
-		 * Note that this function will throw an Error if any instances of the union
-		 * type have already been created, therefore this function must be called at the
-		 * beginning, before any instances are created.
-		 */
-		defineProperty(name: string, type: ref.Type): void;
+    fields: { [key: string]: { type: ref.Type } };
 
-		/**
-		 * Adds a new field to the union instance with the given name and type.
-		 * Note that this function will throw an Error if any instances of the union
-		 * type have already been created, therefore this function must be called at the
-		 * beginning, before any instances are created.
-		 */
-		defineProperty(name: string, type: string): void;
+    /**
+     * Adds a new field to the union instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the union
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: ref.Type): void;
 
-		/**
-		 * Custom for union type instances.
-		 * @override
-		 */
-		toString(): string;
-	}
+    /**
+     * Adds a new field to the union instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the union
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: string): void;
 
-	/** The union type meta-constructor. */
-	var UnionType: {
-		new (fields?: {}): UnionType;
-		new (fields?: any[]): UnionType;
-		(fields?: {}): UnionType;
-		(fields?: any[]): UnionType;
-	}
+    /**
+     * Custom for union type instances.
+     * @override
+     */
+    toString(): string;
+}
+
+/** The union type meta-constructor. */
+declare var UnionType: {
+    new (fields?: {}): UnionType;
+    new (fields?: any[]): UnionType;
+    (fields?: {}): UnionType;
+    (fields?: any[]): UnionType;
+}
 
 export = UnionType;
-}
diff --git a/ref/ref.d.ts b/ref/ref.d.ts
index 70f2ba7593..849fecb4c8 100644
--- a/ref/ref.d.ts
+++ b/ref/ref.d.ts
@@ -5,186 +5,185 @@
 
 /// <reference path="../node-ffi/node-ffi-buffer.d.ts" />
 
-declare module "ref" {
-	export interface Type {
-		/** The size in bytes required to hold this datatype. */
-		size: number;
-		/** The current level of indirection of the buffer. */
-		indirection: number;
-		/** To invoke when `ref.get` is invoked on a buffer of this type. */
-		get(buffer: Buffer, offset: number): any;
-		/** To invoke when `ref.set` is invoked on a buffer of this type. */
-		set(buffer: Buffer, offset: number, value: any): void;
-		/** The name to use during debugging for this datatype. */
-		name?: string;
-		/** The alignment of this datatype when placed inside a struct. */
-		alignment?: number;
-	}
 
-	/** A Buffer that references the C NULL pointer. */
-	export var NULL: Buffer;
-	/** A pointer-sized buffer pointing to NULL. */
-	export var NULL_POINTER: Buffer;
-	/** Get the memory address of buffer. */
-	export function address(buffer: Buffer): number;
-	/** Allocate the memory with the given value written to it. */
-	export function alloc(type: Type, value?: any): Buffer;
-	/** Allocate the memory with the given value written to it. */
-	export function alloc(type: string, value?: any): Buffer;
-
-	/**
-	 * Allocate the memory with the given string written to it with the given
-	 * encoding (defaults to utf8). The buffer is 1 byte longer than the
-	 * string itself, and is NULL terminated.
-	 */
-	export function allocCString(string: string, encoding?: string): Buffer;
-
-	/** Coerce a type.*/
-	export function coerceType(type: Type): Type;
-	/** Coerce a type. String are looked up from the ref.types object. */
-	export function coerceType(type: string): Type;
-
-	/**
-	 * Get value after dereferencing buffer.
-	 * That is, first it checks the indirection count of buffer's type, and
-	 * if it's greater than 1 then it merely returns another Buffer, but with
-	 * one level less indirection.
-	 */
-	export function deref(buffer: Buffer): any;
-
-	/** Create clone of the type, with decremented indirection level by 1. */
-	export function derefType(type: Type): Type;
-	/** Create clone of the type, with decremented indirection level by 1. */
-	export function derefType(type: string): Type;
-	/** Represents the native endianness of the processor ("LE" or "BE"). */
-	export var endianness: string;
-	/** Check the indirection level and return a dereferenced when necessary. */
-	export function get(buffer: Buffer, offset?: number, type?: Type): any;
-	/** Check the indirection level and return a dereferenced when necessary. */
-	export function get(buffer: Buffer, offset?: number, type?: string): any;
-	/** Get type of the buffer. Create a default type when none exists. */
-	export function getType(buffer: Buffer): Type;
-	/** Check the NULL. */
-	export function isNull(buffer: Buffer): boolean;
-	/** Read C string until the first NULL. */
-	export function readCString(buffer: Buffer, offset?: number): string;
-
-	/**
-	 * Read a big-endian signed 64-bit int.
-	 * If there is losing precision, then return a string, otherwise a number.
-	 * @return {number|string}
-	 */
-	export function readInt64BE(buffer: Buffer, offset?: number): any;
-
-	/**
-	 * Read a little-endian signed 64-bit int.
-	 * If there is losing precision, then return a string, otherwise a number.
-	 * @return {number|string}
-	 */
-	export function readInt64LE(buffer: Buffer, offset?: number): any;
-
-	/** Read a JS Object that has previously been written. */
-	export function readObject(buffer: Buffer, offset?: number): Object;
-	/** Read data from the pointer. */
-	export function readPointer(buffer: Buffer, offset?: number,
-								length?: number): Buffer;
-	/**
-	 * Read a big-endian unsigned 64-bit int.
-	 * If there is losing precision, then return a string, otherwise a number.
-	 * @return {number|string}
-	 */
-	export function readUInt64BE(buffer: Buffer, offset?: number): any;
-
-	/**
-	 * Read a little-endian unsigned 64-bit int.
-	 * If there is losing precision, then return a string, otherwise a number.
-	 * @return {number|string}
-	 */
-	export function readUInt64LE(buffer: Buffer, offset?: number): any;
-
-	/** Create pointer to buffer. */
-	export function ref(buffer: Buffer): Buffer;
-	/** Create clone of the type, with incremented indirection level by 1. */
-	export function refType(type: Type): Type;
-	/** Create clone of the type, with incremented indirection level by 1. */
-	export function refType(type: string): Type;
-
-	/**
-	 * Create buffer with the specified size, with the same address as source.
-	 * This function "attaches" source to the returned buffer to prevent it from
-	 * being garbage collected.
-	 */
-	export function reinterpret(buffer: Buffer, size: number,
-								offset?: number): Buffer;
-	/**
-	 * Scan past the boundary of the buffer's length until it finds size number
-	 * of aligned NULL bytes.
-	 */
-	export function reinterpretUntilZeros(buffer: Buffer, size: number,
-										  offset?: number): Buffer;
-
-	/** Write pointer if the indirection is 1, otherwise write value. */
-	export function set(buffer: Buffer, offset: number, value: any, type?: Type): void;
-	/** Write pointer if the indirection is 1, otherwise write value. */
-	export function set(buffer: Buffer, offset: number, value: any, type?: string): void;
-	/** Write the string as a NULL terminated. Default encoding is utf8. */
-	export function writeCString(buffer: Buffer, offset: number,
-								 string: string, encoding?: string): void;
-	/** Write a big-endian signed 64-bit int. */
-	export function writeInt64BE(buffer: Buffer, offset: number, input: number): void;
-	/** Write a big-endian signed 64-bit int. */
-	export function writeInt64BE(buffer: Buffer, offset: number, input: string): void;
-	/** Write a little-endian signed 64-bit int. */
-	export function writeInt64LE(buffer: Buffer, offset: number, input: number): void;
-	/** Write a little-endian signed 64-bit int. */
-	export function writeInt64LE(buffer: Buffer, offset: number, input: string): void;
-
-	/**
-	 * Write the JS Object. This function "attaches" object to buffer to prevent
-	 * it from being garbage collected.
-	 */
-	export function writeObject(buffer: Buffer, offset: number, object: Object): void;
-
-	/**
-	 * Write the memory address of pointer to buffer at the specified offset. This
-	 * function "attaches" object to buffer to prevent it from being garbage collected.
-	 */
-	export function writePointer(buffer: Buffer, offset: number,
-								 pointer: Buffer): void;
-
-	/** Write a little-endian unsigned 64-bit int. */
-	export function writeUInt64BE(buffer: Buffer, offset: number, input: number): void;
-	/** Write a little-endian unsigned 64-bit int. */
-	export function writeUInt64BE(buffer: Buffer, offset: number, input: string): void;
-
-	/**
-	 * Attach object to buffer such.
-	 * It prevents object from being garbage collected until buffer does.
-	 */
-	export function _attach(buffer: Buffer, object: Object): void;
-
-	/** Same as ref.reinterpret, except that this version does not attach buffer. */
-	export function _reinterpret(buffer: Buffer, size: number,
-								 offset?: number): Buffer;
-	/** Same as ref.reinterpretUntilZeros, except that this version does not attach buffer. */
-	export function _reinterpretUntilZeros(buffer: Buffer, size: number,
-										   offset?: number): Buffer;
-	/** Same as ref.writePointer, except that this version does not attach pointer. */
-	export function _writePointer(buffer: Buffer, offset: number,
-								  pointer: Buffer): void;
-	/** Same as ref.writeObject, except that this version does not attach object. */
-	export function _writeObject(buffer: Buffer, offset: number, object: Object): void;
-
-	/** Default types. */
-	export var types: {
-		void: Type;            int64: Type;            ushort: Type;
-		int: Type;             uint64: Type;           float: Type;
-		uint: Type;            long: Type;             double: Type;
-		int8: Type;            ulong: Type;            Object: Type;
-		uint8: Type;           longlong: Type;         CString: Type;
-		int16: Type;           ulonglong: Type;        bool: Type;
-		uint16: Type;          char: Type;             byte: Type;
-		int32: Type;           uchar: Type;            size_t: Type;
-		uint32: Type;          short: Type;
-	};
+export interface Type {
+    /** The size in bytes required to hold this datatype. */
+    size: number;
+    /** The current level of indirection of the buffer. */
+    indirection: number;
+    /** To invoke when `ref.get` is invoked on a buffer of this type. */
+    get(buffer: Buffer, offset: number): any;
+    /** To invoke when `ref.set` is invoked on a buffer of this type. */
+    set(buffer: Buffer, offset: number, value: any): void;
+    /** The name to use during debugging for this datatype. */
+    name?: string;
+    /** The alignment of this datatype when placed inside a struct. */
+    alignment?: number;
 }
+
+/** A Buffer that references the C NULL pointer. */
+declare export var NULL: Buffer;
+/** A pointer-sized buffer pointing to NULL. */
+declare export var NULL_POINTER: Buffer;
+/** Get the memory address of buffer. */
+declare export function address(buffer: Buffer): number;
+/** Allocate the memory with the given value written to it. */
+declare export function alloc(type: Type, value?: any): Buffer;
+/** Allocate the memory with the given value written to it. */
+declare export function alloc(type: string, value?: any): Buffer;
+
+/**
+ * Allocate the memory with the given string written to it with the given
+ * encoding (defaults to utf8). The buffer is 1 byte longer than the
+ * string itself, and is NULL terminated.
+ */
+declare export function allocCString(string: string, encoding?: string): Buffer;
+
+/** Coerce a type.*/
+declare export function coerceType(type: Type): Type;
+/** Coerce a type. String are looked up from the ref.types object. */
+declare export function coerceType(type: string): Type;
+
+/**
+ * Get value after dereferencing buffer.
+ * That is, first it checks the indirection count of buffer's type, and
+ * if it's greater than 1 then it merely returns another Buffer, but with
+ * one level less indirection.
+ */
+declare export function deref(buffer: Buffer): any;
+
+/** Create clone of the type, with decremented indirection level by 1. */
+declare export function derefType(type: Type): Type;
+/** Create clone of the type, with decremented indirection level by 1. */
+declare export function derefType(type: string): Type;
+/** Represents the native endianness of the processor ("LE" or "BE"). */
+declare export var endianness: string;
+/** Check the indirection level and return a dereferenced when necessary. */
+declare export function get(buffer: Buffer, offset?: number, type?: Type): any;
+/** Check the indirection level and return a dereferenced when necessary. */
+declare export function get(buffer: Buffer, offset?: number, type?: string): any;
+/** Get type of the buffer. Create a default type when none exists. */
+declare export function getType(buffer: Buffer): Type;
+/** Check the NULL. */
+declare export function isNull(buffer: Buffer): boolean;
+/** Read C string until the first NULL. */
+declare export function readCString(buffer: Buffer, offset?: number): string;
+
+/**
+ * Read a big-endian signed 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+declare export function readInt64BE(buffer: Buffer, offset?: number): any;
+
+/**
+ * Read a little-endian signed 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+declare export function readInt64LE(buffer: Buffer, offset?: number): any;
+
+/** Read a JS Object that has previously been written. */
+declare export function readObject(buffer: Buffer, offset?: number): Object;
+/** Read data from the pointer. */
+declare export function readPointer(buffer: Buffer, offset?: number,
+    length?: number): Buffer;
+/**
+ * Read a big-endian unsigned 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+declare export function readUInt64BE(buffer: Buffer, offset?: number): any;
+
+/**
+ * Read a little-endian unsigned 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+declare export function readUInt64LE(buffer: Buffer, offset?: number): any;
+
+/** Create pointer to buffer. */
+declare export function ref(buffer: Buffer): Buffer;
+/** Create clone of the type, with incremented indirection level by 1. */
+declare export function refType(type: Type): Type;
+/** Create clone of the type, with incremented indirection level by 1. */
+declare export function refType(type: string): Type;
+
+/**
+ * Create buffer with the specified size, with the same address as source.
+ * This function "attaches" source to the returned buffer to prevent it from
+ * being garbage collected.
+ */
+declare export function reinterpret(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/**
+ * Scan past the boundary of the buffer's length until it finds size number
+ * of aligned NULL bytes.
+ */
+declare export function reinterpretUntilZeros(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+
+/** Write pointer if the indirection is 1, otherwise write value. */
+declare export function set(buffer: Buffer, offset: number, value: any, type?: Type): void;
+/** Write pointer if the indirection is 1, otherwise write value. */
+declare export function set(buffer: Buffer, offset: number, value: any, type?: string): void;
+/** Write the string as a NULL terminated. Default encoding is utf8. */
+declare export function writeCString(buffer: Buffer, offset: number,
+    string: string, encoding?: string): void;
+/** Write a big-endian signed 64-bit int. */
+declare export function writeInt64BE(buffer: Buffer, offset: number, input: number): void;
+/** Write a big-endian signed 64-bit int. */
+declare export function writeInt64BE(buffer: Buffer, offset: number, input: string): void;
+/** Write a little-endian signed 64-bit int. */
+declare export function writeInt64LE(buffer: Buffer, offset: number, input: number): void;
+/** Write a little-endian signed 64-bit int. */
+declare export function writeInt64LE(buffer: Buffer, offset: number, input: string): void;
+
+/**
+ * Write the JS Object. This function "attaches" object to buffer to prevent
+ * it from being garbage collected.
+ */
+declare export function writeObject(buffer: Buffer, offset: number, object: Object): void;
+
+/**
+ * Write the memory address of pointer to buffer at the specified offset. This
+ * function "attaches" object to buffer to prevent it from being garbage collected.
+ */
+declare export function writePointer(buffer: Buffer, offset: number,
+    pointer: Buffer): void;
+
+/** Write a little-endian unsigned 64-bit int. */
+declare export function writeUInt64BE(buffer: Buffer, offset: number, input: number): void;
+/** Write a little-endian unsigned 64-bit int. */
+declare export function writeUInt64BE(buffer: Buffer, offset: number, input: string): void;
+
+/**
+ * Attach object to buffer such.
+ * It prevents object from being garbage collected until buffer does.
+ */
+declare export function _attach(buffer: Buffer, object: Object): void;
+
+/** Same as ref.reinterpret, except that this version does not attach buffer. */
+declare export function _reinterpret(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/** Same as ref.reinterpretUntilZeros, except that this version does not attach buffer. */
+declare export function _reinterpretUntilZeros(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/** Same as ref.writePointer, except that this version does not attach pointer. */
+declare export function _writePointer(buffer: Buffer, offset: number,
+    pointer: Buffer): void;
+/** Same as ref.writeObject, except that this version does not attach object. */
+declare export function _writeObject(buffer: Buffer, offset: number, object: Object): void;
+
+/** Default types. */
+declare export var types: {
+    void: Type; int64: Type; ushort: Type;
+    int: Type; uint64: Type; float: Type;
+    uint: Type; long: Type; double: Type;
+    int8: Type; ulong: Type; Object: Type;
+    uint8: Type; longlong: Type; CString: Type;
+    int16: Type; ulonglong: Type; bool: Type;
+    uint16: Type; char: Type; byte: Type;
+    int32: Type; uchar: Type; size_t: Type;
+    uint32: Type; short: Type;
+};
diff --git a/relateurl/relateurl.d.ts b/relateurl/relateurl.d.ts
index f8fb44b696..88f3342895 100644
--- a/relateurl/relateurl.d.ts
+++ b/relateurl/relateurl.d.ts
@@ -3,113 +3,113 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'relateurl' {
-  namespace RelateUrl {
+
+declare namespace RelateUrl {
     interface Options {
-      /**
-       * Type: Object
-       * Default value: {ftp:21, http:80, https:443}
-       *
-       * Extend the list with any ports you need. Any URLs containing these default ports will have them removed. Example: http://example.com:80/ will become http://example.com/.
-       */
-      defaultPorts?: Object;
+        /**
+         * Type: Object
+         * Default value: {ftp:21, http:80, https:443}
+         *
+         * Extend the list with any ports you need. Any URLs containing these default ports will have them removed. Example: http://example.com:80/ will become http://example.com/.
+         */
+        defaultPorts?: Object;
 
-      /**
-       * Type: Array
-       * Default value: ["index.html"]
-       *
-       * Extend the list with any resources you need. Works with options.removeDirectoryIndexes.
-       */
-      directoryIndexes?: Array<string>;
+        /**
+         * Type: Array
+         * Default value: ["index.html"]
+         *
+         * Extend the list with any resources you need. Works with options.removeDirectoryIndexes.
+         */
+        directoryIndexes?: Array<string>;
 
-      /**
-       * Type: Boolean
-       * Default value: false
-       *
-       * This will, for example, consider any domains containing http://www.example.com/ to be related to any that contain http://example.com/.
-       */
-      ignore_www?: boolean;
+        /**
+         * Type: Boolean
+         * Default value: false
+         *
+         * This will, for example, consider any domains containing http://www.example.com/ to be related to any that contain http://example.com/.
+         */
+        ignore_www?: boolean;
 
-      /**
-       * Type: constant or String
-       * Choices: RelateUrl.ABSOLUTE,RelateUrl.PATH_RELATIVE,RelateUrl.ROOT_RELATIVE,RelateUrl.SHORTEST
-       * Choices: "absolute","pathRelative","rootRelative","shortest"
-       * Default value: RelateUrl.SHORTEST
-       *
-       * RelateUrl.ABSOLUTE will produce an absolute URL. Overrides options.schemeRelative with a value of false.
-       * RelateUrl.PATH_RELATIVE will produce something like ../child-of-parent/etc/.
-       * RelateUrl.ROOT_RELATIVE will produce something like /child-of-root/etc/.
-       * RelateUrl.SHORTEST will choose whichever is shortest between root- and path-relative.
-       */
-      output?: string;
+        /**
+         * Type: constant or String
+         * Choices: RelateUrl.ABSOLUTE,RelateUrl.PATH_RELATIVE,RelateUrl.ROOT_RELATIVE,RelateUrl.SHORTEST
+         * Choices: "absolute","pathRelative","rootRelative","shortest"
+         * Default value: RelateUrl.SHORTEST
+         *
+         * RelateUrl.ABSOLUTE will produce an absolute URL. Overrides options.schemeRelative with a value of false.
+         * RelateUrl.PATH_RELATIVE will produce something like ../child-of-parent/etc/.
+         * RelateUrl.ROOT_RELATIVE will produce something like /child-of-root/etc/.
+         * RelateUrl.SHORTEST will choose whichever is shortest between root- and path-relative.
+         */
+        output?: string;
 
-      /**
-       * Type: Array
-       * Default value: ["data","javascript","mailto"]
-       *
-       * Extend the list with any additional schemes. Example: javascript:something will not be modified.
-       */
-      rejectedSchemes?: Array<string>;
+        /**
+         * Type: Array
+         * Default value: ["data","javascript","mailto"]
+         *
+         * Extend the list with any additional schemes. Example: javascript:something will not be modified.
+         */
+        rejectedSchemes?: Array<string>;
 
-      /**
-       * Type: Boolean
-       * Default value: false
-       *
-       * Remove user authentication information from the output URL.
-       */
-      removeAuth?: boolean;
+        /**
+         * Type: Boolean
+         * Default value: false
+         *
+         * Remove user authentication information from the output URL.
+         */
+        removeAuth?: boolean;
 
-      /**
-       * Type: Boolean
-       * Default value: true
-       *
-       * Remove any resources that match any found in options.directoryIndexes.
-       */
-      removeDirectoryIndexes?: boolean;
+        /**
+         * Type: Boolean
+         * Default value: true
+         *
+         * Remove any resources that match any found in options.directoryIndexes.
+         */
+        removeDirectoryIndexes?: boolean;
 
-      /**
-       * Type: Boolean
-       * Default value: false
-       *
-       * Remove empty query variables. Example: http://domain.com/?var1&var2=&var3=asdf will become http://domain.com/?var3=adsf. This does not apply to unrelated URLs (with other protocols, auths, hosts and/or ports).
-       */
-      removeEmptyQueries?: boolean;
+        /**
+         * Type: Boolean
+         * Default value: false
+         *
+         * Remove empty query variables. Example: http://domain.com/?var1&var2=&var3=asdf will become http://domain.com/?var3=adsf. This does not apply to unrelated URLs (with other protocols, auths, hosts and/or ports).
+         */
+        removeEmptyQueries?: boolean;
 
-      /**
-       * Type: Boolean
-       * Default value: true
-       *
-       * Remove trailing slashes from root paths. Example: http://domain.com/?var will become http://domain.com?var while http://domain.com/dir/?var will not be modified.
-       */
-      removeRootTrailingSlash?: boolean;
+        /**
+         * Type: Boolean
+         * Default value: true
+         *
+         * Remove trailing slashes from root paths. Example: http://domain.com/?var will become http://domain.com?var while http://domain.com/dir/?var will not be modified.
+         */
+        removeRootTrailingSlash?: boolean;
 
-      /**
-       * Type: Boolean
-       * Default value: true
-       *
-       * Output URLs relative to the scheme. Example: http://example.com/ will become //example.com/.
-       */
-      schemeRelative?: boolean;
+        /**
+         * Type: Boolean
+         * Default value: true
+         *
+         * Output URLs relative to the scheme. Example: http://example.com/ will become //example.com/.
+         */
+        schemeRelative?: boolean;
 
-      /**
-       * Type: String
-       * Default value: undefined
-       *
-       * An options-based version of the from argument. If both are specified, from takes priority.
-       */
-      site?: string;
+        /**
+         * Type: String
+         * Default value: undefined
+         *
+         * An options-based version of the from argument. If both are specified, from takes priority.
+         */
+        site?: string;
 
-      /**
-       * Type: Boolean
-       * Default value: true
-       *
-       * Passed to Node's url.parse.
-       */
-      slashesDenoteHost?: boolean;
+        /**
+         * Type: Boolean
+         * Default value: true
+         *
+         * Passed to Node's url.parse.
+         */
+        slashesDenoteHost?: boolean;
     }
-  }
+}
 
-  class RelateUrl {
+declare class RelateUrl {
     static ABSOLUTE: string;
     static PATH_RELATIVE: string;
     static ROOT_RELATIVE: string;
@@ -119,7 +119,6 @@ declare module 'relateurl' {
 
     constructor(from: string, options?: RelateUrl.Options);
     relate(to: string, options?: RelateUrl.Options): string;
-  }
-
-  export = RelateUrl;
 }
+
+export = RelateUrl;
diff --git a/request-ip/request-ip.d.ts b/request-ip/request-ip.d.ts
index 11ed21d63a..696d008f87 100644
--- a/request-ip/request-ip.d.ts
+++ b/request-ip/request-ip.d.ts
@@ -3,30 +3,29 @@
 // Definitions by: Adam Babcock <https://github.com/mrhen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "request-ip" {
-    interface Request {
-        headers: {
-            'x-client-ip'?: string;
-            'x-forwarded-for'?: string;
-            'x-real-ip'?: string;
-            'x-cluster-client-ip'?: string;
-            'x-forwarded'?: string;
-            'forwarded-for'?: string;
-            'forwarded'?: string;
-        };
-        connection: {
-            remoteAddress?: string;
-            socket?: {
-                remoteAddress?: string
-            };
-        };
-        info?: {
-            remoteAddress?: string
-        };
+
+interface Request {
+    headers: {
+        'x-client-ip'?: string;
+        'x-forwarded-for'?: string;
+        'x-real-ip'?: string;
+        'x-cluster-client-ip'?: string;
+        'x-forwarded'?: string;
+        'forwarded-for'?: string;
+        'forwarded'?: string;
+    };
+    connection: {
+        remoteAddress?: string;
         socket?: {
             remoteAddress?: string
         };
-    }
-
-    export function getClientIp(req:Request):string;
+    };
+    info?: {
+        remoteAddress?: string
+    };
+    socket?: {
+        remoteAddress?: string
+    };
 }
+
+declare export function getClientIp(req: Request): string;
diff --git a/request-promise/request-promise.d.ts b/request-promise/request-promise.d.ts
index 7c96689f56..29dd9ff67d 100644
--- a/request-promise/request-promise.d.ts
+++ b/request-promise/request-promise.d.ts
@@ -8,26 +8,25 @@
 /// <reference path="../request/request.d.ts" />
 /// <reference path="../bluebird/bluebird.d.ts" />
 
-declare module 'request-promise' {
-    import request = require('request');
-    import http = require('http');
-        
-    interface RequestPromise extends request.Request {
-        then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
-        then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
-        catch(onrejected?: (reason: any) => any | PromiseLike<any>): Promise<any>;
-        catch(onrejected?: (reason: any) => void): Promise<any>;
-        finally<TResult>(handler: () => PromiseLike<TResult>): Promise<any>;
-        finally<TResult>(handler: () => TResult): Promise<any>;
-        promise(): Promise<any>;
-    }
-    
-    interface RequestPromiseOptions extends request.CoreOptions {
-        simple?: boolean;
-        transform?: (body: any, response: http.IncomingMessage) => any;
-        resolveWithFullResponse?: boolean;
-    }
-    
-    var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions, request.RequiredUriUrl>;
-	export = requestPromise;
+
+import request = require('request');
+import http = require('http');
+
+interface RequestPromise extends request.Request {
+    then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
+    then<TResult>(onfulfilled?: (value: any) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
+    catch(onrejected?: (reason: any) => any | PromiseLike<any>): Promise<any>;
+    catch(onrejected?: (reason: any) => void): Promise<any>;
+    finally<TResult>(handler: () => PromiseLike<TResult>): Promise<any>;
+    finally<TResult>(handler: () => TResult): Promise<any>;
+    promise(): Promise<any>;
 }
+
+interface RequestPromiseOptions extends request.CoreOptions {
+    simple?: boolean;
+    transform?: (body: any, response: http.IncomingMessage) => any;
+    resolveWithFullResponse?: boolean;
+}
+
+declare var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions, request.RequiredUriUrl>;
+export = requestPromise;
diff --git a/request/request.d.ts b/request/request.d.ts
index aaeba2caca..0fab978bee 100644
--- a/request/request.d.ts
+++ b/request/request.d.ts
@@ -8,255 +8,254 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../form-data/form-data.d.ts" />
 
-declare module 'request' {
-	import stream = require('stream');
-	import http = require('http');
-	import https = require('https');
-	import FormData = require('form-data');
-	import url = require('url');
-	import fs = require('fs');
 
-	namespace request {
-		export interface RequestAPI<TRequest extends Request,
-			TOptions extends CoreOptions,
-			TUriUrlOptions> {
+import stream = require('stream');
+import http = require('http');
+import https = require('https');
+import FormData = require('form-data');
+import url = require('url');
+import fs = require('fs');
 
-			defaults(options: TOptions): RequestAPI<TRequest, TOptions, RequiredUriUrl>;
-			defaults(options: RequiredUriUrl & TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
+declare namespace request {
+    export interface RequestAPI<TRequest extends Request,
+        TOptions extends CoreOptions,
+        TUriUrlOptions> {
 
-			(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			(uri: string, callback?: RequestCallback): TRequest;
-			(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        defaults(options: TOptions): RequestAPI<TRequest, TOptions, RequiredUriUrl>;
+        defaults(options: RequiredUriUrl & TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
 
-			get(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			get(uri: string, callback?: RequestCallback): TRequest;
-			get(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        (uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        (uri: string, callback?: RequestCallback): TRequest;
+        (options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
-			post(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			post(uri: string, callback?: RequestCallback): TRequest;
-			post(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        get(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        get(uri: string, callback?: RequestCallback): TRequest;
+        get(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
-			put(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			put(uri: string, callback?: RequestCallback): TRequest;
-			put(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        post(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        post(uri: string, callback?: RequestCallback): TRequest;
+        post(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
-			head(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			head(uri: string, callback?: RequestCallback): TRequest;
-			head(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        put(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        put(uri: string, callback?: RequestCallback): TRequest;
+        put(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
-			patch(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			patch(uri: string, callback?: RequestCallback): TRequest;
-			patch(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        head(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        head(uri: string, callback?: RequestCallback): TRequest;
+        head(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
-			del(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
-			del(uri: string, callback?: RequestCallback): TRequest;
-			del(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
+        patch(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        patch(uri: string, callback?: RequestCallback): TRequest;
+        patch(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
-			forever(agentOptions: any, optionsArg: any): TRequest;
-			jar(): CookieJar;
-			cookie(str: string): Cookie;
+        del(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
+        del(uri: string, callback?: RequestCallback): TRequest;
+        del(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
 
-			initParams: any;
-			debug: boolean;
-		}
+        forever(agentOptions: any, optionsArg: any): TRequest;
+        jar(): CookieJar;
+        cookie(str: string): Cookie;
 
-		interface DefaultUriUrlRequestApi<TRequest extends Request,
-			TOptions extends CoreOptions,
-			TUriUrlOptions>	extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
+        initParams: any;
+        debug: boolean;
+    }
 
-			defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
-			(): TRequest;
-			get(): TRequest;
-			post(): TRequest;
-			put(): TRequest;
-			head(): TRequest;
-			patch(): TRequest;
-			del(): TRequest;
-		}
+    interface DefaultUriUrlRequestApi<TRequest extends Request,
+        TOptions extends CoreOptions,
+        TUriUrlOptions> extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
 
-		interface CoreOptions {
-			baseUrl?: string;
-			callback?: (error: any, response: http.IncomingMessage, body: any) => void;
-			jar?: any; // CookieJar
-			formData?: any; // Object
-			form?: any; // Object or string
-			auth?: AuthOptions;
-			oauth?: OAuthOptions;
-			aws?: AWSOptions;
-			hawk?: HawkOptions;
-			qs?: any;
-			json?: any;
-			multipart?: RequestPart[] | Multipart;
-			agent?: http.Agent | https.Agent;
-			agentOptions?: any;
-			agentClass?: any;
-			forever?: any;
-			host?: string;
-			port?: number;
-			method?: string;
-			headers?: Headers;
-			body?: any;
-			followRedirect?: boolean | ((response: http.IncomingMessage) => boolean);
-			followAllRedirects?: boolean;
-			maxRedirects?: number;
-			encoding?: string;
-			pool?: any;
-			timeout?: number;
-			proxy?: any;
-			strictSSL?: boolean;
-			gzip?: boolean;
-			preambleCRLF?: boolean;
-			postambleCRLF?: boolean;
-			key?: Buffer;
-			cert?: Buffer;
-			passphrase?: string;
-			ca?: Buffer;
-			har?: HttpArchiveRequest;
-			useQuerystring?: boolean;
-		}
+        defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
+        (): TRequest;
+        get(): TRequest;
+        post(): TRequest;
+        put(): TRequest;
+        head(): TRequest;
+        patch(): TRequest;
+        del(): TRequest;
+    }
 
-		interface UriOptions {
-			uri: string;
-		}
-		interface UrlOptions {
-			url: string;
-		}
-		export type RequiredUriUrl = UriOptions | UrlOptions;
+    interface CoreOptions {
+        baseUrl?: string;
+        callback?: (error: any, response: http.IncomingMessage, body: any) => void;
+        jar?: any; // CookieJar
+        formData?: any; // Object
+        form?: any; // Object or string
+        auth?: AuthOptions;
+        oauth?: OAuthOptions;
+        aws?: AWSOptions;
+        hawk?: HawkOptions;
+        qs?: any;
+        json?: any;
+        multipart?: RequestPart[] | Multipart;
+        agent?: http.Agent | https.Agent;
+        agentOptions?: any;
+        agentClass?: any;
+        forever?: any;
+        host?: string;
+        port?: number;
+        method?: string;
+        headers?: Headers;
+        body?: any;
+        followRedirect?: boolean | ((response: http.IncomingMessage) => boolean);
+        followAllRedirects?: boolean;
+        maxRedirects?: number;
+        encoding?: string;
+        pool?: any;
+        timeout?: number;
+        proxy?: any;
+        strictSSL?: boolean;
+        gzip?: boolean;
+        preambleCRLF?: boolean;
+        postambleCRLF?: boolean;
+        key?: Buffer;
+        cert?: Buffer;
+        passphrase?: string;
+        ca?: Buffer;
+        har?: HttpArchiveRequest;
+        useQuerystring?: boolean;
+    }
 
-		interface OptionalUriUrl {
-			uri?: string;
-			url?: string;
-		}
+    interface UriOptions {
+        uri: string;
+    }
+    interface UrlOptions {
+        url: string;
+    }
+    export type RequiredUriUrl = UriOptions | UrlOptions;
 
-        export type OptionsWithUri = UriOptions & CoreOptions;
-        export type OptionsWithUrl = UrlOptions & CoreOptions;
-        export type Options = OptionsWithUri | OptionsWithUrl;
+    interface OptionalUriUrl {
+        uri?: string;
+        url?: string;
+    }
 
-		export interface RequestCallback {
-			(error: any, response: http.IncomingMessage, body: any): void;
-		}
+    export type OptionsWithUri = UriOptions & CoreOptions;
+    export type OptionsWithUrl = UrlOptions & CoreOptions;
+    export type Options = OptionsWithUri | OptionsWithUrl;
 
-		export interface HttpArchiveRequest {
-			url?: string;
-			method?: string;
-			headers?: NameValuePair[];
-			postData?: {
-				mimeType?: string;
-				params?: NameValuePair[];
-			}
-		}
+    export interface RequestCallback {
+        (error: any, response: http.IncomingMessage, body: any): void;
+    }
 
-		export interface NameValuePair {
-			name: string;
-			value: string;
-		}
+    export interface HttpArchiveRequest {
+        url?: string;
+        method?: string;
+        headers?: NameValuePair[];
+        postData?: {
+            mimeType?: string;
+            params?: NameValuePair[];
+        }
+    }
 
-		export interface Multipart {
-			chunked?: boolean;
-			data?: {
-				'content-type'?: string,
-				body: string
-			}[];
-		}
+    export interface NameValuePair {
+        name: string;
+        value: string;
+    }
 
-		export interface RequestPart {
-			headers?: Headers;
-			body: any;
-		}
+    export interface Multipart {
+        chunked?: boolean;
+        data?: {
+            'content-type'?: string,
+            body: string
+        }[];
+    }
 
-		export interface Request extends stream.Stream {
-			readable: boolean;
-			writable: boolean;
+    export interface RequestPart {
+        headers?: Headers;
+        body: any;
+    }
 
-			getAgent(): http.Agent;
-			//start(): void;
-			//abort(): void;
-			pipeDest(dest: any): void;
-			setHeader(name: string, value: string, clobber?: boolean): Request;
-			setHeaders(headers: Headers): Request;
-			qs(q: Object, clobber?: boolean): Request;
-			form(): FormData.FormData;
-			form(form: any): Request;
-			multipart(multipart: RequestPart[]): Request;
-			json(val: any): Request;
-			aws(opts: AWSOptions, now?: boolean): Request;
-			auth(username: string, password: string, sendInmediately?: boolean, bearer?: string): Request;
-			oauth(oauth: OAuthOptions): Request;
-			jar(jar: CookieJar): Request;
+    export interface Request extends stream.Stream {
+        readable: boolean;
+        writable: boolean;
 
-			on(event: string, listener: Function): this;
-			on(event: 'request', listener: (req: http.ClientRequest) => void): this;
-			on(event: 'response', listener: (resp: http.IncomingMessage) => void): this;
-			on(event: 'data', listener: (data: Buffer | string) => void): this;
-			on(event: 'error', listener: (e: Error) => void): this;
-			on(event: 'complete', listener: (resp: http.IncomingMessage, body?: string | Buffer) => void): this;
+        getAgent(): http.Agent;
+        //start(): void;
+        //abort(): void;
+        pipeDest(dest: any): void;
+        setHeader(name: string, value: string, clobber?: boolean): Request;
+        setHeaders(headers: Headers): Request;
+        qs(q: Object, clobber?: boolean): Request;
+        form(): FormData.FormData;
+        form(form: any): Request;
+        multipart(multipart: RequestPart[]): Request;
+        json(val: any): Request;
+        aws(opts: AWSOptions, now?: boolean): Request;
+        auth(username: string, password: string, sendInmediately?: boolean, bearer?: string): Request;
+        oauth(oauth: OAuthOptions): Request;
+        jar(jar: CookieJar): Request;
 
-			write(buffer: Buffer, cb?: Function): boolean;
-			write(str: string, cb?: Function): boolean;
-			write(str: string, encoding: string, cb?: Function): boolean;
-			write(str: string, encoding?: string, fd?: string): boolean;
-			end(): void;
-			end(chunk: Buffer, cb?: Function): void;
-			end(chunk: string, cb?: Function): void;
-			end(chunk: string, encoding: string, cb?: Function): void;
-			pause(): void;
-			resume(): void;
-			abort(): void;
-			destroy(): void;
-			toJSON(): Object;
-		}
+        on(event: string, listener: Function): this;
+        on(event: 'request', listener: (req: http.ClientRequest) => void): this;
+        on(event: 'response', listener: (resp: http.IncomingMessage) => void): this;
+        on(event: 'data', listener: (data: Buffer | string) => void): this;
+        on(event: 'error', listener: (e: Error) => void): this;
+        on(event: 'complete', listener: (resp: http.IncomingMessage, body?: string | Buffer) => void): this;
 
-		export interface Headers {
-			[key: string]: any;
-		}
+        write(buffer: Buffer, cb?: Function): boolean;
+        write(str: string, cb?: Function): boolean;
+        write(str: string, encoding: string, cb?: Function): boolean;
+        write(str: string, encoding?: string, fd?: string): boolean;
+        end(): void;
+        end(chunk: Buffer, cb?: Function): void;
+        end(chunk: string, cb?: Function): void;
+        end(chunk: string, encoding: string, cb?: Function): void;
+        pause(): void;
+        resume(): void;
+        abort(): void;
+        destroy(): void;
+        toJSON(): Object;
+    }
 
-		export interface AuthOptions {
-			user?: string;
-			username?: string;
-			pass?: string;
-			password?: string;
-			sendImmediately?: boolean;
-			bearer?: string;
-		}
+    export interface Headers {
+        [key: string]: any;
+    }
 
-		export interface OAuthOptions {
-			callback?: string;
-			consumer_key?: string;
-			consumer_secret?: string;
-			token?: string;
-			token_secret?: string;
-			verifier?: string;
-		}
+    export interface AuthOptions {
+        user?: string;
+        username?: string;
+        pass?: string;
+        password?: string;
+        sendImmediately?: boolean;
+        bearer?: string;
+    }
 
-		export interface HawkOptions {
-			credentials: any;
-		}
+    export interface OAuthOptions {
+        callback?: string;
+        consumer_key?: string;
+        consumer_secret?: string;
+        token?: string;
+        token_secret?: string;
+        verifier?: string;
+    }
 
-		export interface AWSOptions {
-			secret: string;
-			bucket?: string;
-		}
+    export interface HawkOptions {
+        credentials: any;
+    }
 
-		export interface CookieJar {
-			setCookie(cookie: Cookie, uri: string | url.Url, options?: any): void
-			getCookieString(uri: string | url.Url): string
-			getCookies(uri: string | url.Url): Cookie[]
-		}
+    export interface AWSOptions {
+        secret: string;
+        bucket?: string;
+    }
 
-		export interface CookieValue {
-			name: string;
-			value: any;
-			httpOnly: boolean;
-		}
+    export interface CookieJar {
+        setCookie(cookie: Cookie, uri: string | url.Url, options?: any): void
+        getCookieString(uri: string | url.Url): string
+        getCookies(uri: string | url.Url): Cookie[]
+    }
 
-		export interface Cookie extends Array<CookieValue> {
-			constructor(name: string, req: Request): void;
-			str: string;
-			expires: Date;
-			path: string;
-			toString(): string;
-		}
-	}
-	var request: request.RequestAPI<request.Request, request.CoreOptions, request.RequiredUriUrl>;
-	export = request;
+    export interface CookieValue {
+        name: string;
+        value: any;
+        httpOnly: boolean;
+    }
+
+    export interface Cookie extends Array<CookieValue> {
+        constructor(name: string, req: Request): void;
+        str: string;
+        expires: Date;
+        path: string;
+        toString(): string;
+    }
 }
+declare var request: request.RequestAPI<request.Request, request.CoreOptions, request.RequiredUriUrl>;
+export = request;
diff --git a/requirejs-domready/domready.d.ts b/requirejs-domready/domready.d.ts
index 03d3ef03d8..956282405e 100644
--- a/requirejs-domready/domready.d.ts
+++ b/requirejs-domready/domready.d.ts
@@ -3,13 +3,12 @@
 // Definitions by: Nobuhiro Nakamura <https://github.com/lefb766>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "domReady" {
-    interface DomReady {
-        (callback: () => any): DomReady;
-        version: string;
-    }
 
-    let domReady: DomReady;
-
-    export = domReady;
+interface DomReady {
+    (callback: () => any): DomReady;
+    version: string;
 }
+
+declare let domReady: DomReady;
+
+export = domReady;
diff --git a/response-time/response-time.d.ts b/response-time/response-time.d.ts
index c8d569e296..1635c29640 100644
--- a/response-time/response-time.d.ts
+++ b/response-time/response-time.d.ts
@@ -12,27 +12,26 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "response-time" {
-    import express = require('express');
 
+import express = require('express');
+
+/**
+ * Response time header for node.js
+ * Returns middleware that adds a X-Response-Time header to responses.
+ */
+declare function responseTime(options?: {
     /**
-     * Response time header for node.js
-     * Returns middleware that adds a X-Response-Time header to responses.
+    * The fixed number of digits to include in the output, which is always in milliseconds, defaults to 3 (ex: 2.300ms).
+    */
+    digits?: number;
+    /**
+     * The name of the header to set, defaults to X-Response-Time.
      */
-    function responseTime(options?: {
-        /**
-        * The fixed number of digits to include in the output, which is always in milliseconds, defaults to 3 (ex: 2.300ms).
-        */
-        digits?: number;
-        /**
-         * The name of the header to set, defaults to X-Response-Time.
-         */
-        header?: string;
-        /**
-         * Boolean to indicate if units of measurement suffix should be added to the output, defaults to true (ex: 2.300ms vs 2.300).
-         */
-        suffix?: boolean;
-    }): express.RequestHandler;
-    
-    export = responseTime;
-}
\ No newline at end of file
+    header?: string;
+    /**
+     * Boolean to indicate if units of measurement suffix should be added to the output, defaults to true (ex: 2.300ms vs 2.300).
+     */
+    suffix?: boolean;
+}): express.RequestHandler;
+
+export = responseTime;
diff --git a/rest-io/rest-io.d.ts b/rest-io/rest-io.d.ts
index 86e663194c..5daa963b43 100644
--- a/rest-io/rest-io.d.ts
+++ b/rest-io/rest-io.d.ts
@@ -7,31 +7,31 @@
 /// <reference path="../mongoose/mongoose.d.ts" />
 
 
-declare module 'rest-io' {
+
 import {Router, Application, Response, Request} from 'express';
 
 import {Mongoose, Schema, Model, Document, Types, Promise} from 'mongoose';
 
-  function restIO(app: Application, config?: IRestIOConfig): RestIO;
+declare function restIO(app: Application, config?: IRestIOConfig): RestIO;
 
-  export interface RestIO {
+export interface RestIO {
     resource: ResourceModule
-  }
+}
 
-  export interface IRestIOConfig {
+export interface IRestIOConfig {
     resources: string;
     db?: Mongoose;
-  }
+}
 
-  export interface ResourceModule {
+export interface ResourceModule {
     Resource: Resource;
     AuthorizedResource: AuthorizedResource;
     authorizedResource: AuthorizedResourceModule;
     UserResource: UserResource;
     SubResource: SubResource;
-  }
+}
 
-  export class Resource {
+declare export class Resource {
     baseUrl: string;
     url: string;
     parameterizedUrl: string;
@@ -66,30 +66,30 @@ import {Mongoose, Schema, Model, Document, Types, Promise} from 'mongoose';
     del(req: Request, res: Response): void;
 
     errorHandler(err: Error, res: Response): void;
-  }
+}
 
-  export interface IResource {
+export interface IResource {
     name: string;
     model: any;
     parentRef?: string;
     populate?: string;
     plural?: string;
     parentResource?: Resource;
-  }
+}
 
-  export interface AuthorizedResourceModule {
+export interface AuthorizedResourceModule {
     AuthorizedResource: AuthorizedResource
     ROLES: Roles
-  }
+}
 
-  export interface Roles {
+export interface Roles {
     USER: string;
     SUPER_USER: string;
     MODERATOR: string;
     ADMIN: string;
-  }
+}
 
-  export class AuthorizedResource extends Resource {
+declare export class AuthorizedResource extends Resource {
     methodAccess: IMethodAccess;
 
     maxDays: number;
@@ -107,17 +107,17 @@ import {Mongoose, Schema, Model, Document, Types, Promise} from 'mongoose';
     isAuthorized(req: Request, authorizedRoles: Array<string>): boolean;
 
     sendUnauthorized(error: Error, res: Response): void;
-  }
+}
 
-  export interface IMethodAccess {
+export interface IMethodAccess {
     getAll: Array<string>;
     getById: Array<string>;
     create: Array<string>;
     update: Array<string>;
     del: Array<string>;
-  }
+}
 
-  export class UserResource extends AuthorizedResource {
+declare export class UserResource extends AuthorizedResource {
     ensureBaseUserModel(model: any): void;
 
     createRoleModel(): void;
@@ -125,9 +125,9 @@ import {Mongoose, Schema, Model, Document, Types, Promise} from 'mongoose';
     isSelf(req: Request): boolean;
 
     login(req: Request, res: Response): void;
-  }
+}
 
-  export class SubResource extends Resource {
+declare export class SubResource extends Resource {
     constructor(resDef: ISubResource);
 
     createProjectionQuery(req: Request): any;
@@ -137,12 +137,11 @@ import {Mongoose, Schema, Model, Document, Types, Promise} from 'mongoose';
     createFindQuery(req: Request): any;
 
     createSubUpdateQuery(req: Request): any;
-  }
+}
 
-  export interface ISubResource {
+export interface ISubResource {
     name: string;
     plural?: string;
     parentResource: Resource;
     populate?: string;
-  }
-}
\ No newline at end of file
+}
diff --git a/restful.js/restful.js.d.ts b/restful.js/restful.js.d.ts
index a946b6714c..da3f93a9dd 100644
--- a/restful.js/restful.js.d.ts
+++ b/restful.js/restful.js.d.ts
@@ -3,240 +3,239 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "restful.js" {
-    export interface Headers {
-        [key: string]: any
-    }
 
-    export interface Api extends Endpoint<Api> {
-        all(name: string): CollectionEndpoint;
-        allUrl(name: string, url: string): CollectionEndpoint;
-        one(name: string, id: any): MemberEndpoint;
-        oneUrl(name: string, url: string): MemberEndpoint;
-        protocol(protocol: string): Api;
-        protocol(): string;
-        baseUrl(protocol: string): Api;
-        baseUrl(): string;
-        port(port: number): Api;
-        port(): number;
-        prefixUrl(prefix: string): Api;
-        prefixUrl(): string;
-        customUrl(url: string): Api;
-        customUrl(): string;
-    }
-
-    export interface MemberEndpoint extends Endpoint<MemberEndpoint> {
-        /**
-         * Target a child collection name.
-         * @param name
-         */
-        all(name: string): CollectionEndpoint;
-        allUrl(name: string, url: string): CollectionEndpoint;
-        /**
-         * Target a child member in a collection name.
-         * @param name
-         * @param id
-         */
-        one(name: string, id: any): MemberEndpoint;
-        oneUrl(name: string, url: string): MemberEndpoint;
-        /**
-         * Get a member. Returns a promise with an entity.
-         * @param params
-         * @param headers
-         */
-        get<T>(params?: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Update a member. Returns a promise with the response.
-         * @param data
-         * @param headers
-         */
-        put<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Delete a member. Returns a promise with the response.
-         * @param data
-         * @param headers
-         */
-        delete<T>(data?: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Patch a member. Returns a promise with the response.
-         * @param data
-         * @param headers
-         */
-        patch<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Perform a HEAD request on a member. Returns a promise with the response.
-         * @param headers
-         */
-        head<T>(headers?: any): Promise<MemberResponse<T>>;
-        customUrl(url: string): MemberEndpoint;
-        customUrl(): string;
-    }
-
-    export interface CollectionEndpoint extends Endpoint<CollectionEndpoint> {
-        /**
-         * Get a member in a collection. Returns a promise with an entity.
-         * @param id
-         */
-        get<T>(id: any, params?: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Get a full collection. Returns a promise with an array of entities.
-         */
-        getAll<T>(params?: any, headers?: Headers): Promise<CollectionResponse<T>>;
-        /**
-         * Create a member in a collection. Returns a promise with the response.
-         */
-        post<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Update a member in a collection. Returns a promise with the response.
-         * @param id
-         * @param data
-         * @param headers
-         */
-        put<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Delete a member in a collection. Returns a promise with the response.
-         * @param id
-         * @param data
-         * @param headers
-         */
-        delete<T>(id: any, data?: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Patch a member in a collection. Returns a promise with the response.
-         * @param id
-         * @param data
-         * @param headers
-         */
-        patch<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
-        /**
-         * Perform a HEAD request on a member in a collection. Returns a promise with the response.
-         * @param id
-         * @param headers
-         */
-        head<T>(id: any, headers?: Headers): Promise<MemberResponse<T>>;
-    }
-
-    export interface Endpoint<Self> {
-        /**
-         * Get the url.
-         */
-        url(): string;
-        /**
-         * Add a response interceptor. You can only alter data and headers.
-         */
-        addResponseInterceptor(interceptor: ResponseInterceptor): Self;
-        responseInterceptors(): ResponseInterceptor[];
-        /**
-         * Add a request interceptor.
-         */
-        addRequestInterceptor(interceptor: RequestInterceptor): Self;
-        requestInterceptors(): RequestInterceptor[];
-        /**
-         * Add a full response interceptor. You can alter data and headers.
-         */
-        addFullResponseInterceptor(interceptor: ResponseInterceptor): Self;
-        fullResponseInterceptors(): ResponseInterceptor[];
-        /**
-         * Add a full request interceptor. You can alter params, headers, data, method and url.
-         */
-        addFullRequestInterceptor(interceptor: FullRequestInterceptor): Self;
-        fullRequestInterceptors(): FullRequestInterceptor[];
-        /**
-         * Add a header.
-         * @param name
-         * @param value
-         */
-        header(name: string, value: any): Self;
-        headers(): Headers;
-    }
-
-    export interface MemberResponse<T> extends ResponseBase {
-        (): {
-            data: T;
-            headers: Headers;
-            status: number;
-            statusText: string;
-        }
-        body(): ResponseBody<T>;
-    }
-
-    export interface CollectionResponse<T> extends ResponseBase {
-        (): {
-            data: T[];
-            headers: Headers;
-            status: number;
-            statusText: string;
-        }
-        body(): ResponseBody<T>[];
-    }
-
-    export interface ResponseBase {
-        status(): number;
-        headers(): Headers;
-        config(): any;
-    }
-
-    export interface ResponseBody<T> {
-        /**
-         * Get the JS object unserialized from the response body (which must be in JSON)
-         */
-        data(): T;
-        (): T;
-        /**
-         * Query a collection child of the entity.
-         * @param entity
-         */
-        all(entity: string): CollectionEndpoint;
-        /**
-         * Query a member child of the entity.
-         * @param entity
-         * @param id
-         */
-        one(entity: string, id: any): MemberEndpoint;
-        /**
-         * Update the member link to the entity. Returns a promise with the response.
-         * @param headers
-         */
-        save(headers?: Headers): void;
-        /**
-         * Delete the member link to the entity. Returns a promise with the response.
-         */
-        remove(headers?: Headers): void;
-        /**
-         * Get the entity url.
-         */
-        url(): string;
-        /**
-         * Get the id of the entity.
-         */
-        id(): any;
-    }
-
-    export interface RequestInterceptor {
-        (data: any, headers: Headers, method: string, url: string): any;
-    }
-
-    export interface FullRequestInterceptor {
-        (params: any, headers: Headers, data: any, method: string, url: string): FullRequestInterceptorReturnValue;
-    }
-
-    export interface FullRequestInterceptorReturnValue {
-        params?: any;
-        headers?: Headers;
-        data?: any;
-        method?: string;
-        url?: string;
-    }
-
-    export interface ResponseInterceptor {
-        (data: any, headers: Headers, method: string, url: string): ResponseInterceptorReturnValue;
-    }
-
-    export interface ResponseInterceptorReturnValue {
-        headers?: Headers;
-        data?: any;
-        method?: string;
-        url?: string;
-    }
-
-    export default function restful(endpoint: string): Api;
+export interface Headers {
+    [key: string]: any
 }
+
+export interface Api extends Endpoint<Api> {
+    all(name: string): CollectionEndpoint;
+    allUrl(name: string, url: string): CollectionEndpoint;
+    one(name: string, id: any): MemberEndpoint;
+    oneUrl(name: string, url: string): MemberEndpoint;
+    protocol(protocol: string): Api;
+    protocol(): string;
+    baseUrl(protocol: string): Api;
+    baseUrl(): string;
+    port(port: number): Api;
+    port(): number;
+    prefixUrl(prefix: string): Api;
+    prefixUrl(): string;
+    customUrl(url: string): Api;
+    customUrl(): string;
+}
+
+export interface MemberEndpoint extends Endpoint<MemberEndpoint> {
+    /**
+     * Target a child collection name.
+     * @param name
+     */
+    all(name: string): CollectionEndpoint;
+    allUrl(name: string, url: string): CollectionEndpoint;
+    /**
+     * Target a child member in a collection name.
+     * @param name
+     * @param id
+     */
+    one(name: string, id: any): MemberEndpoint;
+    oneUrl(name: string, url: string): MemberEndpoint;
+    /**
+     * Get a member. Returns a promise with an entity.
+     * @param params
+     * @param headers
+     */
+    get<T>(params?: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Update a member. Returns a promise with the response.
+     * @param data
+     * @param headers
+     */
+    put<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Delete a member. Returns a promise with the response.
+     * @param data
+     * @param headers
+     */
+    delete<T>(data?: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Patch a member. Returns a promise with the response.
+     * @param data
+     * @param headers
+     */
+    patch<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Perform a HEAD request on a member. Returns a promise with the response.
+     * @param headers
+     */
+    head<T>(headers?: any): Promise<MemberResponse<T>>;
+    customUrl(url: string): MemberEndpoint;
+    customUrl(): string;
+}
+
+export interface CollectionEndpoint extends Endpoint<CollectionEndpoint> {
+    /**
+     * Get a member in a collection. Returns a promise with an entity.
+     * @param id
+     */
+    get<T>(id: any, params?: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Get a full collection. Returns a promise with an array of entities.
+     */
+    getAll<T>(params?: any, headers?: Headers): Promise<CollectionResponse<T>>;
+    /**
+     * Create a member in a collection. Returns a promise with the response.
+     */
+    post<T>(data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Update a member in a collection. Returns a promise with the response.
+     * @param id
+     * @param data
+     * @param headers
+     */
+    put<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Delete a member in a collection. Returns a promise with the response.
+     * @param id
+     * @param data
+     * @param headers
+     */
+    delete<T>(id: any, data?: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Patch a member in a collection. Returns a promise with the response.
+     * @param id
+     * @param data
+     * @param headers
+     */
+    patch<T>(id: any, data: any, headers?: Headers): Promise<MemberResponse<T>>;
+    /**
+     * Perform a HEAD request on a member in a collection. Returns a promise with the response.
+     * @param id
+     * @param headers
+     */
+    head<T>(id: any, headers?: Headers): Promise<MemberResponse<T>>;
+}
+
+export interface Endpoint<Self> {
+    /**
+     * Get the url.
+     */
+    url(): string;
+    /**
+     * Add a response interceptor. You can only alter data and headers.
+     */
+    addResponseInterceptor(interceptor: ResponseInterceptor): Self;
+    responseInterceptors(): ResponseInterceptor[];
+    /**
+     * Add a request interceptor.
+     */
+    addRequestInterceptor(interceptor: RequestInterceptor): Self;
+    requestInterceptors(): RequestInterceptor[];
+    /**
+     * Add a full response interceptor. You can alter data and headers.
+     */
+    addFullResponseInterceptor(interceptor: ResponseInterceptor): Self;
+    fullResponseInterceptors(): ResponseInterceptor[];
+    /**
+     * Add a full request interceptor. You can alter params, headers, data, method and url.
+     */
+    addFullRequestInterceptor(interceptor: FullRequestInterceptor): Self;
+    fullRequestInterceptors(): FullRequestInterceptor[];
+    /**
+     * Add a header.
+     * @param name
+     * @param value
+     */
+    header(name: string, value: any): Self;
+    headers(): Headers;
+}
+
+export interface MemberResponse<T> extends ResponseBase {
+    (): {
+        data: T;
+        headers: Headers;
+        status: number;
+        statusText: string;
+    }
+    body(): ResponseBody<T>;
+}
+
+export interface CollectionResponse<T> extends ResponseBase {
+    (): {
+        data: T[];
+        headers: Headers;
+        status: number;
+        statusText: string;
+    }
+    body(): ResponseBody<T>[];
+}
+
+export interface ResponseBase {
+    status(): number;
+    headers(): Headers;
+    config(): any;
+}
+
+export interface ResponseBody<T> {
+    /**
+     * Get the JS object unserialized from the response body (which must be in JSON)
+     */
+    data(): T;
+    (): T;
+    /**
+     * Query a collection child of the entity.
+     * @param entity
+     */
+    all(entity: string): CollectionEndpoint;
+    /**
+     * Query a member child of the entity.
+     * @param entity
+     * @param id
+     */
+    one(entity: string, id: any): MemberEndpoint;
+    /**
+     * Update the member link to the entity. Returns a promise with the response.
+     * @param headers
+     */
+    save(headers?: Headers): void;
+    /**
+     * Delete the member link to the entity. Returns a promise with the response.
+     */
+    remove(headers?: Headers): void;
+    /**
+     * Get the entity url.
+     */
+    url(): string;
+    /**
+     * Get the id of the entity.
+     */
+    id(): any;
+}
+
+export interface RequestInterceptor {
+    (data: any, headers: Headers, method: string, url: string): any;
+}
+
+export interface FullRequestInterceptor {
+    (params: any, headers: Headers, data: any, method: string, url: string): FullRequestInterceptorReturnValue;
+}
+
+export interface FullRequestInterceptorReturnValue {
+    params?: any;
+    headers?: Headers;
+    data?: any;
+    method?: string;
+    url?: string;
+}
+
+export interface ResponseInterceptor {
+    (data: any, headers: Headers, method: string, url: string): ResponseInterceptorReturnValue;
+}
+
+export interface ResponseInterceptorReturnValue {
+    headers?: Headers;
+    data?: any;
+    method?: string;
+    url?: string;
+}
+
+declare export default function restful(endpoint: string): Api;
diff --git a/restify/restify.d.ts b/restify/restify.d.ts
index ec6fd26b6e..0461fc5c81 100644
--- a/restify/restify.d.ts
+++ b/restify/restify.d.ts
@@ -6,35 +6,35 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../bunyan/bunyan.d.ts" />
 
-declare module "restify" {
-  import http = require('http');
-  import bunyan = require('bunyan');
+
+import http = require('http');
+import bunyan = require('bunyan');
 
 
-  interface addressInterface {
+interface addressInterface {
     port: number;
     family: string;
     address: string;
-  }
-  
-  interface requestFileInterface {
-      path: string;
-      type: string;
-  }
-  
-  /**
-   * Comes from authorizationParser plugin
-   */
-  interface requestAuthorization {
-      scheme: string;
-      credentials: string;
-      basic?: {
-          username: string;
-          password: string;
-      }
-  }
+}
 
-  interface Request extends http.ServerRequest {
+interface requestFileInterface {
+    path: string;
+    type: string;
+}
+
+/**
+ * Comes from authorizationParser plugin
+ */
+interface requestAuthorization {
+    scheme: string;
+    credentials: string;
+    basic?: {
+        username: string;
+        password: string;
+    }
+}
+
+interface Request extends http.ServerRequest {
     header: (key: string, defaultValue?: string) => any;
     accepts: (type: string) => boolean;
     is: (type: string) => boolean;
@@ -57,10 +57,10 @@ declare module "restify" {
     username?: string;
     /** available when authorizationParser plugin is used */
     authorization?: requestAuthorization;
-  }
+}
 
-  interface Response extends http.ServerResponse {
-    header: (key: string, value ?: any) => any;
+interface Response extends http.ServerResponse {
+    header: (key: string, value?: any) => any;
     cache: (type?: any, options?: Object) => any;
     status: (code: number) => any;
     send: (status?: any, body?: any, headers?: { [header: string]: string }) => any;
@@ -71,48 +71,48 @@ declare module "restify" {
     contentType: string;
     headers: Object;
     id: string;
-  }
-  
-  interface Route {
+}
+
+interface Route {
     name: string;
     method: string;
     path: RoutePathRegex;
     spec: Object;
     types: string[];
     versions: string[];
-  }
-  
-  interface RouteOptions {
-      name: string;
-      method: string;
-      path?: string | RegExp;
-      url?: string | RegExp;
-      urlParamPattern?: RegExp;
-      contentType?: string | string[];
-      versions?: string | string[];
-  }
-  
-  interface RoutePathRegex extends RegExp {
+}
+
+interface RouteOptions {
+    name: string;
+    method: string;
+    path?: string | RegExp;
+    url?: string | RegExp;
+    urlParamPattern?: RegExp;
+    contentType?: string | string[];
+    versions?: string | string[];
+}
+
+interface RoutePathRegex extends RegExp {
     restifyParams: string[];
-  }
-  
-  interface Router {
+}
+
+interface Router {
     name: string;
     mounts: { [routeName: string]: Route };
     versions: string[];
     contentType: string[];
     routes: {
-      DELETE: Route[];
-      GET: Route[];
-      HEAD: Route[];
-      OPTIONS: Route[];
-      PATCH: Route[];
-      POST: Route[];
-      PUT: Route[];
+        DELETE: Route[];
+        GET: Route[];
+        HEAD: Route[];
+        OPTIONS: Route[];
+        PATCH: Route[];
+        POST: Route[];
+        PUT: Route[];
     };
     log?: any;
     toString: () => string;
-    
+
     /**
      * Takes an object of route params and query params, and 'renders' a URL
      * @param    {String} routeName the route name
@@ -121,23 +121,23 @@ declare module "restify" {
      * @returns  {String}
      */
     render: (routeName: string, params: Object, query?: Object) => string;
-    
+
     /**
      * adds a route.
      * @param    {Object} options an options object
      * @returns  {String}         returns the route name if creation is successful.
      */
     mount: (options: Object) => string;
-    
+
     /**
      * unmounts a route.
      * @param    {String} name the route name
      * @returns  {String}      the name of the deleted route (or false if it was not matched)
      */
     unmount: (name: string) => string | boolean;
-  }
+}
 
-  interface Server extends http.Server {
+interface Server extends http.Server {
     use(handler: RequestHandler, ...handlers: RequestHandler[]): Server;
     use(handler: RequestHandler[], ...handlers: RequestHandler[]): Server;
     use(handler: RequestHandler, ...handlers: RequestHandler[][]): Server;
@@ -177,37 +177,37 @@ declare module "restify" {
     opts(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[]): Route;
     opts(route: any, routeCallBack: RequestHandler, ...routeCallBacks: RequestHandler[][]): Route;
     opts(route: any, routeCallBack: RequestHandler[], ...routeCallBacks: RequestHandler[][]): Route;
-	
+
     name: string;
     version: string;
     log: Object;
     acceptable: string[];
     url: string;
     address: () => addressInterface;
-    listen(... args: any[]): any;
-    close(... args: any[]): any;
+    listen(...args: any[]): any;
+    close(...args: any[]): any;
     pre(routeCallBack: RequestHandler): Server;
     server: http.Server;
     router: Router;
     routes: Route[];
     toString: () => string;
-  }
+}
 
-  interface ServerOptions {
-    certificate ?: string;
-    key ?: string;
-    formatters ?: Object;
-    log ?: Object;
-    name ?: string;
-    spdy ?: Object;
-    version ?: string;
-    responseTimeHeader ?: string;
-    responseTimeFormatter ?: (durationInMilliseconds: number) => any;
-    handleUpgrades ?: boolean;
-    router ?: Router;
-  }
+interface ServerOptions {
+    certificate?: string;
+    key?: string;
+    formatters?: Object;
+    log?: Object;
+    name?: string;
+    spdy?: Object;
+    version?: string;
+    responseTimeHeader?: string;
+    responseTimeFormatter?: (durationInMilliseconds: number) => any;
+    handleUpgrades?: boolean;
+    router?: Router;
+}
 
-  interface ClientOptions {
+interface ClientOptions {
     accept?: string;
     connectTimeout?: number;
     dtrace?: Object;
@@ -219,26 +219,26 @@ declare module "restify" {
     url?: string;
     userAgent?: string;
     version?: string;
-  }
+}
 
-  interface Client {
+interface Client {
     get: (path: string, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
     head: (path: string, callback?: (err: any, req: Request, res: Response) => any) => any;
     post: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
     put: (path: string, object: any, callback?: (err: any, req: Request, res: Response, obj: any) => any) => any;
     del: (path: string, callback?: (err: any, req: Request, res: Response) => any) => any;
     basicAuth: (username: string, password: string) => any;
-  }
+}
 
-  interface HttpClient extends Client {
+interface HttpClient extends Client {
     get: (path?: any, callback?: Function) => any;
-    head: (path?:any, callback?: Function) => any;
+    head: (path?: any, callback?: Function) => any;
     post: (opts?: any, callback?: Function) => any;
     put: (opts?: any, callback?: Function) => any;
     del: (opts?: any, callback?: Function) => any;
-  }
+}
 
-  interface ThrottleOptions {
+interface ThrottleOptions {
     burst?: number;
     rate?: number;
     ip?: boolean;
@@ -247,117 +247,116 @@ declare module "restify" {
     tokensTable?: Object;
     maxKeys?: number;
     overrides?: Object;
-  }
+}
 
-  interface Next {
+interface Next {
     (err?: any): any;
     ifError: (err?: any) => any;
-  }
+}
 
-  interface RequestHandler {
+interface RequestHandler {
     (req: Request, res: Response, next: Next): any;
-  }
+}
 
-  interface CORS {
-      (cors?: {
-          origins?: string[];
-          credentials?: boolean;
-          headers?: string[];
-      }): RequestHandler;
-      origins: string[];
-      ALLOW_HEADERS: string[];
-      credentials: boolean;
-  }
+interface CORS {
+    (cors?: {
+        origins?: string[];
+        credentials?: boolean;
+        headers?: string[];
+    }): RequestHandler;
+    origins: string[];
+    ALLOW_HEADERS: string[];
+    credentials: boolean;
+}
 
-  export function createServer(options?: ServerOptions): Server;
+declare export function createServer(options?: ServerOptions): Server;
 
-  export function createJsonClient(options?: ClientOptions): Client;
-  export function createStringClient(options?: ClientOptions): Client;
-  export function createClient(options?: ClientOptions): HttpClient;
+declare export function createJsonClient(options?: ClientOptions): Client;
+declare export function createStringClient(options?: ClientOptions): Client;
+declare export function createClient(options?: ClientOptions): HttpClient;
 
-  export class HttpError { constructor(cause: any, message?: any); }
+declare export class HttpError { constructor(cause: any, message?: any); }
 
-  class DefiniteHttpError {
+declare class DefiniteHttpError {
     constructor(message?: any);
     constructor(cause: any, message?: any);
-  }
-
-  export class BadRequestError extends DefiniteHttpError {}
-  export class UnauthorizedError extends DefiniteHttpError {}
-  export class PaymentRequiredError extends DefiniteHttpError {}
-  export class ForbiddenError extends DefiniteHttpError {}
-  export class NotFoundError extends DefiniteHttpError {}
-  export class MethodNotAllowedError extends DefiniteHttpError {}
-  export class NotAcceptableError extends DefiniteHttpError {}
-  export class ProxyAuthenticationRequiredError extends DefiniteHttpError {}
-  export class RequestTimeoutError extends DefiniteHttpError {}
-  export class ConflictError extends DefiniteHttpError {}
-  export class GoneError extends DefiniteHttpError {}
-  export class LengthRequiredError extends DefiniteHttpError {}
-  export class RequestEntityTooLargeError extends DefiniteHttpError {}
-  export class RequesturiTooLargeError extends DefiniteHttpError {}
-  export class UnsupportedMediaTypeError extends DefiniteHttpError {}
-  export class RequestedRangeNotSatisfiableError extends DefiniteHttpError {}
-  export class ExpectationFailedError extends DefiniteHttpError {}
-  export class ImATeapotError extends DefiniteHttpError {}
-  export class UnprocessableEntityError extends DefiniteHttpError {}
-  export class LockedError extends DefiniteHttpError {}
-  export class FailedDependencyError extends DefiniteHttpError {}
-  export class UnorderedCollectionError extends DefiniteHttpError {}
-  export class UpgradeRequiredError extends DefiniteHttpError {}
-  export class PreconditionRequiredError extends DefiniteHttpError {}
-  export class TooManyRequestsError extends DefiniteHttpError {}
-  export class RequestHeaderFieldsTooLargeError extends DefiniteHttpError {}
-  export class InternalServerError extends DefiniteHttpError {}
-  export class NotImplementedError extends DefiniteHttpError {}
-  export class BadGatewayError extends DefiniteHttpError {}
-  export class ServiceUnavailableError extends DefiniteHttpError {}
-  export class GatewayTimeoutError extends DefiniteHttpError {}
-  export class HttpVersionNotSupportedError extends DefiniteHttpError {}
-  export class VariantAlsoNegotiatesError extends DefiniteHttpError {}
-  export class InsufficientStorageError extends DefiniteHttpError {}
-  export class BandwidthLimitExceededError extends DefiniteHttpError {}
-  export class NotExtendedError extends DefiniteHttpError {}
-  export class NetworkAuthenticationRequiredError extends DefiniteHttpError {}
-  export class RestError extends DefiniteHttpError {}
-
-  export class PreconditionFailedError extends RestError {}
-  export class BadDigestError extends RestError {}
-  export class BadMethodError extends RestError {}
-  export class InternalError extends RestError {}
-  export class InvalidArgumentError extends RestError {}
-  export class InvalidContentError extends RestError {}
-  export class InvalidCredentialsError extends RestError {}
-  export class InvalidHeaderError extends RestError {}
-  export class InvalidVersionError extends RestError {}
-  export class MissingParameterError extends RestError {}
-  export class NotAuthorizedError extends RestError {}
-  export class RequestExpiredError extends RestError {}
-  export class RequestThrottledError extends RestError {}
-  export class ResourceNotFoundError extends RestError {}
-  export class WrongAcceptError extends RestError {}
-
-
-  export function acceptParser(parser: any): RequestHandler;
-  export function authorizationParser(): RequestHandler;
-  export function dateParser(skew?: number): RequestHandler;
-  export function queryParser(options?: Object): RequestHandler;
-  export function urlEncodedBodyParser(options?: Object): RequestHandler[];
-  export function jsonp(): RequestHandler;
-  export function gzipResponse(options?: Object): RequestHandler;
-  export function bodyParser(options?: Object): RequestHandler[];
-  export function requestLogger(options?: Object): RequestHandler;
-  export function serveStatic(options?: Object): RequestHandler;
-  export function throttle(options?: ThrottleOptions): RequestHandler;
-  export function conditionalRequest(): RequestHandler[];
-  export function auditLogger(options?: Object): Function;
-  export function fullResponse(): RequestHandler;
-  export var defaultResponseHeaders : any;
-  export var CORS: CORS;
-
-  export module pre {
-      export function pause(): RequestHandler;
-      export function sanitizePath(options?: any): RequestHandler;
-      export function userAgentConnection(options?: any): RequestHandler;
-  }
+}
+
+declare export class BadRequestError extends DefiniteHttpError { }
+declare export class UnauthorizedError extends DefiniteHttpError { }
+declare export class PaymentRequiredError extends DefiniteHttpError { }
+declare export class ForbiddenError extends DefiniteHttpError { }
+declare export class NotFoundError extends DefiniteHttpError { }
+declare export class MethodNotAllowedError extends DefiniteHttpError { }
+declare export class NotAcceptableError extends DefiniteHttpError { }
+declare export class ProxyAuthenticationRequiredError extends DefiniteHttpError { }
+declare export class RequestTimeoutError extends DefiniteHttpError { }
+declare export class ConflictError extends DefiniteHttpError { }
+declare export class GoneError extends DefiniteHttpError { }
+declare export class LengthRequiredError extends DefiniteHttpError { }
+declare export class RequestEntityTooLargeError extends DefiniteHttpError { }
+declare export class RequesturiTooLargeError extends DefiniteHttpError { }
+declare export class UnsupportedMediaTypeError extends DefiniteHttpError { }
+declare export class RequestedRangeNotSatisfiableError extends DefiniteHttpError { }
+declare export class ExpectationFailedError extends DefiniteHttpError { }
+declare export class ImATeapotError extends DefiniteHttpError { }
+declare export class UnprocessableEntityError extends DefiniteHttpError { }
+declare export class LockedError extends DefiniteHttpError { }
+declare export class FailedDependencyError extends DefiniteHttpError { }
+declare export class UnorderedCollectionError extends DefiniteHttpError { }
+declare export class UpgradeRequiredError extends DefiniteHttpError { }
+declare export class PreconditionRequiredError extends DefiniteHttpError { }
+declare export class TooManyRequestsError extends DefiniteHttpError { }
+declare export class RequestHeaderFieldsTooLargeError extends DefiniteHttpError { }
+declare export class InternalServerError extends DefiniteHttpError { }
+declare export class NotImplementedError extends DefiniteHttpError { }
+declare export class BadGatewayError extends DefiniteHttpError { }
+declare export class ServiceUnavailableError extends DefiniteHttpError { }
+declare export class GatewayTimeoutError extends DefiniteHttpError { }
+declare export class HttpVersionNotSupportedError extends DefiniteHttpError { }
+declare export class VariantAlsoNegotiatesError extends DefiniteHttpError { }
+declare export class InsufficientStorageError extends DefiniteHttpError { }
+declare export class BandwidthLimitExceededError extends DefiniteHttpError { }
+declare export class NotExtendedError extends DefiniteHttpError { }
+declare export class NetworkAuthenticationRequiredError extends DefiniteHttpError { }
+declare export class RestError extends DefiniteHttpError { }
+
+declare export class PreconditionFailedError extends RestError { }
+declare export class BadDigestError extends RestError { }
+declare export class BadMethodError extends RestError { }
+declare export class InternalError extends RestError { }
+declare export class InvalidArgumentError extends RestError { }
+declare export class InvalidContentError extends RestError { }
+declare export class InvalidCredentialsError extends RestError { }
+declare export class InvalidHeaderError extends RestError { }
+declare export class InvalidVersionError extends RestError { }
+declare export class MissingParameterError extends RestError { }
+declare export class NotAuthorizedError extends RestError { }
+declare export class RequestExpiredError extends RestError { }
+declare export class RequestThrottledError extends RestError { }
+declare export class ResourceNotFoundError extends RestError { }
+declare export class WrongAcceptError extends RestError { }
+
+
+declare export function acceptParser(parser: any): RequestHandler;
+declare export function authorizationParser(): RequestHandler;
+declare export function dateParser(skew?: number): RequestHandler;
+declare export function queryParser(options?: Object): RequestHandler;
+declare export function urlEncodedBodyParser(options?: Object): RequestHandler[];
+declare export function jsonp(): RequestHandler;
+declare export function gzipResponse(options?: Object): RequestHandler;
+declare export function bodyParser(options?: Object): RequestHandler[];
+declare export function requestLogger(options?: Object): RequestHandler;
+declare export function serveStatic(options?: Object): RequestHandler;
+declare export function throttle(options?: ThrottleOptions): RequestHandler;
+declare export function conditionalRequest(): RequestHandler[];
+declare export function auditLogger(options?: Object): Function;
+declare export function fullResponse(): RequestHandler;
+declare export var defaultResponseHeaders: any;
+declare export var CORS: CORS;
+
+declare export module pre {
+    export function pause(): RequestHandler;
+    export function sanitizePath(options?: any): RequestHandler;
+    export function userAgentConnection(options?: any): RequestHandler;
 }
diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index 7161e42060..76ec2ce7f5 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -6,164 +6,164 @@
 // TODO: Document manipulation and below
 ///<reference path="../bluebird/bluebird.d.ts"/>
 
-declare module "rethinkdb" {
-
-  export function connect(host:ConnectionOptions, cb?:(err:Error, conn:Connection)=>void):Promise<Connection>;
-
-  export function dbCreate(name:string):Operation<CreateResult>;
-  export function dbDrop(name:string):Operation<DropResult>;
-  export function dbList():Operation<string[]>;
-
-  export function db(name:string):Db;
-  export function table(name:string, options?:{useOutdated:boolean}):Table;
-
-  export function asc(property:string):Sort;
-  export function desc(property:string):Sort;
-
-  export var count:Aggregator;
-  export function sum(prop:string):Aggregator;
-  export function avg(prop:string):Aggregator;
-
-  export function row(name:string):Expression<any>;
-  export function expr(stuff:any):Expression<any>;
-
-  export function now():Time;
-
-  // Control Structures
-  export function branch(test:Expression<boolean>, trueBranch:Expression<any>, falseBranch:Expression<any>):Expression<any>;
 
 
-  export class Cursor {
-    hasNext():boolean;
-    each(cb:(err:Error, row:any)=>void, done?:()=>void);
-    each(cb:(err:Error, row:any)=>boolean, done?:()=>void); // returning false stops iteration
-    next(cb:(err:Error, row:any) => void);
-    toArray(cb:(err:Error, rows:any[]) => void);
+declare export function connect(host: ConnectionOptions, cb?: (err: Error, conn: Connection) => void): Promise<Connection>;
+
+declare export function dbCreate(name: string): Operation<CreateResult>;
+declare export function dbDrop(name: string): Operation<DropResult>;
+declare export function dbList(): Operation<string[]>;
+
+declare export function db(name: string): Db;
+declare export function table(name: string, options?: { useOutdated: boolean }): Table;
+
+declare export function asc(property: string): Sort;
+declare export function desc(property: string): Sort;
+
+declare export var count: Aggregator;
+declare export function sum(prop: string): Aggregator;
+declare export function avg(prop: string): Aggregator;
+
+declare export function row(name: string): Expression<any>;
+declare export function expr(stuff: any): Expression<any>;
+
+declare export function now(): Time;
+
+// Control Structures
+declare export function branch(test: Expression<boolean>, trueBranch: Expression<any>, falseBranch: Expression<any>): Expression<any>;
+
+
+declare export class Cursor {
+    hasNext(): boolean;
+    each(cb: (err: Error, row: any) => void, done?: () => void);
+    each(cb: (err: Error, row: any) => boolean, done?: () => void); // returning false stops iteration
+    next(cb: (err: Error, row: any) => void);
+    toArray(cb: (err: Error, rows: any[]) => void);
     close();
-  }
+}
 
-  interface ConnectionOptions {
-    host:string;
-    port:number;
-    db?:string;
-    authKey?:string;
-  }
+interface ConnectionOptions {
+    host: string;
+    port: number;
+    db?: string;
+    authKey?: string;
+}
 
-  interface Connection {
+interface Connection {
     close();
-    reconnect(cb?:(err:Error, conn:Connection)=>void):Promise<Connection>;
-    use(dbName:string);
-    addListener(event:string, cb:Function);
-    on(event:string, cb:Function);
-  }
+    reconnect(cb?: (err: Error, conn: Connection) => void): Promise<Connection>;
+    use(dbName: string);
+    addListener(event: string, cb: Function);
+    on(event: string, cb: Function);
+}
 
-  interface Db {
-    tableCreate(name:string, options?:TableOptions):Operation<CreateResult>;
-    tableDrop(name:string):Operation<DropResult>;
-    tableList():Operation<string[]>;
-    table(name:string, options?:GetTableOptions):Table;
-  }
+interface Db {
+    tableCreate(name: string, options?: TableOptions): Operation<CreateResult>;
+    tableDrop(name: string): Operation<DropResult>;
+    tableList(): Operation<string[]>;
+    table(name: string, options?: GetTableOptions): Table;
+}
 
-  interface TableOptions {
-    primary_key?:string; // 'id'
-    durability?:string; // 'soft'
-    cache_size?:number;
-    datacenter?:string;
-  }
+interface TableOptions {
+    primary_key?: string; // 'id'
+    durability?: string; // 'soft'
+    cache_size?: number;
+    datacenter?: string;
+}
 
-  interface GetTableOptions {
+interface GetTableOptions {
     useOutdated: boolean;
-  }
+}
 
-  interface Writeable {
-    update(obj:Object, options?:UpdateOptions):Operation<WriteResult>;
-    replace(obj:Object, options?:UpdateOptions):Operation<WriteResult>;
-    replace(expr:ExpressionFunction<any>):Operation<WriteResult>;
-    delete(options?:UpdateOptions):Operation<WriteResult>;
-  }
+interface Writeable {
+    update(obj: Object, options?: UpdateOptions): Operation<WriteResult>;
+    replace(obj: Object, options?: UpdateOptions): Operation<WriteResult>;
+    replace(expr: ExpressionFunction<any>): Operation<WriteResult>;
+    delete(options?: UpdateOptions): Operation<WriteResult>;
+}
 
-  interface Table extends Sequence {
-    indexCreate(name:string, index?:ExpressionFunction<any>):Operation<CreateResult>;
-    indexDrop(name:string):Operation<DropResult>;
-    indexList():Operation<string[]>;
+interface Table extends Sequence {
+    indexCreate(name: string, index?: ExpressionFunction<any>): Operation<CreateResult>;
+    indexDrop(name: string): Operation<DropResult>;
+    indexList(): Operation<string[]>;
 
-    insert(obj:any[], options?:InsertOptions):Operation<WriteResult>;
-    insert(obj:any, options?:InsertOptions):Operation<WriteResult>;
+    insert(obj: any[], options?: InsertOptions): Operation<WriteResult>;
+    insert(obj: any, options?: InsertOptions): Operation<WriteResult>;
 
-    get(key:string):Sequence; // primary key
-    getAll(key:string, index?:Index):Sequence; // without index defaults to primary key
-    getAll(...keys:string[]):Sequence;
-  }
+    get(key: string): Sequence; // primary key
+    getAll(key: string, index?: Index): Sequence; // without index defaults to primary key
+    getAll(...keys: string[]): Sequence;
+}
 
-  interface Sequence extends Operation<Cursor>, Writeable {
+interface Sequence extends Operation<Cursor>, Writeable {
 
-    between(lower:any, upper:any, index?:Index):Sequence;
-    filter(rql:ExpressionFunction<boolean>):Sequence;
-    filter(rql:Expression<boolean>):Sequence;
-    filter(obj:{[key:string]:any}):Sequence;
+    between(lower: any, upper: any, index?: Index): Sequence;
+    filter(rql: ExpressionFunction<boolean>): Sequence;
+    filter(rql: Expression<boolean>): Sequence;
+    filter(obj: { [key: string]: any }): Sequence;
 
 
     // Join
     // these return left, right
-    innerJoin(sequence:Sequence, join:JoinFunction<boolean>):Sequence;
-    outerJoin(sequence:Sequence, join:JoinFunction<boolean>):Sequence;
-    eqJoin(leftAttribute:string, rightSequence:Sequence, index?:Index):Sequence;
-    eqJoin(leftAttribute:ExpressionFunction<any>, rightSequence:Sequence, index?:Index):Sequence;
-    zip():Sequence;
+    innerJoin(sequence: Sequence, join: JoinFunction<boolean>): Sequence;
+    outerJoin(sequence: Sequence, join: JoinFunction<boolean>): Sequence;
+    eqJoin(leftAttribute: string, rightSequence: Sequence, index?: Index): Sequence;
+    eqJoin(leftAttribute: ExpressionFunction<any>, rightSequence: Sequence, index?: Index): Sequence;
+    zip(): Sequence;
 
     // Transform
-    map(transform:ExpressionFunction<any>):Sequence;
-    withFields(...selectors:any[]):Sequence;
-    concatMap(transform:ExpressionFunction<any>):Sequence;
-    orderBy(...keys:string[]):Sequence;
-    orderBy(...sorts:Sort[]):Sequence;
-    skip(n:number):Sequence;
-    limit(n:number):Sequence;
-    slice(start:number, end?:number):Sequence;
-    nth(n:number):Expression<any>;
-    indexesOf(obj:any):Sequence;
-    isEmpty():Expression<boolean>;
-    union(sequence:Sequence):Sequence;
-    sample(n:number):Sequence;
+    map(transform: ExpressionFunction<any>): Sequence;
+    withFields(...selectors: any[]): Sequence;
+    concatMap(transform: ExpressionFunction<any>): Sequence;
+    orderBy(...keys: string[]): Sequence;
+    orderBy(...sorts: Sort[]): Sequence;
+    skip(n: number): Sequence;
+    limit(n: number): Sequence;
+    slice(start: number, end?: number): Sequence;
+    nth(n: number): Expression<any>;
+    indexesOf(obj: any): Sequence;
+    isEmpty(): Expression<boolean>;
+    union(sequence: Sequence): Sequence;
+    sample(n: number): Sequence;
 
     // Aggregate
-    reduce(r:ReduceFunction<any>, base?:any):Expression<any>;
-    count():Expression<number>;
-    distinct():Sequence;
-    groupedMapReduce(group:ExpressionFunction<any>, map:ExpressionFunction<any>, reduce:ReduceFunction<any>, base?:any):Sequence;
-    groupBy(...aggregators:Aggregator[]):Expression<Object>; // TODO: reduction object
-    contains(prop:string):Expression<boolean>;
+    reduce(r: ReduceFunction<any>, base?: any): Expression<any>;
+    count(): Expression<number>;
+    distinct(): Sequence;
+    groupedMapReduce(group: ExpressionFunction<any>, map: ExpressionFunction<any>, reduce: ReduceFunction<any>, base?: any): Sequence;
+    groupBy(...aggregators: Aggregator[]): Expression<Object>; // TODO: reduction object
+    contains(prop: string): Expression<boolean>;
 
     // Manipulation
-    pluck(...props:string[]):Sequence;
-    without(...props:string[]):Sequence;
-  }
+    pluck(...props: string[]): Sequence;
+    without(...props: string[]): Sequence;
+}
 
-  interface ExpressionFunction<U> {
-    (doc:Expression<any>):Expression<U>;
-  }
+interface ExpressionFunction<U> {
+    (doc: Expression<any>): Expression<U>;
+}
 
-  interface JoinFunction<U> {
-    (left:Expression<any>, right:Expression<any>):Expression<U>;
-  }
+interface JoinFunction<U> {
+    (left: Expression<any>, right: Expression<any>): Expression<U>;
+}
 
-  interface ReduceFunction<U> {
-    (acc:Expression<any>, val:Expression<any>):Expression<U>;
-  }
+interface ReduceFunction<U> {
+    (acc: Expression<any>, val: Expression<any>): Expression<U>;
+}
 
-  interface InsertOptions {
+interface InsertOptions {
     upsert: boolean; // true
     durability: string; // 'soft'
     return_vals: boolean; // false
-  }
+}
 
-  interface UpdateOptions {
+interface UpdateOptions {
     non_atomic: boolean;
     durability: string; // 'soft'
     return_vals: boolean; // false
-  }
+}
 
-  interface WriteResult {
+interface WriteResult {
     inserted: number;
     replaced: number;
     unchanged: number;
@@ -172,65 +172,60 @@ declare module "rethinkdb" {
     skipped: number;
     first_error: Error;
     generated_keys: string[]; // only for insert
-  }
+}
 
-  interface JoinResult {
-    left:any;
-    right:any;
-  }
+interface JoinResult {
+    left: any;
+    right: any;
+}
 
-  interface CreateResult {
+interface CreateResult {
     created: number;
-  }
+}
 
-  interface DropResult {
+interface DropResult {
     dropped: number;
-  }
+}
 
-  interface Index {
+interface Index {
     index: string;
     left_bound?: string; // 'closed'
     right_bound?: string; // 'open'
-  }
-
-  interface Expression<T> extends Writeable, Operation<T> {
-      (prop:string):Expression<any>;
-      merge(query:Expression<Object>):Expression<Object>;
-      append(prop:string):Expression<Object>;
-      contains(prop:string):Expression<boolean>;
-
-      and(b:boolean):Expression<boolean>;
-      or(b:boolean):Expression<boolean>;
-      eq(v:any):Expression<boolean>;
-      ne(v:any):Expression<boolean>;
-      not():Expression<boolean>;
-
-      gt(value:T):Expression<boolean>;
-      ge(value:T):Expression<boolean>;
-      lt(value:T):Expression<boolean>;
-      le(value:T):Expression<boolean>;
-
-      add(n:number):Expression<number>;
-      sub(n:number):Expression<number>;
-      mul(n:number):Expression<number>;
-      div(n:number):Expression<number>;
-      mod(n:number):Expression<number>;
-
-      hasFields(...fields:string[]):Expression<boolean>;
-
-      default(value:T):Expression<T>;
-  }
-
-  interface Operation<T> {
-   run(conn:Connection, cb?:(err:Error, result:T)=>void):Promise<T>;
-  }
-
-  interface Aggregator {}
-  interface Sort {}
-
-  interface Time {}
-
-
-  // http://www.rethinkdb.com/api/#js
-  // TODO control structures
 }
+
+interface Expression<T> extends Writeable, Operation<T> {
+    (prop: string): Expression<any>;
+    merge(query: Expression<Object>): Expression<Object>;
+    append(prop: string): Expression<Object>;
+    contains(prop: string): Expression<boolean>;
+
+    and(b: boolean): Expression<boolean>;
+    or(b: boolean): Expression<boolean>;
+    eq(v: any): Expression<boolean>;
+    ne(v: any): Expression<boolean>;
+    not(): Expression<boolean>;
+
+    gt(value: T): Expression<boolean>;
+    ge(value: T): Expression<boolean>;
+    lt(value: T): Expression<boolean>;
+    le(value: T): Expression<boolean>;
+
+    add(n: number): Expression<number>;
+    sub(n: number): Expression<number>;
+    mul(n: number): Expression<number>;
+    div(n: number): Expression<number>;
+    mod(n: number): Expression<number>;
+
+    hasFields(...fields: string[]): Expression<boolean>;
+
+    default(value: T): Expression<T>;
+}
+
+interface Operation<T> {
+    run(conn: Connection, cb?: (err: Error, result: T) => void): Promise<T>;
+}
+
+interface Aggregator { }
+interface Sort { }
+
+interface Time { }
diff --git a/rimraf/rimraf.d.ts b/rimraf/rimraf.d.ts
index 5df8b9b8ad..1fb95f79cd 100644
--- a/rimraf/rimraf.d.ts
+++ b/rimraf/rimraf.d.ts
@@ -5,12 +5,11 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/rimraf.d.ts
 
-declare module "rimraf" {
-	function rimraf(path: string, callback: (error: Error) => void): void;
-	namespace rimraf {
-		export function sync(path: string): void;
-		export var EMFILE_MAX: number;
-		export var BUSYTRIES_MAX: number;
-	}
-	export = rimraf;
+
+declare function rimraf(path: string, callback: (error: Error) => void): void;
+declare namespace rimraf {
+    export function sync(path: string): void;
+    export var EMFILE_MAX: number;
+    export var BUSYTRIES_MAX: number;
 }
+export = rimraf;
diff --git a/riot-api-nodejs/riot-api-nodejs.d.ts b/riot-api-nodejs/riot-api-nodejs.d.ts
index cb4c88766a..8218092e4b 100644
--- a/riot-api-nodejs/riot-api-nodejs.d.ts
+++ b/riot-api-nodejs/riot-api-nodejs.d.ts
@@ -6,407 +6,406 @@
 /// <reference path="../request/request.d.ts" />
 /// <reference path="../riot-games-api/riot-games-api.d.ts" />
 
-declare module "riot-api-nodejs"{
 
-    export enum region_e {
-        BR = 0,
-        EUNE = 1,
-        EUW = 2,
-        KR = 3,
-        LAN = 4,
-        LAS = 5,
-        NA = 6,
-        OCE = 7,
-        TR = 8,
-        RU = 9,
-        PBE = 10,
-    }
-    /**
-        * Tournament API
-        */
-    export class TournamentAPI {
-        private ApiKeys;
-        private ApiKey;
-        /**
-            * TournamentAPI Constructor
-            */
-        constructor(...ApiKeys: string[]);
-        /**
-            * Change the Api Key for the next requests
-            */
-        private switchApiKey();
-        /**
-            * Send a request to the Riot Games Api and return a formatted json via a callback
-            * @param     {string}    url         request url
-            * @param     {string}    method      method(post / put / get)
-            * @param     {[type]}    data        body parameters
-            * @param     {(JSON}     callback    callback function with formatted JSON
-            */
-        private getJSON(url, method, data, callback);
-        /**
-            * get tournament Codes for a given tournament
-            * @param     {number}                                                      tournamentId    the ID of the tournament
-            * @param     {number}                                                      count           Number of codes you want
-            * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeParameters}    params          Tournament Code parameters
-            * @param     {number[]}                                                    callback        Tournaments Codes                                                                    [description]
-            */
-        getTournamentCodes(tournamentId: number, count: number, params: RiotGamesAPI.TournamentProvider.TournamentCodeParameters, callback: (tournamentCodes: number[]) => void): any;
-        /**
-            * get tournament infos for a given tournament code
-            * @param     {string}                                               tournamentCode    Tournament Code
-            * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeDto}    callback          Tournament Infos
-            */
-        getTournamentByCode(tournamentCode: string, callback: (tournament: RiotGamesAPI.TournamentProvider.TournamentCodeDto) => void): any;
-        /**
-            * edit the tournament Code parameters for a given tournament Code
-            * @param     {string}                                                            tournamentCode    Tournament Code to update
-            * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeUpdateParameters}    params            parameters to edit
-            * @param     {(}                                                                 callback          callback if succes
-            */
-        editTournamentByCode(tournamentCode: string, params: RiotGamesAPI.TournamentProvider.TournamentCodeUpdateParameters, callback: () => void): any;
-        /**
-            * get the lobby envents for a given tournament Code
-            * @param     {string}                                           tournamentCode    the tournament code to get the lobby events
-            * @param     {RiotGamesAPI.TournamentProvider.LobbyEventDto}    callback          lobby events
-            */
-        getLobbyEventByCode(tournamentCode: string, callback: (lobbyEventDto: RiotGamesAPI.TournamentProvider.LobbyEventDto) => void): any;
-        /**
-            * Register a new tournament provider
-            * @param     {region_e}    region      region where you want to register the provider
-            * @param     {string}      url         url of callback for the POST notifications
-            * @param     {number}      callback    returns  the tounament provider ID
-            */
-        registerProvider(region: region_e, url: string, callback: (providerId: number) => void): any;
-        /**
-            * Register a new tournament
-            * @param     {string}    name          Name of tournament
-            * @param     {number}    providerId    Provider ID
-            * @param     {number}    callback      returns the tournament ID
-            */
-        registerTournament(name: string, providerId: number, callback: (tournamentId: number) => void): any;
-    }
-    export class ClassicAPI {
-        private ApiKeys;
-        private ApiKey;
-        private region;
-        /**
-            * ClassicAPI Constructor
-            * @param     {string[]}    ApiKeys    API Keys for the requests
-            * @param     {region_e}    region     region where you want to send requests
-            */
-        constructor(ApiKeys: string[], region: region_e);
-        /**
-            * change the API Key for the next requests
-            */
-        private switchApiKey();
-        /**
-            * get the JSON response code for a given URL
-            * @param     {string}      url         Request url
-            * @param     {Function}    callback    JSON formatted data
-            */
-        private getJSON(url, callback);
-        /**
-            * Edit the consts for a valid url for the riot games api
-            * @param     {string}    unparsedURL    the URL to parse
-            * @return    {string}                   the Parsed URL
-            */
-        private parseURL(unparsedURL);
-        /**
-            * get the API Key that is used for the requests
-            * @return    {string}    the current API Key
-            */
-        getCurrentApiKey(): string;
-        /**
-            * get the region where send send request
-            * @return    {region_e}    the current region
-            */
-        getRegion(): region_e;
-        /**
-            * set the API Keys
-            * @param    {string[]}    ApiKeys    the API Keys
-            */
-        setApikeys(ApiKeys: string[]): void;
-        /**
-            * set the region where you want to send requests
-            * @param    {region_e}    region    the region
-            */
-        setRegion(region: region_e): void;
-        /**
-            * get all champions of league of legends
-            * @param     {RiotGamesAPI.Champion.ChampionListDto}    callback    data callback
-            */
-        getChampions(callback: (championListDto: RiotGamesAPI.Champion.ChampionListDto) => void): any;
-        /**
-            * get the champion for a given id
-            * @param     {number}                               id          the champion id
-            * @param     {RiotGamesAPI.Champion.ChampionDto}    callback    data callback
-            */
-        getChampionById(id: number, callback: (ChampionDto: RiotGamesAPI.Champion.ChampionDto) => void): any;
-        /**
-            * get the free to play champions
-            * @param     {RiotGamesAPI.Champion.ChampionListDto}    callback    data callback
-            */
-        getFreeToPlayChampions(callback: (championsListDto: RiotGamesAPI.Champion.ChampionListDto) => void): any;
-        /**
-            * get Champion mastery of a player for a given champion ID
-            * @param     {number}                                             summonerId    summoner ID
-            * @param     {number}                                             championId    Champion ID
-            * @param     {RiotGamesAPI.ChampionMastery.ChampionMasteryDto}    callback      data callback
-            */
-        getChampionMastery(summonerId: number, championId: number, callback: (championMastery: RiotGamesAPI.ChampionMastery.ChampionMasteryDto) => void): any;
-        /**
-            * get all champion masteries for a given summoner
-            * @param     {number}                                               summonerId    Summoner ID
-            * @param     {[RiotGamesAPI.ChampionMastery.ChampionMasteryDto]}    callback      data callback
-            */
-        getChampionMasteryBySummoner(summonerId: number, callback: (championsMastery: [RiotGamesAPI.ChampionMastery.ChampionMasteryDto]) => void): any;
-        /**
-            * get the mastery score of a summoner
-            * @param     {number}    summonerId    Summoner ID
-            * @param     {number}    callback      Mastery Score
-            */
-        getChampionMasteryScore(summonerId: number, callback: (score: number) => void): any;
-        /**
-            * get The 3 best champion masteries
-            * @param     {[type]}                                               summonerId    Summoner ID
-            * @param     {[RiotGamesAPI.ChampionMastery.ChampionMasteryDto]}    callback      data callback
-            */
-        getTopChampionMastery(summonerId: any, callback: (championsMastery: [RiotGamesAPI.ChampionMastery.ChampionMasteryDto]) => void): any;
-        /**
-            * get the current game infos for a given summoner ID
-            * @param     {number}                                      summonerId    Summoner ID
-            * @param     {RiotGamesAPI.CurrentGame.CurrentGameInfo}    callback      data callback
-            */
-        getCurrentGame(summonerId: number, callback: (gameInfoDto: RiotGamesAPI.CurrentGame.CurrentGameInfo) => void): any;
-        /**
-            * get the featured games
-            * @param     {RiotGamesAPI.FeaturedGames.FeaturedGames}    callback    data callback
-            */
-        getFeaturedGame(callback: (featuredGamesInfos: RiotGamesAPI.FeaturedGames.FeaturedGames) => void): any;
-        /**
-            * get the recents games for a given Summoner ID
-            * @param     {number}                              summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Game.RecentGamesDto}    callback      data callback
-            */
-        getRecentGames(summonerId: number, callback: (RecentGamesDto: RiotGamesAPI.Game.RecentGamesDto) => void): any;
-        /**
-            * Get League infos of a summoner
-            * @param     {number}                             summonerId    Summoner ID
-            * @param     {RiotGamesAPI.League.LeagueDto[]}    callback      data callback
-            */
-        getLeagueBySummonerId(summonerId: number, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
-        /**
-            * get League infos of a summoner
-            * @param     {number}                             summonerId    Summoner ID
-            * @param     {RiotGamesAPI.League.LeagueDto[]}    callback      data callback
-            */
-        getLeagueBySummonerIdEntry(summonerId: number, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
-        /**
-            * get league infos by team
-            * @param     {string}                             teamId      Team ID
-            * @param     {RiotGamesAPI.League.LeagueDto[]}    callback    data callback
-            */
-        getLeagueByTeamId(teamId: string, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
-        /**
-            * get league infos by team
-            * @param     {string}                             teamId      Team ID
-            * @param     {RiotGamesAPI.League.LeagueDto[]}    callback    data callback
-            */
-        getLeagueByTeamIdEntry(teamId: string, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
-        /**
-            * get Challengers in SOLO Queue
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getChallengers_SOLO(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Challengers Teams in 3x3
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getChallengers_3x3(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Challengers Teams in 5x5
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getChallengers_5x5(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Masters in Solo Queue
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getMasters_SOLO(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Master Teams in 3x3
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getMasters_3x3(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Master Teams in 5x5
-            * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
-            */
-        getMasters_5x5(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
-        /**
-            * get Champions (static data)
-            * @param     {RiotGamesAPI.LolStaticData.ChampionListDto}    callback    data callback
-            */
-        staticDataChampions(callback: (championListDto: RiotGamesAPI.LolStaticData.ChampionListDto) => void): any;
-        /**
-            * get data by champion ID
-            * @param     {number}                                    championsId    Champion ID
-            * @param     {RiotGamesAPI.LolStaticData.ChampionDto}    callback       data callback
-            */
-        staticDataChampionById(championsId: number, callback: (championDto: RiotGamesAPI.LolStaticData.ChampionDto) => void): any;
-        /**
-            * get League of Legends Items
-            * @param     {RiotGamesAPI.LolStaticData.ItemListDto}    callback    data callback
-            */
-        staticDataItems(callback: (itemsDto: RiotGamesAPI.LolStaticData.ItemListDto) => void): any;
-        /**
-            * Get item infos by ID
-            * @param     {number}                                itemId      item ID
-            * @param     {RiotGamesAPI.LolStaticData.ItemDto}    callback    data callback
-            */
-        staticDataItemById(itemId: number, callback: (itemDto: RiotGamesAPI.LolStaticData.ItemDto) => void): any;
-        /**
-            * get league of legends languages
-            * @param     {RiotGamesAPI.LolStaticData.LanguageStringsDto}    callback    data callback
-            */
-        staticDataLanguagesStrings(callback: (languageStringsDto: RiotGamesAPI.LolStaticData.LanguageStringsDto) => void): any;
-        /**
-            * get league of legends languages
-            * @param     {string[]}    callback    data callback
-            */
-        staticDataLanguages(callback: (languages: string[]) => void): any;
-        /**
-            * get Map data
-            * @param     {RiotGamesAPI.LolStaticData.MapDataDto}    callback    data callback
-            */
-        staticDataMap(callback: (mapDataDto: RiotGamesAPI.LolStaticData.MapDataDto) => void): any;
-        /**
-            * get all masteries
-            * @param     {RiotGamesAPI.LolStaticData.MasteryListDto}    callback    data callback
-            */
-        staticDataMastery(callback: (masteryListDto: RiotGamesAPI.LolStaticData.MasteryListDto) => void): any;
-        /**
-            * get data by mastery ID
-            * @param     {number}                                   masteryId    Mastery ID
-            * @param     {RiotGamesAPI.LolStaticData.MasteryDto}    callback     data callback
-            */
-        staticDataMasteryById(masteryId: number, callback: (masteryDto: RiotGamesAPI.LolStaticData.MasteryDto) => void): any;
-        staticDataRealm(callback: (realmDto: RiotGamesAPI.LolStaticData.RealmDto) => void): any;
-        /**
-            * get all runes
-            * @param     {RiotGamesAPI.LolStaticData.RuneListDto}    callback    data callback
-            */
-        staticDataRunes(callback: (runeListDto: RiotGamesAPI.LolStaticData.RuneListDto) => void): any;
-        /**
-            * get rune by Rune ID
-            * @param     {number}                                runeId      Rune ID
-            * @param     {RiotGamesAPI.LolStaticData.RuneDto}    callback    data callback
-            */
-        staticDataRuneById(runeId: number, callback: (runeDto: RiotGamesAPI.LolStaticData.RuneDto) => void): any;
-        /**
-            * get all summoner spells
-            * @param     {RiotGamesAPI.LolStaticData.SummonerSpellListDto}    callback    data callback
-            */
-        staticDataSummonerSpells(callback: (summonerSpellListDto: RiotGamesAPI.LolStaticData.SummonerSpellListDto) => void): any;
-        /**
-            * get summoner spell by summoner spell ID
-            * @param     {number}                                         summonerSpellId    Summoner spell ID
-            * @param     {RiotGamesAPI.LolStaticData.SummonerSpellDto}    callback           data callback
-            */
-        staticDataSummonSpellById(summonerSpellId: number, callback: (runeDto: RiotGamesAPI.LolStaticData.SummonerSpellDto) => void): any;
-        /**
-            * get league of legends  versions
-            * @param     {string[]}    callback    data callback
-            */
-        staticDataVersion(callback: (versions: string[]) => void): any;
-        /**
-            * get league of legends status
-            * @param     {RiotGamesAPI.LolStatus.Shard[]}    callback    data callback
-            */
-        getSatus(callback: (shardList: RiotGamesAPI.LolStatus.Shard[]) => void): any;
-        /**
-            * get status for a given region
-            * @param     {region_e}                        region      region
-            * @param     {RiotGamesAPI.LolStatus.Shard}    callback    data callback
-            */
-        getSatusByRegion(region: region_e, callback: (shard: RiotGamesAPI.LolStatus.Shard) => void): any;
-        /**
-            * get match infos for a given match ID
-            * @param     {number}                            matchId     Match ID
-            * @param     {RiotGamesAPI.Match.MatchDetail}    callback    data callback
-            */
-        getMatch(matchId: number, callback: (matchDetails: RiotGamesAPI.Match.MatchDetail) => void): any;
-        /**
-            * get all matches for a given tournament code
-            * @param     {string}      tournamentCode    Tournament Code
-            * @param     {number[]}    callback          data callback
-            */
-        getMatchIdsByTournamentCode(tournamentCode: string, callback: (matchIds: number[]) => void): any;
-        /**
-            * get match by ID in a tournament
-            * @param     {number}                            matchId     Match ID
-            * @param     {RiotGamesAPI.Match.MatchDetail}    callback    data callback
-            */
-        getMatchForTournament(matchId: number, callback: (matchDetails: RiotGamesAPI.Match.MatchDetail) => void): any;
-        /**
-            * get match list of a summoner
-            * @param     {number}                              summonerId    Summoner ID
-            * @param     {RiotGamesAPI.MatchList.MatchList}    callback      data callback
-            */
-        getMatchList(summonerId: number, callback: (matchList: RiotGamesAPI.MatchList.MatchList) => void): any;
-        /**
-            * get ranked stats of summoner
-            * @param     {number}                               summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Stats.RankedStatsDto}    callback      data callback
-            */
-        getStatsRanked(summonerId: number, callback: (rankedStatsDto: RiotGamesAPI.Stats.RankedStatsDto) => void): any;
-        /**
-            * get summary ranked stats of summoner
-            * @param     {number}                                          summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Stats.PlayerStatsSummaryListDto}    callback      data callback
-            */
-        getStatsSummary(summonerId: number, callback: (playerStatsSummaryListDto: RiotGamesAPI.Stats.PlayerStatsSummaryListDto) => void): any;
-        /**
-            * get summoner infos by Summoner Name
-            * @param     {string}                               summonerName    Summoner Name
-            * @param     {RiotGamesAPI.Summoner.SummonerDto}    callback        data callback
-            */
-        getSummonerByName(summonerName: string, callback: (summonerDto: RiotGamesAPI.Summoner.SummonerDto) => void): any;
-        /**
-            * get summoner infos by summoner ID
-            * @param     {number}                               summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Summoner.SummonerDto}    callback      data callback
-            */
-        getSummonerById(summonerId: number, callback: (summonerDto: RiotGamesAPI.Summoner.SummonerDto) => void): any;
-        /**
-            * get masteries of a summoner
-            * @param     {number}                                   summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Summoner.MasteryPagesDto}    callback      data callback
-            */
-        getSummonerMasteries(summonerId: number, callback: (masteryPagesDto: RiotGamesAPI.Summoner.MasteryPagesDto) => void): any;
-        /**
-            * get the Summoner Name of a summoner ID
-            * @param     {number}    summonerId    Summoner ID
-            * @param     {string}    callback      data callback
-            */
-        getSummonerName(summonerId: number, callback: (summonerName: string) => void): any;
-        /**
-            * get the runes of a summoner
-            * @param     {number}                                summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Summoner.RunePagesDto}    callback      data callback
-            */
-        getSummonerRunes(summonerId: number, callback: (runePagesDto: RiotGamesAPI.Summoner.RunePagesDto) => void): any;
-        /**
-            * get teams of a summoner
-            * @param     {number}                         summonerId    Summoner ID
-            * @param     {RiotGamesAPI.Team.TeamDto[]}    callback      data callback
-            */
-        getTeamsBySummoner(summonerId: number, callback: (teamsList: RiotGamesAPI.Team.TeamDto[]) => void): any;
-        /**
-            * get Team infos by Team ID
-            * @param     {string}                       teamId      Team ID
-            * @param     {RiotGamesAPI.Team.TeamDto}    callback    data callback
-            */
-        getTeamById(teamId: string, callback: (teamDto: RiotGamesAPI.Team.TeamDto) => void): any;
-    }
+
+declare export enum region_e {
+    BR = 0,
+    EUNE = 1,
+    EUW = 2,
+    KR = 3,
+    LAN = 4,
+    LAS = 5,
+    NA = 6,
+    OCE = 7,
+    TR = 8,
+    RU = 9,
+    PBE = 10,
+}
+/**
+    * Tournament API
+    */
+declare export class TournamentAPI {
+    private ApiKeys;
+    private ApiKey;
+    /**
+        * TournamentAPI Constructor
+        */
+    constructor(...ApiKeys: string[]);
+    /**
+        * Change the Api Key for the next requests
+        */
+    private switchApiKey();
+    /**
+        * Send a request to the Riot Games Api and return a formatted json via a callback
+        * @param     {string}    url         request url
+        * @param     {string}    method      method(post / put / get)
+        * @param     {[type]}    data        body parameters
+        * @param     {(JSON}     callback    callback function with formatted JSON
+        */
+    private getJSON(url, method, data, callback);
+    /**
+        * get tournament Codes for a given tournament
+        * @param     {number}                                                      tournamentId    the ID of the tournament
+        * @param     {number}                                                      count           Number of codes you want
+        * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeParameters}    params          Tournament Code parameters
+        * @param     {number[]}                                                    callback        Tournaments Codes                                                                    [description]
+        */
+    getTournamentCodes(tournamentId: number, count: number, params: RiotGamesAPI.TournamentProvider.TournamentCodeParameters, callback: (tournamentCodes: number[]) => void): any;
+    /**
+        * get tournament infos for a given tournament code
+        * @param     {string}                                               tournamentCode    Tournament Code
+        * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeDto}    callback          Tournament Infos
+        */
+    getTournamentByCode(tournamentCode: string, callback: (tournament: RiotGamesAPI.TournamentProvider.TournamentCodeDto) => void): any;
+    /**
+        * edit the tournament Code parameters for a given tournament Code
+        * @param     {string}                                                            tournamentCode    Tournament Code to update
+        * @param     {RiotGamesAPI.TournamentProvider.TournamentCodeUpdateParameters}    params            parameters to edit
+        * @param     {(}                                                                 callback          callback if succes
+        */
+    editTournamentByCode(tournamentCode: string, params: RiotGamesAPI.TournamentProvider.TournamentCodeUpdateParameters, callback: () => void): any;
+    /**
+        * get the lobby envents for a given tournament Code
+        * @param     {string}                                           tournamentCode    the tournament code to get the lobby events
+        * @param     {RiotGamesAPI.TournamentProvider.LobbyEventDto}    callback          lobby events
+        */
+    getLobbyEventByCode(tournamentCode: string, callback: (lobbyEventDto: RiotGamesAPI.TournamentProvider.LobbyEventDto) => void): any;
+    /**
+        * Register a new tournament provider
+        * @param     {region_e}    region      region where you want to register the provider
+        * @param     {string}      url         url of callback for the POST notifications
+        * @param     {number}      callback    returns  the tounament provider ID
+        */
+    registerProvider(region: region_e, url: string, callback: (providerId: number) => void): any;
+    /**
+        * Register a new tournament
+        * @param     {string}    name          Name of tournament
+        * @param     {number}    providerId    Provider ID
+        * @param     {number}    callback      returns the tournament ID
+        */
+    registerTournament(name: string, providerId: number, callback: (tournamentId: number) => void): any;
+}
+declare export class ClassicAPI {
+    private ApiKeys;
+    private ApiKey;
+    private region;
+    /**
+        * ClassicAPI Constructor
+        * @param     {string[]}    ApiKeys    API Keys for the requests
+        * @param     {region_e}    region     region where you want to send requests
+        */
+    constructor(ApiKeys: string[], region: region_e);
+    /**
+        * change the API Key for the next requests
+        */
+    private switchApiKey();
+    /**
+        * get the JSON response code for a given URL
+        * @param     {string}      url         Request url
+        * @param     {Function}    callback    JSON formatted data
+        */
+    private getJSON(url, callback);
+    /**
+        * Edit the consts for a valid url for the riot games api
+        * @param     {string}    unparsedURL    the URL to parse
+        * @return    {string}                   the Parsed URL
+        */
+    private parseURL(unparsedURL);
+    /**
+        * get the API Key that is used for the requests
+        * @return    {string}    the current API Key
+        */
+    getCurrentApiKey(): string;
+    /**
+        * get the region where send send request
+        * @return    {region_e}    the current region
+        */
+    getRegion(): region_e;
+    /**
+        * set the API Keys
+        * @param    {string[]}    ApiKeys    the API Keys
+        */
+    setApikeys(ApiKeys: string[]): void;
+    /**
+        * set the region where you want to send requests
+        * @param    {region_e}    region    the region
+        */
+    setRegion(region: region_e): void;
+    /**
+        * get all champions of league of legends
+        * @param     {RiotGamesAPI.Champion.ChampionListDto}    callback    data callback
+        */
+    getChampions(callback: (championListDto: RiotGamesAPI.Champion.ChampionListDto) => void): any;
+    /**
+        * get the champion for a given id
+        * @param     {number}                               id          the champion id
+        * @param     {RiotGamesAPI.Champion.ChampionDto}    callback    data callback
+        */
+    getChampionById(id: number, callback: (ChampionDto: RiotGamesAPI.Champion.ChampionDto) => void): any;
+    /**
+        * get the free to play champions
+        * @param     {RiotGamesAPI.Champion.ChampionListDto}    callback    data callback
+        */
+    getFreeToPlayChampions(callback: (championsListDto: RiotGamesAPI.Champion.ChampionListDto) => void): any;
+    /**
+        * get Champion mastery of a player for a given champion ID
+        * @param     {number}                                             summonerId    summoner ID
+        * @param     {number}                                             championId    Champion ID
+        * @param     {RiotGamesAPI.ChampionMastery.ChampionMasteryDto}    callback      data callback
+        */
+    getChampionMastery(summonerId: number, championId: number, callback: (championMastery: RiotGamesAPI.ChampionMastery.ChampionMasteryDto) => void): any;
+    /**
+        * get all champion masteries for a given summoner
+        * @param     {number}                                               summonerId    Summoner ID
+        * @param     {[RiotGamesAPI.ChampionMastery.ChampionMasteryDto]}    callback      data callback
+        */
+    getChampionMasteryBySummoner(summonerId: number, callback: (championsMastery: [RiotGamesAPI.ChampionMastery.ChampionMasteryDto]) => void): any;
+    /**
+        * get the mastery score of a summoner
+        * @param     {number}    summonerId    Summoner ID
+        * @param     {number}    callback      Mastery Score
+        */
+    getChampionMasteryScore(summonerId: number, callback: (score: number) => void): any;
+    /**
+        * get The 3 best champion masteries
+        * @param     {[type]}                                               summonerId    Summoner ID
+        * @param     {[RiotGamesAPI.ChampionMastery.ChampionMasteryDto]}    callback      data callback
+        */
+    getTopChampionMastery(summonerId: any, callback: (championsMastery: [RiotGamesAPI.ChampionMastery.ChampionMasteryDto]) => void): any;
+    /**
+        * get the current game infos for a given summoner ID
+        * @param     {number}                                      summonerId    Summoner ID
+        * @param     {RiotGamesAPI.CurrentGame.CurrentGameInfo}    callback      data callback
+        */
+    getCurrentGame(summonerId: number, callback: (gameInfoDto: RiotGamesAPI.CurrentGame.CurrentGameInfo) => void): any;
+    /**
+        * get the featured games
+        * @param     {RiotGamesAPI.FeaturedGames.FeaturedGames}    callback    data callback
+        */
+    getFeaturedGame(callback: (featuredGamesInfos: RiotGamesAPI.FeaturedGames.FeaturedGames) => void): any;
+    /**
+        * get the recents games for a given Summoner ID
+        * @param     {number}                              summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Game.RecentGamesDto}    callback      data callback
+        */
+    getRecentGames(summonerId: number, callback: (RecentGamesDto: RiotGamesAPI.Game.RecentGamesDto) => void): any;
+    /**
+        * Get League infos of a summoner
+        * @param     {number}                             summonerId    Summoner ID
+        * @param     {RiotGamesAPI.League.LeagueDto[]}    callback      data callback
+        */
+    getLeagueBySummonerId(summonerId: number, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
+    /**
+        * get League infos of a summoner
+        * @param     {number}                             summonerId    Summoner ID
+        * @param     {RiotGamesAPI.League.LeagueDto[]}    callback      data callback
+        */
+    getLeagueBySummonerIdEntry(summonerId: number, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
+    /**
+        * get league infos by team
+        * @param     {string}                             teamId      Team ID
+        * @param     {RiotGamesAPI.League.LeagueDto[]}    callback    data callback
+        */
+    getLeagueByTeamId(teamId: string, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
+    /**
+        * get league infos by team
+        * @param     {string}                             teamId      Team ID
+        * @param     {RiotGamesAPI.League.LeagueDto[]}    callback    data callback
+        */
+    getLeagueByTeamIdEntry(teamId: string, callback: (LeagueDto: RiotGamesAPI.League.LeagueDto[]) => void): any;
+    /**
+        * get Challengers in SOLO Queue
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getChallengers_SOLO(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Challengers Teams in 3x3
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getChallengers_3x3(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Challengers Teams in 5x5
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getChallengers_5x5(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Masters in Solo Queue
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getMasters_SOLO(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Master Teams in 3x3
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getMasters_3x3(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Master Teams in 5x5
+        * @param     {RiotGamesAPI.League.LeagueDto}    callback    data callback
+        */
+    getMasters_5x5(callback: (League: RiotGamesAPI.League.LeagueDto) => void): any;
+    /**
+        * get Champions (static data)
+        * @param     {RiotGamesAPI.LolStaticData.ChampionListDto}    callback    data callback
+        */
+    staticDataChampions(callback: (championListDto: RiotGamesAPI.LolStaticData.ChampionListDto) => void): any;
+    /**
+        * get data by champion ID
+        * @param     {number}                                    championsId    Champion ID
+        * @param     {RiotGamesAPI.LolStaticData.ChampionDto}    callback       data callback
+        */
+    staticDataChampionById(championsId: number, callback: (championDto: RiotGamesAPI.LolStaticData.ChampionDto) => void): any;
+    /**
+        * get League of Legends Items
+        * @param     {RiotGamesAPI.LolStaticData.ItemListDto}    callback    data callback
+        */
+    staticDataItems(callback: (itemsDto: RiotGamesAPI.LolStaticData.ItemListDto) => void): any;
+    /**
+        * Get item infos by ID
+        * @param     {number}                                itemId      item ID
+        * @param     {RiotGamesAPI.LolStaticData.ItemDto}    callback    data callback
+        */
+    staticDataItemById(itemId: number, callback: (itemDto: RiotGamesAPI.LolStaticData.ItemDto) => void): any;
+    /**
+        * get league of legends languages
+        * @param     {RiotGamesAPI.LolStaticData.LanguageStringsDto}    callback    data callback
+        */
+    staticDataLanguagesStrings(callback: (languageStringsDto: RiotGamesAPI.LolStaticData.LanguageStringsDto) => void): any;
+    /**
+        * get league of legends languages
+        * @param     {string[]}    callback    data callback
+        */
+    staticDataLanguages(callback: (languages: string[]) => void): any;
+    /**
+        * get Map data
+        * @param     {RiotGamesAPI.LolStaticData.MapDataDto}    callback    data callback
+        */
+    staticDataMap(callback: (mapDataDto: RiotGamesAPI.LolStaticData.MapDataDto) => void): any;
+    /**
+        * get all masteries
+        * @param     {RiotGamesAPI.LolStaticData.MasteryListDto}    callback    data callback
+        */
+    staticDataMastery(callback: (masteryListDto: RiotGamesAPI.LolStaticData.MasteryListDto) => void): any;
+    /**
+        * get data by mastery ID
+        * @param     {number}                                   masteryId    Mastery ID
+        * @param     {RiotGamesAPI.LolStaticData.MasteryDto}    callback     data callback
+        */
+    staticDataMasteryById(masteryId: number, callback: (masteryDto: RiotGamesAPI.LolStaticData.MasteryDto) => void): any;
+    staticDataRealm(callback: (realmDto: RiotGamesAPI.LolStaticData.RealmDto) => void): any;
+    /**
+        * get all runes
+        * @param     {RiotGamesAPI.LolStaticData.RuneListDto}    callback    data callback
+        */
+    staticDataRunes(callback: (runeListDto: RiotGamesAPI.LolStaticData.RuneListDto) => void): any;
+    /**
+        * get rune by Rune ID
+        * @param     {number}                                runeId      Rune ID
+        * @param     {RiotGamesAPI.LolStaticData.RuneDto}    callback    data callback
+        */
+    staticDataRuneById(runeId: number, callback: (runeDto: RiotGamesAPI.LolStaticData.RuneDto) => void): any;
+    /**
+        * get all summoner spells
+        * @param     {RiotGamesAPI.LolStaticData.SummonerSpellListDto}    callback    data callback
+        */
+    staticDataSummonerSpells(callback: (summonerSpellListDto: RiotGamesAPI.LolStaticData.SummonerSpellListDto) => void): any;
+    /**
+        * get summoner spell by summoner spell ID
+        * @param     {number}                                         summonerSpellId    Summoner spell ID
+        * @param     {RiotGamesAPI.LolStaticData.SummonerSpellDto}    callback           data callback
+        */
+    staticDataSummonSpellById(summonerSpellId: number, callback: (runeDto: RiotGamesAPI.LolStaticData.SummonerSpellDto) => void): any;
+    /**
+        * get league of legends  versions
+        * @param     {string[]}    callback    data callback
+        */
+    staticDataVersion(callback: (versions: string[]) => void): any;
+    /**
+        * get league of legends status
+        * @param     {RiotGamesAPI.LolStatus.Shard[]}    callback    data callback
+        */
+    getSatus(callback: (shardList: RiotGamesAPI.LolStatus.Shard[]) => void): any;
+    /**
+        * get status for a given region
+        * @param     {region_e}                        region      region
+        * @param     {RiotGamesAPI.LolStatus.Shard}    callback    data callback
+        */
+    getSatusByRegion(region: region_e, callback: (shard: RiotGamesAPI.LolStatus.Shard) => void): any;
+    /**
+        * get match infos for a given match ID
+        * @param     {number}                            matchId     Match ID
+        * @param     {RiotGamesAPI.Match.MatchDetail}    callback    data callback
+        */
+    getMatch(matchId: number, callback: (matchDetails: RiotGamesAPI.Match.MatchDetail) => void): any;
+    /**
+        * get all matches for a given tournament code
+        * @param     {string}      tournamentCode    Tournament Code
+        * @param     {number[]}    callback          data callback
+        */
+    getMatchIdsByTournamentCode(tournamentCode: string, callback: (matchIds: number[]) => void): any;
+    /**
+        * get match by ID in a tournament
+        * @param     {number}                            matchId     Match ID
+        * @param     {RiotGamesAPI.Match.MatchDetail}    callback    data callback
+        */
+    getMatchForTournament(matchId: number, callback: (matchDetails: RiotGamesAPI.Match.MatchDetail) => void): any;
+    /**
+        * get match list of a summoner
+        * @param     {number}                              summonerId    Summoner ID
+        * @param     {RiotGamesAPI.MatchList.MatchList}    callback      data callback
+        */
+    getMatchList(summonerId: number, callback: (matchList: RiotGamesAPI.MatchList.MatchList) => void): any;
+    /**
+        * get ranked stats of summoner
+        * @param     {number}                               summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Stats.RankedStatsDto}    callback      data callback
+        */
+    getStatsRanked(summonerId: number, callback: (rankedStatsDto: RiotGamesAPI.Stats.RankedStatsDto) => void): any;
+    /**
+        * get summary ranked stats of summoner
+        * @param     {number}                                          summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Stats.PlayerStatsSummaryListDto}    callback      data callback
+        */
+    getStatsSummary(summonerId: number, callback: (playerStatsSummaryListDto: RiotGamesAPI.Stats.PlayerStatsSummaryListDto) => void): any;
+    /**
+        * get summoner infos by Summoner Name
+        * @param     {string}                               summonerName    Summoner Name
+        * @param     {RiotGamesAPI.Summoner.SummonerDto}    callback        data callback
+        */
+    getSummonerByName(summonerName: string, callback: (summonerDto: RiotGamesAPI.Summoner.SummonerDto) => void): any;
+    /**
+        * get summoner infos by summoner ID
+        * @param     {number}                               summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Summoner.SummonerDto}    callback      data callback
+        */
+    getSummonerById(summonerId: number, callback: (summonerDto: RiotGamesAPI.Summoner.SummonerDto) => void): any;
+    /**
+        * get masteries of a summoner
+        * @param     {number}                                   summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Summoner.MasteryPagesDto}    callback      data callback
+        */
+    getSummonerMasteries(summonerId: number, callback: (masteryPagesDto: RiotGamesAPI.Summoner.MasteryPagesDto) => void): any;
+    /**
+        * get the Summoner Name of a summoner ID
+        * @param     {number}    summonerId    Summoner ID
+        * @param     {string}    callback      data callback
+        */
+    getSummonerName(summonerId: number, callback: (summonerName: string) => void): any;
+    /**
+        * get the runes of a summoner
+        * @param     {number}                                summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Summoner.RunePagesDto}    callback      data callback
+        */
+    getSummonerRunes(summonerId: number, callback: (runePagesDto: RiotGamesAPI.Summoner.RunePagesDto) => void): any;
+    /**
+        * get teams of a summoner
+        * @param     {number}                         summonerId    Summoner ID
+        * @param     {RiotGamesAPI.Team.TeamDto[]}    callback      data callback
+        */
+    getTeamsBySummoner(summonerId: number, callback: (teamsList: RiotGamesAPI.Team.TeamDto[]) => void): any;
+    /**
+        * get Team infos by Team ID
+        * @param     {string}                       teamId      Team ID
+        * @param     {RiotGamesAPI.Team.TeamDto}    callback    data callback
+        */
+    getTeamById(teamId: string, callback: (teamDto: RiotGamesAPI.Team.TeamDto) => void): any;
 }
diff --git a/router5/router5.d.ts b/router5/router5.d.ts
index bfeb68b6be..dcfbd60bec 100644
--- a/router5/router5.d.ts
+++ b/router5/router5.d.ts
@@ -3,88 +3,87 @@
 // Definitions by: Matthew Dahl <https://github.com/sandersky>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'router5' {
-    interface constants {
-      ROUTER_NOT_STARTED: String;
-      ROUTER_ALREADY_STARTED: String;
-      ROUTE_NOT_FOUND: String;
-      SAME_STATES: String;
-      CANNOT_DEACTIVATE: String;
-      CANNOT_ACTIVATE: String;
-      TRANSITION_ERR: String;
-      TRANSITION_CANCELLED: String;
-    }
 
-    interface State {
-        _meta: Array<Object>;
-        name: String;
-        params: Object;
-    }
-
-    interface RouteNode {
-        add(route: any, cb?: Function): RouteNode;
-        addNode(name?: any, params?: any): RouteNode;
-        buildPath(routeName: String, params?: Object): String;
-        buildPathFromSegments(segment: Array<Object>, params?: Object): String;
-        buildState(name: String, params?: Object): State;
-        buildStateFromSegments(segments: Array<Object>): State;
-        getMetaFromSegments(segments: Array<Object>): Array<Object>;
-        getPath(routeName: String): String;
-        getPathFromSegments(segments: Array<Object>): String;
-        getSegmentsByName(routeName: String): Array<Object>;
-        getSegmentsMatchingPath(path: any, options: Object): Array<any>;
-        matchPath(path: any, options?: Object): State;
-        setPath(path?: any): void;
-    }
-
-    interface RouteNodeFactory {
-        new(name?: any, path?: any, childRoutes?: any, cb?: Function): RouteNode;
-        (name?: any, path?: any, childRoutes?: any, cb?: Function): RouteNode;
-    }
-
-    interface Router5 {
-        add(routes: any): Router5;
-        addNode(name: String, path: String, canActivate?: Function): Router5;
-        areStatesDescendants(parentState: any, childState: any): Boolean;
-        areStatesEqual(state1: any, state2: any): Boolean;
-        buildPath(route: String, params: Object): String;
-        buildState(route: String, params: Object): String;
-        buildUrl(route: String, params: Object): String;
-        canActivate(name: String, canActivate: Function): Router5;
-        canDeactivate(name: String, canDeactivate: Boolean): any;
-        cancel(): void;
-        getAdditionalArgs(): Array<any>;
-        getState(): Object;
-        isActive(name: String, params?: Object, strictEquality?: Boolean, ignoreQueryParams?: Boolean): Boolean;
-        matchPath(path: String): Object;
-        matchUrl(url: String): Object;
-        navigate(name: String, ...args: Array<Object|Function>): Function;
-        setAdditionalArgs(args: Array<any>): void;
-        setOption(opt: String, val: any): Router5;
-        start(...args: Array<any>): Router5;
-        stop(): Router5;
-        urlToPath(path: String): String;
-        useMiddleware(...args: Array<Function>): Router5;
-        usePlugin(pluginFactory: Function): Router5;
-    }
-
-    interface Router5Factory {
-        new(routes?: any, opts?: Object): Router5;
-        (routes?: any, opts?: Object): Router5;
-    }
-
-    var errCodes: constants;
-    var loggerPlugin: () => Function;
-    var RouteNode: RouteNodeFactory;
-    var Router5: Router5Factory;
-    var transitionPath: (toState: any, fromState: any) => any;
-
-    export default Router5;
-    export {
-      errCodes,
-      loggerPlugin,
-      RouteNode,
-      Router5,
-      transitionPath
-    };
+interface constants {
+    ROUTER_NOT_STARTED: String;
+    ROUTER_ALREADY_STARTED: String;
+    ROUTE_NOT_FOUND: String;
+    SAME_STATES: String;
+    CANNOT_DEACTIVATE: String;
+    CANNOT_ACTIVATE: String;
+    TRANSITION_ERR: String;
+    TRANSITION_CANCELLED: String;
 }
+
+interface State {
+    _meta: Array<Object>;
+    name: String;
+    params: Object;
+}
+
+interface RouteNode {
+    add(route: any, cb?: Function): RouteNode;
+    addNode(name?: any, params?: any): RouteNode;
+    buildPath(routeName: String, params?: Object): String;
+    buildPathFromSegments(segment: Array<Object>, params?: Object): String;
+    buildState(name: String, params?: Object): State;
+    buildStateFromSegments(segments: Array<Object>): State;
+    getMetaFromSegments(segments: Array<Object>): Array<Object>;
+    getPath(routeName: String): String;
+    getPathFromSegments(segments: Array<Object>): String;
+    getSegmentsByName(routeName: String): Array<Object>;
+    getSegmentsMatchingPath(path: any, options: Object): Array<any>;
+    matchPath(path: any, options?: Object): State;
+    setPath(path?: any): void;
+}
+
+interface RouteNodeFactory {
+    new (name?: any, path?: any, childRoutes?: any, cb?: Function): RouteNode;
+    (name?: any, path?: any, childRoutes?: any, cb?: Function): RouteNode;
+}
+
+interface Router5 {
+    add(routes: any): Router5;
+    addNode(name: String, path: String, canActivate?: Function): Router5;
+    areStatesDescendants(parentState: any, childState: any): Boolean;
+    areStatesEqual(state1: any, state2: any): Boolean;
+    buildPath(route: String, params: Object): String;
+    buildState(route: String, params: Object): String;
+    buildUrl(route: String, params: Object): String;
+    canActivate(name: String, canActivate: Function): Router5;
+    canDeactivate(name: String, canDeactivate: Boolean): any;
+    cancel(): void;
+    getAdditionalArgs(): Array<any>;
+    getState(): Object;
+    isActive(name: String, params?: Object, strictEquality?: Boolean, ignoreQueryParams?: Boolean): Boolean;
+    matchPath(path: String): Object;
+    matchUrl(url: String): Object;
+    navigate(name: String, ...args: Array<Object | Function>): Function;
+    setAdditionalArgs(args: Array<any>): void;
+    setOption(opt: String, val: any): Router5;
+    start(...args: Array<any>): Router5;
+    stop(): Router5;
+    urlToPath(path: String): String;
+    useMiddleware(...args: Array<Function>): Router5;
+    usePlugin(pluginFactory: Function): Router5;
+}
+
+interface Router5Factory {
+    new (routes?: any, opts?: Object): Router5;
+    (routes?: any, opts?: Object): Router5;
+}
+
+declare var errCodes: constants;
+declare var loggerPlugin: () => Function;
+declare var RouteNode: RouteNodeFactory;
+declare var Router5: Router5Factory;
+declare var transitionPath: (toState: any, fromState: any) => any;
+
+export default Router5;
+export {
+errCodes,
+loggerPlugin,
+RouteNode,
+Router5,
+transitionPath
+};
diff --git a/rsmq-worker/rsmq-worker.d.ts b/rsmq-worker/rsmq-worker.d.ts
index a11ab1ef43..01635e1072 100644
--- a/rsmq-worker/rsmq-worker.d.ts
+++ b/rsmq-worker/rsmq-worker.d.ts
@@ -5,49 +5,48 @@
 
 /// <reference path='../rsmq/rsmq.d.ts'/>
 
-declare module "rsmq-worker" {
-    import redis = require('redis');
-    import events = require('events');
 
-    namespace RSMQWorker {
-        export interface Client extends events.EventEmitter {
-            start(): Client;
-            stop(): Client;
-            send(message: string, delay?: number, cb?: CallbackT<string>): Client;
-            send(message: string, cb: CallbackT<string>): Client;
-            del(id: string, cb?: CallbackT<void>): Client;
-            changeInterval(interval: number|number[]): Client;
-        }
+import redis = require('redis');
+import events = require('events');
 
-        export interface Options {
-            interval?: number;
-            maxReceiveCount?: number;
-            invisibletime?: number;
-            defaultDelay?: number;
-            autostart?: boolean;
-            timeout?: number;
-            customExceedCheck?: CustomExceedCheckCallback;
-            rsmq?: RedisSMQ.Client;
-            redis?: redis.RedisClient;
-            redisPrefix?: string;
-            host?: string;
-            port?: number;
-            options?: redis.ClientOpts;
-        }
-
-        export interface CustomExceedCheckCallback {
-            (message: RedisSMQ.Message): boolean;
-        }
-
-        export interface CallbackT<R> {
-            (e?:Error, res?:R): void;
-        }
+declare namespace RSMQWorker {
+    export interface Client extends events.EventEmitter {
+        start(): Client;
+        stop(): Client;
+        send(message: string, delay?: number, cb?: CallbackT<string>): Client;
+        send(message: string, cb: CallbackT<string>): Client;
+        del(id: string, cb?: CallbackT<void>): Client;
+        changeInterval(interval: number | number[]): Client;
     }
 
-    interface RSMQWorkerStatic {
-        new(queuename: string, options?: RSMQWorker.Options): RSMQWorker.Client;
+    export interface Options {
+        interval?: number;
+        maxReceiveCount?: number;
+        invisibletime?: number;
+        defaultDelay?: number;
+        autostart?: boolean;
+        timeout?: number;
+        customExceedCheck?: CustomExceedCheckCallback;
+        rsmq?: RedisSMQ.Client;
+        redis?: redis.RedisClient;
+        redisPrefix?: string;
+        host?: string;
+        port?: number;
+        options?: redis.ClientOpts;
     }
 
-    var RSMQWorker: RSMQWorkerStatic;
-    export = RSMQWorker;
+    export interface CustomExceedCheckCallback {
+        (message: RedisSMQ.Message): boolean;
+    }
+
+    export interface CallbackT<R> {
+        (e?: Error, res?: R): void;
+    }
 }
+
+interface RSMQWorkerStatic {
+    new (queuename: string, options?: RSMQWorker.Options): RSMQWorker.Client;
+}
+
+declare var RSMQWorker: RSMQWorkerStatic;
+export = RSMQWorker;
diff --git a/rsync/rsync.d.ts b/rsync/rsync.d.ts
index 9c828e6fbc..9504c08656 100644
--- a/rsync/rsync.d.ts
+++ b/rsync/rsync.d.ts
@@ -5,92 +5,91 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'rsync' {
-    import * as child_process from 'child_process';
-    interface StreamDataHandler {
-        (data: any): void;
-    }
 
-    interface Pattern {
-        action: string;
-        pattern: string;
-    }
-
-    interface Flag {
-        [name: string]: boolean;
-    }
-
-    interface Rsync {
-        // instance methods
-        set(option: string, value: string): Rsync;
-        set(option: string): Rsync;
-
-        unset(option: string): Rsync;
-
-        flags(flags: string, set?: boolean): Rsync;
-        flags(flags: Flag): Rsync;
-        flags(flags: string[], set?: boolean): Rsync;
-        flags(...flags: any[]): Rsync;
-
-        isSet(option: string): boolean;
-
-        option(option: string): any;
-
-        args(): string[];
-
-        command(): string;
-
-        output(stdout: StreamDataHandler, stderr: StreamDataHandler): Rsync;
-
-        execute(callback: (err: Error, code: number, cmd: string) => void): child_process.ChildProcess;
-        execute(
-            callback: (err: Error, code: number, cmd: string) => void,
-            stdout: StreamDataHandler,
-            stderr: StreamDataHandler
-        ): child_process.ChildProcess;
-
-
-        // option shorthands
-        shell(shell: string): Rsync;
-        delete(): Rsync;
-        progress(): Rsync;
-        archive(): Rsync;
-        compress(): Rsync;
-        recursive(): Rsync;
-        update(): Rsync;
-        quiet(): Rsync;
-        dirs(): Rsync;
-        links(): Rsync;
-        dry(): Rsync;
-
-        // accessor methods
-        executable(): string;
-        executable(e: string): Rsync;
-
-        executableShell(): string;
-        executableShell(e: string): Rsync;
-
-        destination(): string;
-        destination(d: string): Rsync;
-
-        source(): string[];
-        source(s: string): Rsync;
-        source(s: string[]): Rsync;
-
-        // pattern accessors
-        patterns(patterns: (string|Pattern)[]): Rsync;
-
-        exclude(p: string): Rsync;
-        exclude(p: string[]): Rsync;
-
-        include(p: string): Rsync;
-        include(p: string[]): Rsync;
-    }
-
-    interface RsyncStatic {
-        new(): Rsync;
-    }
-
-    const e: RsyncStatic;
-    export = e;
+import * as child_process from 'child_process';
+interface StreamDataHandler {
+    (data: any): void;
 }
+
+interface Pattern {
+    action: string;
+    pattern: string;
+}
+
+interface Flag {
+    [name: string]: boolean;
+}
+
+interface Rsync {
+    // instance methods
+    set(option: string, value: string): Rsync;
+    set(option: string): Rsync;
+
+    unset(option: string): Rsync;
+
+    flags(flags: string, set?: boolean): Rsync;
+    flags(flags: Flag): Rsync;
+    flags(flags: string[], set?: boolean): Rsync;
+    flags(...flags: any[]): Rsync;
+
+    isSet(option: string): boolean;
+
+    option(option: string): any;
+
+    args(): string[];
+
+    command(): string;
+
+    output(stdout: StreamDataHandler, stderr: StreamDataHandler): Rsync;
+
+    execute(callback: (err: Error, code: number, cmd: string) => void): child_process.ChildProcess;
+    execute(
+        callback: (err: Error, code: number, cmd: string) => void,
+        stdout: StreamDataHandler,
+        stderr: StreamDataHandler
+    ): child_process.ChildProcess;
+
+
+    // option shorthands
+    shell(shell: string): Rsync;
+    delete(): Rsync;
+    progress(): Rsync;
+    archive(): Rsync;
+    compress(): Rsync;
+    recursive(): Rsync;
+    update(): Rsync;
+    quiet(): Rsync;
+    dirs(): Rsync;
+    links(): Rsync;
+    dry(): Rsync;
+
+    // accessor methods
+    executable(): string;
+    executable(e: string): Rsync;
+
+    executableShell(): string;
+    executableShell(e: string): Rsync;
+
+    destination(): string;
+    destination(d: string): Rsync;
+
+    source(): string[];
+    source(s: string): Rsync;
+    source(s: string[]): Rsync;
+
+    // pattern accessors
+    patterns(patterns: (string | Pattern)[]): Rsync;
+
+    exclude(p: string): Rsync;
+    exclude(p: string[]): Rsync;
+
+    include(p: string): Rsync;
+    include(p: string[]): Rsync;
+}
+
+interface RsyncStatic {
+    new (): Rsync;
+}
+
+declare const e: RsyncStatic;
+export = e;
diff --git a/run-sequence/run-sequence.d.ts b/run-sequence/run-sequence.d.ts
index c83f794aef..47008696f4 100644
--- a/run-sequence/run-sequence.d.ts
+++ b/run-sequence/run-sequence.d.ts
@@ -6,15 +6,14 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../gulp/gulp.d.ts" />
 
-declare module "run-sequence" {
-    import gulp = require('gulp');
 
-    interface IRunSequence {
-        (...streams: (string | string[] | gulp.TaskCallback)[]): NodeJS.ReadWriteStream;
+import gulp = require('gulp');
 
-        use(gulp: gulp.Gulp): IRunSequence;
-    }
+interface IRunSequence {
+    (...streams: (string | string[] | gulp.TaskCallback)[]): NodeJS.ReadWriteStream;
 
-    var _tmp: IRunSequence;
-    export = _tmp;
+    use(gulp: gulp.Gulp): IRunSequence;
 }
+
+declare var _tmp: IRunSequence;
+export = _tmp;
diff --git a/s3rver/s3rver.d.ts b/s3rver/s3rver.d.ts
index 6bb273c0f6..09e1391026 100644
--- a/s3rver/s3rver.d.ts
+++ b/s3rver/s3rver.d.ts
@@ -5,28 +5,27 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "s3rver" {
-    import * as http from "http";
 
-    class S3rver {
-        constructor(options: S3rverOptions)
-        setPort(port: number): S3rver;
-        setHostname(hostname: string): S3rver;
-        setDirectory(directory: string): S3rver;
-        setSilent(silent: boolean): S3rver;
-        setIndexDocument(indexDocument: string): S3rver;
-        setErrorDocument(errorDocument: string): S3rver;
-        run(callback: (error: Error, hostname: string, port: number, directory: string) => void): http.Server;
-    }
+import * as http from "http";
 
-    interface S3rverOptions {
-        port?: number;
-        hostname?: string;
-        silent?: boolean;
-        indexDocument?: string;
-        errorDocument?: string;
-        directory: string;
-    }
-
-    export = S3rver;
+declare class S3rver {
+    constructor(options: S3rverOptions)
+    setPort(port: number): S3rver;
+    setHostname(hostname: string): S3rver;
+    setDirectory(directory: string): S3rver;
+    setSilent(silent: boolean): S3rver;
+    setIndexDocument(indexDocument: string): S3rver;
+    setErrorDocument(errorDocument: string): S3rver;
+    run(callback: (error: Error, hostname: string, port: number, directory: string) => void): http.Server;
 }
+
+interface S3rverOptions {
+    port?: number;
+    hostname?: string;
+    silent?: boolean;
+    indexDocument?: string;
+    errorDocument?: string;
+    directory: string;
+}
+
+export = S3rver;
diff --git a/sandboxed-module/sandboxed-module.d.ts b/sandboxed-module/sandboxed-module.d.ts
index 55290cbc71..dac2656f3c 100644
--- a/sandboxed-module/sandboxed-module.d.ts
+++ b/sandboxed-module/sandboxed-module.d.ts
@@ -3,119 +3,118 @@
 // Definitions by: Sven Reglitzki <https://github.com/svi3c/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "sandboxed-module" {
 
-    interface SandboxOptions {
-        /**
-         * An object containing moduleIds and the values to inject for them when required by the sandboxed module.
-         * This does not affect children of the sandboxed module.
-         */
-        requires?: Object;
-        /**
-         * An object of global variables to inject into the sandboxed module.
-         */
-        globals?: Object;
-        /**
-         * An object of local variables to inject into the sandboxed module.
-         */
-        locals?: Object;
-        /**
-         * An object of named functions which will transform the source code required with SandboxedModule.require.
-         * For example, CoffeeScript & istanbul support is implemented with built-in sourceTransformer functions
-         * (see #registerBuiltInSourceTransformer).
-         *
-         * A source transformer receives the source (as it's been transformed thus far) and must return the transformed
-         * source (whether it's changed or unchanged).
-         *
-         * An example source transformer to change all instances of the number "3" to "5" would look like this:
-         *
-         * SandboxedModule.require('../fixture/baz', {
-         *   sourceTransformers: {
-         *     turn3sInto5s: function(source) {
-         *       return source.replace(/3/g,'5');
-         *     }
-         *   }
-         * })
-         */
-        sourceTransformers?: Object;
-        /**
-         * If false, modules that are required by the sandboxed module will not be sandboxed. By default all modules
-         * required by the sandboxedModule will be sandboxed using the same options that were used for the original
-         * sandboxed module.
-         */
-        singleOnly?: boolean;
-        /**
-         * If false, the source transformers will not be run against modules required by the sandboxed module.
-         * By default it will take the same value as {@link SandboxOptions.singleOnly}.
-         */
-        sourceTransformersSingleOnly?: boolean;
-    }
 
-    class SandboxedModule {
-        /**
-         * See {@link SandboxOptions.requires}
-         */
-        required:Object;
-        /**
-         * See {@link SandboxOptions.globals}
-         */
-        globals:Object;
-        /**
-         * See {@link SandboxOptions.locals}
-         */
-        locals:Object;
-        /**
-         * See {@link SandboxOptions.sourceTransformers}.
-         */
-        sourceTransformers:Object;
-        /**
-         * The full path to the module.
-         */
-        filename:string;
-        /**
-         * The underlaying node.js Module instance.
-         */
-        module:string;
-        /**
-         * A getter returning the sandboxedModule.module.exports object.
-         */
-        exports:any;
-        /**
-         * Returns a new SandboxedModule where moduleId is a regular module path / id as you would normally pass into
-         * require(). The new module will be loaded in its own v8 context, but otherwise have access to the normal
-         * node.js environment.
-         *
-         * @param moduleId the ID of the module to load
-         * @param options the loading options
-         */
-        static load(moduleId:string, options?:SandboxOptions):SandboxedModule
-
-        /**
-         * Identical to {@link SandboxedModule.load()}, but returns sandboxedModule.exports directly.
-         *
-         * @param moduleId the ID of the module to require
-         * @param options the requiring options
-         */
-        static require(moduleId:string, options?:SandboxOptions):any
-        /**
-         * Sets options globally across all uses of {@link SandboxedModule.load()} and {@link SandboxedModule.require()}.
-         * This way, a commonly needed require, global, local, or sourceTransformer can be specified once across all
-         * sandboxed modules.
-         * @param options the loading and requiring default options
-         */
-        static configure(options:SandboxOptions):void
-        /**
-         * Enables a built-in source transformer by name. Currently, SandboxedModule ships with two built in source
-         * transformers:
-         *  * "coffee" - Compiles source with CoffeeScript [Enabled by default for backwards compatibility].
-         *    Be sure to run require('coffee-script').register() or require('coffee-script/register') as well.
-         *  * "istanbul" - Instruments sources via istanbul when istanbul code coverage is running.
-         *    For example, if you'd like to use SandboxedModule in conjunction with istanbul, just run
-         *    SandboxedModule.registerBuiltInSourceTransformer('istanbul').
-         * @param name The name of the built-in source transformer
-         */
-        static registerBuiltInSourceTransformer(name:String):void
-    }
-
-    export = SandboxedModule;
+interface SandboxOptions {
+    /**
+     * An object containing moduleIds and the values to inject for them when required by the sandboxed module.
+     * This does not affect children of the sandboxed module.
+     */
+    requires?: Object;
+    /**
+     * An object of global variables to inject into the sandboxed module.
+     */
+    globals?: Object;
+    /**
+     * An object of local variables to inject into the sandboxed module.
+     */
+    locals?: Object;
+    /**
+     * An object of named functions which will transform the source code required with SandboxedModule.require.
+     * For example, CoffeeScript & istanbul support is implemented with built-in sourceTransformer functions
+     * (see #registerBuiltInSourceTransformer).
+     *
+     * A source transformer receives the source (as it's been transformed thus far) and must return the transformed
+     * source (whether it's changed or unchanged).
+     *
+     * An example source transformer to change all instances of the number "3" to "5" would look like this:
+     *
+     * SandboxedModule.require('../fixture/baz', {
+     *   sourceTransformers: {
+     *     turn3sInto5s: function(source) {
+     *       return source.replace(/3/g,'5');
+     *     }
+     *   }
+     * })
+     */
+    sourceTransformers?: Object;
+    /**
+     * If false, modules that are required by the sandboxed module will not be sandboxed. By default all modules
+     * required by the sandboxedModule will be sandboxed using the same options that were used for the original
+     * sandboxed module.
+     */
+    singleOnly?: boolean;
+    /**
+     * If false, the source transformers will not be run against modules required by the sandboxed module.
+     * By default it will take the same value as {@link SandboxOptions.singleOnly}.
+     */
+    sourceTransformersSingleOnly?: boolean;
 }
+
+declare class SandboxedModule {
+    /**
+     * See {@link SandboxOptions.requires}
+     */
+    required: Object;
+    /**
+     * See {@link SandboxOptions.globals}
+     */
+    globals: Object;
+    /**
+     * See {@link SandboxOptions.locals}
+     */
+    locals: Object;
+    /**
+     * See {@link SandboxOptions.sourceTransformers}.
+     */
+    sourceTransformers: Object;
+    /**
+     * The full path to the module.
+     */
+    filename: string;
+    /**
+     * The underlaying node.js Module instance.
+     */
+    module: string;
+    /**
+     * A getter returning the sandboxedModule.module.exports object.
+     */
+    exports: any;
+    /**
+     * Returns a new SandboxedModule where moduleId is a regular module path / id as you would normally pass into
+     * require(). The new module will be loaded in its own v8 context, but otherwise have access to the normal
+     * node.js environment.
+     *
+     * @param moduleId the ID of the module to load
+     * @param options the loading options
+     */
+    static load(moduleId: string, options?: SandboxOptions): SandboxedModule
+
+    /**
+     * Identical to {@link SandboxedModule.load()}, but returns sandboxedModule.exports directly.
+     *
+     * @param moduleId the ID of the module to require
+     * @param options the requiring options
+     */
+    static require(moduleId: string, options?: SandboxOptions): any
+    /**
+     * Sets options globally across all uses of {@link SandboxedModule.load()} and {@link SandboxedModule.require()}.
+     * This way, a commonly needed require, global, local, or sourceTransformer can be specified once across all
+     * sandboxed modules.
+     * @param options the loading and requiring default options
+     */
+    static configure(options: SandboxOptions): void
+    /**
+     * Enables a built-in source transformer by name. Currently, SandboxedModule ships with two built in source
+     * transformers:
+     *  * "coffee" - Compiles source with CoffeeScript [Enabled by default for backwards compatibility].
+     *    Be sure to run require('coffee-script').register() or require('coffee-script/register') as well.
+     *  * "istanbul" - Instruments sources via istanbul when istanbul code coverage is running.
+     *    For example, if you'd like to use SandboxedModule in conjunction with istanbul, just run
+     *    SandboxedModule.registerBuiltInSourceTransformer('istanbul').
+     * @param name The name of the built-in source transformer
+     */
+    static registerBuiltInSourceTransformer(name: String): void
+}
+
+export = SandboxedModule;
diff --git a/sanitize-filename/sanitize-filename.d.ts b/sanitize-filename/sanitize-filename.d.ts
index 05c53aa687..100764c349 100644
--- a/sanitize-filename/sanitize-filename.d.ts
+++ b/sanitize-filename/sanitize-filename.d.ts
@@ -3,14 +3,13 @@
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "sanitize-filename" {
-	function sanitize(filename: string, options?: sanitize.Options): string;
 
-	namespace sanitize {
-		interface Options {
-			replacement: string;
-		}
-	}
+declare function sanitize(filename: string, options?: sanitize.Options): string;
 
-	export = sanitize;
+declare namespace sanitize {
+    interface Options {
+        replacement: string;
+    }
 }
+
+export = sanitize;
diff --git a/sanitize-html/sanitize-html.d.ts b/sanitize-html/sanitize-html.d.ts
index e610a14f71..efbdd60b0c 100644
--- a/sanitize-html/sanitize-html.d.ts
+++ b/sanitize-html/sanitize-html.d.ts
@@ -4,24 +4,23 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
-declare module "sanitize-html" {
 
-	function sanitizeHtml(s: string, opts?: {
-		allowedTags?: string[];
-		allowedSchemes?: string[];
-		allowedAttributes?: { [index: string]: string[] };
-		allowedClasses?: { [index: string]: string[] };
-		transformTags?: { [index: string]: any };
-		exclusiveFilter?: {
-			[index: string]: (frame: {
-				tag: string;
-				attribs: { [index: string]: string };
-				text: string;
-				tagPosition: number;
-			}) => boolean
-		};
 
-	}): string;
+declare function sanitizeHtml(s: string, opts?: {
+    allowedTags?: string[];
+    allowedSchemes?: string[];
+    allowedAttributes?: { [index: string]: string[] };
+    allowedClasses?: { [index: string]: string[] };
+    transformTags?: { [index: string]: any };
+    exclusiveFilter?: {
+        [index: string]: (frame: {
+            tag: string;
+            attribs: { [index: string]: string };
+            text: string;
+            tagPosition: number;
+        }) => boolean
+    };
 
-	export = sanitizeHtml;
-}
+}): string;
+
+export = sanitizeHtml;
diff --git a/sanitizer/sanitizer.d.ts b/sanitizer/sanitizer.d.ts
index 4b41c44c1c..58c6791dda 100644
--- a/sanitizer/sanitizer.d.ts
+++ b/sanitizer/sanitizer.d.ts
@@ -3,25 +3,24 @@
 // Definitions by: Dave Taylor <http://davetayls.me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'sanitizer' {
-  export interface ISaxHandler {
-    startTag(name:string, attribs:string[], param:any):void;
-    endTag(name:string, param:any):void;
-    pcdata(text:string, param:any):void;
-    cdata(text:string, param:any):void;
-    rcdata(text:string, param:any):void;
-    comment(text:string, param:any):void;
-    startDoc(param:any):void;
-    endDoc(param:any):void;
-  }
 
-  export function escape(s:string):string;
-
-  export function makeSaxParser(yourHandler:ISaxHandler):(...any:any[])=>any;
-
-  export function normalizeRCData(s:string):string;
-
-  export function sanitize(s:string):string;
-
-  export function unescapeEntities(s:string):string;
+export interface ISaxHandler {
+    startTag(name: string, attribs: string[], param: any): void;
+    endTag(name: string, param: any): void;
+    pcdata(text: string, param: any): void;
+    cdata(text: string, param: any): void;
+    rcdata(text: string, param: any): void;
+    comment(text: string, param: any): void;
+    startDoc(param: any): void;
+    endDoc(param: any): void;
 }
+
+declare export function escape(s: string): string;
+
+declare export function makeSaxParser(yourHandler: ISaxHandler): (...any: any[]) => any;
+
+declare export function normalizeRCData(s: string): string;
+
+declare export function sanitize(s: string): string;
+
+declare export function unescapeEntities(s: string): string;
diff --git a/sax/sax.d.ts b/sax/sax.d.ts
index c61bf5bc08..826175eacd 100644
--- a/sax/sax.d.ts
+++ b/sax/sax.d.ts
@@ -4,89 +4,88 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference path="../node/node.d.ts" />
 
-declare module "sax" {
-    export var EVENTS: string[];
 
-    interface SAXOptions {
-        trim?: boolean;
-        normalize?: boolean;
-        lowercase?: boolean;
-        xmlns?: boolean;
-        noscript?: boolean;
-        position?: boolean;
-    }
+declare export var EVENTS: string[];
 
-    export interface QualifiedName {
-        name: string;
-        prefix: string;
-        local: string;
-        uri: string;
-    }
-
-    export interface QualifiedAttribute extends QualifiedName {
-        value: string;
-    }
-
-    interface BaseTag {
-        name: string;
-        isSelfClosing: boolean;
-    }
-
-    // Interface used when the xmlns option is set
-    export interface QualifiedTag extends QualifiedName, BaseTag {
-        ns: { [key: string]: string };
-        attributes: { [key: string]: QualifiedAttribute };
-    }
-
-    export interface Tag extends BaseTag {
-        attributes: { [key: string]: string };
-    }
-
-    export function parser(strict: boolean, opt: SAXOptions): SAXParser;
-    export class SAXParser {
-        constructor(strict: boolean, opt: SAXOptions);
-
-        // Methods
-        end(): void;
-        write(s: string): SAXParser;
-        resume(): SAXParser;
-        close(): SAXParser;
-        flush(): void;
-
-        // Members
-        line: number;
-        column: number;
-        error: Error;
-        position: number;
-        startTagPosition: number;
-        closed: boolean;
-        strict: boolean;
-        opt: SAXOptions;
-        tag: string;
-
-        // Events
-        onerror(e: Error): void;
-        ontext(t: string): void;
-        ondoctype(doctype: string): void;
-        onprocessinginstruction(node: { name: string; body: string }): void;
-        onopentag(tag: Tag | QualifiedTag): void;
-        onclosetag(tagName: string): void;
-        onattribute(attr: { name: string; value: string }): void;
-        oncomment(comment: string): void;
-        onopencdata(): void;
-        oncdata(cdata: string): void;
-        onclosecdata(): void;
-        onopennamespace(ns: { prefix: string; uri: string }): void;
-        onclosenamespace(ns: { prefix: string; uri: string }): void;
-        onend(): void;
-        onready(): void;
-        onscript(script: string): void;
-    }
-
-    import stream = require("stream");
-    export function createStream(strict: boolean, opt: SAXOptions): SAXStream;
-    export class SAXStream extends stream.Duplex {
-        constructor(strict: boolean, opt: SAXOptions);
-        private _parser: SAXParser;
-    }
+interface SAXOptions {
+    trim?: boolean;
+    normalize?: boolean;
+    lowercase?: boolean;
+    xmlns?: boolean;
+    noscript?: boolean;
+    position?: boolean;
+}
+
+export interface QualifiedName {
+    name: string;
+    prefix: string;
+    local: string;
+    uri: string;
+}
+
+export interface QualifiedAttribute extends QualifiedName {
+    value: string;
+}
+
+interface BaseTag {
+    name: string;
+    isSelfClosing: boolean;
+}
+
+// Interface used when the xmlns option is set
+export interface QualifiedTag extends QualifiedName, BaseTag {
+    ns: { [key: string]: string };
+    attributes: { [key: string]: QualifiedAttribute };
+}
+
+export interface Tag extends BaseTag {
+    attributes: { [key: string]: string };
+}
+
+declare export function parser(strict: boolean, opt: SAXOptions): SAXParser;
+declare export class SAXParser {
+    constructor(strict: boolean, opt: SAXOptions);
+
+    // Methods
+    end(): void;
+    write(s: string): SAXParser;
+    resume(): SAXParser;
+    close(): SAXParser;
+    flush(): void;
+
+    // Members
+    line: number;
+    column: number;
+    error: Error;
+    position: number;
+    startTagPosition: number;
+    closed: boolean;
+    strict: boolean;
+    opt: SAXOptions;
+    tag: string;
+
+    // Events
+    onerror(e: Error): void;
+    ontext(t: string): void;
+    ondoctype(doctype: string): void;
+    onprocessinginstruction(node: { name: string; body: string }): void;
+    onopentag(tag: Tag | QualifiedTag): void;
+    onclosetag(tagName: string): void;
+    onattribute(attr: { name: string; value: string }): void;
+    oncomment(comment: string): void;
+    onopencdata(): void;
+    oncdata(cdata: string): void;
+    onclosecdata(): void;
+    onopennamespace(ns: { prefix: string; uri: string }): void;
+    onclosenamespace(ns: { prefix: string; uri: string }): void;
+    onend(): void;
+    onready(): void;
+    onscript(script: string): void;
+}
+
+import stream = require("stream");
+declare export function createStream(strict: boolean, opt: SAXOptions): SAXStream;
+declare export class SAXStream extends stream.Duplex {
+    constructor(strict: boolean, opt: SAXOptions);
+    private _parser: SAXParser;
 }
diff --git a/semaphore/semaphore.d.ts b/semaphore/semaphore.d.ts
index 8de9f58718..7ee1165ef7 100644
--- a/semaphore/semaphore.d.ts
+++ b/semaphore/semaphore.d.ts
@@ -3,24 +3,23 @@
 // Definitions by: Matt Frantz <https://github.com/mhfrantz/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'semaphore' {
 
-  function semaphore(capacity?: number): semaphore.Semaphore;
 
-  namespace semaphore {
+declare function semaphore(capacity?: number): semaphore.Semaphore;
+
+declare namespace semaphore {
 
     interface Task {
-      (): void;
+        (): void;
     }
 
     interface Semaphore {
-      capacity: number;
+        capacity: number;
 
-      take(task: Task): void;
-      take(n: number, task: Task): void;
+        take(task: Task): void;
+        take(n: number, task: Task): void;
 
-      leave(n?: number): void;
+        leave(n?: number): void;
     }
-  }
-  export = semaphore;
 }
+export = semaphore;
diff --git a/sentence-case/sentence-case.d.ts b/sentence-case/sentence-case.d.ts
index ef5b2b7dda..59f23e4b27 100644
--- a/sentence-case/sentence-case.d.ts
+++ b/sentence-case/sentence-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "sentence-case" {
-	function sentenceCase(string: string, locale?: string, repl?: string): string;
-	export = sentenceCase;
-}
+
+declare function sentenceCase(string: string, locale?: string, repl?: string): string;
+export = sentenceCase;
diff --git a/sequelize-fixtures/sequelize-fixtures.d.ts b/sequelize-fixtures/sequelize-fixtures.d.ts
index 4f89bc46f6..587aef86f4 100644
--- a/sequelize-fixtures/sequelize-fixtures.d.ts
+++ b/sequelize-fixtures/sequelize-fixtures.d.ts
@@ -5,27 +5,25 @@
 
 /// <reference path="../sequelize/sequelize.d.ts" />
 
-declare module "sequelize-fixtures"
-{
-    import * as Sequelize from "sequelize";
 
-    namespace SequelizeFixtures {
-        interface Options {
-            encoding?: string,
-            log?: (message: string) => void,
-            transaction?: Sequelize.Transaction,
-            transformFixtureDataFn?: (data: any) => any
-        }
+import * as Sequelize from "sequelize";
 
-        interface SequelizeFixturesStatic {
-            loadFile(file: string, models: any, options?: Options): Promise<any>;
-            loadFiles(files: string[], models: any, options?: Options): Promise<any>;
-            loadFixture(fixture: any, models: any, options?: Options): Promise<any>;
-            loadFixtures(fixtures: any[], models: any, options?: Options): Promise<any>;
-        }
+declare namespace SequelizeFixtures {
+    interface Options {
+        encoding?: string,
+        log?: (message: string) => void,
+        transaction?: Sequelize.Transaction,
+        transformFixtureDataFn?: (data: any) => any
     }
 
-    var sequelizeFixtures: SequelizeFixtures.SequelizeFixturesStatic;
-
-    export = sequelizeFixtures;
+    interface SequelizeFixturesStatic {
+        loadFile(file: string, models: any, options?: Options): Promise<any>;
+        loadFiles(files: string[], models: any, options?: Options): Promise<any>;
+        loadFixture(fixture: any, models: any, options?: Options): Promise<any>;
+        loadFixtures(fixtures: any[], models: any, options?: Options): Promise<any>;
+    }
 }
+
+declare var sequelizeFixtures: SequelizeFixtures.SequelizeFixturesStatic;
+
+export = sequelizeFixtures;
diff --git a/sequelize/sequelize-2.0.0.d.ts b/sequelize/sequelize-2.0.0.d.ts
index 79e02d467f..21c5d68cbc 100644
--- a/sequelize/sequelize-2.0.0.d.ts
+++ b/sequelize/sequelize-2.0.0.d.ts
@@ -8,2785 +8,2783 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path='../lodash/lodash-3.10.d.ts' />
 
-declare module "sequelize"
-{
-    namespace sequelize {
-        interface SequelizeStaticAndInstance {
 
-            /**
-             * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you might want
-             * to use Sequelize.Utils._, which is a reference to the lodash library, if you don't already have it imported in
-             * your project.
-             */
-            Utils: Utils;
-
-            /**
-             * A modified version of bluebird promises, that allows listening for sql events.
-             *
-             * @see Promise
-             */
-            Promise: Promise;
-
-            /**
-             * Exposes the validator.js object, so you can extend it with custom validation functions. The validator is exposed
-             * both on the instance, and on the constructor.
-             *
-             * @see Validator
-             */
-            Validator: Validator;
-
-            QueryTypes: QueryTypes;
-
-            /**
-             * A general error class.
-             */
-            Error: Error;
-
-            /**
-             * Emitted when a validation fails.
-             *
-             * @see ValidationError
-             */
-            ValidationError: ValidationError;
-
-            /**
-             * Creates a object representing a database function. This can be used in search queries, both in where and order
-             * parts, and as default values in column definitions. If you want to refer to columns in your function, you should
-             * use sequelize.col, so that the columns are properly interpreted as columns and not a strings.
-             *
-             * @param fn The function you want to call.
-             * @param args All further arguments will be passed as arguments to the function.
-             */
-            fn(fn: string, ...args: Array<any>): any;
-
-            /**
-             * Creates a object representing a column in the DB. This is often useful in conjunction with sequelize.fn, since
-             * raw string arguments to fn will be escaped.
-             *
-             * @param col The name of the column
-             */
-            col(col: string): Col;
-
-            /**
-             * Creates a object representing a call to the cast function.
-             *
-             * @param val The value to cast.
-             * @param type The type to cast it to.
-             */
-            cast(val: any, type: string): Cast;
-
-            /**
-             * Creates a object representing a literal, i.e. something that will not be escaped.
-             *
-             * @param val Value to convert to a literal.
-             */
-            literal(val: any): Literal;
-
-            /**
-             * An AND query.
-             *
-             * @param args Each argument (string or object) will be joined by AND.
-             */
-            and(...args: Array<any>): And;
-
-            /**
-             * An OR query.
-             *
-             * @param args Each argument (string or object) will be joined by OR.
-             */
-            or(...args: Array<any>): Or;
-
-            /**
-             * A way of specifying attr = condition. Mostly used internally.
-             *
-             * @param attr          The attribute
-             * @param condition     The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.)
-             */
-            where(attr: string, condition: any): Where;
-        }
-
-        interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
-            /**
-             * Instantiate sequelize with name of database and username
-             * @param database database name
-             * @param username user name
-             */
-            new (database: string, username: string): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username and password
-             * @param database database name
-             * @param username user name
-             * @param password password
-             */
-            new (database: string, username: string, password: string): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username, password, and options.
-             * @param database database name
-             * @param username user name
-             * @param password password
-             * @param options options. @see Options
-             */
-            new (database: string, username: string, password: string, options: Options): Sequelize;
-
-            /**
-             * Instantiate sequelize with name of database, username, and options.
-             *
-             * @param database database name
-             * @param username user name
-             * @param options options. @see Options
-             */
-            new (database: string, username: string, options: Options): Sequelize;
-
-            /**
-             * Instantiate sequlize with an URI
-             * @param connectionString A full database URI
-             * @param options Options for sequelize. @see Options
-             */
-            new (connectionString: string, options?: Options): Sequelize;
-        }
-
-        interface Sequelize extends SequelizeStaticAndInstance {
-            /**
-             * Sequelize configuration (undocumented).
-             */
-            config: Config;
-
-            /**
-             * Sequelize options (undocumented).
-             */
-            options: Options;
-
-            /**
-             * Models are stored here under the name given to sequelize.define
-             */
-            models: any;
-            modelManager: ModelManager;
-            daoFactoryManager: ModelManager;
-            transactionManager: TransactionManager;
-            importCache: any;
-
-            /**
-             * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a transaction.
-             *
-             * @see Transaction
-             */
-            Transaction: TransactionStatic;
-
-            /**
-             * Returns the specified dialect.
-             */
-            getDialect(): string;
-
-            /**
-             * Returns the singleton instance of QueryInterface.
-             */
-            getQueryInterface(): QueryInterface;
-
-            /**
-             * Returns the singleton instance of Migrator.
-             * @param options Migration options
-             * @param force A flag that defines if the migrator should get instantiated or not.
-             */
-            getMigrator(options?: MigratorOptions, force?: boolean): Migrator;
-
-            /**
-             * Define a new model, representing a table in the DB.
-             *
-             * @param daoName The name of the entity (table). Typically specified in singular form.
-             * @param attributes A hash of attributes to define. Each attribute can be either a string name for the attribute
-             *                   or can be an object defining the attribute and its options. Note attributes is not fully
-             *                   typed since TypeScript does not support union types--it can be either a string or an
-             *                   options object. @see AttributeOptions.
-             * @param options Table options. @see DefineOptions.
-             */
-            define<TInstance, TPojo>(daoName: string, attributes: any, options?: DefineOptions): Model<TInstance, TPojo>;
-
-            /**
-             * Fetch a DAO factory which is already defined.
-             *
-             * @param daoName The name of a model defined with Sequelize.define.
-             */
-            model<TInstance, TPojo>(daoName: string): Model<TInstance, TPojo>;
-
-            /**
-             * Checks whether a model with the given name is defined.
-             *
-             * @param daoName The name of a model defined with Sequelize.define.
-             */
-            isDefined(daoName: string): boolean;
-
-            /**
-             * Imports a model defined in another file.
-             *
-             * @param path  The path to the file that holds the model you want to import. If the part is relative, it will be
-             *              resolved relatively to the calling file
-             */
-            import<TInstance, TPojo>(path: string): Model<TInstance, TPojo>;
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             * @param replacements  Either an object of named parameter replacements in the format :param or an array of
-             *                      unnamed replacements to replace ? in your SQL.
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions, replacements?: any): EventEmitter;
-
-            query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitterT<Model<TInstance, TPojo>>;
-
-            /**
-             * Create a new database schema.
-             *
-             * @param schema Name of the schema.
-             */
-            createSchema(schema: string): EventEmitter;
-
-            /**
-             * Show all defined schemas.
-             */
-            showAllSchemas(): EventEmitter;
-
-            /**
-             * Drop a single schema.
-             *
-             * @param schema Name of the schema.
-             */
-            dropSchema(schema: string): EventEmitter;
-
-            /**
-             * Drop all schemas.
-             */
-            dropAllSchemas(): EventEmitter;
-
-            /**
-             * Sync all defined DAOs to the DB.
-             *
-             * @param options Options.
-             */
-            sync(options?: SyncOptions): EventEmitter;
-
-            /**
-             * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model.
-             *
-             * @param options The options passed to each call to Model.drop.
-             */
-            drop(options: DropOptions): EventEmitter;
-
-            /**
-             * Test the connection by trying to authenticate. Alias for 'validate'.
-             */
-            authenticate(): EventEmitter;
-
-            /**
-             * Alias for authenticate(). Test the connection by trying to authenticate. Alias for 'validate'.
-             */
-            validate(): EventEmitter;
-
-            /**
-             * !! DEPRECATED : When passing a callback to a transaction a promise chain is expected in return,
-             * the transaction will be committed or rejected based on the promise chain returned to the callback.
-             *
-             * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
-             * for the query to happen under that transaction.
-             *
-             * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
-             *                  argument (overload available for error and transaction arguments too).
-             */
-            transaction(callback: (transaction: Transaction) => boolean): Promise;
-
-            /**
-             * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
-             * for the query to happen under that transaction.
-             *
-             * @param options   Transaction options.
-             * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
-             *                  argument (overload available for error and transaction arguments too).
-             */
-            transaction(options?: TransactionOptions, callback?: (transaction: Transaction) => void): PromiseT<Transaction>;
-
-            close(): void;
-        }
-
-        interface Config {
-            database?: string;
-            username?: string;
-            password?: string;
-            host?: string;
-            port?: number;
-            pool?: PoolOptions;
-            protocol?: string;
-            queue?: boolean;
-            native?: boolean;
-            ssl?: boolean;
-            replication?: ReplicationOptions;
-            dialectModulePath?: string;
-            maxConcurrentQueries?: number;
-            dialectOptions?: any;
-        }
-
-        interface Model<TInstance, TPojo> extends Hooks, Associations {
-            /**
-             * A reference to the sequelize instance.
-             */
-            sequelize: Sequelize;
-
-            /**
-             * The name of the model, typically singular.
-             */
-            name: string;
-
-            /**
-             * The name of the underlying database table, typically plural.
-             */
-            tableName: string;
-
-            options: DefineOptions;
-            attributes: any;
-            rawAttributes: any;
-            modelManager: ModelManager;
-            daoFactoryManager: ModelManager;
-            associations: any;
-            scopeObj: any;
-
-            /**
-             * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the model
-             * instance (this).
-             */
-            sync(options?: SyncOptions): PromiseT<Model<TInstance, TPojo>>;
-
-            /**
-             * Drop the table represented by this Model.
-             *
-             * @param options
-             */
-            drop(options?: DropOptions): Promise;
-
-            /**
-             * Apply a schema to this model. For postgres, this will actually place the schema in front of the table name -
-             * "schema"."tableName", while the schema will be prepended to the table name for mysql and sqlite -
-             * 'schema.tablename'.
-             *
-             * @param schema    The name of the schema.
-             * @param options   Schema options.
-             */
-            schema(schema: string, options?: SchemaOptions): Model<TInstance, TPojo>;
-
-            /**
-             * Get the tablename of the model, taking schema into account. The method will return The name as a string if the
-             * model has no schema, or an object with tableName, schema and delimiter properties.
-             */
-            getTableName(): any;
-
-            /**
-             * Apply a scope created in define to the model.
-             *
-             * @param options The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of
-             *                arguments. To apply simple scopes, pass them as strings. For scope function, pass an object,
-             *                with a method property. The value can either be a string, if the method does not take any
-             *                arguments, or an array, where the first element is the name of the method, and consecutive
-             *                elements are arguments to that method. Pass null to remove all scopes, including the default.
-             */
-            scope(options: any): Model<TInstance, TPojo>;
-
-            /**
-             * Search for multiple instances..
-             *
-             * @param options       A hash of options to describe the scope of the search.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options.
-             */
-            findAll(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<Array<TInstance>>;
-
-            /**
-             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
-             *
-             * @param options       A hash of options to describe the scope of the search.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options
-             */
-            find(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
-             *
-             * @param options       A number to search by id.
-             * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
-             *                      Instances. See sequelize.query for options
-             */
-            find(id?: number, queryOptions?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Run an aggregation method on the specified field.
-             *
-             * @param field                 The field to aggregate over. Can be a field name or *.
-             * @param aggregateFunction     The function to use for aggregation, e.g. sum, max etc.
-             * @param options               Query options, particularly options.dataType.
-             */
-            aggregate<V>(field: string, aggregateFunction: string, options: FindOptions): PromiseT<V>;
-
-            /**
-             * Count the number of records matching the provided where clause.
-             *
-             * @param options Conditions and options for the query.
-             */
-            count(options?: FindOptions): PromiseT<number>;
-
-            /**
-             * Find all the rows matching your query, within a specified offset / limit, and get the total number of rows
-             * matching your query. This is very usefull for paging.
-             *
-             * @param findOptions   Filtering options
-             * @param queryOptions  Query options
-             */
-            findAndCountAll(findOptions?: FindOptions, queryOptions?: QueryOptions): PromiseT<FindAndCountResult<TInstance>>;
-
-            /**
-             * Find the maximum value of field.
-             *
-             * @param field
-             * @param options
-             */
-            max<V>(field: string, options?: FindOptions): PromiseT<V>;
-
-            /**
-             * Find the minimum value of field.
-             *
-             * @param field
-             * @param options
-             */
-            min<V>(field: string, options?: FindOptions): PromiseT<V>;
-
-            /**
-             * Find the sum of field.
-             *
-             * @param field
-             * @param options
-             */
-            sum(field: string, options?: FindOptions): PromiseT<number>;
-
-            /**
-             * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
-             *
-             * @param values    any from which to build entity instance.
-             * @param options   any construction options.
-             */
-            build(values: TPojo, options?: BuildOptions): TInstance;
-
-            /**
-             * Builds a new model instance and calls save on it..
-             *
-             * @param values
-             * @param options
-             */
-            create(values: TPojo, options?: CopyOptions): PromiseT<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build (but don't save) the row if none is found. The successfull result
-             * of the promise will be (instance, initialized) - Make sure to use .spread().
-             *
-             * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax
-             *                  is { attr1: 42 } and NOT { where: { attr1: 42}}. This may be subject to change in 2.0
-             * @param defaults  Default values to use if building a new instance
-             * @param options   Options passed to the find call
-             */
-            findOrInitialize(where: any, defaults?: TPojo, options?: QueryOptions): PromiseT<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build and save the row if none is found The successfull result of the
-             * promise will be (instance, created) - Make sure to use .spread().
-             *
-             * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax is
-             *                  { attr1: 42 } and NOT { where: { attr1: 42}}. This is subject to change in 2.0
-             * @param defaults  Default values to use if creating a new instance
-             * @param options   Options passed to the find and create calls.
-             */
-            findOrCreate(where: any, defaults?: TPojo, options?: FindOrCreateOptions): PromiseT<TInstance>;
-
-            /**
-             * Create and insert multiple instances in bulk.
-             *
-             * @param records   List of objects (key/value pairs) to create instances from.
-             * @param options
-             */
-            bulkCreate(records: Array<TPojo>, options?: BulkCreateOptions): PromiseT<Array<TInstance>>;
-
-            /**
-             * Delete multiple instances.
-             */
-            destroy(where?: any, options?: DestroyOptions): Promise;
-
-            /**
-             * Update multiple instances that match the where options.
-             *
-             * @param attrValueHash A hash of fields to change and their new values
-             * @param where         Options to describe the scope of the search. Note that these options are not wrapped in a
-             *                      { where: ... } is in find / findAll calls etc. This is probably due to change in 2.0.
-             */
-            update(attrValueHash: TPojo, where: any, options?: UpdateOptions): Promise;
-
-            /**
-             * Run a describe query on the table. The result will be return to the listener as a hash of attributes and their
-             * types.
-             */
-            describe(): PromiseT<any>;
-
-            /**
-             *  A proxy to the node-sql query builder, which allows you to build your query through a chain of method calls.
-             *  The returned instance already has all the fields property populated with the field of the model.
-             */
-            dataset(): any;
-        }
-
-        interface Instance<TInstance, TPojo> {
-            /**
-             * Returns true if this instance has not yet been persisted to the database.
-             */
-            isNewRecord: boolean;
-
-            /**
-             * Returns the Model the instance was created from.
-             */
-            Model: Model<TInstance, TPojo>;
-
-            /**
-             * A reference to the sequelize instance.
-             */
-            sequelize: Sequelize;
-
-            /**
-             * If timestamps and paranoid are enabled, returns whether the deletedAt timestamp of this instance is set.
-             * Otherwise, always returns false.
-             */
-            isDeleted: boolean;
-
-            /**
-             * Get the values of this Instance. Proxies to this.get.
-             */
-            values: TPojo;
-
-            /**
-             * A getter for this.changed(). Returns true if any keys have changed.
-             */
-            isDirty: boolean;
-
-            /**
-             *  Get the values of the primary keys of this instance.
-             */
-            primaryKeyValues: TPojo;
-
-            /**
-             * Get the value of the underlying data value.
-             *
-             * @param key   Field to retrieve.
-             */
-            getDataValue(key: string): any;
-
-            /**
-             * Update the underlying data value.
-             *
-             * @param key   Field to set.
-             * @param value Value to set.
-             */
-            setDataValue(key: string, value: any): void;
-
-            /**
-             * Retrieves the value for the key when specified. If no key is given, returns all values of the instance, also
-             * invoking virtual getters.
-             */
-            get(key?: string): any;
-
-            /**
-             * Set is used to update values on the instance (the sequelize representation of the instance that is, remember
-             * that nothing will be persisted before you actually call save).
-             */
-            set(key: string, value: any, options?: SetOptions): void;
-
-            /**
-             * If changed is called with a string it will return a boolean indicating whether the value of that key in
-             * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
-             * return an array of keys that have changed.
-             */
-            changed(key: string): any;
-
-            /**
-               * If changed is called with a string it will return a boolean indicating whether the value of that key in
-               * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
-               * return an array of keys that have changed.
-               */
-            changed(): Array<string>;
-
-            /**
-             * Returns the previous value for key from _previousDataValues.
-             */
-            previous(key: string): any;
-
-            /**
-             * Validate this instance, and if the validation passes, persist it to the database.
-             */
-            save(fields?: Array<string>, options?: SaveOptions): PromiseT<TInstance>;
-
-            /**
-             * Refresh the current instance in-place, i.e. update the object with current data from the DB and return the same
-             * object. This is different from doing a find(Instance.id), because that would create and return a new instance.
-             * With this method, all references to the Instance are updated with the new data and no new objects are created.
-             */
-            reload(options?: FindOptions): PromiseT<TInstance>;
-
-            /**
-             * Validate the attribute of this instance according to validation rules set in the model definition.
-             */
-            validate(options?: ValidateOptions): PromiseT<Error>;
-
-            /**
-             * This is the same as calling setAttributes, then calling save.
-             */
-            updateAttributes(updates: TPojo, options: SaveOptions): PromiseT<TInstance>;
-
-            /**
-             * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will either be
-             * completely deleted, or have its deletedAt timestamp set to the current time.
-             *
-             * @param options   Allows caller to specify if delete should be forced.
-             */
-            destroy(options?: DestroyInstanceOptions): Promise;
-
-            /**
-             * Increment the value of one or more columns. This is done in the database, which means it does not use the
-             * values currently stored on the Instance.
-             *
-             * @param fields    If a string is provided, that column is incremented by the value of by given in options. If an
-             *                  array is provided, the same is true for each column. If and object is provided, each column is
-             *                  incremented by the value given.
-             * @param options   Increment options.
-             */
-            increment(fields: any, options?: IncrementOptions): Promise;
-
-            /**
-             * Decrement the value of one or more columns. This is done in the database, which means it does not use the
-             * values currently stored on the Instance.
-             *
-             * @param fields    If a string is provided, that column is decremented by the value of by given in options. If an
-             *                  array is provided, the same is true for each column. If and object is provided, each column is
-             *                  decremented by the value given.
-             * @param options   Decrement options.
-             */
-            decrement(fields: any, options?: IncrementOptions): Promise;
-
-            /**
-             * Check whether all values of this and other Instance are the same.
-             */
-            equal(other: TInstance): boolean;
-
-            /**
-             * Check if this is eqaul to one of others by calling equals.
-             *
-             * @param others    Other instances to compare to.
-             */
-            equalsOneOf(others: Array<TInstance>): boolean;
-
-            /**
-             * Convert the instance to a JSON representation. Proxies to calling get with no keys. This means get all values
-             * gotten from the DB, and apply all custom getters.
-             */
-            toJSON(): TPojo;
-        }
-
-        interface Transaction extends TransactionStatic {
-            /**
-             * Commit the transaction.
-             */
-            commit(): Transaction;
-
-            /**
-             * Rollback (abort) the transaction.
-             */
-            rollback(): Transaction;
-        }
-
-        interface TransactionStatic {
-            /**
-             * The possible isolation levels to use when starting a transaction
-             */
-            ISOLATION_LEVELS: TransactionIsolationLevels;
-
-            /**
-             * Possible options for row locking. Used in conjuction with find calls.
-             */
-            LOCK: TransactionLocks;
-        }
-
-        interface TransactionIsolationLevels {
-            READ_UNCOMMITTED: string;// "READ UNCOMMITTED"
-            READ_COMMITTED: string;  // "READ COMMITTED"
-            REPEATABLE_READ: string; // "REPEATABLE READ"
-            SERIALIZABLE: string;    // "SERIALIZABLE"
-        }
-
-        interface TransactionLocks {
-            UPDATE: string;  // UPDATE
-            SHARE: string;   // SHARE
-        }
-
-        interface Hooks {
-
-            /**
-             * Add a named hook to the model.
-             *
-             * @param hooktype
-             */
-            addHook(hooktype: string, name: string, fn: (...args: Array<any>) => void): boolean;
-
-            /**
-             * Add a hook to the model.
-             *
-             * @param hooktype
-             */
-            addHook(hooktype: string, fn: (...args: Array<any>) => void): boolean;
-
-            /**
-             * A named hook that is run before validation.
-             */
-            beforeValidate<T>(name: string, validator: (dao: T, callback: (err?: Error) => void) => void): void;
-
-            /**
-             * A hook that is run before validation.
-             */
-            beforeValidate<T>(validator: (dao: T, callback: (err?: Error) => void) => void): void;
-
-            /**
-             * A named hook that is run before validation.
-             */
-            afterValidate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before validation.
-             */
-            afterValidate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before creating a single instance.
-             */
-            beforeCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before creating a single instance.
-             */
-            beforeCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after creating a single instance.
-             */
-            afterCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after creating a single instance.
-             */
-            afterCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before destroying a single instance.
-             */
-            beforeDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before destroying a single instance.
-             */
-            beforeDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after destroying a single instance.
-             */
-            afterDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after destroying a single instance.
-             */
-            afterDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before updating a single instance.
-             */
-            beforeUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before updating a single instance.
-             */
-            beforeUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after updating a single instance.
-             */
-            afterUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after updating a single instance.
-             */
-            afterUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before creating instances in bulk.
-             */
-            beforeBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run before creating instances in bulk.
-             */
-            beforeBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run after creating instances in bulk.
-             */
-            afterBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A hook that is run after creating instances in bulk.
-             */
-            afterBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
-
-            /**
-             * A named hook that is run before destroying instances in bulk.
-             */
-            beforeBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run before destroying instances in bulk.
-             */
-            beforeBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run after destroying instances in bulk.
-             */
-            afterBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run after destroying instances in bulk.
-             */
-            afterBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run before updating instances in bulk.
-             */
-            beforeBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run before updating instances in bulk.
-             */
-            beforeBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A named hook that is run after updating instances in bulk.
-             */
-            afterBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-
-            /**
-             * A hook that is run after updating instances in bulk.
-             */
-            afterBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
-        }
-
-        interface Associations {
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added on the target.
-             *
-             * @param target
-             * @param options
-             */
-            hasOne<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
-
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added on the source.
-             *
-             * @param target
-             * @param options
-             */
-            belongsTo<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
-
-            /**
-             * Creates an association to connect sources with multiple targets. Furthermore the targets can also have connections to multiple sources.
-             *
-             * @param target
-             * @param options
-             */
-            belongsToMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
-
-            /**
-             * Create an association that is either 1:m or n:m.
-             *
-             * @param target
-             * @param options
-             */
-            hasMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
-        }
+declare namespace sequelize {
+    interface SequelizeStaticAndInstance {
 
         /**
-         * Extension of external project that doesn't have definitions.
+         * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you might want
+         * to use Sequelize.Utils._, which is a reference to the lodash library, if you don't already have it imported in
+         * your project.
+         */
+        Utils: Utils;
+
+        /**
+         * A modified version of bluebird promises, that allows listening for sql events.
          *
-         * See https://github.com/chriso/validator.js and https://github.com/sequelize/sequelize/blob/master/lib/instance-validator.js
+         * @see Promise
          */
-        interface Validator {
-
-        }
+        Promise: Promise;
 
         /**
-         * Custom class defined, but no extra methods or functionality even.
+         * Exposes the validator.js object, so you can extend it with custom validation functions. The validator is exposed
+         * both on the instance, and on the constructor.
+         *
+         * @see Validator
          */
-        interface ValidationError extends Error {
-
-        }
-
-        interface QueryChainer {
-            /**
-             * Add an query to the chainer. This can be done in two ways - either by invoking the method like you would
-             * normally, and then adding the returned emitter to the chainer, or by passing the class that you want to call a
-             * method on, the name of the method, and its parameters to the chainer. The second form might sound a bit
-             * cumbersome, but it is used when you want to run queries in serial.
-             *
-             * @param emitterOrKlass
-             * @param method
-             * @param params
-             * @param options
-             */
-            add(emitterOrKlass: any, method?: string, params?: any, options?: any): QueryChainer;
-
-            /**
-             * Run the query chainer. In reality, this means, wait for all the added emitters to finish, since the queries
-             * began executing as soon as you invoked their methods.
-             */
-            run(): EventEmitter;
-
-            /**
-             * Run the chainer serially, so that each query waits for the previous one to finish before it starts.
-             *
-             * @param options @see QueryChainerRunSeriallyOptions
-             */
-            runSerially(options?: QueryChainerRunSeriallyOptions): EventEmitter;
-        }
-
-        interface QueryInterface {
-
-            /**
-             * Returns the dialect-specific sql generator.
-             */
-            QueryGenerator: QueryGenerator;
-
-            /**
-             * Queries the schema (table list).
-             *
-             * @param schema The schema to query. Applies only to Postgres.
-             */
-            createSchema(schema?: string): EventEmitter;
-
-            /**
-             * Drops the specified schema (table).
-             *
-             * @param schema The name of the table to drop.
-             */
-            dropSchema(schema: string): EventEmitter;
-
-            /**
-             * Drops all tables.
-             */
-            dropAllSchemas(): EventEmitter;
-
-            /**
-             * Queries all table names in the database.
-             *
-             * @param options
-             */
-            showAllSchemas(options?: QueryOptions): EventEmitter;
-
-            /**
-             * Creates a table with specified attributes.
-             * @param tableName     Name of table to create
-             * @param attributes    Hash of attributes, key is attribute name, value is data type
-             * @param options       Query options.
-             *
-             * @return The return type will be a Promise when dialect is Postgres and an EventEmitter for MySQL and SQLite.
-             */
-            createTable(tableName: string, attributes: any, options?: QueryOptions): any;
-
-            /**
-             * Drops the specified table.
-             *
-             * @param tableName Table name.
-             * @param options   Query options, particularly "force".
-             */
-            dropTable(tableName: string, options?: QueryOptions): EventEmitter;
-            dropAllTables(options?: QueryOptions): EventEmitter;
-            dropAllEnums(options?: QueryOptions): EventEmitter;
-            renameTable(before: string, after: string): EventEmitter;
-            showAllTables(options?: QueryOptions): EventEmitter;
-            describeTable(tableName: string, options?: QueryOptions): EventEmitter;
-            addColumn(tableName: string, attributeName: any, dataTypeOrOptions?: any): EventEmitter;
-            removeColumn(tableName: string, attributeName: string): EventEmitter;
-            changeColumn(tableName: string, attributeName: string, dataTypeOrOptions: any): EventEmitter;
-            renameColumn(tableName: string, attrNameBefore: string, attrNameAfter: string): EventEmitter;
-            addIndex(tableName: string, attributes: Array<any>, options?: QueryOptions): EventEmitter;
-            showIndex(tableName: string, options?: QueryOptions): EventEmitter;
-            getForeignKeysForTables(tableNames: Array<string>): EventEmitter;
-            removeIndex(tableName: string, attributes: Array<string>): EventEmitter;
-            removeIndex(tableName: string, indexName: string): EventEmitter;
-            insert<TModel>(dao: TModel, tableName: string, values: any, options?: QueryOptions): EventEmitter;
-            /**
-             * Inserts several records into the specified table.
-             * @param tableName     Table to insert into.
-             * @param records       Array of key/value pairs to insert as records.
-             * @param options       Query options
-             * @param attributes    For Postgres only, used to identify if an attribute is auto-increment and thus handled specially.
-             */
-            bulkInsert(tableName: string, records: Array<any>, options?: QueryOptions, attributes?: any): EventEmitter;
-
-            update<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
-            bulkUpdate(tableName: string, values: Array<any>, where: any, options?: QueryOptions, attributes?: any): EventEmitter;
-            delete<TModel>(dao: TModel, tableName: string, where: any, options?: QueryOptions): EventEmitter;
-            bulkDelete(tableName: string, where: any, options?: QueryOptions): EventEmitter;
-            bulkDelete<TModel>(tableName: string, where: any, options: QueryOptions, model: TModel): EventEmitter;
-            select<TModel>(factory: TModel, tableName: string, scope?: any, queryOptions?: QueryOptions): EventEmitter;
-            increment<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
-            rawSelect<TModel>(tableName: string, options: QueryOptions, attributeSelector: string, model: TModel): EventEmitter;
-            /**
-             * Postgres only. Creates a trigger on specified table to call the specified function with supplied parameters.
-             *
-             * @param tableName
-             * @param triggerName
-             * @param timingType
-             * @param fireOnArray
-             * @param functionName
-             * @param functionParams
-             * @param optionsArray
-             */
-            createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: Array<any>, functionName: string, functionParams: Array<any>, optionsArray: Array<string>): EventEmitter;
-            /**
-             * Postgres only. Drops the specified trigger.
-             *
-             * @param tableName
-             * @param triggerName
-             */
-            dropTrigger(tableName: string, triggerName: string): EventEmitter;
-            renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): EventEmitter;
-            createFunction(functionName: string, params: Array<any>, returnType: string, language: string, body: string, options?: QueryOptions): EventEmitter;
-            dropFunction(functionName: string, params: Array<any>): EventEmitter;
-            renameFunction(oldFunctionName: string, params: Array<any>, newFunctionName: string): EventEmitter;
-            /**
-             * Escape an identifier (e.g. a table or attribute name). If force is true,
-             * the identifier will be quoted even if the `quoteIdentifiers` option is
-             * false.
-             */
-            quoteIdentifier(identifier: string, force: boolean): EventEmitter;
-            quoteTable(tableName: string): EventEmitter;
-            quoteIdentifiers(identifiers: string, force: boolean): EventEmitter;
-            escape(value: string): EventEmitter;
-            setAutocommit(transaction: Transaction, value: boolean): EventEmitter;
-            setIsolationLevel(transaction: Transaction, value: string): EventEmitter;
-            startTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
-            commitTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
-            rollbackTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
-        }
-
-        interface QueryGenerator {
-            createSchema(schemaName: string): string;
-            dropSchema(schemaName: string): string;
-            showSchemasQuery(): string;
-            addSchema<TInstance, TPojo>(param: Model<TInstance, TPojo>): Schema;
-            createTableQuery(tableName: string, attributes: Array<any>, options?: CreateTableQueryOptions): string;
-            describeTableQuery(tableName: string, schema: string, schemaDelimiter: string): string;
-            dropTableQuery(tableName: string, options?: { cascade: string }): string;
-            renameTableQuery(before: string, after: string): string;
-            showTablesQuery(): string;
-            addColumnQuery(tableName: string, attributes: any): string;
-            removeColumnQuery(tableName: string, attributeName: string): string;
-            changeColumnQuery(tableName: string, attributes: any): string;
-            renameColumnQuery(tableName: string, attrNameBefore: string, attrNameAfter: string): string;
-            insertQuery(table: string, valueHash: any, modelAttributes: any): string;
-            bulkInsertQuery(tableName: string, attrValueHashes: any): string;
-            updateQuery(tableName: string, attrValueHash: any, where: any, options: InsertOptions, attributes: any): string;
-            deleteQuery(tableName: string, where: any, options: DestroyOptions): string;
-            deleteQuery<TInstance, TPojo>(tableName: string, where: any, options: DestroyOptions, model: Model<TInstance, TPojo>): string;
-            /**
-             * Creates a query to increment a value. Note "options" here is an additional hash of values to update.
-             *
-             * @param tableName
-             * @param attrValueHash
-             * @param where
-             * @param options
-             */
-            incrementQuery(tableName: string, attrValueHash: any, where: any, options?: any): string;
-            addIndexQuery(tableName: string, attributes: Array<any>, options?: IndexOptions): string;
-            /**
-             * Return indices for a table. Not options may be passed but is not used, so can be anything.
-             * @param tableName
-             * @param options
-             */
-            showIndexQuery(tableName: string, options?: any): string; // options is actually not used
-            removeIndexQuery(tableName: string, indexNameOrAttributes: string): string;
-            removeIndexQuery(tableName: string, indexNameOrAttributes: Array<string>): string;
-            attributesToSQL(attributes: Array<any>): string;
-            findAutoIncrementField<TInstance, TPojo>(factory: Model<TInstance, TPojo>): Array<string>;
-            quoteTable(param: any, as: boolean): string;
-            quote(obj: any, parent: any, force: boolean): string;
-            createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: TriggerOptions, functionName: string, functionParams: Array<TriggerParam>): string;
-            dropTrigger(tableName: string, triggerName: string): string;
-            renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): string;
-            createFunction(functionName: string, params: Array<TriggerParam>, returnType: string, language: string, body: string, options?: Array<string>): string;
-            dropFunction(functionName: string, params: Array<TriggerParam>): string;
-            renameFunction(oldFunctionName: string, params: Array<TriggerParam>, newFunctionName: string): string;
-            quoteIdentifier(identifier: string, force?: boolean): string;
-            quoteIdentifiers(identifiers: string, force?: boolean): string;
-            /**
-             * Not documented, and reading through the code, I'm not sure what all the options available are for value/field.
-             *
-             * @param value
-             * @param field
-             */
-            escape(value: any, field: any): string;
-            getForeignKeysQuery(tableName: string, schemaName: string): string;
-            dropForeignKeyQuery(tableName: string, foreignKey: string): string;
-            selectQuery<TInstance, TPojo>(tableName: string, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            selectQuery<TInstance, TPojo>(tableName: Array<string>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            selectQuery<TInstance, TPojo>(tableName: Array<Array<string>>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
-            setAutocommitQuery(value: boolean): string;
-            setIsolationLevelQuery(value: string): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            startTransactionQuery(options?: any): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            commitTransactionQuery(options?: any): string;
-            /**
-             * Returns start transaction query. Options is not used.
-             * @param options
-             */
-            rollbackTransactionQuery(options?: any): string;
-            addLimitAndOffset(options: SelectOptions, query?: string): string;
-            getWhereConditions<TInstance, TPojo>(smth: any, tableName: string, factory: Model<TInstance, TPojo>, options?: any, prepend?: boolean): string;
-            prependTableNameToHash(tableName: string, hash?: any): string;
-            findAssociation<TInstance, TPojo>(attribute: string, dao: Model<TInstance, TPojo>): string;
-            getAssociationFilterDAO<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>): string;
-            isAssociationFilter<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: any): string;
-            getAssociationFilterColumn<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: { include: boolean }): string;
-            getConditionalJoins<TInstance, TPojo>(options: { where?: any }, originalDao: Model<TInstance, TPojo>): string;
-            arrayValue(value: Array<string>, key: string, _key: string, factory?: any, logicResult?: any): string;
-            hashToWhereConditions<TInstance, TPojo>(hash: any, dao: Model<TInstance, TPojo>, options?: HashToWhereConditionsOption): string;
-            booleanValue(value: boolean): string;
-        }
-
-        interface Schema {
-            tableName: string;
-            table: string;
-            name: string;
-            schema: string;
-            delimiter: string;
-        }
-
-        interface QueryTypes {
-            SELECT: string;
-            BULKUPDATE: string;
-            BULKDELETE: string;
-        }
-
-        interface ModelManager {
-            daos: Array<Model<any, any>>;
-            sequelize: Sequelize;
-            addDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): Model<TInstance, TPojo>;
-            removeDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): void;
-            getDAO<TInstance, TPojo>(daoName: string, options?: ModelMangerGetDaoOptions): Model<TInstance, TPojo>;
-            all: Array<Model<any, any>>;
-
-            /**
-             * Iterate over DAOs in an order suitable for e.g. creating tables. Will
-             * take foreign key constraints into account so that dependencies are visited
-             * before dependents.
-             */
-            forEachDAO(iterator: (dao: Model<any, any>, name: string) => void, options?: ModelManagerForEachDaoOptions): void;
-        }
-
-        interface TransactionManager {
-            sequelize: Sequelize;
-            connectorManagers: any;
-            getConnectorManager(uuid?: string): ConnectorManager;
-            releaseConnectionManager(uuid?: string): void;
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
-
-            query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitter;
-        }
-
-        interface ConnectorManager {
-
-            /**
-             * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
-             *
-             * @param sql           SQL statement to execute.
-             *
-             * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
-             *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
-             *
-             * @param options       Query options.
-             *
-             */
-            query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
-
-            afterTransactionSetup(callback: () => void): void;
-            connect(): void;
-            disconnect(): void;
-            reconnect(): void;
-            cleanup(): void;
-        }
-
-        interface Migrator {
-            queryInterface: QueryInterface;
-            migrate(options?: MigratorOptions): EventEmitter;
-            getUndoneMigrations(callback: (err: Error, result: Array<Migrator>) => void): void;
-            findOrCreateMetaDAO(syncOptions?: SyncOptions): EventEmitter;
-            exec(filename: string, options?: MigratorExecOptions): EventEmitter;
-            getLastMigrationFromDatabase(): EventEmitter;
-            getLastMigrationIdFromDatabase(): EventEmitter;
-            getFormattedDateString(s: string): string;
-            stringToDate(s: string): Date;
-            saveSuccessfulMigration(from: Migration, to: Migration, callback: (metaData: MetaInstance) => void): void;
-            deleteUndoneMigration(from: Migration, to: Migration, callback: () => void): void;
-            execute(options?: MigrationExecuteOptions): EventEmitter;
-            isBefore(date: Date, options?: MigrationCompareOptions): boolean;
-            isAfter(date: Date, options?: MigrationCompareOptions): boolean;
-
-        }
-
-        interface Migration extends QueryInterface {
-            migrator: Migrator;
-            path: string;
-            filename: string;
-            migrationId: number;
-            date: Date;
-            queryInterface: QueryInterface;
-            migration: (err: Error, migration: Migration, dataTypes: any, callback: (err: Error) => void) => void;
-
-        }
-
-        interface EventEmitter extends EventEmitterT<any>, NodeJS.EventEmitter { }
-
-        interface EventEmitterT<R> extends NodeJS.EventEmitter {
-            /**
-             * Create a new emitter instance.
-             *
-             * @param handler
-             */
-            new (handler: (emitter: EventEmitterT<R>) => void): EventEmitterT<R>;
-
-            /**
-             * Run the function that was passed when the emitter was instantiated.
-             */
-            run(): EventEmitterT<R>;
-
-            /**
-             * Listen for success events.
-             *
-             * @param onSuccess
-             */
-            success(onSuccess: (result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for success(handler). Listen for success events.
-             *
-             * @param onSuccess
-             */
-            ok(onSuccess: (result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Listen for error events.
-             *
-             * @param onError
-             */
-            error(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError
-             */
-            fail(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError
-             */
-            failure(onError: (err: Error) => void): EventEmitterT<R>;
-
-            /**
-             * Listen for both success and error events.
-             *
-             * @param onDone
-             */
-            done(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events.
-             *
-             * @param onDone
-             */
-            complete(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
-             *
-             * @param onSQL
-             */
-            sql(onSQL: (sql: string) => void): EventEmitterT<R>;
-
-            /**
-             * Proxy every event of this event emitter to another one.
-             *
-             * @param emitter   The event emitter that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
-             */
-            proxy(emitter: EventEmitterT<R>, options?: ProxyOptions): EventEmitterT<R>;
-
-
-        }
-
-        interface Options {
-            /**
-             * The dialect you of the database you are connecting to. One of mysql, postgres, sqlite and mariadb.
-             * Default is mysql.
-             */
-            dialect?: string;
-
-            /**
-             * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of pg when
-             * connecting to a pg database, you should specify 'pg.js' here
-             */
-            dialectModulePath?: string;
-
-            /**
-             * The dialect options that are passed to the underlying dialect library.
-             */
-            dialectOptions?: Object;
-
-            /**
-             * The host of the relational database. Default 'localhost'.
-             */
-            host?: string;
-
-            /**
-             * Integer    The port of the relational database.
-             */
-            port?: number;
-
-            /**
-             * The protocol of the relational database. Default 'tcp'.
-             */
-            protocol?: string;
-
-            /**
-             * Default options for model definitions. See sequelize.define for options.
-             */
-            define?: DefineOptions;
-
-            /**
-             * Default options for sequelize.query
-             */
-            query?: QueryOptions;
-
-            /**
-             * Default options for sequelize.sync
-             */
-            sync?: SyncOptions;
-
-            /**
-             * The timezone used when converting a date from the database into a javascript date. The timezone is also used to
-             * SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time
-             * related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM.
-             * Default '+00:00'.
-             */
-            timezone?: string;
-
-            /**
-             * Logging options. Function used to log. Default is console.log. Signature is (message:string) => void.
-             *
-             * Set to "false" to disable logging.
-             */
-            logging?: any;
-
-            /**                                                                                                                                                                                                                        logging=console.log]    Function    A function that gets executed everytime Sequelize would log something.
-             * A flag that defines if null values should be passed to SQL queries or not.
-             */
-            omitNull?: boolean;
-
-            /**
-             * Boolean    Queue queries, so that only maxConcurrentQueries number of queries are executing at once. If false, all
-             * queries will be executed immediately.
-             */
-            queue?: boolean;
-
-            /**
-             * The maximum number of queries that should be executed at once if queue is true.
-             */
-            maxConcurrentQueries?: number;
-
-            /**
-             * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
-             */
-            native?: boolean;
-
-            /**
-             * Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write
-             * should be an object (a single server for handling writes), and read an array of object (several servers to
-             * handle reads). Each read/write server can have the following properties?: host, port, username, password, database
-             */
-            replication?: ReplicationOptions;
-
-            /**
-             * Connection pool options.
-             *
-             */
-            pool?: PoolOptions;
-
-            /**
-             * Set to false to make table names and attributes case-insensitive on Postgres and skip double quoting of them.
-             * Default true.
-             */
-            quoteIdentifiers?: boolean;
-
-            /**
-             * Language. Default "en".
-             */
-            language?: string;
-        }
-
-        interface PoolOptions {
-            maxConnections?: number;
-
-            minConnections?: number;
-
-            /**
-             * The maximum time, in milliseconds, that a connection can be idle before being released.
-             */
-            maxIdleTime?: number;
-
-            /**
-             * A function that validates a connection. Called with client. The default function checks that client is an
-             * object, and that its state is not disconnected.
-             *
-             * Note, this is not documented, and after reading code I'm not sure what client's type is.
-             */
-            validateConnection?: (client?: any) => boolean;
-        }
-
-        interface AttributeOptions {
-            /**
-             * A string or a data type
-             */
-            type?: string;
-
-            /**
-             * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an instance
-             * is saved.
-             */
-            allowNull?: boolean;
-
-            /**
-             * A literal default value, a javascript function, or an SQL function (see sequelize.fn)
-             */
-            defaultValue?: any;
-
-            /**
-             * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
-             * composite unique index. If multiple columns have the same string, they will be part of the same unique index.
-             */
-            unique?: any;
-
-            primaryKey?: boolean;
-
-            /**
-             * If set, sequelize will map the attribute name to a different name in the database.
-             */
-            field?: string;
-
-            autoIncrement?: boolean;
-
-            comment?: string;
-
-            /**
-             * If this column references another table, provide it here as a Model, or a string.
-             */
-            references?: any;
-
-            /**
-             * The column of the foreign table that this column references. Default 'id'.
-             */
-            referencesKey?: string;
-
-            /**
-             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION.
-             */
-            onUpdate?: string;
-
-            /**
-             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION.
-             */
-            onDelete?: string;
-
-            /**
-             * Provide a custom getter for this column. Use this.getDataValue(String) to manipulate the underlying values.
-             */
-            get?: () => any;
-
-            /**
-             * Provide a custom setter for this column. Use this.setDataValue(String, Value) to manipulate the underlying values.
-             */
-            set?: (value?: any) => void;
-
-            /**
-             * An object of validations to execute for this column every time the model is saved. Can be either the name of a
-             * validation provided by validator.js, a validation function provided by extending validator.js (see the
-             * DAOValidator property for more details), or a custom validation function. Custom validation functions are called
-             * with the value of the field, and can possibly take a second callback argument, to signal that they are
-             * asynchronous. If the validator is sync, it should throw in the case of a failed validation, it it is async,
-             * the callback should be called with the error text.
-             */
-            validate?: any;
-        }
-
-        interface ForeignKeyAttributeOptions extends AttributeOptions {
-            /**
-             * The name of the foreign key in the target table. Defaults to the name of source + primary key of source.
-             */
-            fieldName: string;
-        }
-
-        interface DefineOptions {
-            /**
-             * Define the default search scope to use for this model. Scopes have the same form as the options passed to
-             * find / findAll.
-             */
-            defaultScope?: FindOptions;
-
-            /**
-             * More scopes, defined in the same way as defaultScope above. See Model.scope for more information about how
-             * scopes are defined, and what you can do with them
-             */
-            scopes?: any;
-
-            /**
-             * Don't persits null values. This means that all columns with null values will not be saved.
-             */
-            omitNull?: boolean;
-
-            /**
-             * Adds createdAt and updatedAt timestamps to the model. Default true.
-             */
-            timestamps?: boolean;
-
-            /**
-             * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
-             * timestamps=true to work. Default false.
-             */
-            paranoid?: boolean;
-
-            /**
-             * Converts all camelCased columns to underscored if true. Default false.
-             */
-            underscored?: boolean;
-
-            /**
-             * Converts camelCased model names to underscored tablenames if true. Default false.
-             */
-            underscoredAll?: boolean;
-
-            /**
-             * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name. Otherwise, the
-             * dao name will be pluralized. Default false.
-             */
-            freezeTableName?: boolean;
-
-            /**
-             * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps must be true.
-             */
-            createdAt?: any;
-
-            /**
-             * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps must be true.
-             */
-            updatedAt?: any;
-
-            /**
-             * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps must be true.
-             */
-            deletedAt?: any;
-
-            /**
-             * Defaults to pluralized DAO name, unless freezeTableName is true, in which case it uses DAO name verbatim.
-             */
-            tableName?: string;
-
-            /**
-             * Provide getter functions that work like those defined per column. If you provide a getter method with the same
-             * name as a column, it will be used to access the value of that column. If you provide a name that does not match
-             * a column, this function will act as a virtual getter, that can fetch multiple other values.
-             */
-            getterMethods?: any;
-
-            /**
-             * Provide setter functions that work like those defined per column. If you provide a setter method with the same
-             * name as a column, it will be used to update the value of that column. If you provide a name that does not match
-             * a column, this function will act as a virtual setter, that can act on and set other values, but will not be
-             * persisted
-             */
-            setterMethods?: any;
-
-            /**
-             * Provide functions that are added to each instance (DAO).
-             */
-            instanceMethods?: any;
-
-            /**
-             * Provide functions that are added to the model (Model).
-             */
-            classMethods?: any;
-
-            /**
-             * Default 'public'.
-             */
-            schema?: string;
-            schemaDelimiter?: string;
-            engine?: string;
-            charset?: string;
-            comment?: string;
-            collate?: string;
-            whereCollection?: any;
-            language?: string;
-
-            /**
-             * An object of hook function that are called before and after certain lifecycle events. The possible hooks are?:
-             * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
-             * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestory and
-             * afterBulkUpdate. See Hooks for more information about hook functions and their signatures. Each property can
-             * either be a function, or an array of functions.
-             */
-            hooks?: Hooks;
-
-            /**
-             * An object of model wide validations. Validations have access to all model values via this. If the validator
-             * function takes an argument, it is assumed to be async, and is called with a callback that accepts an optional
-             * error.
-             */
-            validate?: any;
-
-            /**
-             *
-             */
-            indexes?: Array<DefineIndexOptions>;
-        }
-
-        interface DefineIndexOptions {
-            /**
-             * The name of the index. Defaults to model name + _ + fields concatenated.
-             */
-            name?: string;
-
-            /**
-             * Index type. Only used by mysql. One of UNIQUE, FULLTEXT and SPATIAL.
-             */
-            type: string;
-
-            /**
-             * The method to create the index by (USING statement in SQL). BTREE and HASH are supported by mysql and postgres,
-             * and postgres additionally supports GIST and GIN.
-             */
-            method: string;
-
-            /**
-             * Should the index by unique? Can also be triggered by setting type to UNIQUE. Default false (unless type = "UNIQUE",
-             * then true).
-             */
-            unique?: boolean;
-
-            /**
-             * PostgreSQL will build the index without taking any write locks. Postgres only. Default false.
-             */
-            concurrently?: boolean;
-
-            /**
-             * An array of the fields to index. Each field can either be a string containing the name of the field, or an object
-             * with the following attributes: attribute (field name), length (create a prefix index of length chars), order (the
-             * direction the column should be sorted in), collate (the collation (sort order) for the column)
-             */
-            fields: Array<any>;
-        }
-
-        interface QueryOptions {
-            /**
-             * If true, sequelize will not try to format the results of the query, or build an instance of a model from the
-             * result.
-             */
-            raw?: boolean;
-
-            /**
-             * The transaction that the query should be executed under.
-             */
-            transaction?: Transaction;
-
-            /**
-             * The type of query you are executing. The query type affects how results are formatted before they are passed
-             * back. If no type is provided sequelize will try to guess the right type based on the sql, and fall back to
-             * SELECT. The type is a string, but Sequelize.QueryTypes is provided is convenience shortcuts. Current options
-             * are SELECT, BULKUPDATE and BULKDELETE.
-             *
-             * Default is SELECT.
-             */
-            type?: string;
-
-            /**
-             * Lock the selected rows in either share or update mode. Possible options are transaction.LOCK.UPDATE and
-             * transaction.LOCK.SHARE. See transaction.LOCK for an example.
-             */
-            lock?: string;
-
-            /**
-             * For aggregate function calls, the type of the result. If field is a field in this Model, the default will be the
-             * type of that field, otherwise defaults to float.
-             */
-            dataType?: any;
-
-            /**
-             * A function that logs sql queries, or false for no logging.
-             */
-            logging?: any;
-
-            /**
-             * If plain is true, then sequelize will only return the first record of the result set. In case of false it will
-             * all records.
-             */
-            plain?: boolean;
-        }
-
-        interface SyncOptions {
-            /**
-             * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table.
-             * Default false.
-             */
-            force?: boolean;
-
-            /**
-             * A function that logs sql queries, or false for no logging.
-             */
-            logging?: any;
-
-            /**
-             * The schema that the tables should be created in. This can be overriden for each table in sequelize.define.
-             * Default 'public'.
-             */
-            schema?: string;
-        }
-
-        interface ReplicationOptions {
-            read?: Array<Server>;
-            write?: Server;
-        }
-
-        interface Server {
-            host?: string;
-            port?: number;
-            database?: string;
-            username?: string;
-            password?: string;
-        }
-
-        interface DropOptions {
-            /**
-             * Also drop all objects depending on this table, such as views. Only works in postgres.
-             *
-             * Default false.
-             */
-            cascade?: boolean;
-        }
-
-        interface SchemaOptions {
-            /**
-             * The character(s) that separates the schema name from the table name. Default '.'.
-             */
-            schemaDelimiter?: string;
-        }
-
-        interface FindOptions {
-            /**
-             * A hash of attributes to describe your search.
-             */
-            where?: any;
-
-            /**
-             * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with two
-             * elements - the first is the name of the attribute in the DB (or some kind of expression such as
-             * Sequelize.literal, Sequelize.fn and so on), and the second is the name you want the attribute to have in the
-             * returned instance
-             */
-            attributes?: Array<any>;
-
-            /**
-             * A list of associations to eagerly load. Supported is either { include?: [ Model1, Model2, ...] } or { include?:
-             * [ { model?: Model1, as?: 'Alias' } ] }. If your association are set up with an as (eg. X.hasMany(Y, { as?: 'Z },
-             * you need to specify Z in the as attribute when eager loading Y). When using the object form, you can also
-             * specify attributes to specify what columns to load, where to limit the relations, and include to load further
-             * nested relations
-             */
-            include?: any;
-
-            /**
-             * Specifies an ordering. If a string is provided, it will be esacped. Using an array, you can provide several
-             * columns / functions to order by. Each element can be further wrapped in a two-element array. The first element
-             * is the column / function to order by, the second is the direction. For example?: order?: [['name', 'DESC']]. In
-             * this way the column will be escaped, but the direction will not.
-             */
-            order?: any;
-
-            limit?: number;
-
-            offset?: number;
-        }
-
-        interface BuildOptions {
-            /**
-             * If set to true, values will ignore field and virtual setters. Default false.
-             */
-            raw?: boolean;
-
-            /**
-             * Default true.
-             */
-            isNewRecord?: boolean;
-
-            /**
-             * Default true.
-             */
-            isDirty?: boolean;
-
-            /**
-             * an array of include options - Used to build prefetched/included model instances. See set.
-             */
-            include?: Array<any>;
-        }
-
-        interface CopyOptions extends BuildOptions {
-            /**
-             * If set, only columns matching those in fields will be saved.
-             */
-            fields?: Array<string>;
-
-            /**
-             *
-             */
-            transaction?: Transaction;
-        }
-
-        interface FindOrCreateOptions extends FindOptions, QueryOptions {
-
-        }
-
-        interface BulkCreateOptions {
-            /**
-             * Fields to insert (defaults to all fields).
-             */
-            fields?: Array<string>;
-
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
-             * validation. Default false.
-             */
-            validate?: boolean;
-
-            /**
-             * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run. Default false;
-             */
-            hooks?: boolean;
-
-            /**
-             * Ignore duplicate values for primary keys? (not supported by postgres). Default false.
-             */
-            ignoreDuplicates?: boolean;
-        }
-
-        interface DestroyOptions {
-            /**
-             * If set to true, destroy will find all records within the where parameter and will execute before-/ after
-             * bulkDestroy hooks on each row.
-             */
-            hooks?: boolean;
-
-            /**
-             * How many rows to delete
-             */
-            limit?: number;
-
-            /**
-             * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is truncated the
-             * where and limit options are ignored.
-             */
-            truncate?: boolean;
-        }
-
-        interface DestroyInstanceOptions {
-            /**
-             * If set to true, paranoid models will actually be deleted.
-             */
-            force: boolean;
-        }
-
-        interface InsertOptions {
-            limit?: number;
-            returning?: string;
-            allowNull?: string;
-        }
-
-        interface UpdateOptions {
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
-             * validation. Default true.
-             */
-            validate?: boolean;
-
-            /**
-             * Run before / after bulkUpdate hooks? Default false.
-             */
-            hooks?: boolean;
-
-            /**
-             * How many rows to update (only for mysql and mariadb).
-             */
-            limit?: number;
-        }
-
-        interface SetOptions {
-            /**
-             * If set to true, field and virtual setters will be ignored. Default false.
-             */
-            raw?: boolean;
-
-            /**
-             * Clear all previously set data values. Default false.
-             */
-            reset?: boolean;
-
-            include?: any;
-        }
-
-        interface SaveOptions {
-            /**
-             * An alternative way of setting which fields should be persisted.
-             */
-            fields?: any;
-
-            /**
-             * If true, the updatedAt timestamp will not be updated. Default false.
-             */
-            silent?: boolean;
-
-            transaction?: Transaction;
-        }
-
-        interface ValidateOptions {
-            /**
-             * An array of strings. All properties that are in this array will not be validated.
-             */
-            skip: Array<string>;
-        }
-
-        interface IncrementOptions {
-            /**
-             * The number to increment by. Default 1.
-             */
-            by?: number;
-
-            transaction?: Transaction;
-        }
-
-        interface IndexOptions {
-            indicesType?: string;
-            indexType?: string;
-            indexName?: string;
-            parser?: any;
-        }
-
-        interface ProxyOptions {
-            /**
-             * An array of the events to proxy. Defaults to sql, error and success.
-             */
-            events: Array<string>;
-        }
-
-        interface AssociationOptions {
-            /**
-             * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade. For
-             * example if User.hasOne(Profile, {onDelete: 'cascade', hooks:true}), the before-/afterDestroy hooks for profile
-             * will be called when a user is deleted. Otherwise the profile will be deleted without invoking any hooks.
-             * Default false.
-             */
-            hooks?: boolean;
-
-            /**
-             * The name of the table that is used to join source and target in n:m associations. Can also be a sequelize model
-             * if you want to define the junction table yourself and add extra attributes to it.
-             */
-            through?: any;
-
-            /**
-             * The alias of this model. If you create multiple associations between the same tables, you should provide an
-             * alias to be able to distinguish between them. If you provide an alias when creating the assocition, you should
-             * provide the same alias when eager loading and when getting assocated models. Defaults to the singularized
-             * version of target.name
-             */
-            as?: string;
-
-            /**
-             * The foreignKey can be either a string name of the foreign key in the target table,
-             * or can be an object defining the foreign key and its options. Note foreignKey is not fully
-             * typed since TypeScript does not support union types--it can be either a string or an
-             * options object. String name defaults to the name of source + primary key of source.
-             *
-             * @see ForeignKeyAttributeOptions.
-             */
-            foreignKey?: any;
-
-            /**
-             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION. Default SET NULL.
-             */
-            onDelete?: string;
-
-            /**
-             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION. Default CASCADE.
-             */
-            onUpdate?: string;
-
-            /**
-             * Should on update and on delete constraints be enabled on the foreign key.
-             */
-            constraints?: boolean;
-        }
-
-        interface TriggerOptions {
-            insert?: Array<string>;
-            update?: Array<string>;
-            delete?: Array<string>;
-            truncate?: Array<string>;
-        }
-
-        interface TriggerParam {
-            type: string;
-            direction?: string;
-            name?: string;
-        }
-
-        interface SelectOptions {
-            limit?: number;
-            offset?: number;
-            attributes?: Array<any>;
-            hasIncludeWhere?: boolean;
-            hasIncludeRequired?: boolean;
-            hasMultiAssociation?: boolean;
-            tableAs?: string;
-            table?: string;
-            include?: Array<any>;
-            includeIgnoreAttributes?: boolean;
-            where?: any;
-            /**
-             * String field name or array of strings of field names.
-             */
-            group?: any;
-            having?: any;
-            order?: any;
-            lock?: string;
-        }
-
-        interface HashToWhereConditionsOption {
-            include?: boolean;
-            keysEscaped?: boolean;
-        }
-
-        interface ModelMangerGetDaoOptions {
-            attribute: string;
-        }
-
-        interface ModelManagerForEachDaoOptions {
-            /**
-             * Default true.
-             */
-            reverse: boolean;
-        }
-
-        interface MigratorOptions {
-            /**
-             * A flag that defines if the migrator should get instantiated or not..
-             */
-            force: boolean;
-        }
-
-        interface FindAndCountResult<T> {
-            /**
-             * The matching model instances.
-             */
-            rows?: Array<T>;
-
-            /**
-             * The total number of rows. This may be more than the rows returned if a limit and/or offset was supplied.
-             */
-            count?: number;
-        }
-
-        interface Col {
-            /**
-             * Column name.
-             */
-            col: string;
-        }
-
-        interface Cast {
-            /**
-             * The value to cast.
-             */
-            val: any;
-
-            /**
-             * The type to cast it to.
-             */
-            type: string;
-        }
-
-        interface Literal {
-            val: any;
-        }
-
-        interface And {
-            /**
-             * Each argument (string or object) will be joined by AND.
-             */
-            args: Array<any>;
-        }
-
-        interface Or {
-            /**
-             * Each argument (string or object) will be joined by OR.
-             */
-            args: Array<any>;
-        }
-
-        interface Where {
-            /**
-             * The attribute.
-             */
-            attribute: string;
-
-            /**
-             * The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.).
-             */
-            logic: any;
-        }
-
-        interface TransactionOptions {
-            /**
-             *
-             */
-            autocommit?: boolean;
-
-            /**
-             * One of: 'READ UNCOMMITTED', 'READ COMMITTED', 'REPEATABLE READ', 'SERIALIZABLE'. Default 'REPEATABLE READ'.
-             */
-            isolationLevel?: string;
-        }
-
-        interface QueryChainerRunSeriallyOptions {
-            /**
-             * If set to true, all pending emitters will be skipped if a previous emitter failed. Default false.
-             */
-            skipOnError: boolean;
-        }
-
-        interface CreateTableQueryOptions {
-            comment?: string;
-            uniqueKeys?: Array<any>;
-            charset?: string;
-        }
-
-        interface MigratorExecOptions {
-            before?: (migrator: Migrator) => void;
-            after?: (migrator: Migrator) => void;
-            success?: (migrator: Migrator) => void;
-        }
-
-        interface MigrationExecuteOptions {
-            method: string;
-        }
-
-        interface MigrationCompareOptions {
-            /**
-             * Default false.
-             */
-            withoutEquals: boolean;
-        }
-
-        interface Promise {
-            /**
-             * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
-             *
-             * @param evt Event
-             * @param fct Handler
-             */
-            on(evt: string, fct: () => void): void;
-
-            /**
-             * Emit an event from the emitter.
-             *
-             * @param type  The type of event.
-             * @param value All other arguments will be passed to the event listeners.
-             */
-            emit(type: string, ...value: Array<any>): void;
-
-            /**
-             * Listen for success events.
-             */
-            success(onSuccess: () => void): Promise;
-
-            /**
-             * Alias for success(handler). Listen for success events.
-             */
-            ok(onSuccess: () => void): Promise;
-
-            /**
-             * Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            error(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            fail(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Alias for error(handler). Listen for error events.
-             *
-             * @param onError Error handler.
-             */
-            failure(onError: (err?: Error) => void): Promise;
-
-            /**
-             * Listen for both success and error events..
-             */
-            done(handler: (err: Error, result?: any) => void): Promise;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events..
-             */
-            complete(handler: (err: Error, result?: any) => void): Promise;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
-             *
-             * @param onSQL
-             */
-            sql(onSQL: (sql: string) => void): Promise;
-
-            /**
-             * Proxy every event of this promise to another one.
-             *
-             * @param promise   The promise that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
-             */
-            proxy(promise: Promise, options?: ProxyOptions): Promise;
-
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: any) => Promise, onRejected?: (result?: any) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => void): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R1, R2>(onFulfilled?: (result?: any) => PromiseT<R1>, onRejected?: (result?: any) => PromiseT<R2>): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => void): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
-             * as opposed to then which will only recieve the first argument.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             * @param onRejected
-             */
-            spread<R1, R2>(onFulfilled?: (...results: Array<any>) => PromiseT<R1>, onRejected?: (...results: Array<any>) => PromiseT<R2>): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: any) => Promise): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch<R>(onRejected: (result?: any) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: any) => void): Promise;
-        }
-
-        interface PromiseT<T> extends Promise {
-            /**
-             * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
-             *
-             * @param evt Event
-             * @param fct Handler
-             */
-            on(evt: string, fct: (t: T) => void): void;
-
-            /**
-             * Emit an event from the emitter.
-             *
-             * @param type  The type of event.
-             * @param value All other arguments will be passed to the event listeners.
-             */
-            emit(type: string, ...value: Array<T>): void;
-
-            /**
-             * Listen for success events.
-             */
-            success(onSuccess: (t: T) => void): PromiseT<T>;
-
-            /**
-             * Alias for success(handler). Listen for success events.
-             */
-            ok(onSuccess: (t: T) => void): PromiseT<T>;
-
-            /**
-             * Listen for both success and error events..
-             */
-            done(handler: (err: Error, result: T) => void): PromiseT<T>;
-
-            /**
-             * Alias for done(handler). Listen for both success and error events..
-             */
-            complete(handler: (err: Error, result: T) => void): PromiseT<T>;
-
-            /**
-             * Attach a function that is called every time the function that created this emitter executes a query.
-             *
-             * @param onSQL
-             */
-            sql(onSQL: (sql: string) => void): PromiseT<T>;
-
-            /**
-             * Proxy every event of this promise to another one.
-             *
-             * @param promise   The promise that should receive the events.
-             * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
-             */
-            proxy(promise: PromiseT<T>, options?: ProxyOptions): PromiseT<T>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => void): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then(onFulfilled?: (result?: T) => Promise, onRejected?: (result?: T) => Promise): Promise;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => void): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R>(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Attach listeners to the emitter, promise style.
-             *
-             * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
-             *                          Note that this function will always only be called with one argument, as per
-             *                          the promises/A spec. For functions that emit multiple arguments
-             *                          (e.g. findOrCreate) @see spread
-             * @param onRejected
-             */
-            then<R1, R2>(onFulfilled?: (result?: T) => PromiseT<R1>, onRejected?: (result?: T) => PromiseT<R2>): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: T) => Promise): Promise;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch<R>(onRejected: (result?: T) => PromiseT<R>): PromiseT<R>;
-
-            /**
-             * Shorthand for then(null, onRejected)
-             */
-            catch(onRejected: (result?: T) => void): Promise;
-        }
-
-        interface Utils {
-            _: Lodash;
-
-            /**
-             * Formats a string to parse and interpolate values into the string based on the optionally provided SQL dialect.
-             * @param arr       Array where first element is string with placeholders and remaining attributes are values to replace placeholders.
-             * @param dialect   SQL Dialect.
-             */
-            format(arr: Array<any>, dialect?: string): string;
-
-            /**
-             * Formats a SQL string replacing named placeholders with values from the parameters object with matching key names.
-             *
-             * @param sql           String to format.
-             * @param parameters    Key/value hash with values to replace in string.
-             * @param dialect       SQL Dialect
-             */
-            formatNamedParameters(sql: string, parameters: any, dialect?: string): string;
-
-            injectScope(scope: string, merge: boolean): any;
-
-            smartWhere(whereArg: any, dialect: string): any;
-
-            compileSmartWhere(obj: any, dialect: string): Array<any>;
-
-            getWhereLogic(logic: string, val?: any): string;
-
-            isHash(obj: any): boolean;
-
-            hasChanged(attrValue: any, value: any): boolean;
-
-            argsArePrimaryKeys(args: Array<any>, primaryKeys: any): boolean;
-
-            /**
-             * Consistently combines two table names such that the alphabetically first name always comes first when combined.
-             *
-             * @param table1
-             * @param table2
-             */
-            combineTableNames(table1: string, table2: string): string;
-
-            singularize(s: string, language?: string): string;
-
-            pluralize(s: string, language: string): string;
-
-            /**
-             * Same concept as _.merge, but don't overwrite properties that have already been assigned
-             */
-            mergeDefaults: typeof _.merge;
-
-            lowercaseFirst(str: string): string;
-
-            uppercaseFirst(str: string): string;
-
-            spliceStr(str: string, index: number, count: number, add: string): string;
-
-            camelize(str: string): string;
-
-            removeCommentsFromFunctionString(s: string): string;
-
-            toDefaultValue(value: any): any;
-
-            defaultValueSchemable(value: any): boolean;
-            setAttributes(hash: any, identifier: string, instance: any, prefix: string): any;
-            removeNullValuesFromHash(hash: any, omitNull: boolean, options: any): any;
-            firstValueOfHash(obj: any): any;
-            inherit(subClass: any, superClass: any): any;
-            stack(): string;
-            now(dialect: string): Date;
-
-            /**
-             * Runs provided function on next tick, depending on environment.
-             *
-             * @param f
-             */
-            tick(f: Function): void;
-
-            /**
-             * Surrounds a string with tick marks while removing all existing tick marks from the string.
-             * @param s         String to tick
-             * @param tickChar  Tick mark. Default `
-             */
-            addTicks(s: string, tickChar?: string): string;
-
-            removeTicks(s: string, tickChar?: string): string;
-
-            generateUUID(): string;
-
-            validateParameter(value: any, expectation: any): boolean;
-
-            CustomEventEmitter: EventEmitter;
-            Promise: Promise;
-            QueryChainer: QueryChainer;
-            Lingo: any; // external project, no definitions yet}
-        }
-
-        interface Lodash extends _.LoDashStatic {
-            camelizeIf(str: string, condition: boolean): string;
-            camelizeIf(str: string, condition: any): string;
-            underscoredIf(str: string, condition: boolean): string;
-            underscoredIf(str: string, condition: any): string;
-            /**
-             * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered falsey.
-             *
-             * @param arr Array to compact.
-             */
-            compactLite<T>(arr: Array<T>): Array<T>;
-        }
-
-        interface MetaPojo {
-            from: string;
-            to: string;
-        }
-        interface MetaInstance extends MetaPojo, Model<MetaInstance, MetaPojo> {
-
-        }
-
-        interface DataTypeStringBase {
-            BINARY: DataTypeString;
-        }
-        interface DataTypeNumberBase {
-            UNSIGNED: boolean;
-            ZEROFILL: boolean;
-        }
-
-        interface DataTypeString extends DataTypeStringBase {
-        }
-        interface DataTypeChar extends DataTypeStringBase {
-        }
-        interface DataTypeInteger extends DataTypeNumberBase {
-        }
-        interface DataTypeBigInt extends DataTypeNumberBase {
-        }
-        interface DataTypeFloat extends DataTypeNumberBase {
-        }
-        interface DataTypeBlob {
-        }
-        interface DataTypeDecimal {
-            PRECISION: number;
-            SCALE: number;
-        }
-
-        interface DataTypeVirtual {
-        }
-        interface DataTypeEnum {
-            (...values: Array<string>): DataTypeEnum;
-        }
-        interface DataTypeArray {
-        }
-        interface DataTypeHstore {
-        }
-
-        interface DataTypes {
-            STRING: DataTypeString;
-            CHAR: DataTypeChar;
-            TEXT: string;
-            INTEGER: DataTypeInteger;
-            BIGINT: DataTypeBigInt;
-            DATE: string;
-            BOOLEAN: string;
-            FLOAT: DataTypeFloat;
-            NOW: string;
-            BLOB: DataTypeBlob;
-            DECIMAL: DataTypeDecimal;
-            UUID: string;
-            UUIDV1: string;
-            UUIDV4: string;
-            VIRTUAL: DataTypeVirtual;
-            NONE: DataTypeVirtual;
-            ENUM: DataTypeEnum;
-            ARRAY: DataTypeArray;
-            HSTORE: DataTypeHstore;
-        }
+        Validator: Validator;
+
+        QueryTypes: QueryTypes;
+
+        /**
+         * A general error class.
+         */
+        Error: Error;
+
+        /**
+         * Emitted when a validation fails.
+         *
+         * @see ValidationError
+         */
+        ValidationError: ValidationError;
+
+        /**
+         * Creates a object representing a database function. This can be used in search queries, both in where and order
+         * parts, and as default values in column definitions. If you want to refer to columns in your function, you should
+         * use sequelize.col, so that the columns are properly interpreted as columns and not a strings.
+         *
+         * @param fn The function you want to call.
+         * @param args All further arguments will be passed as arguments to the function.
+         */
+        fn(fn: string, ...args: Array<any>): any;
+
+        /**
+         * Creates a object representing a column in the DB. This is often useful in conjunction with sequelize.fn, since
+         * raw string arguments to fn will be escaped.
+         *
+         * @param col The name of the column
+         */
+        col(col: string): Col;
+
+        /**
+         * Creates a object representing a call to the cast function.
+         *
+         * @param val The value to cast.
+         * @param type The type to cast it to.
+         */
+        cast(val: any, type: string): Cast;
+
+        /**
+         * Creates a object representing a literal, i.e. something that will not be escaped.
+         *
+         * @param val Value to convert to a literal.
+         */
+        literal(val: any): Literal;
+
+        /**
+         * An AND query.
+         *
+         * @param args Each argument (string or object) will be joined by AND.
+         */
+        and(...args: Array<any>): And;
+
+        /**
+         * An OR query.
+         *
+         * @param args Each argument (string or object) will be joined by OR.
+         */
+        or(...args: Array<any>): Or;
+
+        /**
+         * A way of specifying attr = condition. Mostly used internally.
+         *
+         * @param attr          The attribute
+         * @param condition     The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.)
+         */
+        where(attr: string, condition: any): Where;
     }
 
-    var sequelize: sequelize.SequelizeStatic;
+    interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
+        /**
+         * Instantiate sequelize with name of database and username
+         * @param database database name
+         * @param username user name
+         */
+        new (database: string, username: string): Sequelize;
 
-    export = sequelize;
+        /**
+         * Instantiate sequelize with name of database, username and password
+         * @param database database name
+         * @param username user name
+         * @param password password
+         */
+        new (database: string, username: string, password: string): Sequelize;
+
+        /**
+         * Instantiate sequelize with name of database, username, password, and options.
+         * @param database database name
+         * @param username user name
+         * @param password password
+         * @param options options. @see Options
+         */
+        new (database: string, username: string, password: string, options: Options): Sequelize;
+
+        /**
+         * Instantiate sequelize with name of database, username, and options.
+         *
+         * @param database database name
+         * @param username user name
+         * @param options options. @see Options
+         */
+        new (database: string, username: string, options: Options): Sequelize;
+
+        /**
+         * Instantiate sequlize with an URI
+         * @param connectionString A full database URI
+         * @param options Options for sequelize. @see Options
+         */
+        new (connectionString: string, options?: Options): Sequelize;
+    }
+
+    interface Sequelize extends SequelizeStaticAndInstance {
+        /**
+         * Sequelize configuration (undocumented).
+         */
+        config: Config;
+
+        /**
+         * Sequelize options (undocumented).
+         */
+        options: Options;
+
+        /**
+         * Models are stored here under the name given to sequelize.define
+         */
+        models: any;
+        modelManager: ModelManager;
+        daoFactoryManager: ModelManager;
+        transactionManager: TransactionManager;
+        importCache: any;
+
+        /**
+         * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a transaction.
+         *
+         * @see Transaction
+         */
+        Transaction: TransactionStatic;
+
+        /**
+         * Returns the specified dialect.
+         */
+        getDialect(): string;
+
+        /**
+         * Returns the singleton instance of QueryInterface.
+         */
+        getQueryInterface(): QueryInterface;
+
+        /**
+         * Returns the singleton instance of Migrator.
+         * @param options Migration options
+         * @param force A flag that defines if the migrator should get instantiated or not.
+         */
+        getMigrator(options?: MigratorOptions, force?: boolean): Migrator;
+
+        /**
+         * Define a new model, representing a table in the DB.
+         *
+         * @param daoName The name of the entity (table). Typically specified in singular form.
+         * @param attributes A hash of attributes to define. Each attribute can be either a string name for the attribute
+         *                   or can be an object defining the attribute and its options. Note attributes is not fully
+         *                   typed since TypeScript does not support union types--it can be either a string or an
+         *                   options object. @see AttributeOptions.
+         * @param options Table options. @see DefineOptions.
+         */
+        define<TInstance, TPojo>(daoName: string, attributes: any, options?: DefineOptions): Model<TInstance, TPojo>;
+
+        /**
+         * Fetch a DAO factory which is already defined.
+         *
+         * @param daoName The name of a model defined with Sequelize.define.
+         */
+        model<TInstance, TPojo>(daoName: string): Model<TInstance, TPojo>;
+
+        /**
+         * Checks whether a model with the given name is defined.
+         *
+         * @param daoName The name of a model defined with Sequelize.define.
+         */
+        isDefined(daoName: string): boolean;
+
+        /**
+         * Imports a model defined in another file.
+         *
+         * @param path  The path to the file that holds the model you want to import. If the part is relative, it will be
+         *              resolved relatively to the calling file
+         */
+        import<TInstance, TPojo>(path: string): Model<TInstance, TPojo>;
+
+        /**
+         * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+         *
+         * @param sql           SQL statement to execute.
+         *
+         * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+         *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+         *
+         * @param options       Query options.
+         *
+         * @param replacements  Either an object of named parameter replacements in the format :param or an array of
+         *                      unnamed replacements to replace ? in your SQL.
+         */
+        query(sql: string, callee?: Model<any, any>, options?: QueryOptions, replacements?: any): EventEmitter;
+
+        query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitterT<Model<TInstance, TPojo>>;
+
+        /**
+         * Create a new database schema.
+         *
+         * @param schema Name of the schema.
+         */
+        createSchema(schema: string): EventEmitter;
+
+        /**
+         * Show all defined schemas.
+         */
+        showAllSchemas(): EventEmitter;
+
+        /**
+         * Drop a single schema.
+         *
+         * @param schema Name of the schema.
+         */
+        dropSchema(schema: string): EventEmitter;
+
+        /**
+         * Drop all schemas.
+         */
+        dropAllSchemas(): EventEmitter;
+
+        /**
+         * Sync all defined DAOs to the DB.
+         *
+         * @param options Options.
+         */
+        sync(options?: SyncOptions): EventEmitter;
+
+        /**
+         * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model.
+         *
+         * @param options The options passed to each call to Model.drop.
+         */
+        drop(options: DropOptions): EventEmitter;
+
+        /**
+         * Test the connection by trying to authenticate. Alias for 'validate'.
+         */
+        authenticate(): EventEmitter;
+
+        /**
+         * Alias for authenticate(). Test the connection by trying to authenticate. Alias for 'validate'.
+         */
+        validate(): EventEmitter;
+
+        /**
+         * !! DEPRECATED : When passing a callback to a transaction a promise chain is expected in return,
+         * the transaction will be committed or rejected based on the promise chain returned to the callback.
+         *
+         * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
+         * for the query to happen under that transaction.
+         *
+         * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
+         *                  argument (overload available for error and transaction arguments too).
+         */
+        transaction(callback: (transaction: Transaction) => boolean): Promise;
+
+        /**
+         * Start a transaction. When using transactions, you should pass the transaction in the options argument in order
+         * for the query to happen under that transaction.
+         *
+         * @param options   Transaction options.
+         * @param callback  Called when the transaction has been set up and is ready for use. Callback takes transaction
+         *                  argument (overload available for error and transaction arguments too).
+         */
+        transaction(options?: TransactionOptions, callback?: (transaction: Transaction) => void): PromiseT<Transaction>;
+
+        close(): void;
+    }
+
+    interface Config {
+        database?: string;
+        username?: string;
+        password?: string;
+        host?: string;
+        port?: number;
+        pool?: PoolOptions;
+        protocol?: string;
+        queue?: boolean;
+        native?: boolean;
+        ssl?: boolean;
+        replication?: ReplicationOptions;
+        dialectModulePath?: string;
+        maxConcurrentQueries?: number;
+        dialectOptions?: any;
+    }
+
+    interface Model<TInstance, TPojo> extends Hooks, Associations {
+        /**
+         * A reference to the sequelize instance.
+         */
+        sequelize: Sequelize;
+
+        /**
+         * The name of the model, typically singular.
+         */
+        name: string;
+
+        /**
+         * The name of the underlying database table, typically plural.
+         */
+        tableName: string;
+
+        options: DefineOptions;
+        attributes: any;
+        rawAttributes: any;
+        modelManager: ModelManager;
+        daoFactoryManager: ModelManager;
+        associations: any;
+        scopeObj: any;
+
+        /**
+         * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the model
+         * instance (this).
+         */
+        sync(options?: SyncOptions): PromiseT<Model<TInstance, TPojo>>;
+
+        /**
+         * Drop the table represented by this Model.
+         *
+         * @param options
+         */
+        drop(options?: DropOptions): Promise;
+
+        /**
+         * Apply a schema to this model. For postgres, this will actually place the schema in front of the table name -
+         * "schema"."tableName", while the schema will be prepended to the table name for mysql and sqlite -
+         * 'schema.tablename'.
+         *
+         * @param schema    The name of the schema.
+         * @param options   Schema options.
+         */
+        schema(schema: string, options?: SchemaOptions): Model<TInstance, TPojo>;
+
+        /**
+         * Get the tablename of the model, taking schema into account. The method will return The name as a string if the
+         * model has no schema, or an object with tableName, schema and delimiter properties.
+         */
+        getTableName(): any;
+
+        /**
+         * Apply a scope created in define to the model.
+         *
+         * @param options The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of
+         *                arguments. To apply simple scopes, pass them as strings. For scope function, pass an object,
+         *                with a method property. The value can either be a string, if the method does not take any
+         *                arguments, or an array, where the first element is the name of the method, and consecutive
+         *                elements are arguments to that method. Pass null to remove all scopes, including the default.
+         */
+        scope(options: any): Model<TInstance, TPojo>;
+
+        /**
+         * Search for multiple instances..
+         *
+         * @param options       A hash of options to describe the scope of the search.
+         * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+         *                      Instances. See sequelize.query for options.
+         */
+        findAll(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<Array<TInstance>>;
+
+        /**
+         * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
+         *
+         * @param options       A hash of options to describe the scope of the search.
+         * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+         *                      Instances. See sequelize.query for options
+         */
+        find(options?: FindOptions, queryOptions?: QueryOptions): PromiseT<TInstance>;
+
+        /**
+         * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single instance.
+         *
+         * @param options       A number to search by id.
+         * @param queryOptions  Set the query options, e.g. raw, specifying that you want raw data instead of built
+         *                      Instances. See sequelize.query for options
+         */
+        find(id?: number, queryOptions?: QueryOptions): PromiseT<TInstance>;
+
+        /**
+         * Run an aggregation method on the specified field.
+         *
+         * @param field                 The field to aggregate over. Can be a field name or *.
+         * @param aggregateFunction     The function to use for aggregation, e.g. sum, max etc.
+         * @param options               Query options, particularly options.dataType.
+         */
+        aggregate<V>(field: string, aggregateFunction: string, options: FindOptions): PromiseT<V>;
+
+        /**
+         * Count the number of records matching the provided where clause.
+         *
+         * @param options Conditions and options for the query.
+         */
+        count(options?: FindOptions): PromiseT<number>;
+
+        /**
+         * Find all the rows matching your query, within a specified offset / limit, and get the total number of rows
+         * matching your query. This is very usefull for paging.
+         *
+         * @param findOptions   Filtering options
+         * @param queryOptions  Query options
+         */
+        findAndCountAll(findOptions?: FindOptions, queryOptions?: QueryOptions): PromiseT<FindAndCountResult<TInstance>>;
+
+        /**
+         * Find the maximum value of field.
+         *
+         * @param field
+         * @param options
+         */
+        max<V>(field: string, options?: FindOptions): PromiseT<V>;
+
+        /**
+         * Find the minimum value of field.
+         *
+         * @param field
+         * @param options
+         */
+        min<V>(field: string, options?: FindOptions): PromiseT<V>;
+
+        /**
+         * Find the sum of field.
+         *
+         * @param field
+         * @param options
+         */
+        sum(field: string, options?: FindOptions): PromiseT<number>;
+
+        /**
+         * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
+         *
+         * @param values    any from which to build entity instance.
+         * @param options   any construction options.
+         */
+        build(values: TPojo, options?: BuildOptions): TInstance;
+
+        /**
+         * Builds a new model instance and calls save on it..
+         *
+         * @param values
+         * @param options
+         */
+        create(values: TPojo, options?: CopyOptions): PromiseT<TInstance>;
+
+        /**
+         * Find a row that matches the query, or build (but don't save) the row if none is found. The successfull result
+         * of the promise will be (instance, initialized) - Make sure to use .spread().
+         *
+         * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax
+         *                  is { attr1: 42 } and NOT { where: { attr1: 42}}. This may be subject to change in 2.0
+         * @param defaults  Default values to use if building a new instance
+         * @param options   Options passed to the find call
+         */
+        findOrInitialize(where: any, defaults?: TPojo, options?: QueryOptions): PromiseT<TInstance>;
+
+        /**
+         * Find a row that matches the query, or build and save the row if none is found The successfull result of the
+         * promise will be (instance, created) - Make sure to use .spread().
+         *
+         * @param where     A hash of search attributes. Note that this method differs from finders, in that the syntax is
+         *                  { attr1: 42 } and NOT { where: { attr1: 42}}. This is subject to change in 2.0
+         * @param defaults  Default values to use if creating a new instance
+         * @param options   Options passed to the find and create calls.
+         */
+        findOrCreate(where: any, defaults?: TPojo, options?: FindOrCreateOptions): PromiseT<TInstance>;
+
+        /**
+         * Create and insert multiple instances in bulk.
+         *
+         * @param records   List of objects (key/value pairs) to create instances from.
+         * @param options
+         */
+        bulkCreate(records: Array<TPojo>, options?: BulkCreateOptions): PromiseT<Array<TInstance>>;
+
+        /**
+         * Delete multiple instances.
+         */
+        destroy(where?: any, options?: DestroyOptions): Promise;
+
+        /**
+         * Update multiple instances that match the where options.
+         *
+         * @param attrValueHash A hash of fields to change and their new values
+         * @param where         Options to describe the scope of the search. Note that these options are not wrapped in a
+         *                      { where: ... } is in find / findAll calls etc. This is probably due to change in 2.0.
+         */
+        update(attrValueHash: TPojo, where: any, options?: UpdateOptions): Promise;
+
+        /**
+         * Run a describe query on the table. The result will be return to the listener as a hash of attributes and their
+         * types.
+         */
+        describe(): PromiseT<any>;
+
+        /**
+         *  A proxy to the node-sql query builder, which allows you to build your query through a chain of method calls.
+         *  The returned instance already has all the fields property populated with the field of the model.
+         */
+        dataset(): any;
+    }
+
+    interface Instance<TInstance, TPojo> {
+        /**
+         * Returns true if this instance has not yet been persisted to the database.
+         */
+        isNewRecord: boolean;
+
+        /**
+         * Returns the Model the instance was created from.
+         */
+        Model: Model<TInstance, TPojo>;
+
+        /**
+         * A reference to the sequelize instance.
+         */
+        sequelize: Sequelize;
+
+        /**
+         * If timestamps and paranoid are enabled, returns whether the deletedAt timestamp of this instance is set.
+         * Otherwise, always returns false.
+         */
+        isDeleted: boolean;
+
+        /**
+         * Get the values of this Instance. Proxies to this.get.
+         */
+        values: TPojo;
+
+        /**
+         * A getter for this.changed(). Returns true if any keys have changed.
+         */
+        isDirty: boolean;
+
+        /**
+         *  Get the values of the primary keys of this instance.
+         */
+        primaryKeyValues: TPojo;
+
+        /**
+         * Get the value of the underlying data value.
+         *
+         * @param key   Field to retrieve.
+         */
+        getDataValue(key: string): any;
+
+        /**
+         * Update the underlying data value.
+         *
+         * @param key   Field to set.
+         * @param value Value to set.
+         */
+        setDataValue(key: string, value: any): void;
+
+        /**
+         * Retrieves the value for the key when specified. If no key is given, returns all values of the instance, also
+         * invoking virtual getters.
+         */
+        get(key?: string): any;
+
+        /**
+         * Set is used to update values on the instance (the sequelize representation of the instance that is, remember
+         * that nothing will be persisted before you actually call save).
+         */
+        set(key: string, value: any, options?: SetOptions): void;
+
+        /**
+         * If changed is called with a string it will return a boolean indicating whether the value of that key in
+         * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
+         * return an array of keys that have changed.
+         */
+        changed(key: string): any;
+
+        /**
+           * If changed is called with a string it will return a boolean indicating whether the value of that key in
+           * dataValues is different from the value in _previousDataValues. If changed is called without an argument, it will
+           * return an array of keys that have changed.
+           */
+        changed(): Array<string>;
+
+        /**
+         * Returns the previous value for key from _previousDataValues.
+         */
+        previous(key: string): any;
+
+        /**
+         * Validate this instance, and if the validation passes, persist it to the database.
+         */
+        save(fields?: Array<string>, options?: SaveOptions): PromiseT<TInstance>;
+
+        /**
+         * Refresh the current instance in-place, i.e. update the object with current data from the DB and return the same
+         * object. This is different from doing a find(Instance.id), because that would create and return a new instance.
+         * With this method, all references to the Instance are updated with the new data and no new objects are created.
+         */
+        reload(options?: FindOptions): PromiseT<TInstance>;
+
+        /**
+         * Validate the attribute of this instance according to validation rules set in the model definition.
+         */
+        validate(options?: ValidateOptions): PromiseT<Error>;
+
+        /**
+         * This is the same as calling setAttributes, then calling save.
+         */
+        updateAttributes(updates: TPojo, options: SaveOptions): PromiseT<TInstance>;
+
+        /**
+         * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will either be
+         * completely deleted, or have its deletedAt timestamp set to the current time.
+         *
+         * @param options   Allows caller to specify if delete should be forced.
+         */
+        destroy(options?: DestroyInstanceOptions): Promise;
+
+        /**
+         * Increment the value of one or more columns. This is done in the database, which means it does not use the
+         * values currently stored on the Instance.
+         *
+         * @param fields    If a string is provided, that column is incremented by the value of by given in options. If an
+         *                  array is provided, the same is true for each column. If and object is provided, each column is
+         *                  incremented by the value given.
+         * @param options   Increment options.
+         */
+        increment(fields: any, options?: IncrementOptions): Promise;
+
+        /**
+         * Decrement the value of one or more columns. This is done in the database, which means it does not use the
+         * values currently stored on the Instance.
+         *
+         * @param fields    If a string is provided, that column is decremented by the value of by given in options. If an
+         *                  array is provided, the same is true for each column. If and object is provided, each column is
+         *                  decremented by the value given.
+         * @param options   Decrement options.
+         */
+        decrement(fields: any, options?: IncrementOptions): Promise;
+
+        /**
+         * Check whether all values of this and other Instance are the same.
+         */
+        equal(other: TInstance): boolean;
+
+        /**
+         * Check if this is eqaul to one of others by calling equals.
+         *
+         * @param others    Other instances to compare to.
+         */
+        equalsOneOf(others: Array<TInstance>): boolean;
+
+        /**
+         * Convert the instance to a JSON representation. Proxies to calling get with no keys. This means get all values
+         * gotten from the DB, and apply all custom getters.
+         */
+        toJSON(): TPojo;
+    }
+
+    interface Transaction extends TransactionStatic {
+        /**
+         * Commit the transaction.
+         */
+        commit(): Transaction;
+
+        /**
+         * Rollback (abort) the transaction.
+         */
+        rollback(): Transaction;
+    }
+
+    interface TransactionStatic {
+        /**
+         * The possible isolation levels to use when starting a transaction
+         */
+        ISOLATION_LEVELS: TransactionIsolationLevels;
+
+        /**
+         * Possible options for row locking. Used in conjuction with find calls.
+         */
+        LOCK: TransactionLocks;
+    }
+
+    interface TransactionIsolationLevels {
+        READ_UNCOMMITTED: string;// "READ UNCOMMITTED"
+        READ_COMMITTED: string;  // "READ COMMITTED"
+        REPEATABLE_READ: string; // "REPEATABLE READ"
+        SERIALIZABLE: string;    // "SERIALIZABLE"
+    }
+
+    interface TransactionLocks {
+        UPDATE: string;  // UPDATE
+        SHARE: string;   // SHARE
+    }
+
+    interface Hooks {
+
+        /**
+         * Add a named hook to the model.
+         *
+         * @param hooktype
+         */
+        addHook(hooktype: string, name: string, fn: (...args: Array<any>) => void): boolean;
+
+        /**
+         * Add a hook to the model.
+         *
+         * @param hooktype
+         */
+        addHook(hooktype: string, fn: (...args: Array<any>) => void): boolean;
+
+        /**
+         * A named hook that is run before validation.
+         */
+        beforeValidate<T>(name: string, validator: (dao: T, callback: (err?: Error) => void) => void): void;
+
+        /**
+         * A hook that is run before validation.
+         */
+        beforeValidate<T>(validator: (dao: T, callback: (err?: Error) => void) => void): void;
+
+        /**
+         * A named hook that is run before validation.
+         */
+        afterValidate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before validation.
+         */
+        afterValidate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before creating a single instance.
+         */
+        beforeCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before creating a single instance.
+         */
+        beforeCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run after creating a single instance.
+         */
+        afterCreate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run after creating a single instance.
+         */
+        afterCreate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before destroying a single instance.
+         */
+        beforeDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before destroying a single instance.
+         */
+        beforeDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run after destroying a single instance.
+         */
+        afterDestroy<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run after destroying a single instance.
+         */
+        afterDestroy<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before updating a single instance.
+         */
+        beforeUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before updating a single instance.
+         */
+        beforeUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run after updating a single instance.
+         */
+        afterUpdate<T>(name: string, validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run after updating a single instance.
+         */
+        afterUpdate<T>(validator: (dao: T, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before creating instances in bulk.
+         */
+        beforeBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run before creating instances in bulk.
+         */
+        beforeBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run after creating instances in bulk.
+         */
+        afterBulkCreate<T>(name: string, validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A hook that is run after creating instances in bulk.
+         */
+        afterBulkCreate<T>(validator: (daos: Array<T>, fields: Array<string>, callback: (err?: Error, dao?: T) => void) => void): void;
+
+        /**
+         * A named hook that is run before destroying instances in bulk.
+         */
+        beforeBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+        /**
+         * A hook that is run before destroying instances in bulk.
+         */
+        beforeBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+        /**
+         * A named hook that is run after destroying instances in bulk.
+         */
+        afterBulkDestroy<T>(name: string, validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+        /**
+         * A hook that is run after destroying instances in bulk.
+         */
+        afterBulkDestroy<T>(validator: (where: any, callback: (err?: Error, where?: any) => void) => void): void;
+
+        /**
+         * A named hook that is run before updating instances in bulk.
+         */
+        beforeBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+        /**
+         * A hook that is run before updating instances in bulk.
+         */
+        beforeBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+        /**
+         * A named hook that is run after updating instances in bulk.
+         */
+        afterBulkUpdate<T>(name: string, validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+
+        /**
+         * A hook that is run after updating instances in bulk.
+         */
+        afterBulkUpdate<T>(validator: (instances: Array<T>, where: any, callback: (err?: Error, instances?: Array<T>, where?: any) => void) => void): void;
+    }
+
+    interface Associations {
+        /**
+         * Creates an association between this (the source) and the provided target. The foreign key is added on the target.
+         *
+         * @param target
+         * @param options
+         */
+        hasOne<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+        /**
+         * Creates an association between this (the source) and the provided target. The foreign key is added on the source.
+         *
+         * @param target
+         * @param options
+         */
+        belongsTo<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+        /**
+         * Creates an association to connect sources with multiple targets. Furthermore the targets can also have connections to multiple sources.
+         *
+         * @param target
+         * @param options
+         */
+        belongsToMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+
+        /**
+         * Create an association that is either 1:m or n:m.
+         *
+         * @param target
+         * @param options
+         */
+        hasMany<TInstance, TPojo>(target: Model<TInstance, TPojo>, options?: AssociationOptions): void;
+    }
+
+    /**
+     * Extension of external project that doesn't have definitions.
+     *
+     * See https://github.com/chriso/validator.js and https://github.com/sequelize/sequelize/blob/master/lib/instance-validator.js
+     */
+    interface Validator {
+
+    }
+
+    /**
+     * Custom class defined, but no extra methods or functionality even.
+     */
+    interface ValidationError extends Error {
+
+    }
+
+    interface QueryChainer {
+        /**
+         * Add an query to the chainer. This can be done in two ways - either by invoking the method like you would
+         * normally, and then adding the returned emitter to the chainer, or by passing the class that you want to call a
+         * method on, the name of the method, and its parameters to the chainer. The second form might sound a bit
+         * cumbersome, but it is used when you want to run queries in serial.
+         *
+         * @param emitterOrKlass
+         * @param method
+         * @param params
+         * @param options
+         */
+        add(emitterOrKlass: any, method?: string, params?: any, options?: any): QueryChainer;
+
+        /**
+         * Run the query chainer. In reality, this means, wait for all the added emitters to finish, since the queries
+         * began executing as soon as you invoked their methods.
+         */
+        run(): EventEmitter;
+
+        /**
+         * Run the chainer serially, so that each query waits for the previous one to finish before it starts.
+         *
+         * @param options @see QueryChainerRunSeriallyOptions
+         */
+        runSerially(options?: QueryChainerRunSeriallyOptions): EventEmitter;
+    }
+
+    interface QueryInterface {
+
+        /**
+         * Returns the dialect-specific sql generator.
+         */
+        QueryGenerator: QueryGenerator;
+
+        /**
+         * Queries the schema (table list).
+         *
+         * @param schema The schema to query. Applies only to Postgres.
+         */
+        createSchema(schema?: string): EventEmitter;
+
+        /**
+         * Drops the specified schema (table).
+         *
+         * @param schema The name of the table to drop.
+         */
+        dropSchema(schema: string): EventEmitter;
+
+        /**
+         * Drops all tables.
+         */
+        dropAllSchemas(): EventEmitter;
+
+        /**
+         * Queries all table names in the database.
+         *
+         * @param options
+         */
+        showAllSchemas(options?: QueryOptions): EventEmitter;
+
+        /**
+         * Creates a table with specified attributes.
+         * @param tableName     Name of table to create
+         * @param attributes    Hash of attributes, key is attribute name, value is data type
+         * @param options       Query options.
+         *
+         * @return The return type will be a Promise when dialect is Postgres and an EventEmitter for MySQL and SQLite.
+         */
+        createTable(tableName: string, attributes: any, options?: QueryOptions): any;
+
+        /**
+         * Drops the specified table.
+         *
+         * @param tableName Table name.
+         * @param options   Query options, particularly "force".
+         */
+        dropTable(tableName: string, options?: QueryOptions): EventEmitter;
+        dropAllTables(options?: QueryOptions): EventEmitter;
+        dropAllEnums(options?: QueryOptions): EventEmitter;
+        renameTable(before: string, after: string): EventEmitter;
+        showAllTables(options?: QueryOptions): EventEmitter;
+        describeTable(tableName: string, options?: QueryOptions): EventEmitter;
+        addColumn(tableName: string, attributeName: any, dataTypeOrOptions?: any): EventEmitter;
+        removeColumn(tableName: string, attributeName: string): EventEmitter;
+        changeColumn(tableName: string, attributeName: string, dataTypeOrOptions: any): EventEmitter;
+        renameColumn(tableName: string, attrNameBefore: string, attrNameAfter: string): EventEmitter;
+        addIndex(tableName: string, attributes: Array<any>, options?: QueryOptions): EventEmitter;
+        showIndex(tableName: string, options?: QueryOptions): EventEmitter;
+        getForeignKeysForTables(tableNames: Array<string>): EventEmitter;
+        removeIndex(tableName: string, attributes: Array<string>): EventEmitter;
+        removeIndex(tableName: string, indexName: string): EventEmitter;
+        insert<TModel>(dao: TModel, tableName: string, values: any, options?: QueryOptions): EventEmitter;
+        /**
+         * Inserts several records into the specified table.
+         * @param tableName     Table to insert into.
+         * @param records       Array of key/value pairs to insert as records.
+         * @param options       Query options
+         * @param attributes    For Postgres only, used to identify if an attribute is auto-increment and thus handled specially.
+         */
+        bulkInsert(tableName: string, records: Array<any>, options?: QueryOptions, attributes?: any): EventEmitter;
+
+        update<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
+        bulkUpdate(tableName: string, values: Array<any>, where: any, options?: QueryOptions, attributes?: any): EventEmitter;
+        delete<TModel>(dao: TModel, tableName: string, where: any, options?: QueryOptions): EventEmitter;
+        bulkDelete(tableName: string, where: any, options?: QueryOptions): EventEmitter;
+        bulkDelete<TModel>(tableName: string, where: any, options: QueryOptions, model: TModel): EventEmitter;
+        select<TModel>(factory: TModel, tableName: string, scope?: any, queryOptions?: QueryOptions): EventEmitter;
+        increment<TModel>(dao: TModel, tableName: string, values: Array<any>, where: any, options?: QueryOptions): EventEmitter;
+        rawSelect<TModel>(tableName: string, options: QueryOptions, attributeSelector: string, model: TModel): EventEmitter;
+        /**
+         * Postgres only. Creates a trigger on specified table to call the specified function with supplied parameters.
+         *
+         * @param tableName
+         * @param triggerName
+         * @param timingType
+         * @param fireOnArray
+         * @param functionName
+         * @param functionParams
+         * @param optionsArray
+         */
+        createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: Array<any>, functionName: string, functionParams: Array<any>, optionsArray: Array<string>): EventEmitter;
+        /**
+         * Postgres only. Drops the specified trigger.
+         *
+         * @param tableName
+         * @param triggerName
+         */
+        dropTrigger(tableName: string, triggerName: string): EventEmitter;
+        renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): EventEmitter;
+        createFunction(functionName: string, params: Array<any>, returnType: string, language: string, body: string, options?: QueryOptions): EventEmitter;
+        dropFunction(functionName: string, params: Array<any>): EventEmitter;
+        renameFunction(oldFunctionName: string, params: Array<any>, newFunctionName: string): EventEmitter;
+        /**
+         * Escape an identifier (e.g. a table or attribute name). If force is true,
+         * the identifier will be quoted even if the `quoteIdentifiers` option is
+         * false.
+         */
+        quoteIdentifier(identifier: string, force: boolean): EventEmitter;
+        quoteTable(tableName: string): EventEmitter;
+        quoteIdentifiers(identifiers: string, force: boolean): EventEmitter;
+        escape(value: string): EventEmitter;
+        setAutocommit(transaction: Transaction, value: boolean): EventEmitter;
+        setIsolationLevel(transaction: Transaction, value: string): EventEmitter;
+        startTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+        commitTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+        rollbackTransaction(transaction: Transaction, options?: QueryOptions): EventEmitter;
+    }
+
+    interface QueryGenerator {
+        createSchema(schemaName: string): string;
+        dropSchema(schemaName: string): string;
+        showSchemasQuery(): string;
+        addSchema<TInstance, TPojo>(param: Model<TInstance, TPojo>): Schema;
+        createTableQuery(tableName: string, attributes: Array<any>, options?: CreateTableQueryOptions): string;
+        describeTableQuery(tableName: string, schema: string, schemaDelimiter: string): string;
+        dropTableQuery(tableName: string, options?: { cascade: string }): string;
+        renameTableQuery(before: string, after: string): string;
+        showTablesQuery(): string;
+        addColumnQuery(tableName: string, attributes: any): string;
+        removeColumnQuery(tableName: string, attributeName: string): string;
+        changeColumnQuery(tableName: string, attributes: any): string;
+        renameColumnQuery(tableName: string, attrNameBefore: string, attrNameAfter: string): string;
+        insertQuery(table: string, valueHash: any, modelAttributes: any): string;
+        bulkInsertQuery(tableName: string, attrValueHashes: any): string;
+        updateQuery(tableName: string, attrValueHash: any, where: any, options: InsertOptions, attributes: any): string;
+        deleteQuery(tableName: string, where: any, options: DestroyOptions): string;
+        deleteQuery<TInstance, TPojo>(tableName: string, where: any, options: DestroyOptions, model: Model<TInstance, TPojo>): string;
+        /**
+         * Creates a query to increment a value. Note "options" here is an additional hash of values to update.
+         *
+         * @param tableName
+         * @param attrValueHash
+         * @param where
+         * @param options
+         */
+        incrementQuery(tableName: string, attrValueHash: any, where: any, options?: any): string;
+        addIndexQuery(tableName: string, attributes: Array<any>, options?: IndexOptions): string;
+        /**
+         * Return indices for a table. Not options may be passed but is not used, so can be anything.
+         * @param tableName
+         * @param options
+         */
+        showIndexQuery(tableName: string, options?: any): string; // options is actually not used
+        removeIndexQuery(tableName: string, indexNameOrAttributes: string): string;
+        removeIndexQuery(tableName: string, indexNameOrAttributes: Array<string>): string;
+        attributesToSQL(attributes: Array<any>): string;
+        findAutoIncrementField<TInstance, TPojo>(factory: Model<TInstance, TPojo>): Array<string>;
+        quoteTable(param: any, as: boolean): string;
+        quote(obj: any, parent: any, force: boolean): string;
+        createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: TriggerOptions, functionName: string, functionParams: Array<TriggerParam>): string;
+        dropTrigger(tableName: string, triggerName: string): string;
+        renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string): string;
+        createFunction(functionName: string, params: Array<TriggerParam>, returnType: string, language: string, body: string, options?: Array<string>): string;
+        dropFunction(functionName: string, params: Array<TriggerParam>): string;
+        renameFunction(oldFunctionName: string, params: Array<TriggerParam>, newFunctionName: string): string;
+        quoteIdentifier(identifier: string, force?: boolean): string;
+        quoteIdentifiers(identifiers: string, force?: boolean): string;
+        /**
+         * Not documented, and reading through the code, I'm not sure what all the options available are for value/field.
+         *
+         * @param value
+         * @param field
+         */
+        escape(value: any, field: any): string;
+        getForeignKeysQuery(tableName: string, schemaName: string): string;
+        dropForeignKeyQuery(tableName: string, foreignKey: string): string;
+        selectQuery<TInstance, TPojo>(tableName: string, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+        selectQuery<TInstance, TPojo>(tableName: Array<string>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+        selectQuery<TInstance, TPojo>(tableName: Array<Array<string>>, options: SelectOptions, model?: Model<TInstance, TPojo>): string;
+        setAutocommitQuery(value: boolean): string;
+        setIsolationLevelQuery(value: string): string;
+        /**
+         * Returns start transaction query. Options is not used.
+         * @param options
+         */
+        startTransactionQuery(options?: any): string;
+        /**
+         * Returns start transaction query. Options is not used.
+         * @param options
+         */
+        commitTransactionQuery(options?: any): string;
+        /**
+         * Returns start transaction query. Options is not used.
+         * @param options
+         */
+        rollbackTransactionQuery(options?: any): string;
+        addLimitAndOffset(options: SelectOptions, query?: string): string;
+        getWhereConditions<TInstance, TPojo>(smth: any, tableName: string, factory: Model<TInstance, TPojo>, options?: any, prepend?: boolean): string;
+        prependTableNameToHash(tableName: string, hash?: any): string;
+        findAssociation<TInstance, TPojo>(attribute: string, dao: Model<TInstance, TPojo>): string;
+        getAssociationFilterDAO<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>): string;
+        isAssociationFilter<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: any): string;
+        getAssociationFilterColumn<TInstance, TPojo>(filterStr: string, dao: Model<TInstance, TPojo>, options?: { include: boolean }): string;
+        getConditionalJoins<TInstance, TPojo>(options: { where?: any }, originalDao: Model<TInstance, TPojo>): string;
+        arrayValue(value: Array<string>, key: string, _key: string, factory?: any, logicResult?: any): string;
+        hashToWhereConditions<TInstance, TPojo>(hash: any, dao: Model<TInstance, TPojo>, options?: HashToWhereConditionsOption): string;
+        booleanValue(value: boolean): string;
+    }
+
+    interface Schema {
+        tableName: string;
+        table: string;
+        name: string;
+        schema: string;
+        delimiter: string;
+    }
+
+    interface QueryTypes {
+        SELECT: string;
+        BULKUPDATE: string;
+        BULKDELETE: string;
+    }
+
+    interface ModelManager {
+        daos: Array<Model<any, any>>;
+        sequelize: Sequelize;
+        addDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): Model<TInstance, TPojo>;
+        removeDAO<TInstance, TPojo>(dao: Model<TInstance, TPojo>): void;
+        getDAO<TInstance, TPojo>(daoName: string, options?: ModelMangerGetDaoOptions): Model<TInstance, TPojo>;
+        all: Array<Model<any, any>>;
+
+        /**
+         * Iterate over DAOs in an order suitable for e.g. creating tables. Will
+         * take foreign key constraints into account so that dependencies are visited
+         * before dependents.
+         */
+        forEachDAO(iterator: (dao: Model<any, any>, name: string) => void, options?: ModelManagerForEachDaoOptions): void;
+    }
+
+    interface TransactionManager {
+        sequelize: Sequelize;
+        connectorManagers: any;
+        getConnectorManager(uuid?: string): ConnectorManager;
+        releaseConnectionManager(uuid?: string): void;
+
+        /**
+         * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+         *
+         * @param sql           SQL statement to execute.
+         *
+         * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+         *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+         *
+         * @param options       Query options.
+         *
+         */
+        query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
+
+        query<TInstance, TPojo>(sql: string, callee?: Model<TInstance, TPojo>, options?: QueryOptions): EventEmitter;
+    }
+
+    interface ConnectorManager {
+
+        /**
+         * Execute a query on the DB, with the possibility to bypass all the sequelize goodness.
+         *
+         * @param sql           SQL statement to execute.
+         *
+         * @param callee        If callee is provided, the selected data will be used to build an instance of the DAO represented
+         *                      by the factory. Equivalent to calling Model.build with the values provided by the query.
+         *
+         * @param options       Query options.
+         *
+         */
+        query(sql: string, callee?: Model<any, any>, options?: QueryOptions): EventEmitter;
+
+        afterTransactionSetup(callback: () => void): void;
+        connect(): void;
+        disconnect(): void;
+        reconnect(): void;
+        cleanup(): void;
+    }
+
+    interface Migrator {
+        queryInterface: QueryInterface;
+        migrate(options?: MigratorOptions): EventEmitter;
+        getUndoneMigrations(callback: (err: Error, result: Array<Migrator>) => void): void;
+        findOrCreateMetaDAO(syncOptions?: SyncOptions): EventEmitter;
+        exec(filename: string, options?: MigratorExecOptions): EventEmitter;
+        getLastMigrationFromDatabase(): EventEmitter;
+        getLastMigrationIdFromDatabase(): EventEmitter;
+        getFormattedDateString(s: string): string;
+        stringToDate(s: string): Date;
+        saveSuccessfulMigration(from: Migration, to: Migration, callback: (metaData: MetaInstance) => void): void;
+        deleteUndoneMigration(from: Migration, to: Migration, callback: () => void): void;
+        execute(options?: MigrationExecuteOptions): EventEmitter;
+        isBefore(date: Date, options?: MigrationCompareOptions): boolean;
+        isAfter(date: Date, options?: MigrationCompareOptions): boolean;
+
+    }
+
+    interface Migration extends QueryInterface {
+        migrator: Migrator;
+        path: string;
+        filename: string;
+        migrationId: number;
+        date: Date;
+        queryInterface: QueryInterface;
+        migration: (err: Error, migration: Migration, dataTypes: any, callback: (err: Error) => void) => void;
+
+    }
+
+    interface EventEmitter extends EventEmitterT<any>, NodeJS.EventEmitter { }
+
+    interface EventEmitterT<R> extends NodeJS.EventEmitter {
+        /**
+         * Create a new emitter instance.
+         *
+         * @param handler
+         */
+        new (handler: (emitter: EventEmitterT<R>) => void): EventEmitterT<R>;
+
+        /**
+         * Run the function that was passed when the emitter was instantiated.
+         */
+        run(): EventEmitterT<R>;
+
+        /**
+         * Listen for success events.
+         *
+         * @param onSuccess
+         */
+        success(onSuccess: (result: R) => void): EventEmitterT<R>;
+
+        /**
+         * Alias for success(handler). Listen for success events.
+         *
+         * @param onSuccess
+         */
+        ok(onSuccess: (result: R) => void): EventEmitterT<R>;
+
+        /**
+         * Listen for error events.
+         *
+         * @param onError
+         */
+        error(onError: (err: Error) => void): EventEmitterT<R>;
+
+        /**
+         * Alias for error(handler). Listen for error events.
+         *
+         * @param onError
+         */
+        fail(onError: (err: Error) => void): EventEmitterT<R>;
+
+        /**
+         * Alias for error(handler). Listen for error events.
+         *
+         * @param onError
+         */
+        failure(onError: (err: Error) => void): EventEmitterT<R>;
+
+        /**
+         * Listen for both success and error events.
+         *
+         * @param onDone
+         */
+        done(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
+
+        /**
+         * Alias for done(handler). Listen for both success and error events.
+         *
+         * @param onDone
+         */
+        complete(onDone: (err: Error, result: R) => void): EventEmitterT<R>;
+
+        /**
+         * Attach a function that is called every time the function that created this emitter executes a query.
+         *
+         * @param onSQL
+         */
+        sql(onSQL: (sql: string) => void): EventEmitterT<R>;
+
+        /**
+         * Proxy every event of this event emitter to another one.
+         *
+         * @param emitter   The event emitter that should receive the events.
+         * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+         */
+        proxy(emitter: EventEmitterT<R>, options?: ProxyOptions): EventEmitterT<R>;
+
+
+    }
+
+    interface Options {
+        /**
+         * The dialect you of the database you are connecting to. One of mysql, postgres, sqlite and mariadb.
+         * Default is mysql.
+         */
+        dialect?: string;
+
+        /**
+         * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of pg when
+         * connecting to a pg database, you should specify 'pg.js' here
+         */
+        dialectModulePath?: string;
+
+        /**
+         * The dialect options that are passed to the underlying dialect library.
+         */
+        dialectOptions?: Object;
+
+        /**
+         * The host of the relational database. Default 'localhost'.
+         */
+        host?: string;
+
+        /**
+         * Integer    The port of the relational database.
+         */
+        port?: number;
+
+        /**
+         * The protocol of the relational database. Default 'tcp'.
+         */
+        protocol?: string;
+
+        /**
+         * Default options for model definitions. See sequelize.define for options.
+         */
+        define?: DefineOptions;
+
+        /**
+         * Default options for sequelize.query
+         */
+        query?: QueryOptions;
+
+        /**
+         * Default options for sequelize.sync
+         */
+        sync?: SyncOptions;
+
+        /**
+         * The timezone used when converting a date from the database into a javascript date. The timezone is also used to
+         * SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time
+         * related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM.
+         * Default '+00:00'.
+         */
+        timezone?: string;
+
+        /**
+         * Logging options. Function used to log. Default is console.log. Signature is (message:string) => void.
+         *
+         * Set to "false" to disable logging.
+         */
+        logging?: any;
+
+        /**                                                                                                                                                                                                                        logging=console.log]    Function    A function that gets executed everytime Sequelize would log something.
+         * A flag that defines if null values should be passed to SQL queries or not.
+         */
+        omitNull?: boolean;
+
+        /**
+         * Boolean    Queue queries, so that only maxConcurrentQueries number of queries are executing at once. If false, all
+         * queries will be executed immediately.
+         */
+        queue?: boolean;
+
+        /**
+         * The maximum number of queries that should be executed at once if queue is true.
+         */
+        maxConcurrentQueries?: number;
+
+        /**
+         * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
+         */
+        native?: boolean;
+
+        /**
+         * Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write
+         * should be an object (a single server for handling writes), and read an array of object (several servers to
+         * handle reads). Each read/write server can have the following properties?: host, port, username, password, database
+         */
+        replication?: ReplicationOptions;
+
+        /**
+         * Connection pool options.
+         *
+         */
+        pool?: PoolOptions;
+
+        /**
+         * Set to false to make table names and attributes case-insensitive on Postgres and skip double quoting of them.
+         * Default true.
+         */
+        quoteIdentifiers?: boolean;
+
+        /**
+         * Language. Default "en".
+         */
+        language?: string;
+    }
+
+    interface PoolOptions {
+        maxConnections?: number;
+
+        minConnections?: number;
+
+        /**
+         * The maximum time, in milliseconds, that a connection can be idle before being released.
+         */
+        maxIdleTime?: number;
+
+        /**
+         * A function that validates a connection. Called with client. The default function checks that client is an
+         * object, and that its state is not disconnected.
+         *
+         * Note, this is not documented, and after reading code I'm not sure what client's type is.
+         */
+        validateConnection?: (client?: any) => boolean;
+    }
+
+    interface AttributeOptions {
+        /**
+         * A string or a data type
+         */
+        type?: string;
+
+        /**
+         * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an instance
+         * is saved.
+         */
+        allowNull?: boolean;
+
+        /**
+         * A literal default value, a javascript function, or an SQL function (see sequelize.fn)
+         */
+        defaultValue?: any;
+
+        /**
+         * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
+         * composite unique index. If multiple columns have the same string, they will be part of the same unique index.
+         */
+        unique?: any;
+
+        primaryKey?: boolean;
+
+        /**
+         * If set, sequelize will map the attribute name to a different name in the database.
+         */
+        field?: string;
+
+        autoIncrement?: boolean;
+
+        comment?: string;
+
+        /**
+         * If this column references another table, provide it here as a Model, or a string.
+         */
+        references?: any;
+
+        /**
+         * The column of the foreign table that this column references. Default 'id'.
+         */
+        referencesKey?: string;
+
+        /**
+         * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION.
+         */
+        onUpdate?: string;
+
+        /**
+         * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION.
+         */
+        onDelete?: string;
+
+        /**
+         * Provide a custom getter for this column. Use this.getDataValue(String) to manipulate the underlying values.
+         */
+        get?: () => any;
+
+        /**
+         * Provide a custom setter for this column. Use this.setDataValue(String, Value) to manipulate the underlying values.
+         */
+        set?: (value?: any) => void;
+
+        /**
+         * An object of validations to execute for this column every time the model is saved. Can be either the name of a
+         * validation provided by validator.js, a validation function provided by extending validator.js (see the
+         * DAOValidator property for more details), or a custom validation function. Custom validation functions are called
+         * with the value of the field, and can possibly take a second callback argument, to signal that they are
+         * asynchronous. If the validator is sync, it should throw in the case of a failed validation, it it is async,
+         * the callback should be called with the error text.
+         */
+        validate?: any;
+    }
+
+    interface ForeignKeyAttributeOptions extends AttributeOptions {
+        /**
+         * The name of the foreign key in the target table. Defaults to the name of source + primary key of source.
+         */
+        fieldName: string;
+    }
+
+    interface DefineOptions {
+        /**
+         * Define the default search scope to use for this model. Scopes have the same form as the options passed to
+         * find / findAll.
+         */
+        defaultScope?: FindOptions;
+
+        /**
+         * More scopes, defined in the same way as defaultScope above. See Model.scope for more information about how
+         * scopes are defined, and what you can do with them
+         */
+        scopes?: any;
+
+        /**
+         * Don't persits null values. This means that all columns with null values will not be saved.
+         */
+        omitNull?: boolean;
+
+        /**
+         * Adds createdAt and updatedAt timestamps to the model. Default true.
+         */
+        timestamps?: boolean;
+
+        /**
+         * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
+         * timestamps=true to work. Default false.
+         */
+        paranoid?: boolean;
+
+        /**
+         * Converts all camelCased columns to underscored if true. Default false.
+         */
+        underscored?: boolean;
+
+        /**
+         * Converts camelCased model names to underscored tablenames if true. Default false.
+         */
+        underscoredAll?: boolean;
+
+        /**
+         * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name. Otherwise, the
+         * dao name will be pluralized. Default false.
+         */
+        freezeTableName?: boolean;
+
+        /**
+         * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps must be true.
+         */
+        createdAt?: any;
+
+        /**
+         * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps must be true.
+         */
+        updatedAt?: any;
+
+        /**
+         * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps must be true.
+         */
+        deletedAt?: any;
+
+        /**
+         * Defaults to pluralized DAO name, unless freezeTableName is true, in which case it uses DAO name verbatim.
+         */
+        tableName?: string;
+
+        /**
+         * Provide getter functions that work like those defined per column. If you provide a getter method with the same
+         * name as a column, it will be used to access the value of that column. If you provide a name that does not match
+         * a column, this function will act as a virtual getter, that can fetch multiple other values.
+         */
+        getterMethods?: any;
+
+        /**
+         * Provide setter functions that work like those defined per column. If you provide a setter method with the same
+         * name as a column, it will be used to update the value of that column. If you provide a name that does not match
+         * a column, this function will act as a virtual setter, that can act on and set other values, but will not be
+         * persisted
+         */
+        setterMethods?: any;
+
+        /**
+         * Provide functions that are added to each instance (DAO).
+         */
+        instanceMethods?: any;
+
+        /**
+         * Provide functions that are added to the model (Model).
+         */
+        classMethods?: any;
+
+        /**
+         * Default 'public'.
+         */
+        schema?: string;
+        schemaDelimiter?: string;
+        engine?: string;
+        charset?: string;
+        comment?: string;
+        collate?: string;
+        whereCollection?: any;
+        language?: string;
+
+        /**
+         * An object of hook function that are called before and after certain lifecycle events. The possible hooks are?:
+         * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
+         * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestory and
+         * afterBulkUpdate. See Hooks for more information about hook functions and their signatures. Each property can
+         * either be a function, or an array of functions.
+         */
+        hooks?: Hooks;
+
+        /**
+         * An object of model wide validations. Validations have access to all model values via this. If the validator
+         * function takes an argument, it is assumed to be async, and is called with a callback that accepts an optional
+         * error.
+         */
+        validate?: any;
+
+        /**
+         *
+         */
+        indexes?: Array<DefineIndexOptions>;
+    }
+
+    interface DefineIndexOptions {
+        /**
+         * The name of the index. Defaults to model name + _ + fields concatenated.
+         */
+        name?: string;
+
+        /**
+         * Index type. Only used by mysql. One of UNIQUE, FULLTEXT and SPATIAL.
+         */
+        type: string;
+
+        /**
+         * The method to create the index by (USING statement in SQL). BTREE and HASH are supported by mysql and postgres,
+         * and postgres additionally supports GIST and GIN.
+         */
+        method: string;
+
+        /**
+         * Should the index by unique? Can also be triggered by setting type to UNIQUE. Default false (unless type = "UNIQUE",
+         * then true).
+         */
+        unique?: boolean;
+
+        /**
+         * PostgreSQL will build the index without taking any write locks. Postgres only. Default false.
+         */
+        concurrently?: boolean;
+
+        /**
+         * An array of the fields to index. Each field can either be a string containing the name of the field, or an object
+         * with the following attributes: attribute (field name), length (create a prefix index of length chars), order (the
+         * direction the column should be sorted in), collate (the collation (sort order) for the column)
+         */
+        fields: Array<any>;
+    }
+
+    interface QueryOptions {
+        /**
+         * If true, sequelize will not try to format the results of the query, or build an instance of a model from the
+         * result.
+         */
+        raw?: boolean;
+
+        /**
+         * The transaction that the query should be executed under.
+         */
+        transaction?: Transaction;
+
+        /**
+         * The type of query you are executing. The query type affects how results are formatted before they are passed
+         * back. If no type is provided sequelize will try to guess the right type based on the sql, and fall back to
+         * SELECT. The type is a string, but Sequelize.QueryTypes is provided is convenience shortcuts. Current options
+         * are SELECT, BULKUPDATE and BULKDELETE.
+         *
+         * Default is SELECT.
+         */
+        type?: string;
+
+        /**
+         * Lock the selected rows in either share or update mode. Possible options are transaction.LOCK.UPDATE and
+         * transaction.LOCK.SHARE. See transaction.LOCK for an example.
+         */
+        lock?: string;
+
+        /**
+         * For aggregate function calls, the type of the result. If field is a field in this Model, the default will be the
+         * type of that field, otherwise defaults to float.
+         */
+        dataType?: any;
+
+        /**
+         * A function that logs sql queries, or false for no logging.
+         */
+        logging?: any;
+
+        /**
+         * If plain is true, then sequelize will only return the first record of the result set. In case of false it will
+         * all records.
+         */
+        plain?: boolean;
+    }
+
+    interface SyncOptions {
+        /**
+         * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table.
+         * Default false.
+         */
+        force?: boolean;
+
+        /**
+         * A function that logs sql queries, or false for no logging.
+         */
+        logging?: any;
+
+        /**
+         * The schema that the tables should be created in. This can be overriden for each table in sequelize.define.
+         * Default 'public'.
+         */
+        schema?: string;
+    }
+
+    interface ReplicationOptions {
+        read?: Array<Server>;
+        write?: Server;
+    }
+
+    interface Server {
+        host?: string;
+        port?: number;
+        database?: string;
+        username?: string;
+        password?: string;
+    }
+
+    interface DropOptions {
+        /**
+         * Also drop all objects depending on this table, such as views. Only works in postgres.
+         *
+         * Default false.
+         */
+        cascade?: boolean;
+    }
+
+    interface SchemaOptions {
+        /**
+         * The character(s) that separates the schema name from the table name. Default '.'.
+         */
+        schemaDelimiter?: string;
+    }
+
+    interface FindOptions {
+        /**
+         * A hash of attributes to describe your search.
+         */
+        where?: any;
+
+        /**
+         * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with two
+         * elements - the first is the name of the attribute in the DB (or some kind of expression such as
+         * Sequelize.literal, Sequelize.fn and so on), and the second is the name you want the attribute to have in the
+         * returned instance
+         */
+        attributes?: Array<any>;
+
+        /**
+         * A list of associations to eagerly load. Supported is either { include?: [ Model1, Model2, ...] } or { include?:
+         * [ { model?: Model1, as?: 'Alias' } ] }. If your association are set up with an as (eg. X.hasMany(Y, { as?: 'Z },
+         * you need to specify Z in the as attribute when eager loading Y). When using the object form, you can also
+         * specify attributes to specify what columns to load, where to limit the relations, and include to load further
+         * nested relations
+         */
+        include?: any;
+
+        /**
+         * Specifies an ordering. If a string is provided, it will be esacped. Using an array, you can provide several
+         * columns / functions to order by. Each element can be further wrapped in a two-element array. The first element
+         * is the column / function to order by, the second is the direction. For example?: order?: [['name', 'DESC']]. In
+         * this way the column will be escaped, but the direction will not.
+         */
+        order?: any;
+
+        limit?: number;
+
+        offset?: number;
+    }
+
+    interface BuildOptions {
+        /**
+         * If set to true, values will ignore field and virtual setters. Default false.
+         */
+        raw?: boolean;
+
+        /**
+         * Default true.
+         */
+        isNewRecord?: boolean;
+
+        /**
+         * Default true.
+         */
+        isDirty?: boolean;
+
+        /**
+         * an array of include options - Used to build prefetched/included model instances. See set.
+         */
+        include?: Array<any>;
+    }
+
+    interface CopyOptions extends BuildOptions {
+        /**
+         * If set, only columns matching those in fields will be saved.
+         */
+        fields?: Array<string>;
+
+        /**
+         *
+         */
+        transaction?: Transaction;
+    }
+
+    interface FindOrCreateOptions extends FindOptions, QueryOptions {
+
+    }
+
+    interface BulkCreateOptions {
+        /**
+         * Fields to insert (defaults to all fields).
+         */
+        fields?: Array<string>;
+
+        /**
+         * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
+         * validation. Default false.
+         */
+        validate?: boolean;
+
+        /**
+         * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run. Default false;
+         */
+        hooks?: boolean;
+
+        /**
+         * Ignore duplicate values for primary keys? (not supported by postgres). Default false.
+         */
+        ignoreDuplicates?: boolean;
+    }
+
+    interface DestroyOptions {
+        /**
+         * If set to true, destroy will find all records within the where parameter and will execute before-/ after
+         * bulkDestroy hooks on each row.
+         */
+        hooks?: boolean;
+
+        /**
+         * How many rows to delete
+         */
+        limit?: number;
+
+        /**
+         * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is truncated the
+         * where and limit options are ignored.
+         */
+        truncate?: boolean;
+    }
+
+    interface DestroyInstanceOptions {
+        /**
+         * If set to true, paranoid models will actually be deleted.
+         */
+        force: boolean;
+    }
+
+    interface InsertOptions {
+        limit?: number;
+        returning?: string;
+        allowNull?: string;
+    }
+
+    interface UpdateOptions {
+        /**
+         * Should each row be subject to validation before it is inserted. The whole insert will fail if one row fails
+         * validation. Default true.
+         */
+        validate?: boolean;
+
+        /**
+         * Run before / after bulkUpdate hooks? Default false.
+         */
+        hooks?: boolean;
+
+        /**
+         * How many rows to update (only for mysql and mariadb).
+         */
+        limit?: number;
+    }
+
+    interface SetOptions {
+        /**
+         * If set to true, field and virtual setters will be ignored. Default false.
+         */
+        raw?: boolean;
+
+        /**
+         * Clear all previously set data values. Default false.
+         */
+        reset?: boolean;
+
+        include?: any;
+    }
+
+    interface SaveOptions {
+        /**
+         * An alternative way of setting which fields should be persisted.
+         */
+        fields?: any;
+
+        /**
+         * If true, the updatedAt timestamp will not be updated. Default false.
+         */
+        silent?: boolean;
+
+        transaction?: Transaction;
+    }
+
+    interface ValidateOptions {
+        /**
+         * An array of strings. All properties that are in this array will not be validated.
+         */
+        skip: Array<string>;
+    }
+
+    interface IncrementOptions {
+        /**
+         * The number to increment by. Default 1.
+         */
+        by?: number;
+
+        transaction?: Transaction;
+    }
+
+    interface IndexOptions {
+        indicesType?: string;
+        indexType?: string;
+        indexName?: string;
+        parser?: any;
+    }
+
+    interface ProxyOptions {
+        /**
+         * An array of the events to proxy. Defaults to sql, error and success.
+         */
+        events: Array<string>;
+    }
+
+    interface AssociationOptions {
+        /**
+         * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade. For
+         * example if User.hasOne(Profile, {onDelete: 'cascade', hooks:true}), the before-/afterDestroy hooks for profile
+         * will be called when a user is deleted. Otherwise the profile will be deleted without invoking any hooks.
+         * Default false.
+         */
+        hooks?: boolean;
+
+        /**
+         * The name of the table that is used to join source and target in n:m associations. Can also be a sequelize model
+         * if you want to define the junction table yourself and add extra attributes to it.
+         */
+        through?: any;
+
+        /**
+         * The alias of this model. If you create multiple associations between the same tables, you should provide an
+         * alias to be able to distinguish between them. If you provide an alias when creating the assocition, you should
+         * provide the same alias when eager loading and when getting assocated models. Defaults to the singularized
+         * version of target.name
+         */
+        as?: string;
+
+        /**
+         * The foreignKey can be either a string name of the foreign key in the target table,
+         * or can be an object defining the foreign key and its options. Note foreignKey is not fully
+         * typed since TypeScript does not support union types--it can be either a string or an
+         * options object. String name defaults to the name of source + primary key of source.
+         *
+         * @see ForeignKeyAttributeOptions.
+         */
+        foreignKey?: any;
+
+        /**
+         * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION. Default SET NULL.
+         */
+        onDelete?: string;
+
+        /**
+         * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION. Default CASCADE.
+         */
+        onUpdate?: string;
+
+        /**
+         * Should on update and on delete constraints be enabled on the foreign key.
+         */
+        constraints?: boolean;
+    }
+
+    interface TriggerOptions {
+        insert?: Array<string>;
+        update?: Array<string>;
+        delete?: Array<string>;
+        truncate?: Array<string>;
+    }
+
+    interface TriggerParam {
+        type: string;
+        direction?: string;
+        name?: string;
+    }
+
+    interface SelectOptions {
+        limit?: number;
+        offset?: number;
+        attributes?: Array<any>;
+        hasIncludeWhere?: boolean;
+        hasIncludeRequired?: boolean;
+        hasMultiAssociation?: boolean;
+        tableAs?: string;
+        table?: string;
+        include?: Array<any>;
+        includeIgnoreAttributes?: boolean;
+        where?: any;
+        /**
+         * String field name or array of strings of field names.
+         */
+        group?: any;
+        having?: any;
+        order?: any;
+        lock?: string;
+    }
+
+    interface HashToWhereConditionsOption {
+        include?: boolean;
+        keysEscaped?: boolean;
+    }
+
+    interface ModelMangerGetDaoOptions {
+        attribute: string;
+    }
+
+    interface ModelManagerForEachDaoOptions {
+        /**
+         * Default true.
+         */
+        reverse: boolean;
+    }
+
+    interface MigratorOptions {
+        /**
+         * A flag that defines if the migrator should get instantiated or not..
+         */
+        force: boolean;
+    }
+
+    interface FindAndCountResult<T> {
+        /**
+         * The matching model instances.
+         */
+        rows?: Array<T>;
+
+        /**
+         * The total number of rows. This may be more than the rows returned if a limit and/or offset was supplied.
+         */
+        count?: number;
+    }
+
+    interface Col {
+        /**
+         * Column name.
+         */
+        col: string;
+    }
+
+    interface Cast {
+        /**
+         * The value to cast.
+         */
+        val: any;
+
+        /**
+         * The type to cast it to.
+         */
+        type: string;
+    }
+
+    interface Literal {
+        val: any;
+    }
+
+    interface And {
+        /**
+         * Each argument (string or object) will be joined by AND.
+         */
+        args: Array<any>;
+    }
+
+    interface Or {
+        /**
+         * Each argument (string or object) will be joined by OR.
+         */
+        args: Array<any>;
+    }
+
+    interface Where {
+        /**
+         * The attribute.
+         */
+        attribute: string;
+
+        /**
+         * The condition. Can be both a simply type, or a further condition (.or, .and, .literal etc.).
+         */
+        logic: any;
+    }
+
+    interface TransactionOptions {
+        /**
+         *
+         */
+        autocommit?: boolean;
+
+        /**
+         * One of: 'READ UNCOMMITTED', 'READ COMMITTED', 'REPEATABLE READ', 'SERIALIZABLE'. Default 'REPEATABLE READ'.
+         */
+        isolationLevel?: string;
+    }
+
+    interface QueryChainerRunSeriallyOptions {
+        /**
+         * If set to true, all pending emitters will be skipped if a previous emitter failed. Default false.
+         */
+        skipOnError: boolean;
+    }
+
+    interface CreateTableQueryOptions {
+        comment?: string;
+        uniqueKeys?: Array<any>;
+        charset?: string;
+    }
+
+    interface MigratorExecOptions {
+        before?: (migrator: Migrator) => void;
+        after?: (migrator: Migrator) => void;
+        success?: (migrator: Migrator) => void;
+    }
+
+    interface MigrationExecuteOptions {
+        method: string;
+    }
+
+    interface MigrationCompareOptions {
+        /**
+         * Default false.
+         */
+        withoutEquals: boolean;
+    }
+
+    interface Promise {
+        /**
+         * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
+         *
+         * @param evt Event
+         * @param fct Handler
+         */
+        on(evt: string, fct: () => void): void;
+
+        /**
+         * Emit an event from the emitter.
+         *
+         * @param type  The type of event.
+         * @param value All other arguments will be passed to the event listeners.
+         */
+        emit(type: string, ...value: Array<any>): void;
+
+        /**
+         * Listen for success events.
+         */
+        success(onSuccess: () => void): Promise;
+
+        /**
+         * Alias for success(handler). Listen for success events.
+         */
+        ok(onSuccess: () => void): Promise;
+
+        /**
+         * Listen for error events.
+         *
+         * @param onError Error handler.
+         */
+        error(onError: (err?: Error) => void): Promise;
+
+        /**
+         * Alias for error(handler). Listen for error events.
+         *
+         * @param onError Error handler.
+         */
+        fail(onError: (err?: Error) => void): Promise;
+
+        /**
+         * Alias for error(handler). Listen for error events.
+         *
+         * @param onError Error handler.
+         */
+        failure(onError: (err?: Error) => void): Promise;
+
+        /**
+         * Listen for both success and error events..
+         */
+        done(handler: (err: Error, result?: any) => void): Promise;
+
+        /**
+         * Alias for done(handler). Listen for both success and error events..
+         */
+        complete(handler: (err: Error, result?: any) => void): Promise;
+
+        /**
+         * Attach a function that is called every time the function that created this emitter executes a query.
+         *
+         * @param onSQL
+         */
+        sql(onSQL: (sql: string) => void): Promise;
+
+        /**
+         * Proxy every event of this promise to another one.
+         *
+         * @param promise   The promise that should receive the events.
+         * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+         */
+        proxy(promise: Promise, options?: ProxyOptions): Promise;
+
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => void): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then(onFulfilled?: (result?: any) => Promise, onRejected?: (result?: any) => Promise): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: any) => PromiseT<R>, onRejected?: (result?: any) => void): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: any) => void, onRejected?: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R1, R2>(onFulfilled?: (result?: any) => PromiseT<R1>, onRejected?: (result?: any) => PromiseT<R2>): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => Promise): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => void): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread(onFulfilled?: (...results: Array<any>) => Promise, onRejected?: (...results: Array<any>) => void): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => Promise): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread<R>(onFulfilled?: (...results: Array<any>) => void, onRejected?: (...results: Array<any>) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread<R>(onFulfilled?: (...results: Array<any>) => PromiseT<R>, onRejected?: (...results: Array<any>) => void): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style. This listener will recieve all arguments emitted by the emitter,
+         * as opposed to then which will only recieve the first argument.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         * @param onRejected
+         */
+        spread<R1, R2>(onFulfilled?: (...results: Array<any>) => PromiseT<R1>, onRejected?: (...results: Array<any>) => PromiseT<R2>): Promise;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch(onRejected: (result?: any) => Promise): Promise;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch<R>(onRejected: (result?: any) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch(onRejected: (result?: any) => void): Promise;
+    }
+
+    interface PromiseT<T> extends Promise {
+        /**
+         * Listen for events, event emitter style. Mostly for backwards compatibility with EventEmitter.
+         *
+         * @param evt Event
+         * @param fct Handler
+         */
+        on(evt: string, fct: (t: T) => void): void;
+
+        /**
+         * Emit an event from the emitter.
+         *
+         * @param type  The type of event.
+         * @param value All other arguments will be passed to the event listeners.
+         */
+        emit(type: string, ...value: Array<T>): void;
+
+        /**
+         * Listen for success events.
+         */
+        success(onSuccess: (t: T) => void): PromiseT<T>;
+
+        /**
+         * Alias for success(handler). Listen for success events.
+         */
+        ok(onSuccess: (t: T) => void): PromiseT<T>;
+
+        /**
+         * Listen for both success and error events..
+         */
+        done(handler: (err: Error, result: T) => void): PromiseT<T>;
+
+        /**
+         * Alias for done(handler). Listen for both success and error events..
+         */
+        complete(handler: (err: Error, result: T) => void): PromiseT<T>;
+
+        /**
+         * Attach a function that is called every time the function that created this emitter executes a query.
+         *
+         * @param onSQL
+         */
+        sql(onSQL: (sql: string) => void): PromiseT<T>;
+
+        /**
+         * Proxy every event of this promise to another one.
+         *
+         * @param promise   The promise that should receive the events.
+         * @param options   Contains an array of the events to proxy. Defaults to sql, error and success
+         */
+        proxy(promise: PromiseT<T>, options?: ProxyOptions): PromiseT<T>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => void): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then(onFulfilled?: (result?: T) => Promise, onRejected?: (result?: T) => Promise): Promise;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: T) => PromiseT<R>, onRejected?: (result?: T) => void): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R>(onFulfilled?: (result?: T) => void, onRejected?: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Attach listeners to the emitter, promise style.
+         *
+         * @param onFulfilled       The function to call if the promise is fulfilled (if the emitter emits success).
+         *                          Note that this function will always only be called with one argument, as per
+         *                          the promises/A spec. For functions that emit multiple arguments
+         *                          (e.g. findOrCreate) @see spread
+         * @param onRejected
+         */
+        then<R1, R2>(onFulfilled?: (result?: T) => PromiseT<R1>, onRejected?: (result?: T) => PromiseT<R2>): Promise;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch(onRejected: (result?: T) => Promise): Promise;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch<R>(onRejected: (result?: T) => PromiseT<R>): PromiseT<R>;
+
+        /**
+         * Shorthand for then(null, onRejected)
+         */
+        catch(onRejected: (result?: T) => void): Promise;
+    }
+
+    interface Utils {
+        _: Lodash;
+
+        /**
+         * Formats a string to parse and interpolate values into the string based on the optionally provided SQL dialect.
+         * @param arr       Array where first element is string with placeholders and remaining attributes are values to replace placeholders.
+         * @param dialect   SQL Dialect.
+         */
+        format(arr: Array<any>, dialect?: string): string;
+
+        /**
+         * Formats a SQL string replacing named placeholders with values from the parameters object with matching key names.
+         *
+         * @param sql           String to format.
+         * @param parameters    Key/value hash with values to replace in string.
+         * @param dialect       SQL Dialect
+         */
+        formatNamedParameters(sql: string, parameters: any, dialect?: string): string;
+
+        injectScope(scope: string, merge: boolean): any;
+
+        smartWhere(whereArg: any, dialect: string): any;
+
+        compileSmartWhere(obj: any, dialect: string): Array<any>;
+
+        getWhereLogic(logic: string, val?: any): string;
+
+        isHash(obj: any): boolean;
+
+        hasChanged(attrValue: any, value: any): boolean;
+
+        argsArePrimaryKeys(args: Array<any>, primaryKeys: any): boolean;
+
+        /**
+         * Consistently combines two table names such that the alphabetically first name always comes first when combined.
+         *
+         * @param table1
+         * @param table2
+         */
+        combineTableNames(table1: string, table2: string): string;
+
+        singularize(s: string, language?: string): string;
+
+        pluralize(s: string, language: string): string;
+
+        /**
+         * Same concept as _.merge, but don't overwrite properties that have already been assigned
+         */
+        mergeDefaults: typeof _.merge;
+
+        lowercaseFirst(str: string): string;
+
+        uppercaseFirst(str: string): string;
+
+        spliceStr(str: string, index: number, count: number, add: string): string;
+
+        camelize(str: string): string;
+
+        removeCommentsFromFunctionString(s: string): string;
+
+        toDefaultValue(value: any): any;
+
+        defaultValueSchemable(value: any): boolean;
+        setAttributes(hash: any, identifier: string, instance: any, prefix: string): any;
+        removeNullValuesFromHash(hash: any, omitNull: boolean, options: any): any;
+        firstValueOfHash(obj: any): any;
+        inherit(subClass: any, superClass: any): any;
+        stack(): string;
+        now(dialect: string): Date;
+
+        /**
+         * Runs provided function on next tick, depending on environment.
+         *
+         * @param f
+         */
+        tick(f: Function): void;
+
+        /**
+         * Surrounds a string with tick marks while removing all existing tick marks from the string.
+         * @param s         String to tick
+         * @param tickChar  Tick mark. Default `
+         */
+        addTicks(s: string, tickChar?: string): string;
+
+        removeTicks(s: string, tickChar?: string): string;
+
+        generateUUID(): string;
+
+        validateParameter(value: any, expectation: any): boolean;
+
+        CustomEventEmitter: EventEmitter;
+        Promise: Promise;
+        QueryChainer: QueryChainer;
+        Lingo: any; // external project, no definitions yet}
+    }
+
+    interface Lodash extends _.LoDashStatic {
+        camelizeIf(str: string, condition: boolean): string;
+        camelizeIf(str: string, condition: any): string;
+        underscoredIf(str: string, condition: boolean): string;
+        underscoredIf(str: string, condition: any): string;
+        /**
+         * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered falsey.
+         *
+         * @param arr Array to compact.
+         */
+        compactLite<T>(arr: Array<T>): Array<T>;
+    }
+
+    interface MetaPojo {
+        from: string;
+        to: string;
+    }
+    interface MetaInstance extends MetaPojo, Model<MetaInstance, MetaPojo> {
+
+    }
+
+    interface DataTypeStringBase {
+        BINARY: DataTypeString;
+    }
+    interface DataTypeNumberBase {
+        UNSIGNED: boolean;
+        ZEROFILL: boolean;
+    }
+
+    interface DataTypeString extends DataTypeStringBase {
+    }
+    interface DataTypeChar extends DataTypeStringBase {
+    }
+    interface DataTypeInteger extends DataTypeNumberBase {
+    }
+    interface DataTypeBigInt extends DataTypeNumberBase {
+    }
+    interface DataTypeFloat extends DataTypeNumberBase {
+    }
+    interface DataTypeBlob {
+    }
+    interface DataTypeDecimal {
+        PRECISION: number;
+        SCALE: number;
+    }
+
+    interface DataTypeVirtual {
+    }
+    interface DataTypeEnum {
+        (...values: Array<string>): DataTypeEnum;
+    }
+    interface DataTypeArray {
+    }
+    interface DataTypeHstore {
+    }
+
+    interface DataTypes {
+        STRING: DataTypeString;
+        CHAR: DataTypeChar;
+        TEXT: string;
+        INTEGER: DataTypeInteger;
+        BIGINT: DataTypeBigInt;
+        DATE: string;
+        BOOLEAN: string;
+        FLOAT: DataTypeFloat;
+        NOW: string;
+        BLOB: DataTypeBlob;
+        DECIMAL: DataTypeDecimal;
+        UUID: string;
+        UUIDV1: string;
+        UUIDV4: string;
+        VIRTUAL: DataTypeVirtual;
+        NONE: DataTypeVirtual;
+        ENUM: DataTypeEnum;
+        ARRAY: DataTypeArray;
+        HSTORE: DataTypeHstore;
+    }
 }
+
+declare var sequelize: sequelize.SequelizeStatic;
+
+export = sequelize;
diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts
index 9af29c0e97..6a3e83ac72 100644
--- a/sequelize/sequelize.d.ts
+++ b/sequelize/sequelize.d.ts
@@ -9,6157 +9,6155 @@
 /// <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path="../validator/validator.d.ts" />
 
-declare module "sequelize" {
 
-    namespace sequelize {
 
-        //
-        //  Associations
-        // ~~~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/tree/v3.4.1/lib/associations
-        //
-
-
-        /**
-         * The options for the getAssociation mixin of the belongsTo association.
-         * @see BelongsToGetAssociationMixin
-         */
-        interface BelongsToGetAssociationMixinOptions {
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The getAssociation mixin applied to models with belongsTo.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsTo(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
-         *    getRole: Sequelize.BelongsToGetAssociationMixin<RoleInstance>;
-         *    // setRole...
-         *    // createRole...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
-         * @see Instance
-         */
-        interface BelongsToGetAssociationMixin<TInstance> {
-            /**
-             * Get the associated instance.
-             * @param options The options to use when getting the association.
-             */
-            (options?: BelongsToGetAssociationMixinOptions): Promise<TInstance>;
-        }
-
-        /**
-         * The options for the setAssociation mixin of the belongsTo association.
-         * @see BelongsToSetAssociationMixin
-         */
-        interface BelongsToSetAssociationMixinOptions {
-            /**
-             * Skip saving this after setting the foreign key if false.
-             */
-            save?: boolean;
-        }
-
-        /**
-         * The setAssociation mixin applied to models with belongsTo.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsTo(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRole...
-         *    setRole: Sequelize.BelongsToSetAssociationMixin<RoleInstance, RoleId>;
-         *    // createRole...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
-         * @see Instance
-         */
-        interface BelongsToSetAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Set the associated instance.
-             * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
-             * @param options the options passed to `this.save`.
-             */
-            (
-                newAssociation?: TInstance | TInstancePrimaryKey,
-                options?: BelongsToSetAssociationMixinOptions | InstanceSaveOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the createAssociation mixin of the belongsTo association.
-         * @see BelongsToCreateAssociationMixin
-         */
-        interface BelongsToCreateAssociationMixinOptions { }
-
-        /**
-         * The createAssociation mixin applied to models with belongsTo.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsTo(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRole...
-         *    // setRole...
-         *    createRole: Sequelize.BelongsToCreateAssociationMixin<RoleAttributes>;
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
-         * @see Instance
-         */
-        interface BelongsToCreateAssociationMixin<TAttributes> {
-            /**
-             * Create a new instance of the associated model and associate it with this.
-             * @param values The values used to create the association.
-             * @param options The options passed to `target.create` and `setAssociation`.
-             */
-            (
-                values?: TAttributes,
-                options?: BelongsToCreateAssociationMixinOptions | CreateOptions | BelongsToSetAssociationMixinOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the getAssociation mixin of the hasOne association.
-         * @see HasOneGetAssociationMixin
-         */
-        interface HasOneGetAssociationMixinOptions {
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The getAssociation mixin applied to models with hasOne.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasOne(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
-         *    getRole: Sequelize.HasOneGetAssociationMixin<RoleInstance>;
-         *    // setRole...
-         *    // createRole...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
-         * @see Instance
-         */
-        interface HasOneGetAssociationMixin<TInstance> {
-            /**
-             * Get the associated instance.
-             * @param options The options to use when getting the association.
-             */
-            (options?: HasOneGetAssociationMixinOptions): Promise<TInstance>;
-        }
-
-        /**
-         * The options for the setAssociation mixin of the hasOne association.
-         * @see HasOneSetAssociationMixin
-         */
-        interface HasOneSetAssociationMixinOptions {
-            /**
-             * Skip saving this after setting the foreign key if false.
-             */
-            save?: boolean;
-        }
-
-        /**
-         * The setAssociation mixin applied to models with hasOne.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasOne(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRole...
-         *    setRole: Sequelize.HasOneSetAssociationMixin<RoleInstance, RoleId>;
-         *    // createRole...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
-         * @see Instance
-         */
-        interface HasOneSetAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Set the associated instance.
-             * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
-             * @param options The options passed to `getAssocation` and `target.save`.
-             */
-            (
-                newAssociation?: TInstance | TInstancePrimaryKey,
-                options?: HasOneSetAssociationMixinOptions | HasOneGetAssociationMixinOptions | InstanceSaveOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the createAssociation mixin of the hasOne association.
-         * @see HasOneCreateAssociationMixin
-         */
-        interface HasOneCreateAssociationMixinOptions { }
-
-        /**
-         * The createAssociation mixin applied to models with hasOne.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasOne(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRole...
-         *    // setRole...
-         *    createRole: Sequelize.HasOneCreateAssociationMixin<RoleAttributes>;
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
-         * @see Instance
-         */
-        interface HasOneCreateAssociationMixin<TAttributes> {
-            /**
-             * Create a new instance of the associated model and associate it with this.
-             * @param values The values used to create the association.
-             * @param options The options passed to `target.create` and `setAssociation`.
-             */
-            (
-                values?: TAttributes,
-                options?: HasOneCreateAssociationMixinOptions | HasOneSetAssociationMixinOptions | CreateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the getAssociations mixin of the hasMany association.
-         * @see HasManyGetAssociationsMixin
-         */
-        interface HasManyGetAssociationsMixinOptions {
-
-            /**
-             * An optional where clause to limit the associated models.
-             */
-            where?: WhereOptions;
-
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The getAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    getRoles: Sequelize.HasManyGetAssociationsMixin<RoleInstance>;
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyGetAssociationsMixin<TInstance> {
-            /**
-             * Get everything currently associated with this, using an optional where clause.
-             * @param options The options to use when getting the associations.
-             */
-            (options?: HasManyGetAssociationsMixinOptions): Promise<TInstance[]>;
-        }
-
-        /**
-         * The options for the setAssociations mixin of the hasMany association.
-         * @see HasManySetAssociationsMixin
-         */
-        interface HasManySetAssociationsMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The setAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    setRoles: Sequelize.HasManySetAssociationsMixin<RoleInstance, RoleId>;
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManySetAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Set the associated models by passing an array of instances or their primary keys.
-             * Everything that it not in the passed array will be un-associated.
-             * @param newAssociations An array of instances or primary key of instances to associate with this. Pass null or undefined to remove all associations.
-             * @param options The options passed to `target.findAll` and `update`.
-             */
-            (
-                newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-                options?: HasManySetAssociationsMixinOptions | FindOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the addAssociations mixin of the hasMany association.
-         * @see HasManyAddAssociationsMixin
-         */
-        interface HasManyAddAssociationsMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The addAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    addRoles: Sequelize.HasManyAddAssociationsMixin<RoleInstance, RoleId>;
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyAddAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Associate several instances with this.
-             * @param newAssociations An array of instances or primary key of instances to associate with this.
-             * @param options The options passed to `target.update`.
-             */
-            (
-                newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-                options?: HasManyAddAssociationsMixinOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the addAssociation mixin of the hasMany association.
-         * @see HasManyAddAssociationMixin
-         */
-        interface HasManyAddAssociationMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The addAssociation mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    addRole: Sequelize.HasManyAddAssociationMixin<RoleInstance, RoleId>;
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyAddAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Associate an instance with this.
-             * @param newAssociation An instance or the primary key of an instance to associate with this.
-             * @param options The options passed to `target.update`.
-             */
-            (
-                newAssociation?: TInstance | TInstancePrimaryKey,
-                options?: HasManyAddAssociationMixinOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the createAssociation mixin of the hasMany association.
-         * @see HasManyCreateAssociationMixin
-         */
-        interface HasManyCreateAssociationMixinOptions { }
-
-        /**
-         * The createAssociation mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    createRole: Sequelize.HasManyCreateAssociationMixin<RoleAttributes>;
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyCreateAssociationMixin<TAttributes> {
-            /**
-             * Create a new instance of the associated model and associate it with this.
-             * @param values The values used to create the association.
-             * @param options The options to use when creating the association.
-             */
-            (
-                values?: TAttributes,
-                options?: HasManyCreateAssociationMixinOptions | CreateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the removeAssociation mixin of the hasMany association.
-         * @see HasManyRemoveAssociationMixin
-         */
-        interface HasManyRemoveAssociationMixinOptions { }
-
-        /**
-         * The removeAssociation mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    removeRole: Sequelize.HasManyRemoveAssociationMixin<RoleInstance, RoleId>;
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyRemoveAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Un-associate the instance.
-             * @param oldAssociated The instance or the primary key of the instance to un-associate.
-             * @param options The options passed to `target.update`.
-             */
-            (
-                oldAssociated?: TInstance | TInstancePrimaryKey,
-                options?: HasManyRemoveAssociationMixinOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the removeAssociations mixin of the hasMany association.
-         * @see HasManyRemoveAssociationsMixin
-         */
-        interface HasManyRemoveAssociationsMixinOptions { }
-
-        /**
-         * The removeAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    removeRoles: Sequelize.HasManyRemoveAssociationsMixin<RoleInstance, RoleId>;
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyRemoveAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Un-associate several instances.
-             * @param oldAssociated An array of instances or primary key of instances to un-associate.
-             * @param options The options passed to `target.update`.
-             */
-            (
-                oldAssociateds?: Array<TInstance | TInstancePrimaryKey>,
-                options?: HasManyRemoveAssociationsMixinOptions | InstanceUpdateOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the hasAssociation mixin of the hasMany association.
-         * @see HasManyHasAssociationMixin
-         */
-        interface HasManyHasAssociationMixinOptions { }
-
-        /**
-         * The hasAssociation mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    hasRole: Sequelize.HasManyHasAssociationMixin<RoleInstance, RoleId>;
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyHasAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Check if an instance is associated with this.
-             * @param target The instance or the primary key of the instance to check.
-             * @param options The options passed to `getAssociations`.
-             */
-            (
-                target: TInstance | TInstancePrimaryKey,
-                options?: HasManyHasAssociationMixinOptions | HasManyGetAssociationsMixinOptions
-            ): Promise<boolean>;
-        }
-
-        /**
-         * The options for the hasAssociations mixin of the hasMany association.
-         * @see HasManyHasAssociationsMixin
-         */
-        interface HasManyHasAssociationsMixinOptions { }
-
-        /**
-         * The removeAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles
-         *    // hasRole...
-         *    hasRoles: Sequelize.HasManyHasAssociationsMixin<RoleInstance, RoleId>;
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyHasAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Check if all instances are associated with this.
-             * @param targets An array of instances or primary key of instances to check.
-             * @param options The options passed to `getAssociations`.
-             */
-            (
-                targets: Array<TInstance | TInstancePrimaryKey>,
-                options?: HasManyHasAssociationsMixinOptions | HasManyGetAssociationsMixinOptions
-            ): Promise<boolean>;
-        }
-
-        /**
-         * The options for the countAssociations mixin of the hasMany association.
-         * @see HasManyCountAssociationsMixin
-         */
-        interface HasManyCountAssociationsMixinOptions {
-
-            /**
-             * An optional where clause to limit the associated models.
-             */
-            where?: WhereOptions;
-
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The countAssociations mixin applied to models with hasMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.hasMany(Role);
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    countRoles: Sequelize.HasManyCountAssociationsMixin;
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
-         * @see Instance
-         */
-        interface HasManyCountAssociationsMixin {
-            /**
-             * Count everything currently associated with this, using an optional where clause.
-             * @param options The options to use when counting the associations.
-             */
-            (options?: HasManyCountAssociationsMixinOptions): Promise<number>;
-        }
-
-        /**
-         * The options for the getAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyGetAssociationsMixin
-         */
-        interface BelongsToManyGetAssociationsMixinOptions {
-
-            /**
-             * An optional where clause to limit the associated models.
-             */
-            where?: WhereOptions;
-
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The getAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    getRoles: Sequelize.BelongsToManyGetAssociationsMixin<RoleInstance>;
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyGetAssociationsMixin<TInstance> {
-            /**
-             * Get everything currently associated with this, using an optional where clause.
-             * @param options The options to use when getting the associations.
-             */
-            (options?: BelongsToManyGetAssociationsMixinOptions): Promise<TInstance[]>;
-        }
-
-        /**
-         * The options for the setAssociations mixin of the belongsToMany association.
-         * @see BelongsToManySetAssociationsMixin
-         */
-        interface BelongsToManySetAssociationsMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The setAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    setRoles: Sequelize.BelongsToManySetAssociationsMixin<RoleInstance, RoleId, UserRoleAttributes>;
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManySetAssociationsMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
-            /**
-             * Set the associated models by passing an array of instances or their primary keys.
-             * Everything that it not in the passed array will be un-associated.
-             * @param newAssociations An array of instances or primary key of instances to associate with this. Pass null or undefined to remove all associations.
-             * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
-             */
-            (
-                newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-                options?: BelongsToManySetAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the addAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyAddAssociationsMixin
-         */
-        interface BelongsToManyAddAssociationsMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The addAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    addRoles: Sequelize.BelongsToManyAddAssociationsMixin<RoleInstance, RoleId, UserRoleAttributes>;
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyAddAssociationsMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
-            /**
-             * Associate several instances with this.
-             * @param newAssociations An array of instances or primary key of instances to associate with this.
-             * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
-             */
-            (
-                newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-                options?: BelongsToManyAddAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the addAssociation mixin of the belongsToMany association.
-         * @see BelongsToManyAddAssociationMixin
-         */
-        interface BelongsToManyAddAssociationMixinOptions {
-
-            /**
-             * Run validation for the join model.
-             */
-            validate?: boolean;
-        }
-
-        /**
-         * The addAssociation mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    addRole: Sequelize.BelongsToManyAddAssociationMixin<RoleInstance, RoleId, UserRoleAttributes>;
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyAddAssociationMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
-            /**
-             * Associate an instance with this.
-             * @param newAssociation An instance or the primary key of an instance to associate with this.
-             * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
-             */
-            (
-                newAssociation?: TInstance | TInstancePrimaryKey,
-                options?: BelongsToManyAddAssociationMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the createAssociation mixin of the belongsToMany association.
-         * @see BelongsToManyCreateAssociationMixin
-         */
-        interface BelongsToManyCreateAssociationMixinOptions { }
-
-        /**
-         * The createAssociation mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    createRole: Sequelize.BelongsToManyCreateAssociationMixin<RoleAttributes, UserRoleAttributes>;
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyCreateAssociationMixin<TAttributes, TJoinTableAttributes> {
-            /**
-             * Create a new instance of the associated model and associate it with this.
-             * @param values The values used to create the association.
-             * @param options Options passed to `create` and `add`. Can also hold additional attributes for the join table.
-             */
-            (
-                values?: TAttributes,
-                options?: BelongsToManyCreateAssociationMixinOptions | CreateOptions | TJoinTableAttributes
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the removeAssociation mixin of the belongsToMany association.
-         * @see BelongsToManyRemoveAssociationMixin
-         */
-        interface BelongsToManyRemoveAssociationMixinOptions { }
-
-        /**
-         * The removeAssociation mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    removeRole: Sequelize.BelongsToManyRemoveAssociationMixin<RoleInstance, RoleId>;
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyRemoveAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Un-associate the instance.
-             * @param oldAssociated The instance or the primary key of the instance to un-associate.
-             * @param options The options passed to `through.destroy`.
-             */
-            (
-                oldAssociated?: TInstance | TInstancePrimaryKey,
-                options?: BelongsToManyRemoveAssociationMixinOptions | InstanceDestroyOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the removeAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyRemoveAssociationsMixin
-         */
-        interface BelongsToManyRemoveAssociationsMixinOptions { }
-
-        /**
-         * The removeAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    removeRoles: Sequelize.BelongsToManyRemoveAssociationsMixin<RoleInstance, RoleId>;
-         *    // hasRole...
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyRemoveAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Un-associate several instances.
-             * @param oldAssociated An array of instances or primary key of instances to un-associate.
-             * @param options The options passed to `through.destroy`.
-             */
-            (
-                oldAssociateds?: Array<TInstance | TInstancePrimaryKey>,
-                options?: BelongsToManyRemoveAssociationsMixinOptions | InstanceDestroyOptions
-            ): Promise<void>;
-        }
-
-        /**
-         * The options for the hasAssociation mixin of the belongsToMany association.
-         * @see BelongsToManyHasAssociationMixin
-         */
-        interface BelongsToManyHasAssociationMixinOptions { }
-
-        /**
-         * The hasAssociation mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    hasRole: Sequelize.BelongsToManyHasAssociationMixin<RoleInstance, RoleId>;
-         *    // hasRoles...
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyHasAssociationMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Check if an instance is associated with this.
-             * @param target The instance or the primary key of the instance to check.
-             * @param options The options passed to `getAssociations`.
-             */
-            (
-                target: TInstance | TInstancePrimaryKey,
-                options?: BelongsToManyHasAssociationMixinOptions | BelongsToManyGetAssociationsMixinOptions
-            ): Promise<boolean>;
-        }
-
-        /**
-         * The options for the hasAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyHasAssociationsMixin
-         */
-        interface BelongsToManyHasAssociationsMixinOptions { }
-
-        /**
-         * The removeAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles
-         *    // hasRole...
-         *    hasRoles: Sequelize.BelongsToManyHasAssociationsMixin<RoleInstance, RoleId>;
-         *    // countRoles...
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyHasAssociationsMixin<TInstance, TInstancePrimaryKey> {
-            /**
-             * Check if all instances are associated with this.
-             * @param targets An array of instances or primary key of instances to check.
-             * @param options The options passed to `getAssociations`.
-             */
-            (
-                targets: Array<TInstance | TInstancePrimaryKey>,
-                options?: BelongsToManyHasAssociationsMixinOptions | BelongsToManyGetAssociationsMixinOptions
-            ): Promise<boolean>;
-        }
-
-        /**
-         * The options for the countAssociations mixin of the belongsToMany association.
-         * @see BelongsToManyCountAssociationsMixin
-         */
-        interface BelongsToManyCountAssociationsMixinOptions {
-
-            /**
-             * An optional where clause to limit the associated models.
-             */
-            where?: WhereOptions;
-
-            /**
-             * Apply a scope on the related model, or remove its default scope by passing false.
-             */
-            scope?: string | boolean;
-        }
-
-        /**
-         * The countAssociations mixin applied to models with belongsToMany.
-         * An example of usage is as follows:
-         *
-         * ```js
-         *
-         * User.belongsToMany(Role, { through: UserRole });
-         *
-         * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
-         *    // getRoles...
-         *    // setRoles...
-         *    // addRoles...
-         *    // addRole...
-         *    // createRole...
-         *    // removeRole...
-         *    // removeRoles...
-         *    // hasRole...
-         *    // hasRoles...
-         *    countRoles: Sequelize.BelongsToManyCountAssociationsMixin;
-         * }
-         * ```
-         *
-         * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
-         * @see Instance
-         */
-        interface BelongsToManyCountAssociationsMixin {
-            /**
-             * Count everything currently associated with this, using an optional where clause.
-             * @param options The options to use when counting the associations.
-             */
-            (options?: BelongsToManyCountAssociationsMixinOptions): Promise<number>;
-        }
-
-        /**
-         * Foreign Key Options
-         *
-         * @see AssociationOptions
-         */
-        interface AssociationForeignKeyOptions extends ColumnOptions {
-
-            /**
-             *  Attribute name for the relation
-             */
-            name? : string;
-
-        }
-
-        /**
-         * Options provided when associating models
-         *
-         * @see Association class
-         */
-        interface AssociationOptions {
-
-            /**
-             * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade.
-             * For example if `User.hasOne(Profile, {onDelete: 'cascade', hooks:true})`, the before-/afterDestroy hooks
-             * for profile will be called when a user is deleted. Otherwise the profile will be deleted without invoking
-             * any hooks.
-             *
-             * Defaults to false
-             */
-            hooks?: boolean;
-
-            /**
-             * The alias of this model, in singular form. See also the `name` option passed to `sequelize.define`. If
-             * you create multiple associations between the same tables, you should provide an alias to be able to
-             * distinguish between them. If you provide an alias when creating the assocition, you should provide the
-             * same alias when eager loading and when getting assocated models. Defaults to the singularized name of
-             * target
-             */
-                as?: string | { singular: string, plural: string };
-
-            /**
-             * The name of the foreign key in the target table or an object representing the type definition for the
-             * foreign column (see `Sequelize.define` for syntax). When using an object, you can add a `name` property
-             * to set the name of the column. Defaults to the name of source + primary key of source
-             */
-            foreignKey?: string | AssociationForeignKeyOptions;
-
-            /**
-             * What happens when delete occurs.
-             *
-             * Cascade if this is a n:m, and set null if it is a 1:m
-             *
-             * Defaults to 'SET NULL' or 'CASCADE'
-             */
-            onDelete?: string;
-
-            /**
-             * What happens when update occurs
-             *
-             * Defaults to 'CASCADE'
-             */
-            onUpdate?: string;
-
-            /**
-             * Should on update and on delete constraints be enabled on the foreign key.
-             */
-            constraints?: boolean;
-            foreignKeyConstraint?: boolean;
-
-        }
-
-        /**
-         * Options for Association Scope
-         *
-         * @see AssociationOptionsManyToMany
-         */
-        interface AssociationScope {
-
-            /**
-             * The name of the column that will be used for the associated scope and it's value
-             */
-            [scopeName: string] : any;
-
-        }
-
-        /**
-         * Options provided for many-to-many relationships
-         *
-         * @see AssociationOptionsHasMany
-         * @see AssociationOptionsBelongsToMany
-         */
-        interface AssociationOptionsManyToMany extends AssociationOptions {
-
-            /**
-             * A key/value set that will be used for association create and find defaults on the target.
-             * (sqlite not supported for N:M)
-             */
-            scope? : AssociationScope;
-
-        }
-
-        /**
-         * Options provided when associating models with hasOne relationship
-         *
-         * @see Association class hasOne method
-         */
-        interface AssociationOptionsHasOne extends AssociationOptions {
-
-            /**
-             * A string or a data type to represent the identifier in the table
-             */
-            keyType?: DataTypeAbstract;
-
-        }
-
-        /**
-         * Options provided when associating models with belongsTo relationship
-         *
-         * @see Association class belongsTo method
-         */
-        interface AssociationOptionsBelongsTo extends AssociationOptions {
-
-            /**
-             * The name of the field to use as the key for the association in the target table. Defaults to the primary
-             * key of the target table
-             */
-            targetKey? : string;
-
-            /**
-             * A string or a data type to represent the identifier in the table
-             */
-            keyType?: DataTypeAbstract;
-
-        }
-
-        /**
-         * Options provided when associating models with hasMany relationship
-         *
-         * @see Association class hasMany method
-         */
-        interface AssociationOptionsHasMany extends AssociationOptionsManyToMany {
-
-            /**
-             * A string or a data type to represent the identifier in the table
-             */
-            keyType?: DataTypeAbstract;
-
-        }
-
-        /**
-         * Options provided when associating models with belongsToMany relationship
-         *
-         * @see Association class belongsToMany method
-         */
-        interface AssociationOptionsBelongsToMany extends AssociationOptionsManyToMany {
-
-            /**
-             * The name of the table that is used to join source and target in n:m associations. Can also be a
-             * sequelize
-             * model if you want to define the junction table yourself and add extra attributes to it.
-             *
-             * In 3.4.1 version of Sequelize, hasMany's use of through gives an error, and on the other hand through
-             * option for belongsToMany has been made required.
-             *
-             * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/has-many.js
-             * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/belongs-to-many.js
-             */
-            through : Model<any, any> | string | ThroughOptions;
-
-            /**
-             * The name of the foreign key in the join table (representing the target model) or an object representing
-             * the type definition for the other column (see `Sequelize.define` for syntax). When using an object, you
-             * can add a `name` property to set the name of the colum. Defaults to the name of target + primary key of
-             * target
-             */
-            otherKey? : string | AssociationForeignKeyOptions;
-
-        }
-
-        /**
-         * Used for a association table in n:m associations.
-         *
-         * @see AssociationOptionsBelongsToMany
-         */
-        interface ThroughOptions {
-
-            /**
-             * The model used to join both sides of the N:M association.
-             */
-            model : Model<any, any>;
-
-            /**
-             * A key/value set that will be used for association create and find defaults on the through model.
-             * (Remember to add the attributes to the through model)
-             */
-            scope? : AssociationScope;
-
-            /**
-             * If true a unique key will be generated from the foreign keys used (might want to turn this off and create
-             * specific unique keys when using scopes)
-             *
-             * Defaults to true
-             */
-            unique? : boolean;
-
-        }
-
-        /**
-         * Creating assocations in sequelize is done by calling one of the belongsTo / hasOne / hasMany functions on a
-         * model (the source), and providing another model as the first argument to the function (the target).
-         *
-         * * hasOne - adds a foreign key to target
-         * * belongsTo - add a foreign key to source
-         * * hasMany - adds a foreign key to target, unless you also specify that target hasMany source, in which case
-         * a
-         * junction table is created with sourceId and targetId
-         *
-         * Creating an association will add a foreign key constraint to the attributes. All associations use `CASCADE`
-         * on update and `SET NULL` on delete, except for n:m, which also uses `CASCADE` on delete.
-         *
-         * When creating associations, you can provide an alias, via the `as` option. This is useful if the same model
-         * is associated twice, or you want your association to be called something other than the name of the target
-         * model.
-         *
-         * As an example, consider the case where users have many pictures, one of which is their profile picture. All
-         * pictures have a `userId`, but in addition the user model also has a `profilePictureId`, to be able to easily
-         * load the user's profile picture.
-         *
-         * ```js
-         * User.hasMany(Picture)
-         * User.belongsTo(Picture, { as: 'ProfilePicture', constraints: false })
-         *
-         * user.getPictures() // gets you all pictures
-         * user.getProfilePicture() // gets you only the profile picture
-         *
-         * User.findAll({
-         *   where: ...,
-         *   include: [
-         *     { model: Picture }, // load all pictures
-         *     { model: Picture, as: 'ProfilePicture' }, // load the profile picture. Notice that the spelling must be
-         * the exact same as the one in the association
-         *   ]
-         * })
-         * ```
-         * To get full control over the foreign key column added by sequelize, you can use the `foreignKey` option. It
-         * can either be a string, that specifies the name, or and object type definition,
-         * equivalent to those passed to `sequelize.define`.
-         *
-         * ```js
-         * User.hasMany(Picture, { foreignKey: 'uid' })
-         * ```
-         *
-         * The foreign key column in Picture will now be called `uid` instead of the default `userId`.
-         *
-         * ```js
-         * User.hasMany(Picture, {
-         *   foreignKey: {
-         *     name: 'uid',
-         *     allowNull: false
-         *   }
-         * })
-         * ```
-         *
-         * This specifies that the `uid` column can not be null. In most cases this will already be covered by the
-         * foreign key costraints, which sequelize creates automatically, but can be useful in case where the foreign
-         * keys are disabled, e.g. due to circular references (see `constraints: false` below).
-         *
-         * When fetching associated models, you can limit your query to only load some models. These queries are
-         * written
-         * in the same way as queries to `find`/`findAll`. To only get pictures in JPG, you can do:
-         *
-         * ```js
-         * user.getPictures({
-         *   where: {
-         *     format: 'jpg'
-         *   }
-         * })
-         * ```
-         *
-         * There are several ways to update and add new assoications. Continuing with our example of users and
-         * pictures:
-         * ```js
-         * user.addPicture(p) // Add a single picture
-         * user.setPictures([p1, p2]) // Associate user with ONLY these two picture, all other associations will be
-         * deleted user.addPictures([p1, p2]) // Associate user with these two pictures, but don't touch any current
-         * associations
-         * ```
-         *
-         * You don't have to pass in a complete object to the association functions, if your associated model has a
-         * single primary key:
-         *
-         * ```js
-         * user.addPicture(req.query.pid) // Here pid is just an integer, representing the primary key of the picture
-         * ```
-         *
-         * In the example above we have specified that a user belongs to his profile picture. Conceptually, this might
-         * not make sense, but since we want to add the foreign key to the user model this is the way to do it.
-         *
-         * Note how we also specified `constraints: false` for profile picture. This is because we add a foreign key
-         * from user to picture (profilePictureId), and from picture to user (userId). If we were to add foreign keys
-         * to both, it would create a cyclic dependency, and sequelize would not know which table to create first,
-         * since user depends on picture, and picture depends on user. These kinds of problems are detected by
-         * sequelize before the models are synced to the database, and you will get an error along the lines of `Error:
-         * Cyclic dependency found. 'users' is dependent of itself`. If you encounter this, you should either disable
-         * some constraints, or rethink your associations completely.
-         *
-         * @see Sequelize.Model
-         */
-        interface Associations {
-
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added
-             * on the target.
-             *
-             * Example: `User.hasOne(Profile)`. This will add userId to the profile table.
-             *
-             * @param target The model that will be associated with hasOne relationship
-             * @param options Options for the association
-             */
-            hasOne( target : Model<any, any>, options? : AssociationOptionsHasOne ): void;
-
-            /**
-             * Creates an association between this (the source) and the provided target. The foreign key is added on the
-             * source.
-             *
-             * Example: `Profile.belongsTo(User)`. This will add userId to the profile table.
-             *
-             * @param target The model that will be associated with hasOne relationship
-             * @param options Options for the association
-             */
-            belongsTo( target : Model<any, any>, options? : AssociationOptionsBelongsTo ) : void;
-
-            /**
-             * Create an association that is either 1:m or n:m.
-             *
-             * ```js
-             * // Create a 1:m association between user and project
-             * User.hasMany(Project)
-             * ```
-             * ```js
-             * // Create a n:m association between user and project
-             * User.hasMany(Project)
-             * Project.hasMany(User)
-             * ```
-             * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
-             * overridden by providing either a string or a Model as `through` in the options. If you use a through
-             * model with custom attributes, these attributes can be set when adding / setting new associations in two
-             * ways. Consider users and projects from before with a join table that stores whether the project has been
-             * started yet:
-             * ```js
-             * var UserProjects = sequelize.define('userprojects', {
-             *   started: Sequelize.BOOLEAN
-             * })
-             * User.hasMany(Project, { through: UserProjects })
-             * Project.hasMany(User, { through: UserProjects })
-             * ```
-             * ```js
-             * jan.addProject(homework, { started: false }) // The homework project is not started yet
-             * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner have been
-             * started
-             * ```
-             *
-             * If you want to set several target instances, but with different attributes you have to set the
-             * attributes on the instance, using a property with the name of the through model:
-             *
-             * ```js
-             * p1.userprojects {
-             *   started: true
-             * }
-             * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
-             * ```
-             *
-             * Similarily, when fetching through a join table with custom attributes, these attributes will be
-             * available as an object with the name of the through model.
-             * ```js
-             * user.getProjects().then(function (projects) {
-             *   var p1 = projects[0]
-             *   p1.userprojects.started // Is this project started yet?
-             * })
-             * ```
-             *
-             * @param target The model that will be associated with hasOne relationship
-             * @param options Options for the association
-             */
-            hasMany( target : Model<any, any>, options? : AssociationOptionsHasMany ) : void;
-
-            /**
-             * Create an N:M association with a join table
-             *
-             * ```js
-             * User.belongsToMany(Project)
-             * Project.belongsToMany(User)
-             * ```
-             * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
-             * overridden by providing either a string or a Model as `through` in the options.
-             *
-             * If you use a through model with custom attributes, these attributes can be set when adding / setting new
-             * associations in two ways. Consider users and projects from before with a join table that stores whether
-             * the project has been started yet:
-             * ```js
-             * var UserProjects = sequelize.define('userprojects', {
-             *   started: Sequelize.BOOLEAN
-             * })
-             * User.belongsToMany(Project, { through: UserProjects })
-             * Project.belongsToMany(User, { through: UserProjects })
-             * ```
-             * ```js
-             * jan.addProject(homework, { started: false }) // The homework project is not started yet
-             * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner has been started
-             * ```
-             *
-             * If you want to set several target instances, but with different attributes you have to set the
-             * attributes on the instance, using a property with the name of the through model:
-             *
-             * ```js
-             * p1.userprojects {
-             *   started: true
-             * }
-             * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
-             * ```
-             *
-             * Similarily, when fetching through a join table with custom attributes, these attributes will be
-             * available as an object with the name of the through model.
-             * ```js
-             * user.getProjects().then(function (projects) {
-             *   var p1 = projects[0]
-             *   p1.userprojects.started // Is this project started yet?
-             * })
-             * ```
-             *
-             * @param target The model that will be associated with hasOne relationship
-             * @param options Options for the association
-             *
-             */
-            belongsToMany( target : Model<any, any>, options : AssociationOptionsBelongsToMany ) : void;
-
-        }
-
-        //
-        //  DataTypes
-        // ~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/data-types.js
-        //
-
-        /**
-         * Abstract DataType interface. Use this if you want to create an interface that has a value any of the
-         * DataTypes that Sequelize supports.
-         */
-        interface DataTypeAbstract {
-
-            /**
-             * Although this is not needed for the definitions itself, we want to make sure that DataTypeAbstract is not
-             * something than can be evaluated to an empty object.
-             */
-            dialectTypes : string;
-
-        }
-
-        interface DataTypeAbstractString<T> extends DataTypeAbstract {
-
-            /**
-             * A variable length string. Default length 255
-             */
-            ( options? : { length: number } ) : T;
-            ( length : number ) : T;
-
-            /**
-             * Property BINARY for the type
-             */
-            BINARY : T;
-
-        }
-
-        interface DataTypeString extends DataTypeAbstractString<DataTypeString> { }
-
-        interface DataTypeChar extends DataTypeAbstractString<DataTypeChar> { }
-
-        interface DataTypeText extends DataTypeAbstract {
-
-            /**
-             * Length of the text field.
-             *
-             * Available lengths: `tiny`, `medium`, `long`
-             */
-            ( options? : { length: string } ) : DataTypeText;
-            ( length : string ) : DataTypeText;
-
-        }
-
-        interface DataTypeAbstractNumber<T> extends DataTypeAbstract {
-            UNSIGNED : T;
-            ZEROFILL : T;
-        }
-
-        interface DataTypeNumber extends DataTypeAbstractNumber<DataTypeNumber> { }
-
-        interface DataTypeInteger extends DataTypeAbstractNumber<DataTypeInteger> {
-
-            /**
-             * Length of the number field.
-             */
-            ( options? : { length: number } ) : DataTypeInteger;
-            ( length : number ) : DataTypeInteger;
-
-        }
-
-        interface DataTypeBigInt extends DataTypeAbstractNumber<DataTypeBigInt> {
-
-            /**
-             * Length of the number field.
-             */
-            ( options? : { length: number } ) : DataTypeBigInt;
-            ( length : number ) : DataTypeBigInt;
-
-        }
-
-        interface DataTypeFloat extends DataTypeAbstractNumber<DataTypeFloat> {
-
-            /**
-             * Length of the number field and decimals of the float
-             */
-            ( options? : { length: number, decimals?: number } ) : DataTypeFloat;
-            ( length : number, decimals? : number ) : DataTypeFloat;
-
-        }
-
-        interface DataTypeReal extends DataTypeAbstractNumber<DataTypeReal> {
-
-            /**
-             * Length of the number field and decimals of the real
-             */
-            ( options? : { length: number, decimals?: number } ) : DataTypeReal;
-            ( length : number, decimals? : number ) : DataTypeReal;
-
-        }
-
-        interface DataTypeDouble extends DataTypeAbstractNumber<DataTypeDouble> {
-
-            /**
-             * Length of the number field and decimals of the real
-             */
-            ( options? : { length: number, decimals?: number } ) : DataTypeDouble;
-            ( length : number, decimals? : number ) : DataTypeDouble;
-
-        }
-
-        interface DataTypeDecimal extends DataTypeAbstractNumber<DataTypeDecimal> {
-
-            /**
-             * Precision and scale for the decimal number
-             */
-            ( options? : { precision: number, scale?: number } ) : DataTypeDecimal;
-            ( precision : number, scale? : number ) : DataTypeDecimal;
-
-        }
-
-        interface DataTypeBoolean extends DataTypeAbstract { }
-
-        interface DataTypeTime extends DataTypeAbstract { }
-
-        interface DataTypeDate extends DataTypeAbstract {
-
-            /**
-             * Length of decimal places of time
-             */
-            ( options? : { length?: number } ) : DataTypeDate;
-            ( length? : number) : DataTypeDate;
-
-        }
-
-        interface DataTypeDateOnly extends DataTypeAbstract { }
-
-        interface DataTypeHStore extends DataTypeAbstract { }
-
-        interface DataTypeJSONType extends DataTypeAbstract { }
-
-        interface DataTypeJSONB extends DataTypeAbstract { }
-
-        interface DataTypeNow extends DataTypeAbstract { }
-
-        interface DataTypeBlob extends DataTypeAbstract {
-
-            /**
-             * Length of the blob field.
-             *
-             * Available lengths: `tiny`, `medium`, `long`
-             */
-            ( options? : { length: string } ) : DataTypeBlob;
-            ( length : string ) : DataTypeBlob;
-
-        }
-
-        interface DataTypeRange extends DataTypeAbstract {
-
-            /**
-             * Range field for Postgre
-             *
-             * Accepts subtype any of the ranges
-             */
-            ( options? : { subtype: DataTypeAbstract } ) : DataTypeRange;
-            ( subtype : DataTypeAbstract ) : DataTypeRange;
-
-        }
-
-        interface DataTypeUUID extends DataTypeAbstract { }
-
-        interface DataTypeUUIDv1 extends DataTypeAbstract { }
-
-        interface DataTypeUUIDv4 extends DataTypeAbstract { }
-
-        interface DataTypeVirtual extends DataTypeAbstract {
-
-            /**
-             * Virtual field
-             *
-             * Accepts subtype any of the DataTypes
-             * Array of required attributes that are available on the model
-             */
-            new( subtype : DataTypeAbstract, requireAttributes? : Array<string> ) : DataTypeVirtual;
-        }
-
-        interface DataTypeEnum extends DataTypeAbstract {
-
-            /**
-             * Enum field
-             *
-             * Accepts values
-             */
-            ( options? : { values: string | string[] } ) : DataTypeEnum;
-            ( values : string | string[] ) : DataTypeEnum;
-            ( ...args : string[] ) : DataTypeEnum;
-
-        }
-
-        interface DataTypeArray extends DataTypeAbstract {
-
-            /**
-             * Array field for Postgre
-             *
-             * Accepts type any of the DataTypes
-             */
-            ( options : { type: DataTypeAbstract } ) : DataTypeArray;
-            ( type : DataTypeAbstract ) : DataTypeArray;
-
-        }
-
-        interface DataTypeGeometry extends DataTypeAbstract {
-
-            /**
-             * Geometry field for Postgres
-             */
-            ( type : string, srid? : number ) : DataTypeGeometry;
-
-        }
-
-        /**
-         * A convenience class holding commonly used data types. The datatypes are used when definining a new model
-         * using
-         * `Sequelize.define`, like this:
-         *
-         * ```js
-         * sequelize.define('model', {
-     *   column: DataTypes.INTEGER
-     * })
-         * ```
-         * When defining a model you can just as easily pass a string as type, but often using the types defined here
-         * is
-         * beneficial. For example, using `DataTypes.BLOB`, mean that that column will be returned as an instance of
-         * `Buffer` when being fetched by sequelize.
-         *
-         * Some data types have special properties that can be accessed in order to change the data type.
-         * For example, to get an unsigned integer with zerofill you can do `DataTypes.INTEGER.UNSIGNED.ZEROFILL`.
-         * The order you access the properties in do not matter, so `DataTypes.INTEGER.ZEROFILL.UNSIGNED` is fine as
-         * well. The available properties are listed under each data type.
-         *
-         * To provide a length for the data type, you can invoke it like a function: `INTEGER(2)`
-         *
-         * Three of the values provided here (`NOW`, `UUIDV1` and `UUIDV4`) are special default values, that should not
-         * be used to define types. Instead they are used as shorthands for defining default values. For example, to
-         * get a uuid field with a default value generated following v1 of the UUID standard:
-         *
-         * ```js
-         * sequelize.define('model', {
-     *   uuid: {
-     *     type: DataTypes.UUID,
-     *     defaultValue: DataTypes.UUIDV1,
-     *     primaryKey: true
-     *   }
-     * })
-         * ```
-         */
-        interface DataTypes {
-            ABSTRACT : DataTypeAbstract;
-            STRING : DataTypeString;
-            CHAR : DataTypeChar;
-            TEXT : DataTypeText;
-            NUMBER : DataTypeNumber;
-            INTEGER : DataTypeInteger;
-            BIGINT : DataTypeBigInt;
-            FLOAT : DataTypeFloat;
-            TIME : DataTypeTime;
-            DATE : DataTypeDate;
-            DATEONLY: DataTypeDateOnly;
-            BOOLEAN: DataTypeBoolean;
-            NOW: DataTypeNow;
-            BLOB: DataTypeBlob;
-            DECIMAL: DataTypeDecimal;
-            NUMERIC: DataTypeDecimal;
-            UUID: DataTypeUUID;
-            UUIDV1: DataTypeUUIDv1;
-            UUIDV4: DataTypeUUIDv4;
-            HSTORE: DataTypeHStore;
-            JSON: DataTypeJSONType;
-            JSONB: DataTypeJSONB;
-            VIRTUAL: DataTypeVirtual;
-            ARRAY: DataTypeArray;
-            NONE: DataTypeVirtual;
-            ENUM: DataTypeEnum;
-            RANGE: DataTypeRange;
-            REAL: DataTypeReal;
-            DOUBLE: DataTypeDouble;
-            "DOUBLE PRECISION": DataTypeDouble;
-            GEOMETRY: DataTypeGeometry;
-        }
-
-        //
-        //  Deferrable
-        // ~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/deferrable.js
-        //
-
-        /**
-         * Abstract Deferrable interface. Use this if you want to create an interface that has a value any of the
-         * Deferrables that Sequelize supports.
-         */
-        interface DeferrableAbstract {
-
-            /**
-             * Although this is not needed for the definitions itself, we want to make sure that DeferrableAbstract is
-             * not something than can be evaluated to an empty object.
-             */
-            toString() : string;
-            toSql() : string;
-
-        }
-
-        interface DeferrableInitiallyDeferred extends DeferrableAbstract {
-
-            /**
-             * A property that will defer constraints checks to the end of transactions.
-             */
-            () : DeferrableInitiallyDeferred;
-
-        }
-
-        interface DeferrableInitiallyImmediate extends DeferrableAbstract {
-
-            /**
-             * A property that will trigger the constraint checks immediately
-             */
-            () : DeferrableInitiallyImmediate;
-
-        }
-
-        interface DeferrableNot extends DeferrableAbstract {
-
-            /**
-             * A property that will set the constraints to not deferred. This is the default in PostgreSQL and it make
-             * it impossible to dynamically defer the constraints within a transaction.
-             */
-            () : DeferrableNot;
-
-        }
-
-        interface DeferrableSetDeferred extends DeferrableAbstract {
-
-            /**
-             * A property that will trigger an additional query at the beginning of a
-             * transaction which sets the constraints to deferred.
-             *
-             * @param constraints An array of constraint names. Will defer all constraints by default.
-             */
-            ( constraints : string[] ) : DeferrableSetDeferred;
-
-        }
-
-        interface DeferrableSetImmediate extends DeferrableAbstract {
-
-            /**
-             * A property that will trigger an additional query at the beginning of a
-             * transaction which sets the constraints to immediately.
-             *
-             * @param constraints An array of constraint names. Will defer all constraints by default.
-             */
-            ( constraints : string[] ) : DeferrableSetImmediate;
-
-        }
-
-        /**
-         * A collection of properties related to deferrable constraints. It can be used to
-         * make foreign key constraints deferrable and to set the constaints within a
-         * transaction. This is only supported in PostgreSQL.
-         *
-         * The foreign keys can be configured like this. It will create a foreign key
-         * that will check the constraints immediately when the data was inserted.
-         *
-         * ```js
-         * sequelize.define('Model', {
-         *   foreign_id: {
-         *     type: Sequelize.INTEGER,
-         *     references: {
-         *       model: OtherModel,
-         *       key: 'id',
-         *       deferrable: Sequelize.Deferrable.INITIALLY_IMMEDIATE
-         *     }
-         *   }
-         * });
-         * ```
-         *
-         * The constraints can be configured in a transaction like this. It will
-         * trigger a query once the transaction has been started and set the constraints
-         * to be checked at the very end of the transaction.
-         *
-         * ```js
-         * sequelize.transaction({
-     *   deferrable: Sequelize.Deferrable.SET_DEFERRED
-     * });
-         * ```
-         */
-        interface Deferrable {
-            INITIALLY_DEFERRED: DeferrableInitiallyDeferred;
-            INITIALLY_IMMEDIATE: DeferrableInitiallyImmediate;
-            NOT: DeferrableNot;
-            SET_DEFERRED: DeferrableSetDeferred;
-            SET_IMMEDIATE: DeferrableSetImmediate;
-        }
-
-        //
-        //  Errors
-        // ~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/errors.js
-        //
-
-        /**
-         * The Base Error all Sequelize Errors inherit from.
-         */
-        interface BaseError extends Error, ErrorConstructor { }
-
-        interface ValidationError extends BaseError {
-
-            /**
-             * Validation Error. Thrown when the sequelize validation has failed. The error contains an `errors`
-             * property, which is an array with 1 or more ValidationErrorItems, one for each validation that failed.
-             *
-             * @param message Error message
-             * @param errors  Array of ValidationErrorItem objects describing the validation errors
-             */
-            new ( message : string, errors? : ValidationErrorItem[] ) : ValidationError;
-
-            /**
-             * Gets all validation error items for the path / field specified.
-             *
-             * @param path The path to be checked for error items
-             */
-            get( path : string ) : ValidationErrorItem[];
-
-            /** Array of ValidationErrorItem objects describing the validation errors */
-            errors : ValidationErrorItem[];
-
-        }
-
-        interface ValidationErrorItem extends BaseError {
-
-            /**
-             * Validation Error Item
-             * Instances of this class are included in the `ValidationError.errors` property.
-             *
-             * @param message An error message
-             * @param type The type of the validation error
-             * @param path The field that triggered the validation error
-             * @param value The value that generated the error
-             */
-            new ( message : string, type : string, path : string, value : string ) : ValidationErrorItem;
-
-            /** An error message */
-            message : string;
-
-            /** The type of the validation error */
-            type : string;
-
-            /** The field that triggered the validation error */
-            path : string;
-
-            /** The value that generated the error */
-            value : string;
-
-        }
-
-        interface DatabaseError extends BaseError {
-
-            /**
-             * A base class for all database related errors.
-             */
-            new ( parent : Error ) : DatabaseError;
-
-        }
-
-        interface TimeoutError extends DatabaseError {
-
-            /**
-             * Thrown when a database query times out because of a deadlock
-             */
-            new ( parent : Error ) : TimeoutError;
-
-        }
-
-        interface UniqueConstraintError extends DatabaseError {
-
-            /**
-             * Thrown when a unique constraint is violated in the database
-             */
-            new ( options : { parent? : Error, message? : string, errors? : Object } ) : UniqueConstraintError;
-
-        }
-
-        interface ForeignKeyConstraintError extends DatabaseError {
-
-            /**
-             * Thrown when a foreign key constraint is violated in the database
-             */
-            new ( options : { parent? : Error, message? : string, index? : string, fields? : string[], table? : string } ) : ForeignKeyConstraintError;
-
-        }
-
-        interface ExclusionConstraintError extends DatabaseError {
-
-            /**
-             * Thrown when an exclusion constraint is violated in the database
-             */
-            new ( options : { parent? : Error, message? : string, constraint? : string, fields? : string[], table? : string } ) : ExclusionConstraintError;
-
-        }
-
-        interface ConnectionError extends BaseError {
-
-            /**
-             * A base class for all connection related errors.
-             */
-            new ( parent : Error ) : ConnectionError;
-
-        }
-
-        interface ConnectionRefusedError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database is refused
-             */
-            new ( parent : Error ) : ConnectionRefusedError;
-
-        }
-
-        interface AccessDeniedError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database is refused due to insufficient privileges
-             */
-            new ( parent : Error ) : AccessDeniedError;
-
-        }
-
-        interface HostNotFoundError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database has a hostname that was not found
-             */
-            new ( parent : Error ) : HostNotFoundError;
-
-        }
-
-        interface HostNotReachableError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database has a hostname that was not reachable
-             */
-            new ( parent : Error ) : HostNotReachableError;
-
-        }
-
-        interface InvalidConnectionError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database has invalid values for any of the connection parameters
-             */
-            new ( parent : Error ) : InvalidConnectionError;
-
-        }
-
-        interface ConnectionTimedOutError extends ConnectionError {
-
-            /**
-             * Thrown when a connection to a database times out
-             */
-            new ( parent : Error ) : ConnectionTimedOutError;
-
-        }
-
-        /**
-         * Sequelize provides a host of custom error classes, to allow you to do easier debugging. All of these errors
-         * are exposed on the sequelize object and the sequelize constructor. All sequelize errors inherit from the
-         * base JS error object.
-         */
-        interface Errors {
-            Error : BaseError;
-            ValidationError : ValidationError;
-            ValidationErrorItem : ValidationErrorItem;
-            DatabaseError : DatabaseError;
-            TimeoutError : TimeoutError;
-            UniqueConstraintError : UniqueConstraintError;
-            ExclusionConstraintError : ExclusionConstraintError;
-            ForeignKeyConstraintError : ForeignKeyConstraintError;
-            ConnectionError : ConnectionError;
-            ConnectionRefusedError : ConnectionRefusedError;
-            AccessDeniedError : AccessDeniedError;
-            HostNotFoundError : HostNotFoundError;
-            HostNotReachableError : HostNotReachableError;
-            InvalidConnectionError : InvalidConnectionError;
-            ConnectionTimedOutError : ConnectionTimedOutError;
-        }
-
-        //
-        //  Hooks
-        // ~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/hooks.js
-        //
-
-        /**
-         * Options for Sequelize.define. We mostly duplicate the Hooks here, since there is no way to combine the two
-         * interfaces.
-         *
-         * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
-         * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestroy and
-         * afterBulkUpdate.
-         */
-        interface HooksDefineOptions<TInstance> {
-
-            beforeValidate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            afterValidate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            beforeCreate? : ( attributes : TInstance, options : Object, fn? : Function ) => any;
-            afterCreate? : ( attributes : TInstance, options : Object, fn? : Function ) => any;
-            beforeDestroy? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            beforeDelete? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            afterDestroy? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            afterDelete? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            beforeUpdate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            afterUpdate? : ( instance : TInstance, options : Object, fn? : Function ) => any;
-            beforeBulkCreate? : ( instances : TInstance[], options : Object, fn? : Function ) => any;
-            afterBulkCreate? : ( instances : TInstance[], options : Object, fn? : Function ) => any;
-            beforeBulkDestroy? : ( options : Object, fn? : Function ) => any;
-            beforeBulkDelete? : ( options : Object, fn? : Function ) => any;
-            afterBulkDestroy? : ( options : Object, fn? : Function ) => any;
-            afterBulkDelete? : ( options : Object, fn? : Function ) => any;
-            beforeBulkUpdate? : ( options : Object, fn? : Function ) => any;
-            afterBulkUpdate? : ( options : Object, fn? : Function ) => any;
-            beforeFind? : ( options : Object, fn? : Function ) => any;
-            beforeFindAfterExpandIncludeAll? : ( options : Object, fn? : Function ) => any;
-            beforeFindAfterOptions? : ( options : Object, fn? : Function ) => any;
-            afterFind? : ( instancesOrInstance : TInstance[] | TInstance, options : Object,
-                           fn? : Function ) => any;
-
-        }
-
-        /**
-         * Hooks are function that are called before and after  (bulk-) creation/updating/deletion and validation.
-         * Hooks can be added to you models in three ways:
-         *
-         * 1. By specifying them as options in `sequelize.define`
-         * 2. By calling `hook()` with a string and your hook handler function
-         * 3. By calling the function with the same name as the hook you want
-         *
-         * ```js
-         * // Method 1
-         * sequelize.define(name, { attributes }, {
-         *   hooks: {
-         *     beforeBulkCreate: function () {
-         *       // can be a single function
-         *     },
-         *     beforeValidate: [
-         *       function () {},
-         *       function() {} // Or an array of several
-         *     ]
-         *   }
-         * })
-         *
-         * // Method 2
-         * Model.hook('afterDestroy', function () {})
-         *
-         * // Method 3
-         * Model.afterBulkUpdate(function () {})
-         * ```
-         *
-         * @see Sequelize.define
-         */
-        interface Hooks<TInstance> {
-
-            /**
-             * Add a hook to the model
-             *
-             * @param hookType
-             * @param name Provide a name for the hook function. It can be used to remove the hook later or to order
-             *     hooks based on some sort of priority system in the future.
-             * @param fn The hook function
-             *
-             * @alias hook
-             */
-            addHook( hookType : string, name : string, fn : Function ) : Hooks<TInstance>;
-            addHook( hookType : string, fn : Function ) : Hooks<TInstance>;
-            hook( hookType : string, name : string, fn : Function ) : Hooks<TInstance>;
-            hook( hookType : string, fn : Function ) : Hooks<TInstance>;
-
-            /**
-             * Remove hook from the model
-             *
-             * @param hookType
-             * @param name
-             */
-            removeHook( hookType : string, name : string ) : Hooks<TInstance>;
-
-            /**
-             * Check whether the mode has any hooks of this type
-             *
-             * @param hookType
-             *
-             * @alias hasHooks
-             */
-            hasHook( hookType : string ) : boolean;
-            hasHooks( hookType : string ) : boolean;
-
-            /**
-             * A hook that is run before validation
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             */
-            beforeValidate( name : string,
-                            fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeValidate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after validation
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             */
-            afterValidate( name : string,
-                           fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterValidate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before creating a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with attributes, options
-             */
-            beforeCreate( name : string,
-                          fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeCreate( fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after creating a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with attributes, options
-             */
-            afterCreate( name : string,
-                         fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterCreate( fn : ( attributes : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before destroying a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             * @alias beforeDelete
-             */
-            beforeDestroy( name : string,
-                           fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeDestroy( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeDelete( name : string,
-                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeDelete( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after destroying a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             * @alias afterDelete
-             */
-            afterDestroy( name : string,
-                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterDestroy( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterDelete( name : string, fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterDelete( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before updating a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             */
-            beforeUpdate( name : string,
-                          fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            beforeUpdate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after updating a single instance
-             *
-             * @param name
-             * @param fn A callback function that is called with instance, options
-             */
-            afterUpdate( name : string, fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-            afterUpdate( fn : ( instance : TInstance, options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before creating instances in bulk
-             *
-             * @param name
-             * @param fn A callback function that is called with instances, options
-             */
-            beforeBulkCreate( name : string,
-                              fn : ( instances : TInstance[], options : Object, fn? : Function ) => void ): void;
-            beforeBulkCreate( fn : ( instances : TInstance[], options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after creating instances in bulk
-             *
-             * @param name
-             * @param fn A callback function that is called with instances, options
-             * @name afterBulkCreate
-             */
-            afterBulkCreate( name : string,
-                             fn : ( instances : TInstance[], options : Object, fn? : Function ) => void ): void;
-            afterBulkCreate( fn : ( instances : TInstance[], options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before destroying instances in bulk
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             *
-             * @alias beforeBulkDelete
-             */
-            beforeBulkDestroy( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeBulkDestroy( fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeBulkDelete( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeBulkDelete( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after destroying instances in bulk
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             *
-             * @alias afterBulkDelete
-             */
-            afterBulkDestroy( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            afterBulkDestroy( fn : ( options : Object, fn? : Function ) => void ): void;
-            afterBulkDelete( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            afterBulkDelete( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after updating instances in bulk
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            beforeBulkUpdate( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeBulkUpdate( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after updating instances in bulk
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            afterBulkUpdate( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            afterBulkUpdate( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before a find (select) query
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            beforeFind( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeFind( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before a find (select) query, after any { include: {all: ...} } options are expanded
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            beforeFindAfterExpandIncludeAll( name : string,
-                                             fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeFindAfterExpandIncludeAll( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before a find (select) query, after all option parsing is complete
-             *
-             * @param name
-             * @param fn   A callback function that is called with options
-             */
-            beforeFindAfterOptions( name : string, fn : ( options : Object, fn? : Function ) => void ): void;
-            beforeFindAfterOptions( fn : ( options : Object, fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run after a find (select) query
-             *
-             * @param name
-             * @param fn   A callback function that is called with instance(s), options
-             */
-            afterFind( name : string,
-                       fn : ( instancesOrInstance : TInstance[] | TInstance, options : Object,
-                              fn? : Function ) => void ): void;
-            afterFind( fn : ( instancesOrInstance : TInstance[] | TInstance, options : Object,
-                              fn? : Function ) => void ): void;
-
-            /**
-             * A hook that is run before a define call
-             *
-             * @param name
-             * @param fn   A callback function that is called with attributes, options
-             */
-            beforeDefine( name : string, fn : ( attributes : DefineAttributes, options : Object ) => void ): void;
-            beforeDefine( fn : ( attributes : DefineAttributes, options : Object ) => void ): void;
-
-            /**
-             * A hook that is run after a define call
-             *
-             * @param name
-             * @param fn   A callback function that is called with factory
-             */
-            afterDefine( name : string, fn : ( model : Model<TInstance, any> ) => void ): void;
-            afterDefine( fn : ( model : Model<TInstance, any> ) => void ): void;
-
-            /**
-             * A hook that is run before Sequelize() call
-             *
-             * @param name
-             * @param fn   A callback function that is called with config, options
-             */
-            beforeInit( name : string, fn : ( config : Object, options : Object ) => void ): void;
-            beforeInit( fn : ( config : Object, options : Object ) => void ): void;
-
-            /**
-             * A hook that is run after Sequelize() call
-             *
-             * @param name
-             * @param fn   A callback function that is called with sequelize
-             */
-            afterInit( name : string, fn : ( sequelize : Sequelize ) => void ): void;
-            afterInit( fn : ( sequelize : Sequelize ) => void ): void;
-
-        }
-
-        //
-        //  Instance
-        // ~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/instance.js
-        //
-
-        /**
-         * Options used for Instance.increment method
-         */
-        interface InstanceIncrementDecrementOptions {
-
-            /**
-             * The number to increment by
-             *
-             * Defaults to 1
-             */
-            by? : number;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * A hash of attributes to describe your search. See above for examples.
-             */
-            where? : WhereOptions | Array<col | and | or | string>;
-
-        }
-
-        /**
-         * Options used for Instance.restore method
-         */
-        interface InstanceRestoreOptions {
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * Options used for Instance.destroy method
-         */
-        interface InstanceDestroyOptions {
-
-            /**
-             * If set to true, paranoid models will actually be deleted
-             */
-            force? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run the query in
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * Options used for Instance.update method
-         */
-        interface InstanceUpdateOptions extends InstanceSaveOptions, InstanceSetOptions {
-
-            /**
-             * A hash of attributes to describe your search. See above for examples.
-             */
-            where? : WhereOptions | Array<col | and | or | string>;
-
-        }
-
-        /**
-         * Options used for Instance.set method
-         */
-        interface InstanceSetOptions {
-
-            /**
-             * If set to true, field and virtual setters will be ignored
-             */
-            raw? : boolean;
-
-            /**
-             * Clear all previously set data values
-             */
-            reset? : boolean;
-
-        }
-
-        /**
-         * Options used for Instance.save method
-         */
-        interface InstanceSaveOptions {
-
-            /**
-             * An optional array of strings, representing database columns. If fields is provided, only those columns
-             * will be validated and saved.
-             */
-            fields? : string[];
-
-            /**
-             * If true, the updatedAt timestamp will not be updated.
-             *
-             * Defaults to false
-             */
-            silent? : boolean;
-
-            /**
-             * If false, validations won't be run.
-             *
-             * Defaults to true
-             */
-            validate? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run the query in
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * This class represents an single instance, a database row. You might see it referred to as both Instance and
-         * instance. You should not instantiate the Instance class directly, instead you access it using the finder and
-         * creation methods on the model.
-         *
-         * Instance instances operate with the concept of a `dataValues` property, which stores the actual values
-         * represented by the instance. By default, the values from dataValues can also be accessed directly from the
-         * Instance, that is:
-         * ```js
-         * instance.field
-         * // is the same as
-         * instance.get('field')
-         * // is the same as
-         * instance.getDataValue('field')
-         * ```
-         * However, if getters and/or setters are defined for `field` they will be invoked, instead of returning the
-         * value from `dataValues`. Accessing properties directly or using `get` is preferred for regular use,
-         * `getDataValue` should only be used for custom getters.
-         *
-         * @see Sequelize.define for more information about getters and setters
-         */
-        interface Instance<TAttributes> {
-
-            /**
-             * Returns true if this instance has not yet been persisted to the database
-             */
-            isNewRecord : boolean;
-
-            /**
-             * Returns the Model the instance was created from.
-             *
-             * @see Model
-             */
-            Model : Model<this, TAttributes>;
-
-            /**
-             * A reference to the sequelize instance
-             */
-            sequelize : Sequelize;
-
-            /**
-             * Get an object representing the query for this instance, use with `options.where`
-             */
-            where() : Object;
-
-            /**
-             * Get the value of the underlying data value
-             */
-            getDataValue( key : string ) : any;
-
-            /**
-             * Update the underlying data value
-             */
-            setDataValue( key : string, value : any ) : void;
-
-            /**
-             * If no key is given, returns all values of the instance, also invoking virtual getters.
-             *
-             * If key is given and a field or virtual getter is present for the key it will call that getter - else it
-             * will return the value for key.
-             *
-             * @param options.plain If set to true, included instances will be returned as plain objects
-             */
-            get( key : string, options? : { plain? : boolean, clone? : boolean } ) : any;
-            get( options? : { plain? : boolean, clone? : boolean } ) : TAttributes;
-
-            /**
-             * Set is used to update values on the instance (the sequelize representation of the instance that is,
-             * remember that nothing will be persisted before you actually call `save`). In its most basic form `set`
-             * will update a value stored in the underlying `dataValues` object. However, if a custom setter function
-             * is defined for the key, that function will be called instead. To bypass the setter, you can pass `raw:
-             * true` in the options object.
-             *
-             * If set is called with an object, it will loop over the object, and call set recursively for each key,
-             * value pair. If you set raw to true, the underlying dataValues will either be set directly to the object
-             * passed, or used to extend dataValues, if dataValues already contain values.
-             *
-             * When set is called, the previous value of the field is stored and sets a changed flag(see `changed`).
-             *
-             * Set can also be used to build instances for associations, if you have values for those.
-             * When using set with associations you need to make sure the property key matches the alias of the
-             * association while also making sure that the proper include options have been set (from .build() or
-             * .find())
-             *
-             * If called with a dot.seperated key on a JSON/JSONB attribute it will set the value nested and flag the
-             * entire object as changed.
-             *
-             * @param options.raw If set to true, field and virtual setters will be ignored
-             * @param options.reset Clear all previously set data values
-             */
-            set( key : string, value : any, options? : InstanceSetOptions ) : this;
-            set( keys : Object, options? : InstanceSetOptions ) : this;
-            setAttributes( key : string, value : any, options? : InstanceSetOptions ) : this;
-            setAttributes( keys : Object, options? : InstanceSetOptions ) : this;
-
-            /**
-             * If changed is called with a string it will return a boolean indicating whether the value of that key in
-             * `dataValues` is different from the value in `_previousDataValues`.
-             *
-             * If changed is called without an argument, it will return an array of keys that have changed.
-             *
-             * If changed is called without an argument and no keys have changed, it will return `false`.
-             */
-            changed( key : string ) : boolean;
-            changed() : boolean | string[];
-
-            /**
-             * Returns the previous value for key from `_previousDataValues`.
-             */
-            previous( key : string ) : any;
-
-            /**
-             * Validate this instance, and if the validation passes, persist it to the database.
-             *
-             * On success, the callback will be called with this instance. On validation error, the callback will be
-             * called with an instance of `Sequelize.ValidationError`. This error will have a property for each of the
-             * fields for which validation failed, with the error message for that field.
-             */
-            save( options? : InstanceSaveOptions ) : Promise<this>;
-
-            /**
-             * Refresh the current instance in-place, i.e. update the object with current data from the DB and return
-             * the same object. This is different from doing a `find(Instance.id)`, because that would create and
-             * return a new instance. With this method, all references to the Instance are updated with the new data
-             * and no new objects are created.
-             */
-            reload( options? : FindOptions ) : Promise<this>;
-
-            /**
-             * Validate the attribute of this instance according to validation rules set in the model definition.
-             *
-             * Emits null if and only if validation successful; otherwise an Error instance containing
-             * { field name : [error msgs] } entries.
-             *
-             * @param options.skip An array of strings. All properties that are in this array will not be validated
-             */
-            validate( options? : { skip?: string[] } ) : Promise<ValidationError>;
-
-            /**
-             * This is the same as calling `set` and then calling `save`.
-             */
-            update( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<this>;
-            update( keys : Object, options? : InstanceUpdateOptions ) : Promise<this>;
-            updateAttributes( key : string, value : any, options? : InstanceUpdateOptions ) : Promise<this>;
-            updateAttributes( keys : Object, options? : InstanceUpdateOptions ) : Promise<this>;
-
-            /**
-             * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will
-             * either be completely deleted, or have its deletedAt timestamp set to the current time.
-             */
-            destroy( options? : InstanceDestroyOptions ) : Promise<void>;
-
-            /**
-             * Restore the row corresponding to this instance. Only available for paranoid models.
-             */
-            restore( options? : InstanceRestoreOptions ) : Promise<void>;
-
-            /**
-             * Increment the value of one or more columns. This is done in the database, which means it does not use
-             * the values currently stored on the Instance. The increment is done using a
-             * ```sql
-             * SET column = column + X
-             * ```
-             * query. To get the correct value after an increment into the Instance you should do a reload.
-             *
-             *```js
-             * instance.increment('number') // increment number by 1
-             * instance.increment(['number', 'count'], { by: 2 }) // increment number and count by 2
-             * instance.increment({ answer: 42, tries: 1}, { by: 2 }) // increment answer by 42, and tries by 1.
-             *                                                        // `by` is ignored, since each column has its own
-             *                                                        // value
-             * ```
-             *
-             * @param fields If a string is provided, that column is incremented by the value of `by` given in options.
-             *               If an array is provided, the same is true for each column.
-             *               If and object is provided, each column is incremented by the value given.
-             */
-            increment( fields : string | string[] | Object,
-                       options? : InstanceIncrementDecrementOptions ) : Promise<this>;
-
-            /**
-             * Decrement the value of one or more columns. This is done in the database, which means it does not use
-             * the values currently stored on the Instance. The decrement is done using a
-             * ```sql
-             * SET column = column - X
-             * ```
-             * query. To get the correct value after an decrement into the Instance you should do a reload.
-             *
-             * ```js
-             * instance.decrement('number') // decrement number by 1
-             * instance.decrement(['number', 'count'], { by: 2 }) // decrement number and count by 2
-             * instance.decrement({ answer: 42, tries: 1}, { by: 2 }) // decrement answer by 42, and tries by 1.
-             *                                                        // `by` is ignored, since each column has its own
-             *                                                        // value
-             * ```
-             *
-             * @param fields If a string is provided, that column is decremented by the value of `by` given in options.
-             *               If an array is provided, the same is true for each column.
-             *               If and object is provided, each column is decremented by the value given
-             */
-            decrement( fields : string | string[] | Object,
-                       options? : InstanceIncrementDecrementOptions ) : Promise<this>;
-
-            /**
-             * Check whether all values of this and `other` Instance are the same
-             */
-            equals( other : Instance<any> ) : boolean;
-
-            /**
-             * Check if this is eqaul to one of `others` by calling equals
-             */
-            equalsOneOf( others : Instance<any>[] ) : boolean;
-
-            /**
-             * Convert the instance to a JSON representation. Proxies to calling `get` with no keys. This means get all
-             * values gotten from the DB, and apply all custom getters.
-             */
-            toJSON() : TAttributes;
-
-        }
-
-        //
-        //  Model
-        // ~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/model.js
-        //
-
-        /**
-         * Options to pass to Model on drop
-         */
-        interface DropOptions {
-
-            /**
-             * Also drop all objects depending on this table, such as views. Only works in postgres
-             */
-            cascade?: boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging?: boolean | Function;
-
-        }
-
-        /**
-         * Schema Options provided for applying a schema to a model
-         */
-        interface SchemaOptions {
-
-            /**
-             * The character(s) that separates the schema name from the table name
-             */
-            schemaDelimeter? : string;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : Function | boolean;
-
-        }
-
-        /**
-         * Scope Options for Model.scope
-         */
-        interface ScopeOptions {
-
-            /**
-             * The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of arguments.
-             * To apply simple scopes and scope functions with no arguments, pass them as strings. For scope function,
-             * pass an object, with a `method` property. The value can either be a string, if the method does not take
-             * any arguments, or an array, where the first element is the name of the method, and consecutive elements
-             * are arguments to that method. Pass null to remove all scopes, including the default.
-             */
-            method : string | any[];
-
-        }
-
-        /**
-         * Where Complex nested query
-         */
-        interface WhereNested {
-            $and : Array<WhereOptions | WhereLogic>;
-            $or : Array<WhereOptions | WhereLogic>;
-        }
-
-        /**
-         * Nested where Postgre Statement
-         */
-        interface WherePGStatement {
-            $any : Array<string | number>;
-            $all : Array<string | number>;
-        }
-
-        /**
-         * Where Geometry Options
-         */
-        interface WhereGeometryOptions {
-            type: string;
-            coordinates: Array<number[] | number>;
-        }
-
-        /**
-         * Logic of where statement
-         */
-        interface WhereLogic {
-            $ne : string | number | WhereLogic;
-            $in : Array<string | number> | literal;
-            $not : boolean | string | number | WhereOptions;
-            $notIn : Array<string | number> | literal;
-            $gte : number | string | Date;
-            $gt : number | string | Date;
-            $lte : number | string | Date;
-            $lt : number | string | Date;
-            $like : string | WherePGStatement;
-            $iLike : string | WherePGStatement;
-            $ilike : string | WherePGStatement;
-            $notLike : string | WherePGStatement;
-            $notILike : string | WherePGStatement;
-            $between : [number, number];
-            ".." : [number, number];
-            $notBetween: [number, number];
-            "!.." : [number, number];
-            $overlap : [number, number];
-            "&&" : [number, number];
-            $contains: any;
-            "@>": any;
-            $contained: any;
-            "<@": any;
-        }
-
-        /**
-         * A hash of attributes to describe your search. See above for examples.
-         *
-         * We did put Object in the end, because there where query might be a JSON Blob. It cripples a bit the
-         * typesafety, but there is no way to pass the tests if we just remove it.
-         */
-        interface WhereOptions {
-            [field: string]: string | number | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | Array<string | number> | Object;
-        }
-
-        /**
-         * Through options for Include Options
-         */
-        interface IncludeThroughOptions {
-
-            /**
-             * Filter on the join model for belongsToMany relations
-             */
-            where? : WhereOptions;
-
-            /**
-             * A list of attributes to select from the join model for belongsToMany relations
-             */
-            attributes? : string[];
-
-        }
-
-        /**
-         * Association Object for Include Options
-         */
-        interface IncludeAssociation {
-            source: Model<any, any>;
-            target: Model<any, any>;
-            identifier: string;
-        }
-
-        /**
-         * Complex include options
-         */
-        interface IncludeOptions {
-
-            /**
-             * The model you want to eagerly load
-             */
-            model? : Model<any, any>;
-
-            /**
-             * The alias of the relation, in case the model you want to eagerly load is aliassed. For `hasOne` /
-             * `belongsTo`, this should be the singular name, and for `hasMany`, it should be the plural
-             */
-            as? : string;
-
-            /**
-             * The association you want to eagerly load. (This can be used instead of providing a model/as pair)
-             */
-            association? : IncludeAssociation;
-
-            /**
-             * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
-             * unless you explicitly set `required: false`
-             */
-            where? : WhereOptions;
-
-            /**
-             * A list of attributes to select from the child model
-             */
-            attributes? : string[];
-
-            /**
-             * If true, converts to an inner join, which means that the parent model will only be loaded if it has any
-             * matching children. True if `include.where` is set, false otherwise.
-             */
-            required? : boolean;
-
-            /**
-             * Through Options
-             */
-            through? : IncludeThroughOptions;
-
-            /**
-             * Load further nested related models
-             */
-            include? : Array<Model<any, any> | IncludeOptions>;
-
-        }
-
-        /**
-         * Options that are passed to any model creating a SELECT query
-         *
-         * A hash of options to describe the scope of the search
-         */
-        interface FindOptions {
-
-            /**
-             * A hash of attributes to describe your search. See above for examples.
-             */
-            where? : WhereOptions | Array<col | and | or | string>;
-
-            /**
-             * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with
-             * two elements - the first is the name of the attribute in the DB (or some kind of expression such as
-             * `Sequelize.literal`, `Sequelize.fn` and so on), and the second is the name you want the attribute to
-             * have in the returned instance
-             */
-            attributes? : Array<string | [string, string]>;
-
-            /**
-             * If true, only non-deleted records will be returned. If false, both deleted and non-deleted records will
-             * be returned. Only applies if `options.paranoid` is true for the model.
-             */
-            paranoid?: boolean;
-
-            /**
-             * A list of associations to eagerly load using a left join. Supported is either
-             * `{ include: [ Model1, Model2, ...]}` or `{ include: [{ model: Model1, as: 'Alias' }]}`.
-             * If your association are set up with an `as` (eg. `X.hasMany(Y, { as: 'Z }`, you need to specify Z in
-             * the as attribute when eager loading Y).
-             */
-            include?: Array<Model<any, any> | IncludeOptions>;
-
-            /**
-             * Specifies an ordering. If a string is provided, it will be escaped. Using an array, you can provide
-             * several columns / functions to order by. Each element can be further wrapped in a two-element array. The
-             * first element is the column / function to order by, the second is the direction. For example:
-             * `order: [['name', 'DESC']]`. In this way the column will be escaped, but the direction will not.
-             */
-            order?: string | col | literal | Array<string | number | Model<any, any> | { model : Model<any, any>, as? : string}> | Array<string | col | literal | Array<string | number | Model<any, any> | { model : Model<any, any>, as? : string}>>;
-
-            /**
-             * Limit the results
-             */
-            limit?: number;
-
-            /**
-             * Skip the results;
-             */
-            offset?: number;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * Lock the selected rows. Possible options are transaction.LOCK.UPDATE and transaction.LOCK.SHARE.
-             * Postgres also supports transaction.LOCK.KEY_SHARE, transaction.LOCK.NO_KEY_UPDATE and specific model
-             * locks with joins. See [transaction.LOCK for an example](transaction#lock)
-             */
-            lock? : string | { level: string, of: Model<any, any> };
-
-            /**
-             * Return raw result. See sequelize.query for more information.
-             */
-            raw? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * having ?!?
-             */
-            having? : WhereOptions;
-
-        }
-
-        /**
-         * Options for Model.count method
-         */
-        interface CountOptions {
-
-            /**
-             * A hash of search attributes.
-             */
-            where? : WhereOptions | string[];
-
-            /**
-             * Include options. See `find` for details
-             */
-            include?: Array<Model<any, any> | IncludeOptions>;
-
-            /**
-             * Apply COUNT(DISTINCT(col))
-             */
-            distinct? : boolean;
-
-            /**
-             * Used in conjustion with `group`
-             */
-            attributes? : Array<string | [string, string]>;
-
-            /**
-             * For creating complex counts. Will return multiple rows as needed.
-             *
-             * TODO: Check?
-             */
-            group? : Object;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            transaction?: Transaction;
-        }
-
-        /**
-         * Options for Model.build method
-         */
-        interface BuildOptions {
-
-            /**
-             * If set to true, values will ignore field and virtual setters.
-             */
-            raw? : boolean;
-
-            /**
-             * Is this record new
-             */
-            isNewRecord? : boolean;
-
-            /**
-             * an array of include options - Used to build prefetched/included model instances. See `set`
-             *
-             * TODO: See set
-             */
-            include? :  Array<Model<any, any> | IncludeOptions>;
-
-        }
-
-        /**
-         * Options for Model.create method
-         */
-        interface CreateOptions extends BuildOptions {
-
-            /**
-             * If set, only columns matching those in fields will be saved
-             */
-            fields? : string[];
-
-            /**
-             * On Duplicate
-             */
-            onDuplicate? : string;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            silent? : boolean;
-
-            returning? : boolean;
-        }
-
-        /**
-         * Options for Model.findOrInitialize method
-         */
-        interface FindOrInitializeOptions<TAttributes> {
-
-            /**
-             * A hash of search attributes.
-             */
-            where : string | WhereOptions;
-
-            /**
-             * Default values to use if building a new instance
-             */
-            defaults? : TAttributes;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-        }
-
-        /**
-         * Options for Model.upsert method
-         */
-        interface UpsertOptions {
-
-            /**
-             * Run validations before the row is inserted
-             */
-            validate? : boolean;
-
-            /**
-             * The fields to insert / update. Defaults to all fields
-             */
-            fields? : string[];
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * An optional parameter to specify the schema search_path (Postgres only)
-             */
-            searchPath? : string;
-
-            /**
-             * Print query execution time in milliseconds when logging SQL.
-             */
-            benchmark? : boolean;
-        }
-
-        /**
-         * Options for Model.bulkCreate method
-         */
-        interface BulkCreateOptions {
-
-            /**
-             * Fields to insert (defaults to all fields)
-             */
-            fields? : string[];
-
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
-             * fails validation
-             */
-            validate? : boolean;
-
-            /**
-             * Run before / after bulk create hooks?
-             */
-            hooks? : boolean;
-
-            /**
-             * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run if
-             * options.hooks is true.
-             */
-            individualHooks? : boolean;
-
-            /**
-             * Ignore duplicate values for primary keys? (not supported by postgres)
-             *
-             * Defaults to false
-             */
-            ignoreDuplicates? : boolean;
-
-            /**
-             * Fields to update if row key already exists (on duplicate key update)? (only supported by mysql &
-             * mariadb). By default, all fields are updated.
-             */
-            updateOnDuplicate? : string[];
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-        }
-
-        /**
-         * The options passed to Model.destroy in addition to truncate
-         */
-        interface TruncateOptions {
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-            /**
-             * Only used in conjuction with TRUNCATE. Truncates  all tables that have foreign-key references to the
-             * named table, or to any tables added to the group due to CASCADE.
-             *
-             * Defaults to false;
-             */
-            cascade? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-        }
-
-        /**
-         * Options used for Model.destroy
-         */
-        interface DestroyOptions extends TruncateOptions {
-
-            /**
-             * Filter the destroy
-             */
-            where? : WhereOptions;
-
-            /**
-             * Run before / after bulk destroy hooks?
-             */
-            hooks? : boolean;
-
-            /**
-             * If set to true, destroy will SELECT all records matching the where parameter and will execute before /
-             * after destroy hooks on each row
-             */
-            individualHooks? : boolean;
-
-            /**
-             * How many rows to delete
-             */
-            limit? : number;
-
-            /**
-             * Delete instead of setting deletedAt to current timestamp (only applicable if `paranoid` is enabled)
-             */
-            force? : boolean;
-
-            /**
-             * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is
-             * truncated the where and limit options are ignored
-             */
-            truncate? : boolean;
-
-        }
-
-        /**
-         * Options for Model.restore
-         */
-        interface RestoreOptions {
-
-            /**
-             * Filter the restore
-             */
-            where? : WhereOptions;
-
-            /**
-             * Run before / after bulk restore hooks?
-             */
-            hooks? : boolean;
-
-            /**
-             * If set to true, restore will find all records within the where parameter and will execute before / after
-             * bulkRestore hooks on each row
-             */
-            individualHooks? : boolean;
-
-            /**
-             * How many rows to undelete
-             */
-            limit? : number;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * Options used for Model.update
-         */
-        interface UpdateOptions {
-
-            /**
-             * Options to describe the scope of the search.
-             */
-            where: WhereOptions;
-
-            /**
-             * Fields to update (defaults to all fields)
-             */
-            fields? : string[];
-
-            /**
-             * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
-             * fails validation.
-             *
-             * Defaults to true
-             */
-            validate? : boolean;
-
-            /**
-             * Run before / after bulk update hooks?
-             *
-             * Defaults to true
-             */
-            hooks? : boolean;
-
-            /**
-             * Whether or not to update the side effects of any virtual setters.
-             *
-             * Defaults to true
-             */
-            sideEffects? : boolean;
-
-            /**
-             * Run before / after update hooks?. If true, this will execute a SELECT followed by individual UPDATEs.
-             * A select is needed, because the row data needs to be passed to the hooks
-             *
-             * Defaults to false
-             */
-            individualHooks? : boolean;
-
-            /**
-             * Return the affected rows (only for postgres)
-             */
-            returning? : boolean;
-
-            /**
-             * How many rows to update (only for mysql and mariadb)
-             */
-            limit? : number;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * Transaction to run query under
-             */
-            transaction? : Transaction;
-
-        }
-
-        /**
-         * Options used for Model.aggregate
-         */
-        interface AggregateOptions extends QueryOptions {
-
-            /**
-             * A hash of search attributes.
-             */
-            where?: WhereOptions;
-
-            /**
-             * The type of the result. If `field` is a field in this Model, the default will be the type of that field,
-             * otherwise defaults to float.
-             */
-            dataType? : DataTypeAbstract | string;
-
-            /**
-             * Applies DISTINCT to the field being aggregated over
-             */
-            distinct? : boolean;
-
-        }
-
-        /**
-         * A Model represents a table in the database. Sometimes you might also see it referred to as model, or simply
-         * as factory. This class should _not_ be instantiated directly, it is created using `sequelize.define`, and
-         * already created models can be loaded using `sequelize.import`
-         */
-        interface Model<TInstance, TAttributes> extends Hooks<TInstance>, Associations {
-
-            /**
-             * The Instance class
-             */
-            Instance() : TInstance;
-
-            /**
-             * Remove attribute from model definition
-             *
-             * @param attribute
-             */
-            removeAttribute( attribute : string ) : void;
-
-            /**
-             * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the
-             * model instance (this)
-             */
-            sync( options? : SyncOptions ) : Promise<this>;
-
-            /**
-             * Drop the table represented by this Model
-             *
-             * @param options
-             */
-            drop( options? : DropOptions ) : Promise<void>;
-
-            /**
-             * Apply a schema to this model. For postgres, this will actually place the schema in front of the table
-             * name
-             * - `"schema"."tableName"`, while the schema will be prepended to the table name for mysql and
-             * sqlite - `'schema.tablename'`.
-             *
-             * @param schema The name of the schema
-             * @param options
-             */
-            schema( schema : string, options? : SchemaOptions ) : this;
-
-            /**
-             * Get the tablename of the model, taking schema into account. The method will return The name as a string
-             * if the model has no schema, or an object with `tableName`, `schema` and `delimiter` properties.
-             *
-             * @param options The hash of options from any query. You can use one model to access tables with matching
-             *     schemas by overriding `getTableName` and using custom key/values to alter the name of the table.
-             *     (eg.
-             *     subscribers_1, subscribers_2)
-             * @param options.logging=false A function that gets executed while running the query to log the sql.
-             */
-            getTableName( options? : { logging : Function } ) : string | Object;
-
-            /**
-             * Apply a scope created in `define` to the model. First let's look at how to create scopes:
-             * ```js
-             * var Model = sequelize.define('model', attributes, {
-             *   defaultScope: {
-             *     where: {
-             *       username: 'dan'
-             *     },
-             *     limit: 12
-             *   },
-             *   scopes: {
-             *     isALie: {
-             *       where: {
-             *         stuff: 'cake'
-             *       }
-             *     },
-             *     complexFunction: function(email, accessLevel) {
-             *       return {
-             *         where: {
-             *           email: {
-             *             $like: email
-             *           },
-             *           accesss_level {
-             *             $gte: accessLevel
-             *           }
-             *         }
-             *       }
-             *     }
-             *   }
-             * })
-             * ```
-             * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
-             * your query. Here's a couple of examples:
-             * ```js
-             * Model.findAll() // WHERE username = 'dan'
-             * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
-             * ```
-             *
-             * To invoke scope functions you can do:
-             * ```js
-             * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
-             * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
-             * ```
-             *
-             * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
-             *     model will clear the previous scope.
-             */
-            scope( options? : string | string[] | ScopeOptions | WhereOptions ) : this;
-
-            /**
-             * Search for multiple instances.
-             *
-             * __Simple search using AND and =__
-             * ```js
-             * Model.findAll({
-             *   where: {
-             *     attr1: 42,
-             *     attr2: 'cake'
-             *   }
-             * })
-             * ```
-             * ```sql
-             * WHERE attr1 = 42 AND attr2 = 'cake'
-             *```
-             *
-             * __Using greater than, less than etc.__
-             * ```js
-             *
-             * Model.findAll({
-             *   where: {
-             *     attr1: {
-             *       gt: 50
-             *     },
-             *     attr2: {
-             *       lte: 45
-             *     },
-             *     attr3: {
-             *       in: [1,2,3]
-             *     },
-             *     attr4: {
-             *       ne: 5
-             *     }
-             *   }
-             * })
-             * ```
-             * ```sql
-             * WHERE attr1 > 50 AND attr2 <= 45 AND attr3 IN (1,2,3) AND attr4 != 5
-             * ```
-             * Possible options are: `$ne, $in, $not, $notIn, $gte, $gt, $lte, $lt, $like, $ilike/$iLike, $notLike,
-             * $notILike, '..'/$between, '!..'/$notBetween, '&&'/$overlap, '@>'/$contains, '<@'/$contained`
-             *
-             * __Queries using OR__
-             * ```js
-             * Model.findAll({
-             *   where: Sequelize.and(
-             *     { name: 'a project' },
-             *     Sequelize.or(
-             *       { id: [1,2,3] },
-             *       { id: { gt: 10 } }
-             *     )
-             *   )
-             * })
-             * ```
-             * ```sql
-             * WHERE name = 'a project' AND (id` IN (1,2,3) OR id > 10)
-             * ```
-             *
-             * The success listener is called with an array of instances if the query succeeds.
-             *
-             * @see    {Sequelize#query}
-             */
-            findAll( options? : FindOptions ) : Promise<TInstance[]>;
-            all( optionz? : FindOptions ) : Promise<TInstance[]>;
-
-            /**
-             * Search for a single instance by its primary key. This applies LIMIT 1, so the listener will
-             * always be called with a single instance.
-             */
-            findById( identifier? : number | string, options? : FindOptions ) : Promise<TInstance>;
-            findByPrimary( identifier? : number | string, options? : FindOptions ) : Promise<TInstance>;
-
-            /**
-             * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single
-             * instance.
-             */
-            findOne( options? : FindOptions ) : Promise<TInstance>;
-            find( optionz? : FindOptions ) : Promise<TInstance>;
-
-            /**
-             * Run an aggregation method on the specified field
-             *
-             * @param field The field to aggregate over. Can be a field name or *
-             * @param aggregateFunction The function to use for aggregation, e.g. sum, max etc.
-             * @param options Query options. See sequelize.query for full options
-             * @return Returns the aggregate result cast to `options.dataType`, unless `options.plain` is false, in
-             *     which case the complete data result is returned.
-             */
-            aggregate( field : string, aggregateFunction : Function, options? : AggregateOptions ) : Promise<Object>;
-
-            /**
-             * Count the number of records matching the provided where clause.
-             *
-             * If you provide an `include` option, the number of matching associations will be counted instead.
-             */
-            count( options? : CountOptions ) : Promise<number>;
-
-            /**
-             * Find all the rows matching your query, within a specified offset / limit, and get the total number of
-             * rows matching your query. This is very usefull for paging
-             *
-             * ```js
-             * Model.findAndCountAll({
-             *   where: ...,
-             *   limit: 12,
-             *   offset: 12
-             * }).then(function (result) {
-             *   ...
-             * })
-             * ```
-             * In the above example, `result.rows` will contain rows 13 through 24, while `result.count` will return
-             * the
-             * total number of rows that matched your query.
-             *
-             * When you add includes, only those which are required (either because they have a where clause, or
-             * because
-             * `required` is explicitly set to true on the include) will be added to the count part.
-             *
-             * Suppose you want to find all users who have a profile attached:
-             * ```js
-             * User.findAndCountAll({
-             *   include: [
-             *      { model: Profile, required: true}
-             *   ],
-             *   limit 3
-             * });
-             * ```
-             * Because the include for `Profile` has `required` set it will result in an inner join, and only the users
-             * who have a profile will be counted. If we remove `required` from the include, both users with and
-             * without
-             * profiles will be counted
-             */
-            findAndCount( options? : FindOptions ) : Promise<{ rows : TInstance[], count : number }>;
-            findAndCountAll( options? : FindOptions ) : Promise<{ rows : TInstance[], count : number }>;
-
-            /**
-             * Find the maximum value of field
-             */
-            max( field : string, options? : AggregateOptions ) : Promise<any>;
-
-            /**
-             * Find the minimum value of field
-             */
-            min( field : string, options? : AggregateOptions ) : Promise<any>;
-
-            /**
-             * Find the sum of field
-             */
-            sum( field : string, options? : AggregateOptions ) : Promise<number>;
-
-            /**
-             * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
-             */
-            build( record? : TAttributes, options? : BuildOptions ) : TInstance;
-
-            /**
-             * Undocumented bulkBuild
-             */
-            bulkBuild( records : TAttributes[], options? : BuildOptions ) : TInstance[];
-
-            /**
-             * Builds a new model instance and calls save on it.
-             */
-            create( values? : TAttributes, options? : CreateOptions ) : Promise<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build (but don't save) the row if none is found.
-             * The successfull result of the promise will be (instance, initialized) - Make sure to use .spread()
-             */
-            findOrInitialize( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
-            findOrBuild( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
-
-            /**
-             * Find a row that matches the query, or build and save the row if none is found
-             * The successful result of the promise will be (instance, created) - Make sure to use .spread()
-             *
-             * If no transaction is passed in the `options` object, a new transaction will be created internally, to
-             * prevent the race condition where a matching row is created by another connection after the find but
-             * before the insert call. However, it is not always possible to handle this case in SQLite, specifically
-             * if one transaction inserts and another tries to select before the first one has comitted. In this case,
-             * an instance of sequelize.TimeoutError will be thrown instead. If a transaction is created, a savepoint
-             * will be created instead, and any unique constraint violation will be handled internally.
-             */
-            findOrCreate( options : FindOrInitializeOptions<TAttributes> ) : Promise<TInstance>;
-
-            /**
-             * Insert or update a single row. An update will be executed if a row which matches the supplied values on
-             * either the primary key or a unique key is found. Note that the unique index must be defined in your
-             * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
-             * because sequelize fails to identify the row that should be updated.
-             *
-             * **Implementation details:**
-             *
-             * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
-             * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
-             *   unique_constraint UPDATE
-             * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
-             * regardless
-             *   of whether the row already existed or not
-             *
-             * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
-             * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
-             * whether the row was inserted or not.
-             */
-            upsert( values : TAttributes, options? : UpsertOptions ) : Promise<boolean>;
-            insertOrUpdate( values : TAttributes, options? : UpsertOptions ) : Promise<boolean>;
-
-            /**
-             * Create and insert multiple instances in bulk.
-             *
-             * The success handler is passed an array of instances, but please notice that these may not completely
-             * represent the state of the rows in the DB. This is because MySQL and SQLite do not make it easy to
-             * obtain
-             * back automatically generated IDs and other default values in a way that can be mapped to multiple
-             * records. To obtain Instances for the newly created values, you will need to query for them again.
-             *
-             * @param records List of objects (key/value pairs) to create instances from
-             */
-            bulkCreate( records : TAttributes[], options? : BulkCreateOptions ) : Promise<TInstance[]>;
-
-            /**
-             * Truncate all instances of the model. This is a convenient method for Model.destroy({ truncate: true }).
-             */
-            truncate( options? : TruncateOptions ) : Promise<void>;
-
-            /**
-             * Delete multiple instances, or set their deletedAt timestamp to the current time if `paranoid` is enabled.
-             *
-             * @return Promise<number> The number of destroyed rows
-             */
-            destroy( options? : DestroyOptions ) : Promise<number>;
-
-            /**
-             * Restore multiple instances if `paranoid` is enabled.
-             */
-            restore( options? : RestoreOptions ) : Promise<void>;
-
-            /**
-             * Update multiple instances that match the where options. The promise returns an array with one or two
-             * elements. The first element is always the number of affected rows, while the second element is the actual
-             * affected rows (only supported in postgres with `options.returning` true.)
-             */
-            update( values : TAttributes, options : UpdateOptions ) : Promise<[number, TInstance[]]>;
-
-            /**
-             * Run a describe query on the table. The result will be return to the listener as a hash of attributes and
-             * their types.
-             */
-            describe() : Promise<Object>;
-
-            /**
-             * Unscope the model
-             */
-            unscoped() : this;
-
-        }
-
-        //
-        //  Query Interface
-        // ~~~~~~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-interface.js
-        //
-
-        /**
-         * Most of the methods accept options and use only the logger property of the options. That's why the most used
-         * interface type for options in a method is separated here as another interface.
-         */
-        interface QueryInterfaceOptions {
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : boolean | Function;
-
-        }
-
-        /**
-         * The interface that Sequelize uses to talk to all databases.
-         *
-         * This interface is available through sequelize.QueryInterface. It should not be commonly used, but it's
-         * referenced anyway, so it can be used.
-         */
-        interface QueryInterface {
-
-            /**
-             * Returns the dialect-specific sql generator.
-             *
-             * We don't have a definition for the QueryGenerator, because I doubt it is commonly in use separately.
-             */
-            QueryGenerator: any;
-
-            /**
-             * Returns the current sequelize instance.
-             */
-            sequelize: Sequelize;
-
-            /**
-             * Queries the schema (table list).
-             *
-             * @param schema The schema to query. Applies only to Postgres.
-             */
-            createSchema( schema? : string, options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Drops the specified schema (table).
-             *
-             * @param schema The schema to query. Applies only to Postgres.
-             */
-            dropSchema( schema? : string, options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Drops all tables.
-             */
-            dropAllSchemas( options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Queries all table names in the database.
-             *
-             * @param options
-             */
-            showAllSchemas( options? : QueryOptions ): Promise<Object>;
-
-            /**
-             * Return database version
-             */
-            databaseVersion( options? : QueryInterfaceOptions ) : Promise<string>;
-
-            /**
-             * Creates a table with specified attributes.
-             *
-             * @param tableName     Name of table to create
-             * @param attributes    Hash of attributes, key is attribute name, value is data type
-             * @param options       Query options.
-             */
-            createTable( tableName : string | { schema? : string, tableName? : string }, attributes : DefineAttributes,
-                         options? : QueryOptions ): Promise<void>;
-
-            /**
-             * Drops the specified table.
-             *
-             * @param tableName Table name.
-             * @param options   Query options, particularly "force".
-             */
-            dropTable( tableName : string, options? : QueryOptions ): Promise<void>;
-
-            /**
-             * Drops all tables.
-             *
-             * @param options
-             */
-            dropAllTables( options? : QueryOptions ): Promise<void>;
-
-            /**
-             * Drops all defined enums
-             *
-             * @param options
-             */
-            dropAllEnums( options? : QueryOptions ): Promise<void>;
-
-            /**
-             * Renames a table
-             */
-            renameTable( before : string, after : string, options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Returns all tables
-             */
-            showAllTables( options? : QueryOptions ) : Promise<string[]>;
-
-            /**
-             * Describe a table
-             */
-            describeTable( tableName : string | { schema? : string, tableName? : string },
-                           options? : string | { schema? : string, schemaDelimeter? : string, logging? : boolean | Function } ) : Promise<Object>;
-
-            /**
-             * Adds a new column to a table
-             */
-            addColumn( table : string, key : string, attribute : DefineAttributeColumnOptions | DataTypeAbstract,
-                       options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Removes a column from a table
-             */
-            removeColumn( table : string, attribute : string, options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Changes a column
-             */
-            changeColumn( tableName : string | { schema? : string, tableName? : string }, attributeName : string,
-                          dataTypeOrOptions? : string | DataTypeAbstract | DefineAttributeColumnOptions,
-                          options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Renames a column
-             */
-            renameColumn( tableName : string | { schema? : string, tableName? : string }, attrNameBefore : string,
-                          attrNameAfter : string,
-                          options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Adds a new index to a table
-             */
-            addIndex( tableName : string | Object, attributes : string[], options? : QueryOptions,
-                      rawTablename? : string ) : Promise<void>;
-
-            /**
-             * Shows the index of a table
-             */
-            showIndex( tableName : string | Object, options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Put a name to an index
-             */
-            nameIndexes( indexes : string[], rawTablename : string ) : Promise<void>;
-
-            /**
-             * Returns all foreign key constraints of a table
-             */
-            getForeignKeysForTables( tableNames : string, options? : QueryInterfaceOptions ) : Promise<Object>;
-
-            /**
-             * Removes an index of a table
-             */
-            removeIndex( tableName : string, indexNameOrAttributes : string[] | string,
-                         options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Inserts a new record
-             */
-            insert( instance : Instance<any>, tableName : string, values : Object,
-                    options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Inserts or Updates a record in the database
-             */
-            upsert( tableName : string, values : Object, updateValues : Object, model : Model<any, any>,
-                    options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Inserts multiple records at once
-             */
-            bulkInsert( tableName : string, records : Object[], options? : QueryOptions,
-                        attributes? : string[] | string ) : Promise<Object>;
-
-            /**
-             * Updates a row
-             */
-            update( instance : Instance<any>, tableName : string, values : Object, identifier : Object,
-                    options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Updates multiple rows at once
-             */
-            bulkUpdate( tableName : string, values : Object, identifier : Object, options? : QueryOptions,
-                        attributes? : string[] | string ) : Promise<Object>;
-
-            /**
-             * Deletes a row
-             */
-            "delete"( instance : Instance<any>, tableName : string, identifier : Object,
-                      options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Deletes multiple rows at once
-             */
-            bulkDelete( tableName : string, identifier : Object, options? : QueryOptions,
-                        model? : Model<any, any> ) : Promise<Object>;
-
-            /**
-             * Returns selected rows
-             */
-            select( model : Model<any, any>, tableName : string, options? : QueryOptions ) : Promise<Object[]>;
-
-            /**
-             * Increments a row value
-             */
-            increment( instance : Instance<any>, tableName : string, values : Object, identifier : Object,
-                       options? : QueryOptions ) : Promise<Object>;
-
-            /**
-             * Selects raw without parsing the string into an object
-             */
-            rawSelect( tableName : string, options : QueryOptions, attributeSelector : string | string[],
-                       model? : Model<any, any> ) : Promise<string[]>;
-
-            /**
-             * Postgres only. Creates a trigger on specified table to call the specified function with supplied
-             * parameters.
-             */
-            createTrigger( tableName : string, triggerName : string, timingType : string, fireOnArray : any[],
-                           functionName : string, functionParams : any[], optionsArray : string[],
-                           options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Postgres only. Drops the specified trigger.
-             */
-            dropTrigger( tableName : string, triggerName : string, options? : QueryInterfaceOptions ): Promise<void>;
-
-            /**
-             * Postgres only. Renames a trigger
-             */
-            renameTrigger( tableName : string, oldTriggerName : string, newTriggerName : string,
-                           options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Postgres only. Create a function
-             */
-            createFunction( functionName : string, params : any[], returnType : string, language : string,
-                            body : string, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Postgres only. Drops a function
-             */
-            dropFunction( functionName : string, params : any[],
-                          options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Postgres only. Rename a function
-             */
-            renameFunction( oldFunctionName : string, params : any[], newFunctionName : string,
-                            options? : QueryInterfaceOptions ) : Promise<void>;
-
-            /**
-             * Escape an identifier (e.g. a table or attribute name). If force is true, the identifier will be quoted
-             * even if the `quoteIdentifiers` option is false.
-             */
-            quoteIdentifier( identifier : string, force : boolean ) : string;
-
-            /**
-             * Escape a table name
-             */
-            quoteTable( identifier : string ) : string;
-
-            /**
-             * Split an identifier into .-separated tokens and quote each part. If force is true, the identifier will be
-             * quoted even if the `quoteIdentifiers` option is false.
-             */
-            quoteIdentifiers( identifiers : string, force : boolean ) : string;
-
-            /**
-             * Escape a value (e.g. a string, number or date)
-             */
-            escape( value? : string | number | Date ) : string;
-
-            /**
-             * Set option for autocommit of a transaction
-             */
-            setAutocommit( transaction : Transaction, value : boolean, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Set the isolation level of a transaction
-             */
-            setIsolationLevel( transaction : Transaction, value : string, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Begin a new transaction
-             */
-            startTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Defer constraints
-             */
-            deferConstraints( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Commit an already started transaction
-             */
-            commitTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
-
-            /**
-             * Rollback ( revert ) a transaction that has'nt been commited
-             */
-            rollbackTransaction( transaction : Transaction, options? : QueryOptions ) : Promise<void>;
-
-        }
-
-        //
-        //  Query Types
-        // ~~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-types.js
-        //
-
-        interface QueryTypes {
-            SELECT: string; // 'SELECT'
-            INSERT: string; // 'INSERT'
-            UPDATE: string; // 'UPDATE'
-            BULKUPDATE: string; // 'BULKUPDATE'
-            BULKDELETE: string; // 'BULKDELETE'
-            DELETE: string; // 'DELETE'
-            UPSERT: string; // 'UPSERT'
-            VERSION: string; // 'VERSION'
-            SHOWTABLES: string; // 'SHOWTABLES'
-            SHOWINDEXES: string; // 'SHOWINDEXES'
-            DESCRIBE: string; // 'DESCRIBE'
-            RAW: string; // 'RAW'
-            FOREIGNKEYS: string; // 'FOREIGNKEYS'
-        }
-
-        //
-        //  Sequelize
-        // ~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/sequelize.js
-        //
-
-        /**
-         * General column options
-         *
-         * @see Define
-         * @see AssociationForeignKeyOptions
-         */
-        interface ColumnOptions {
-
-            /**
-             * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an
-             * instance is saved.
-             */
-            allowNull?: boolean;
-
-            /**
-             *  If set, sequelize will map the attribute name to a different name in the database
-             */
-            field? : string;
-
-            /**
-             * A literal default value, a JavaScript function, or an SQL function (see `sequelize.fn`)
-             */
-            defaultValue?: any;
-
-        }
-
-        /**
-         * References options for the column's attributes
-         *
-         * @see AttributeColumnOptions
-         */
-        interface DefineAttributeColumnReferencesOptions {
-
-            /**
-             * If this column references another table, provide it here as a Model, or a string
-             */
-            model?: string | Model<any, any>;
-
-            /**
-             * The column of the foreign table that this column references
-             */
-            key? : string;
-
-            /**
-             * When to check for the foreign key constraing
-             *
-             * PostgreSQL only
-             */
-            deferrable? : Deferrable;
-
-        }
-
-        /**
-         * Column options for the model schema attributes
-         *
-         * @see Attributes
-         */
-        interface DefineAttributeColumnOptions extends ColumnOptions {
-
-            /**
-             * A string or a data type
-             */
-            type: string | DataTypeAbstract;
-
-            /**
-             * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
-             * composite unique index. If multiple columns have the same string, they will be part of the same unique
-             * index
-             */
-            unique?: boolean | string | { name: string, msg: string };
-
-            /**
-             * Primary key flag
-             */
-            primaryKey?: boolean;
-
-            /**
-             * Is this field an auto increment field
-             */
-            autoIncrement?: boolean;
-
-            /**
-             * Comment for the database
-             */
-            comment?: string;
-
-            /**
-             * An object with reference configurations
-             */
-            references? : DefineAttributeColumnReferencesOptions;
-
-            /**
-             * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION
-             */
-            onUpdate? : string;
-
-            /**
-             * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
-             * NO ACTION
-             */
-            onDelete? : string;
-
-            /**
-             * Provide a custom getter for this column. Use `this.getDataValue(String)` to manipulate the underlying
-             * values.
-             */
-            get? : () => any;
-
-            /**
-             * Provide a custom setter for this column. Use `this.setDataValue(String, Value)` to manipulate the
-             * underlying values.
-             */
-            set? : ( val : any ) => void;
-
-            /**
-             * An object of validations to execute for this column every time the model is saved. Can be either the
-             * name of a validation provided by validator.js, a validation function provided by extending validator.js
-             * (see the
-             * `DAOValidator` property for more details), or a custom validation function. Custom validation functions
-             * are called with the value of the field, and can possibly take a second callback argument, to signal that
-             * they are asynchronous. If the validator is sync, it should throw in the case of a failed validation, it
-             * it is async, the callback should be called with the error text.
-             */
-            validate? : DefineValidateOptions;
-
-            /**
-             * Usage in object notation
-             *
-             * ```js
-             * sequelize.define('model', {
-             *     states: {
-             *       type:   Sequelize.ENUM,
-             *       values: ['active', 'pending', 'deleted']
-             *     }
-             *   })
-             * ```
-             */
-            values? : string[];
-
-        }
-
-        /**
-         * Interface for Attributes provided for a column
-         *
-         * @see Sequelize.define
-         */
-        interface DefineAttributes {
-
-            /**
-             * The description of a database column
-             */
-            [name : string] : string | DataTypeAbstract | DefineAttributeColumnOptions;
-
-        }
-
-        /**
-         * Interface for query options
-         *
-         * @see Options
-         */
-        interface QueryOptions {
-
-            /**
-             * If true, sequelize will not try to format the results of the query, or build an instance of a model from
-             * the result
-             */
-            raw?: boolean;
-
-            /**
-             * The transaction that the query should be executed under
-             */
-            transaction?: Transaction;
-
-            /**
-             * The type of query you are executing. The query type affects how results are formatted before they are
-             * passed back. The type is a string, but `Sequelize.QueryTypes` is provided as convenience shortcuts.
-             */
-            type?: string;
-
-            /**
-             * If true, transforms objects with `.` separated property names into nested objects using
-             * [dottie.js](https://github.com/mickhansen/dottie.js). For example { 'user.username': 'john' } becomes
-             * { user: { username: 'john' }}. When `nest` is true, the query type is assumed to be `'SELECT'`,
-             * unless otherwise specified
-             *
-             * Defaults to false
-             */
-            nest?: boolean;
-
-            /**
-             * Sets the query type to `SELECT` and return a single row
-             */
-            plain?: boolean;
-
-            /**
-             * Either an object of named parameter replacements in the format `:param` or an array of unnamed
-             * replacements to replace `?` in your SQL.
-             */
-            replacements? : Object | string[];
-
-            /**
-             * Force the query to use the write pool, regardless of the query type.
-             *
-             * Defaults to false
-             */
-            useMaster? : boolean;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging? : Function;
-
-            /**
-             * A sequelize instance used to build the return instance
-             */
-            instance? : Instance<any>;
-
-            /**
-             * A sequelize model used to build the returned model instances (used to be called callee)
-             */
-            model? : Model<any, any>;
-
-            // TODO: force, cascade
-
-        }
-
-        /**
-         * Model validations, allow you to specify format/content/inheritance validations for each attribute of the
-         * model.
-         *
-         * Validations are automatically run on create, update and save. You can also call validate() to manually
-         * validate an instance.
-         *
-         * The validations are implemented by validator.js.
-         */
-        interface DefineValidateOptions {
-
-            /**
-             * is: ["^[a-z]+$",'i'] // will only allow letters
-             * is: /^[a-z]+$/i      // same as the previous example using real RegExp
-             */
-            is?: string | Array<string | RegExp> | RegExp | { msg: string, args : string | Array<string | RegExp> | RegExp };
-
-            /**
-             * not: ["[a-z]",'i']  // will not allow letters
-             */
-            not?: string | Array<string | RegExp> | RegExp | { msg: string, args : string | Array<string | RegExp> | RegExp };
-
-            /**
-             * checks for email format (foo@bar.com)
-             */
-            isEmail?: boolean | { msg: string };
-
-            /**
-             * checks for url format (http://foo.com)
-             */
-            isUrl?: boolean | { msg: string };
-
-            /**
-             * checks for IPv4 (129.89.23.1) or IPv6 format
-             */
-            isIP?: boolean | { msg: string };
-
-            /**
-             * checks for IPv4 (129.89.23.1)
-             */
-            isIPv4?: boolean | { msg: string };
-
-            /**
-             * checks for IPv6 format
-             */
-            isIPv6?: boolean | { msg: string };
-
-            /**
-             * will only allow letters
-             */
-            isAlpha?: boolean | { msg: string };
-
-            /**
-             * will only allow alphanumeric characters, so "_abc" will fail
-             */
-            isAlphanumeric?: boolean | { msg: string };
-
-            /**
-             * will only allow numbers
-             */
-            isNumeric?: boolean | { msg: string };
-
-            /**
-             * checks for valid integers
-             */
-            isInt?: boolean | { msg: string };
-
-            /**
-             * checks for valid floating point numbers
-             */
-            isFloat?: boolean | { msg: string };
-
-            /**
-             * checks for any numbers
-             */
-            isDecimal?: boolean | { msg: string };
-
-            /**
-             * checks for lowercase
-             */
-            isLowercase?: boolean | { msg: string };
-
-            /**
-             * checks for uppercase
-             */
-            isUppercase?: boolean | { msg: string };
-
-            /**
-             * won't allow null
-             */
-            notNull?: boolean | { msg: string };
-
-            /**
-             * only allows null
-             */
-            isNull?: boolean | { msg: string };
-
-            /**
-             * don't allow empty strings
-             */
-            notEmpty?: boolean | { msg: string };
-
-            /**
-             * only allow a specific value
-             */
-            equals? : string | { msg: string };
-
-            /**
-             * force specific substrings
-             */
-            contains? : string | { msg: string };
-
-            /**
-             * check the value is not one of these
-             */
-            notIn? : string[][] | { msg: string, args: string[][] };
-
-            /**
-             * check the value is one of these
-             */
-            isIn? : string[][] | { msg: string, args: string[][] };
-
-            /**
-             * don't allow specific substrings
-             */
-            notContains? : string[] | string | { msg: string, args: string[] | string };
-
-            /**
-             * only allow values with length between 2 and 10
-             */
-            len?: [number, number] | { msg: string, args: [number, number] };
-
-            /**
-             * only allow uuids
-             */
-            isUUID?: number | { msg: string, args: number };
-
-            /**
-             * only allow date strings
-             */
-            isDate?: boolean | { msg: string, args: boolean };
-
-            /**
-             * only allow date strings after a specific date
-             */
-            isAfter?: string | { msg: string, args: string };
-
-            /**
-             * only allow date strings before a specific date
-             */
-            isBefore?: string | { msg: string, args: string };
-
-            /**
-             * only allow values
-             */
-            max?: number | { msg: string, args: number };
-
-            /**
-             * only allow values >= 23
-             */
-            min?: number | { msg: string, args: number };
-
-            /**
-             * only allow arrays
-             */
-            isArray?: boolean | { msg: string, args: boolean };
-
-            /**
-             * check for valid credit card numbers
-             */
-            isCreditCard?: boolean | { msg: string, args: boolean };
-
-            /**
-             * custom validations are also possible
-             *
-             * Implementation notes :
-             *
-             * We can't enforce any other method to be a function, so :
-             *
-             * ```typescript
-             * [name: string] : ( value : any ) => boolean;
-             * ```
-             *
-             * doesn't work in combination with the properties above
-             *
-             * @see https://github.com/Microsoft/TypeScript/issues/1889
-             */
-            [name: string] : any;
-
-        }
-
-        /**
-         * Interface for indexes property in DefineOptions
-         *
-         * @see DefineOptions
-         */
-        interface DefineIndexesOptions {
-
-            /**
-             * The name of the index. Defaults to model name + _ + fields concatenated
-             */
-            name? : string;
-
-            /**
-             * Index type. Only used by mysql. One of `UNIQUE`, `FULLTEXT` and `SPATIAL`
-             */
-            index? : string;
-
-            /**
-             * The method to create the index by (`USING` statement in SQL). BTREE and HASH are supported by mysql and
-             * postgres, and postgres additionally supports GIST and GIN.
-             */
-            method? : string;
-
-            /**
-             * Should the index by unique? Can also be triggered by setting type to `UNIQUE`
-             *
-             * Defaults to false
-             */
-            unique? : boolean;
-
-            /**
-             * PostgreSQL will build the index without taking any write locks. Postgres only
-             *
-             * Defaults to false
-             */
-            concurrently? : boolean;
-
-            /**
-             * An array of the fields to index. Each field can either be a string containing the name of the field,
-             * a sequelize object (e.g `sequelize.fn`), or an object with the following attributes: `attribute`
-             * (field name), `length` (create a prefix index of length chars), `order` (the direction the column
-             * should be sorted in), `collate` (the collation (sort order) for the column)
-             */
-            fields? : Array<string|{ attribute: string, length: number, order: string, collate: string }>;
-
-        }
-
-        /**
-         * Interface for name property in DefineOptions
-         *
-         * @see DefineOptions
-         */
-        interface DefineNameOptions {
-
-            /**
-             * Singular model name
-             */
-            singular? : string;
-
-            /**
-             * Plural model name
-             */
-            plural? : string;
-
-        }
-
-        /**
-         * Interface for getterMethods in DefineOptions
-         *
-         * @see DefineOptions
-         */
-        interface DefineGetterMethodsOptions {
-            [name: string] : () => any;
-        }
-
-        /**
-         * Interface for setterMethods in DefineOptions
-         *
-         * @see DefineOptions
-         */
-        interface DefineSetterMethodsOptions {
-            [name: string] : ( val : any ) => void;
-        }
-
-        /**
-         * Interface for Define Scope Options
-         *
-         * @see DefineOptions
-         */
-        interface DefineScopeOptions {
-
-            /**
-             * Name of the scope and it's query
-             */
-            [scopeName: string] : FindOptions | Function;
-
-        }
-
-        /**
-         * Options for model definition
-         *
-         * @see Sequelize.define
-         */
-        interface DefineOptions<TInstance> {
-
-            /**
-             * Define the default search scope to use for this model. Scopes have the same form as the options passed to
-             * find / findAll.
-             */
-            defaultScope?: FindOptions;
-
-            /**
-             * More scopes, defined in the same way as defaultScope above. See `Model.scope` for more information about
-             * how scopes are defined, and what you can do with them
-             */
-            scopes?: DefineScopeOptions;
-
-            /**
-             * Don't persits null values. This means that all columns with null values will not be saved.
-             */
-            omitNull?: boolean;
-
-            /**
-             * Adds createdAt and updatedAt timestamps to the model. Default true.
-             */
-            timestamps?: boolean;
-
-            /**
-             * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
-             * timestamps=true to work. Default false.
-             */
-            paranoid?: boolean;
-
-            /**
-             * Converts all camelCased columns to underscored if true. Default false.
-             */
-            underscored?: boolean;
-
-            /**
-             * Converts camelCased model names to underscored tablenames if true. Default false.
-             */
-            underscoredAll?: boolean;
-
-            /**
-             * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name.
-             * Otherwise, the dao name will be pluralized. Default false.
-             */
-            freezeTableName?: boolean;
-
-            /**
-             * An object with two attributes, `singular` and `plural`, which are used when this model is associated to
-             * others.
-             */
-            name?: DefineNameOptions;
-
-            /**
-             * Indexes for the provided database table
-             */
-            indexes? : DefineIndexesOptions[];
-
-            /**
-             * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps
-             * must be true. Not affected by underscored setting.
-             */
-            createdAt? : string | boolean;
-
-            /**
-             * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps
-             * must be true. Not affected by underscored setting.
-             */
-            deletedAt? : string | boolean;
-
-            /**
-             * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps
-             * must be true. Not affected by underscored setting.
-             */
-            updatedAt? : string | boolean;
-
-            /**
-             * Defaults to pluralized model name, unless freezeTableName is true, in which case it uses model name
-             * verbatim
-             */
-            tableName? : string;
-
-            /**
-             * Provide getter functions that work like those defined per column. If you provide a getter method with
-             * the
-             * same name as a column, it will be used to access the value of that column. If you provide a name that
-             * does not match a column, this function will act as a virtual getter, that can fetch multiple other
-             * values
-             */
-            getterMethods? : DefineGetterMethodsOptions;
-
-            /**
-             * Provide setter functions that work like those defined per column. If you provide a setter method with
-             * the
-             * same name as a column, it will be used to update the value of that column. If you provide a name that
-             * does not match a column, this function will act as a virtual setter, that can act on and set other
-             * values, but will not be persisted
-             */
-            setterMethods? : DefineSetterMethodsOptions;
-
-            /**
-             * Provide functions that are added to each instance (DAO). If you override methods provided by sequelize,
-             * you can access the original method using `this.constructor.super_.prototype`, e.g.
-             * `this.constructor.super_.prototype.toJSON.apply(this, arguments)`
-             */
-            instanceMethods? : Object;
-
-            /**
-             * Provide functions that are added to the model (Model). If you override methods provided by sequelize,
-             * you can access the original method using `this.constructor.prototype`, e.g.
-             * `this.constructor.prototype.find.apply(this, arguments)`
-             */
-            classMethods? : Object;
-
-            schema? : string;
-
-            /**
-             * You can also change the database engine, e.g. to MyISAM. InnoDB is the default.
-             */
-            engine? : string;
-
-            charset? : string;
-
-            /**
-             * Finaly you can specify a comment for the table in MySQL and PG
-             */
-            comment? : string;
-
-            collate? : string;
-
-            /**
-             * Set the initial AUTO_INCREMENT value for the table in MySQL.
-             */
-            initialAutoIncrement? : string;
-
-            /**
-             * An object of hook function that are called before and after certain lifecycle events.
-             * The possible hooks are: beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy,
-             * beforeBulkUpdate, beforeCreate, beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate,
-             * afterBulkCreate, afterBulkDestory and afterBulkUpdate. See Hooks for more information about hook
-             * functions and their signatures. Each property can either be a function, or an array of functions.
-             */
-            hooks? : HooksDefineOptions<TInstance>;
-
-            /**
-             * An object of model wide validations. Validations have access to all model values via `this`. If the
-             * validator function takes an argument, it is asumed to be async, and is called with a callback that
-             * accepts an optional error.
-             */
-            validate? : DefineValidateOptions;
-
-        }
-
-        /**
-         * Sync Options
-         *
-         * @see Sequelize.sync
-         */
-        interface SyncOptions {
-
-            /**
-             * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table
-             */
-            force?: boolean;
-
-            /**
-             * Match a regex against the database name before syncing, a safety check for cases where force: true is
-             * used in tests but not live code
-             */
-            match?: RegExp;
-
-            /**
-             * A function that logs sql queries, or false for no logging
-             */
-            logging?: Function | boolean;
-
-            /**
-             * The schema that the tables should be created in. This can be overriden for each table in sequelize.define
-             */
-            schema?: string;
-
-        }
-
-        interface SetOptions { }
-
-        /**
-         * Connection Pool options
-         *
-         * @see Options
-         */
-        interface PoolOptions {
-
-            /**
-             * Maximum connections of the pool
-             */
-            maxConnections?: number;
-
-            /**
-             * Minimum connections of the pool
-             */
-            minConnections?: number;
-
-            /**
-             * The maximum time, in milliseconds, that a connection can be idle before being released.
-             */
-            maxIdleTime?: number;
-
-            /**
-             * A function that validates a connection. Called with client. The default function checks that client is an
-             * object, and that its state is not disconnected.
-             */
-            validateConnection?: ( client? : any ) => boolean;
-
-        }
-
-        /**
-         * Interface for replication Options in the sequelize constructor
-         *
-         * @see Options
-         */
-        interface ReplicationOptions {
-
-            read?: {
-                host?: string;
-                port?: string | number;
-                username?: string;
-                password?: string;
-                database?: string;
-            };
-
-            write?: {
-                host?: string;
-                port?: string | number;
-                username?: string;
-                password?: string;
-                database?: string;
-            };
-
-        }
-
-        /**
-         * Options for the constructor of Sequelize main class
-         */
-        interface Options {
-
-            /**
-             * The dialect of the database you are connecting to. One of mysql, postgres, sqlite, mariadb and mssql.
-             *
-             * Defaults to 'mysql'
-             */
-            dialect?: string;
-
-            /**
-             * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of
-             * pg when connecting to a pg database, you should specify 'pg.js' here
-             */
-            dialectModulePath?: string;
-
-            /**
-             * An object of additional options, which are passed directly to the connection library
-             */
-            dialectOptions? : Object;
-
-            /**
-             * Only used by sqlite.
-             *
-             * Defaults to ':memory:'
-             */
-            storage? : string;
-
-            /**
-             * The host of the relational database.
-             *
-             * Defaults to 'localhost'
-             */
-            host? : string;
-
-            /**
-             * The port of the relational database.
-             */
-            port? : number;
-
-            /**
-             * The protocol of the relational database.
-             *
-             * Defaults to 'tcp'
-             */
-            protocol? : string;
-
-            /**
-             * Default options for model definitions. See sequelize.define for options
-             */
-            define? : DefineOptions<any>;
-
-            /**
-             * Default options for sequelize.query
-             */
-            query? : QueryOptions;
-
-            /**
-             * Default options for sequelize.set
-             */
-            set? : SetOptions;
-
-            /**
-             * Default options for sequelize.sync
-             */
-            sync? : SyncOptions;
-
-            /**
-             * The timezone used when converting a date from the database into a JavaScript date. The timezone is also
-             * used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP
-             * and other time related functions have in the right timezone. For best cross platform performance use the
-             * format
-             * +/-HH:MM. Will also accept string versions of timezones used by moment.js (e.g. 'America/Los_Angeles');
-             * this is useful to capture daylight savings time changes.
-             *
-             * Defaults to '+00:00'
-             */
-            timezone? : string;
-
-            /**
-             * A function that gets executed everytime Sequelize would log something.
-             *
-             * Defaults to console.log
-             */
-            logging? : boolean | Function;
-
-            /**
-             * A flag that defines if null values should be passed to SQL queries or not.
-             *
-             * Defaults to false
-             */
-            omitNull? : boolean;
-
-            /**
-             * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
-             *
-             * Defaults to false
-             */
-            native? : boolean;
-
-            /**
-             * Use read / write replication. To enable replication, pass an object, with two properties, read and write.
-             * Write should be an object (a single server for handling writes), and read an array of object (several
-             * servers to handle reads). Each read/write server can have the following properties: `host`, `port`,
-             * `username`, `password`, `database`
-             *
-             * Defaults to false
-             */
-            replication? : ReplicationOptions;
-
-            /**
-             * Connection pool options
-             */
-            pool? : PoolOptions;
-
-            /**
-             * Set to `false` to make table names and attributes case-insensitive on Postgres and skip double quoting of
-             * them.
-             *
-             * Defaults to true
-             */
-            quoteIdentifiers? : boolean;
-
-            /**
-             * Set the default transaction isolation level. See `Sequelize.Transaction.ISOLATION_LEVELS` for possible
-             * options.
-             *
-             * Defaults to 'REPEATABLE_READ'
-             */
-            isolationLevel? : string;
-
-            /**
-             * Set the default transaction type. See `Sequelize.Transaction.TYPES` for possible
-             * options.
-             *
-             * Defaults to 'DEFERRED'
-             */
-            transactionType? : string;
-
-        }
-
-        /**
-         * Sequelize methods that are available both for the static and the instance class of Sequelize
-         */
-        interface SequelizeStaticAndInstance extends Errors {
-
-            /**
-             * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you
-             * might want to use `Sequelize.Utils._`, which is a reference to the lodash library, if you don't already
-             * have it imported in your project.
-             */
-            Utils: Utils;
-
-            /**
-             * A modified version of bluebird promises, that allows listening for sql events
-             */
-            Promise: typeof Promise;
-
-            /**
-             * Available query types for use with `sequelize.query`
-             */
-            QueryTypes: QueryTypes;
-
-            /**
-             * Exposes the validator.js object, so you can extend it with custom validation functions.
-             * The validator is exposed both on the instance, and on the constructor.
-             */
-            Validator: Validator;
-
-            /**
-             * A Model represents a table in the database. Sometimes you might also see it referred to as model, or
-             * simply as factory. This class should not be instantiated directly, it is created using sequelize.define,
-             * and already created models can be loaded using sequelize.import
-             */
-            Model: Model<any, any>;
-
-            /**
-             * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a
-             * transaction
-             */
-            Transaction : TransactionStatic;
-
-            /**
-             * A reference to the deferrable collection. Use this to access the different deferrable options.
-             */
-            Deferrable : Deferrable;
-
-            /**
-             * A reference to the sequelize instance class.
-             */
-            Instance : Instance<any>;
-
-            /**
-             * Creates a object representing a database function. This can be used in search queries, both in where and
-             * order parts, and as default values in column definitions. If you want to refer to columns in your
-             * function, you should use `sequelize.col`, so that the columns are properly interpreted as columns and
-             * not a strings.
-             *
-             * Convert a user's username to upper case
-             * ```js
-             * instance.updateAttributes({
-             *   username: self.sequelize.fn('upper', self.sequelize.col('username'))
-             * })
-             * ```
-             * @param fn The function you want to call
-             * @param args All further arguments will be passed as arguments to the function
-             */
-            fn( fn : string, ...args : any[] ) : fn;
-
-            /**
-             * Creates a object representing a column in the DB. This is often useful in conjunction with
-             * `sequelize.fn`, since raw string arguments to fn will be escaped.
-             *
-             * @param col The name of the column
-             */
-            col( col : string ) : col;
-
-            /**
-             * Creates a object representing a call to the cast function.
-             *
-             * @param val The value to cast
-             * @param type The type to cast it to
-             */
-            cast( val : any, type : string ) : cast;
-
-            /**
-             * Creates a object representing a literal, i.e. something that will not be escaped.
-             *
-             * @param val
-             */
-            literal( val : any ) : literal;
-            asIs( val : any ) : literal;
-
-            /**
-             * An AND query
-             *
-             * @param args Each argument will be joined by AND
-             */
-            and( ...args : Array<string | Object> ) : and;
-
-            /**
-             * An OR query
-             *
-             * @param args Each argument will be joined by OR
-             */
-            or( ...args : Array<string | Object> ) : or;
-
-            /**
-             * Creates an object representing nested where conditions for postgres's json data-type.
-             *
-             * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
-             *     notation or a string using postgres json syntax.
-             * @param value An optional value to compare against. Produces a string of the form "<json path> =
-             *     '<value>'".
-             */
-            json( conditionsOrPath : string | Object, value? : string | number | boolean ) : json;
-
-            /**
-             * A way of specifying attr = condition.
-             *
-             * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
-             * or
-             * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
-             * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
-             *
-             * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
-             * string to be escaped, use `sequelize.literal`.
-             *
-             * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
-             *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
-             *     POJO syntax
-             * @param comparator Comparator
-             * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
-             *     etc.)
-             */
-            where( attr : Object, comparator : string, logic : string | Object ) : where;
-            where( attr : Object, logic : string | Object ) : where;
-            condition( attr : Object, logic : string | Object ) : where;
-
-        }
-
-        /**
-         * Sequelize methods available only for the static class ( basically this is the constructor and some extends )
-         */
-        interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
-
-            /**
-             * Instantiate sequelize with name of database, username and password
-             *
-             * #### Example usage
-             *
-             * ```javascript
-             * // without password and options
-             * var sequelize = new Sequelize('database', 'username')
-             *
-             * // without options
-             * var sequelize = new Sequelize('database', 'username', 'password')
-             *
-             * // without password / with blank password
-             * var sequelize = new Sequelize('database', 'username', null, {})
-             *
-             * // with password and options
-             * var sequelize = new Sequelize('my_database', 'john', 'doe', {})
-             *
-             * // with uri (see below)
-             * var sequelize = new Sequelize('mysql://localhost:3306/database', {})
-             * ```
-             *
-             * @param database The name of the database
-             * @param username The username which is used to authenticate against the
-             *     database.
-             * @param password The password which is used to authenticate against the
-             *     database.
-             * @param options An object with options.
-             */
-            new ( database : string, username : string, password : string, options? : Options ) : Sequelize;
-            new ( database : string, username : string, options? : Options ) : Sequelize;
-
-            /**
-             * Instantiate sequelize with an URI
-             * @name Sequelize
-             * @constructor
-             *
-             * @param uri A full database URI
-             * @param options See above for possible options
-             */
-            new ( uri : string, options? : Options ) : Sequelize;
-
-            /**
-             * Provide access to continuation-local-storage (http://docs.sequelizejs.com/en/latest/api/sequelize/#transactionoptions-promise)
-             */
-            cls: any;
-
-        }
-
-        interface QueryOptionsTransactionRequired { }
-        interface ModelsHashInterface {
-            [name: string]: Model<any, any>;
-        }
-
-        /**
-         * This is the main class, the entry point to sequelize. To use it, you just need to
-         * import sequelize:
-         *
-         * ```js
-         * var Sequelize = require('sequelize');
-         * ```
-         *
-         * In addition to sequelize, the connection library for the dialect you want to use
-         * should also be installed in your project. You don't need to import it however, as
-         * sequelize will take care of that.
-         */
-        interface Sequelize extends SequelizeStaticAndInstance, Hooks<any> {
-
-            /**
-             * A reference to Sequelize constructor from sequelize. Useful for accessing DataTypes, Errors etc.
-             */
-            Sequelize: SequelizeStatic;
-
-            /**
-             * Defined models.
-             */
-            models: ModelsHashInterface;
-
-            /**
-             * Returns the specified dialect.
-             */
-            getDialect() : string;
-
-            /**
-             * Returns an instance of QueryInterface.
-             */
-            getQueryInterface(): QueryInterface;
-
-            /**
-             * Define a new model, representing a table in the DB.
-             *
-             * The table columns are define by the hash that is given as the second argument. Each attribute of the
-             * hash
-             * represents a column. A short table definition might look like this:
-             *
-             * ```js
-             * sequelize.define('modelName', {
-             *     columnA: {
-             *         type: Sequelize.BOOLEAN,
-             *         validate: {
-             *           is: ["[a-z]",'i'],        // will only allow letters
-             *           max: 23,                  // only allow values <= 23
-             *           isIn: {
-             *             args: [['en', 'zh']],
-             *             msg: "Must be English or Chinese"
-             *           }
-             *         },
-             *         field: 'column_a'
-             *         // Other attributes here
-             *     },
-             *     columnB: Sequelize.STRING,
-             *     columnC: 'MY VERY OWN COLUMN TYPE'
-             * })
-             *
-             * sequelize.models.modelName // The model will now be available in models under the name given to define
-             * ```
-             *
-             * As shown above, column definitions can be either strings, a reference to one of the datatypes that are
-             * predefined on the Sequelize constructor, or an object that allows you to specify both the type of the
-             * column, and other attributes such as default values, foreign key constraints and custom setters and
-             * getters.
-             *
-             * For a list of possible data types, see
-             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#data-types
-             *
-             * For more about getters and setters, see
-             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#getters-setters
-             *
-             * For more about instance and class methods, see
-             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#expansion-of-models
-             *
-             * For more about validation, see
-             * http://docs.sequelizejs.com/en/latest/docs/models-definition/#validations
-             *
-             * @param modelName  The name of the model. The model will be stored in `sequelize.models` under this name
-             * @param attributes An object, where each attribute is a column of the table. Each column can be either a
-             *                   DataType, a string or a type-description object, with the properties described below:
-             * @param options    These options are merged with the default define options provided to the Sequelize
-             *                   constructor
-             */
-            define<TInstance, TAttributes>( modelName : string, attributes : DefineAttributes,
-                                            options? : DefineOptions<TInstance> ) : Model<TInstance, TAttributes>;
-
-            /**
-             * Fetch a Model which is already defined
-             *
-             * @param modelName The name of a model defined with Sequelize.define
-             */
-            model<TInstance, TAttributes>( modelName : string ) : Model<TInstance, TAttributes>;
-
-            /**
-             * Checks whether a model with the given name is defined
-             *
-             * @param modelName The name of a model defined with Sequelize.define
-             */
-            isDefined( modelName : string ) : boolean;
-
-            /**
-             * Imports a model defined in another file
-             *
-             * Imported models are cached, so multiple calls to import with the same path will not load the file
-             * multiple times
-             *
-             * See https://github.com/sequelize/sequelize/blob/master/examples/using-multiple-model-files/Task.js for a
-             * short example of how to define your models in separate files so that they can be imported by
-             * sequelize.import
-             *
-             * @param path The path to the file that holds the model you want to import. If the part is relative, it
-             *     will be resolved relatively to the calling file
-             *
-             * @param defineFunction An optional function that provides model definitions. Useful if you do not
-             *     want to use the module root as the define function
-             */
-            import<TInstance, TAttributes>( path : string, defineFunction? : (sequelize: Sequelize, dataTypes: DataTypes) => Model<TInstance, TAttributes> ) : Model<TInstance, TAttributes>;
-
-            /**
-             * Execute a query on the DB, with the posibility to bypass all the sequelize goodness.
-             *
-             * By default, the function will return two arguments: an array of results, and a metadata object,
-             * containing number of affected rows etc. Use `.spread` to access the results.
-             *
-             * If you are running a type of query where you don't need the metadata, for example a `SELECT` query, you
-             * can pass in a query type to make sequelize format the results:
-             *
-             * ```js
-             * sequelize.query('SELECT...').spread(function (results, metadata) {
-             *   // Raw query - use spread
-             * });
-             *
-             * sequelize.query('SELECT...', { type: sequelize.QueryTypes.SELECT }).then(function (results) {
-             *   // SELECT query - use then
-             * })
-             * ```
-             *
-             * @param sql
-             * @param options Query options
-             */
-            query( sql : string | { query: string, values: any[] }, options? : QueryOptions ) : Promise<any>;
-
-            /**
-             * Execute a query which would set an environment or user variable. The variables are set per connection,
-             * so this function needs a transaction.
-             *
-             * Only works for MySQL.
-             *
-             * @param variables Object with multiple variables.
-             * @param options Query options.
-             */
-            set( variables : Object, options : QueryOptionsTransactionRequired ) : Promise<any>;
-
-            /**
-             * Escape value.
-             *
-             * @param value Value that needs to be escaped
-             */
-            escape( value : string ) : string;
-
-            /**
-             * Create a new database schema.
-             *
-             * Note,that this is a schema in the
-             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
-             * not a database table. In mysql and sqlite, this command will do nothing.
-             *
-             * @param schema Name of the schema
-             * @param options Options supplied
-             * @param options.logging A function that logs sql queries, or false for no logging
-             */
-            createSchema( schema : string, options : { logging? : boolean | Function } ) : Promise<any>;
-
-            /**
-             * Show all defined schemas
-             *
-             * Note,that this is a schema in the
-             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
-             * not a database table. In mysql and sqlite, this will show all tables.
-             *
-             * @param options Options supplied
-             * @param options.logging A function that logs sql queries, or false for no logging
-             */
-            showAllSchemas( options : { logging? : boolean | Function } ) : Promise<any>;
-
-            /**
-             * Drop a single schema
-             *
-             * Note,that this is a schema in the
-             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
-             * not a database table. In mysql and sqlite, this drop a table matching the schema name
-             *
-             * @param schema Name of the schema
-             * @param options Options supplied
-             * @param options.logging A function that logs sql queries, or false for no logging
-             */
-            dropSchema( schema : string, options : { logging? : boolean | Function } ) : Promise<any>;
-
-            /**
-             * Drop all schemas
-             *
-             * Note,that this is a schema in the
-             * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
-             * not a database table. In mysql and sqlite, this is the equivalent of drop all tables.
-             *
-             * @param options Options supplied
-             * @param options.logging A function that logs sql queries, or false for no logging
-             */
-            dropAllSchemas( options : { logging? : boolean | Function } ) : Promise<any>;
-
-            /**
-             * Sync all defined models to the DB.
-             *
-             * @param options Sync Options
-             */
-            sync( options? : SyncOptions ) : Promise<any>;
-
-            /**
-             * Truncate all tables defined through the sequelize models. This is done
-             * by calling Model.truncate() on each model.
-             *
-             * @param {object} [options] The options passed to Model.destroy in addition to truncate
-             * @param {Boolean|function} [options.transaction]
-             * @param {Boolean|function} [options.logging] A function that logs sql queries, or false for no logging
-             */
-            truncate( options? : DestroyOptions ) : Promise<any>;
-
-            /**
-             * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model
-             * @see {Model#drop} for options
-             *
-             * @param options The options passed to each call to Model.drop
-             */
-            drop( options? : DropOptions ) : Promise<any>;
-
-            /**
-             * Test the connection by trying to authenticate
-             *
-             * @param options Query Options for authentication
-             */
-            authenticate( options? : QueryOptions ) : Promise<void>;
-            validate( options? : QueryOptions ) : Promise<ValidationError>;
-
-            /**
-             * Start a transaction. When using transactions, you should pass the transaction in the options argument
-             * in order for the query to happen under that transaction
-             *
-             * ```js
-             * sequelize.transaction().then(function (t) {
-             *   return User.find(..., { transaction: t}).then(function (user) {
-             *     return user.updateAttributes(..., { transaction: t});
-             *   })
-             *   .then(t.commit.bind(t))
-             *   .catch(t.rollback.bind(t));
-             * })
-             * ```
-             *
-             * A syntax for automatically committing or rolling back based on the promise chain resolution is also
-             * supported:
-             *
-             * ```js
-             * sequelize.transaction(function (t) { // Note that we use a callback rather than a promise.then()
-             *   return User.find(..., { transaction: t}).then(function (user) {
-             *     return user.updateAttributes(..., { transaction: t});
-             *   });
-             * }).then(function () {
-             *   // Commited
-             * }).catch(function (err) {
-             *   // Rolled back
-             *   console.error(err);
-             * });
-             * ```
-             *
-             * If you have [CLS](https://github.com/othiym23/node-continuation-local-storage) enabled, the transaction
-             * will automatically be passed to any query that runs witin the callback. To enable CLS, add it do your
-             * project, create a namespace and set it on the sequelize constructor:
-             *
-             * ```js
-             * var cls = require('continuation-local-storage'),
-             *     ns = cls.createNamespace('....');
-             * var Sequelize = require('sequelize');
-             * Sequelize.cls = ns;
-             * ```
-             * Note, that CLS is enabled for all sequelize instances, and all instances will share the same namespace
-             *
-             * @param options Transaction Options
-             * @param autoCallback Callback for the transaction
-             */
-            transaction( options : TransactionOptions,
-                         autoCallback : ( t : Transaction ) => Promise<any> ) : Promise<any>;
-            transaction( autoCallback : ( t : Transaction ) => Promise<any> ) : Promise<any>;
-            transaction() : Promise<Transaction>;
-
-            /**
-             * Close all connections used by this sequelize instance, and free all references so the instance can be
-             * garbage collected.
-             *
-             * Normally this is done on process exit, so you only need to call this method if you are creating multiple
-             * instances, and want to garbage collect some of them.
-             */
-            close() : void;
-
-            /**
-             * Returns the database version
-             */
-            databaseVersion() : Promise<string>;
-
-        }
-
-        //
-        //  Validator
-        // ~~~~~~~~~~~
-
-        /**
-         * Validator Interface
-         */
-        interface Validator extends ValidatorJS.ValidatorStatic {
-
-            notEmpty( str : string ) : boolean;
-            len( str : string, min : number, max : number ) : boolean;
-            isUrl( str : string ) : boolean;
-            isIPv6( str : string ) : boolean;
-            isIPv4( str : string ) : boolean;
-            notIn( str : string, values : string[] ) : boolean;
-            regex( str : string, pattern : string, modifiers : string ) : boolean;
-            notRegex( str : string, pattern : string, modifiers : string ) : boolean;
-            isDecimal( str : string ) : boolean;
-            min( str : string, val : number ) : boolean;
-            max( str : string, val : number ) : boolean;
-            not( str : string, pattern : string, modifiers : string ) : boolean;
-            contains( str : string, element : string[] ) : boolean;
-            notContains( str : string, element : string[] ) : boolean;
-            is( str : string, pattern : string, modifiers : string ) : boolean;
-
-        }
-
-        //
-        //  Transaction
-        // ~~~~~~~~~~~~~
-        //
-        //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/transaction.js
-        //
-
-        /**
-         * The transaction object is used to identify a running transaction. It is created by calling
-         * `Sequelize.transaction()`.
-         *
-         * To run a query under a transaction, you should pass the transaction in the options object.
-         */
-        interface Transaction {
-
-            /**
-             * Possible options for row locking. Used in conjuction with `find` calls:
-             *
-             * @see TransactionStatic
-             */
-            LOCK : TransactionLock;
-
-            /**
-             * Commit the transaction
-             */
-            commit() : Promise<void>;
-
-            /**
-             * Rollback (abort) the transaction
-             */
-            rollback() : Promise<void>;
-
-        }
-
-        /**
-         * The transaction static object
-         *
-         * @see Transaction
-         */
-        interface TransactionStatic {
-
-            /**
-             * Isolations levels can be set per-transaction by passing `options.isolationLevel` to
-             * `sequelize.transaction`. Default to `REPEATABLE_READ` but you can override the default isolation level
-             * by passing
-             * `options.isolationLevel` in `new Sequelize`.
-             *
-             * The possible isolations levels to use when starting a transaction:
-             *
-             * ```js
-             * {
-             *   READ_UNCOMMITTED: "READ UNCOMMITTED",
-             *   READ_COMMITTED: "READ COMMITTED",
-             *   REPEATABLE_READ: "REPEATABLE READ",
-             *   SERIALIZABLE: "SERIALIZABLE"
-             * }
-             * ```
-             *
-             * Pass in the desired level as the first argument:
-             *
-             * ```js
-             * return sequelize.transaction({
-             *   isolationLevel: Sequelize.Transaction.SERIALIZABLE
-             * }, function (t) {
-             *
-             *  // your transactions
-             *
-             * }).then(function(result) {
-             *   // transaction has been committed. Do something after the commit if required.
-             * }).catch(function(err) {
-             *   // do something with the err.
-             * });
-             * ```
-             *
-             * @see ISOLATION_LEVELS
-             */
-            ISOLATION_LEVELS : TransactionIsolationLevels;
-
-            /**
-             * Transaction type can be set per-transaction by passing `options.type` to
-             * `sequelize.transaction`. Default to `DEFERRED` but you can override the default isolation level
-             * by passing `options.transactionType` in `new Sequelize`.
-             *
-             * The transaction types to use when starting a transaction:
-             *
-             * ```js
-             * {
-             *   DEFERRED: "DEFERRED",
-             *   IMMEDIATE: "IMMEDIATE",
-             *   EXCLUSIVE: "EXCLUSIVE"
-             * }
-             * ```
-             *
-             * Pass in the transaction type the first argument:
-             *
-             * ```js
-             * return sequelize.transaction({
-             *   type: Sequelize.Transaction.EXCLUSIVE
-             * }, function (t) {
-             *
-             *  // your transactions
-             *
-             * }).then(function(result) {
-             *   // transaction has been committed. Do something after the commit if required.
-             * }).catch(function(err) {
-             *   // do something with the err.
-             * });
-             * ```
-             *
-             * @see Sequelize.Transaction.TYPES
-             */
-            TYPES : TransactionTypes;
-
-            /**
-             * Possible options for row locking. Used in conjuction with `find` calls:
-             *
-             * ```js
-             * t1 // is a transaction
-             * t1.LOCK.UPDATE,
-             * t1.LOCK.SHARE,
-             * t1.LOCK.KEY_SHARE, // Postgres 9.3+ only
-             * t1.LOCK.NO_KEY_UPDATE // Postgres 9.3+ only
-             * ```
-             *
-             * Usage:
-             * ```js
-             * t1 // is a transaction
-             * Model.findAll({
-             *   where: ...,
-             *   transaction: t1,
-             *   lock: t1.LOCK...
-             * });
-             * ```
-             *
-             * Postgres also supports specific locks while eager loading by using OF:
-             * ```js
-             * UserModel.findAll({
-             *   where: ...,
-             *   include: [TaskModel, ...],
-             *   transaction: t1,
-             *   lock: {
-             *     level: t1.LOCK...,
-             *     of: UserModel
-             *   }
-             * });
-             * ```
-             * UserModel will be locked but TaskModel won't!
-             */
-            LOCK : TransactionLock;
-
-        }
-
-        /**
-         * Isolations levels can be set per-transaction by passing `options.isolationLevel` to `sequelize.transaction`.
-         * Default to `REPEATABLE_READ` but you can override the default isolation level by passing
-         * `options.isolationLevel` in `new Sequelize`.
-         */
-        interface TransactionIsolationLevels {
-            READ_UNCOMMITTED: string; // 'READ UNCOMMITTED'
-            READ_COMMITTED: string; // 'READ COMMITTED'
-            REPEATABLE_READ: string; // 'REPEATABLE READ'
-            SERIALIZABLE: string; // 'SERIALIZABLE'
-        }
-
-        /**
-         * Transaction type can be set per-transaction by passing `options.type` to `sequelize.transaction`.
-         * Default to `DEFERRED` but you can override the default isolation level by passing
-         * `options.transactionType` in `new Sequelize`.
-         */
-        interface TransactionTypes {
-          DEFERRED: string; // 'DEFERRED'
-          IMMEDIATE: string; // 'IMMEDIATE'
-          EXCLUSIVE: string; // 'EXCLUSIVE'
-        }
-
-        /**
-         * Possible options for row locking. Used in conjuction with `find` calls:
-         */
-        interface TransactionLock {
-            UPDATE: string; // 'UPDATE'
-            SHARE: string; // 'SHARE'
-            KEY_SHARE: string; // 'KEY SHARE'
-            NO_KEY_UPDATE: string; // 'NO KEY UPDATE'
-        }
-
-        /**
-         * Options provided when the transaction is created
-         *
-         * @see sequelize.transaction()
-         */
-        interface TransactionOptions {
-
-            autocommit?: boolean;
-
-            /**
-             *  See `Sequelize.Transaction.ISOLATION_LEVELS` for possible options
-             */
-            isolationLevel?: string;
-
-            /**
-             *  See `Sequelize.Transaction.TYPES` for possible options
-             */
-            type?: string;
-
-            /**
-             * A function that gets executed while running the query to log the sql.
-             */
-            logging?: Function;
-
-        }
-
-        //
-        //  Utils
-        // ~~~~~~~
-
-        interface fn {
-            clone : fnStatic;
-        }
-
-        interface fnStatic {
-            /**
-             * @param fn The function you want to call
-             * @param args All further arguments will be passed as arguments to the function
-             */
-            new ( fn : string, ...args : any[] ) : fn;
-        }
-
-        interface col {
-            col: string;
-        }
-
-        interface colStatic {
-            /**
-             * Creates a object representing a column in the DB. This is often useful in conjunction with
-             * `sequelize.fn`, since raw string arguments to fn will be escaped.
-             * @see {Sequelize#fn}
-             *
-             * @param col The name of the column
-             */
-            new ( col : string ) : col;
-        }
-
-        interface cast {
-            val: any;
-            type: string;
-        }
-
-        interface castStatic {
-            /**
-             * Creates a object representing a call to the cast function.
-             *
-             * @param val The value to cast
-             * @param type The type to cast it to
-             */
-            new ( val : any, type : string ) : cast;
-        }
-
-        interface literal {
-            val: any;
-        }
-
-        interface literalStatic {
-            /**
-             * Creates a object representing a literal, i.e. something that will not be escaped.
-             *
-             * @param val
-             */
-            new ( val : any ) : literal;
-        }
-
-        interface and {
-            args: any[];
-        }
-
-        interface andStatic {
-            /**
-             * An AND query
-             *
-             * @param args Each argument will be joined by AND
-             */
-            new ( ...args : Array<string | Object> ) : and;
-        }
-
-        interface or {
-            args: any[];
-        }
-
-        interface orStatic {
-            /**
-             * An OR query
-             * @see {Model#find}
-             *
-             * @param args Each argument will be joined by OR
-             */
-            new ( ...args : Array<string | Object> ) : or;
-        }
-
-        interface json {
-            conditions?: Object;
-            path? : string;
-            value? : string | number | boolean;
-        }
-
-        interface jsonStatic {
-            /**
-             * Creates an object representing nested where conditions for postgres's json data-type.
-             * @see {Model#find}
-             *
-             * @method json
-             * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
-             *     notation or a string using postgres json syntax.
-             * @param value An optional value to compare against. Produces a string of the form "<json path> =
-             *     '<value>'".
-             */
-            new ( conditionsOrPath : string | Object, value? : string | number | boolean ) : json;
-        }
-
-        interface where {
-            attribute : Object;
-            comparator? : string;
-            logic : string | Object;
-        }
-
-        interface whereStatic {
-            /**
-             * A way of specifying attr = condition.
-             *
-             * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
-             * or
-             * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
-             * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
-             *
-             * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
-             * string to be escaped, use `sequelize.literal`.
-             *
-             * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
-             *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
-             *     POJO syntax
-             * @param comparator Comparator
-             * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
-             *     etc.)
-             */
-            new ( attr : Object, comparator : string, logic : string | Object ) : where;
-            new ( attr : Object, logic : string | Object ) : where;
-        }
-
-        interface SequelizeLoDash extends _.LoDashStatic {
-
-            camelizeIf( str : string, condition : boolean ): string;
-            underscoredIf( str : string, condition : boolean ): string;
-            /**
-             * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered
-             * falsey.
-             *
-             * @param arr Array to compact.
-             */
-            compactLite<T>( arr : T[] ): T[];
-            matchesDots( dots : string | string[], value : Object ) : ( item : Object ) => boolean;
-
-        }
-
-        interface Utils {
-
-            _ : SequelizeLoDash;
-
-            /**
-             * Same concept as _.merge, but don't overwrite properties that have already been assigned
-             */
-            mergeDefaults : typeof _.merge;
-
-            lowercaseFirst( str : string ): string;
-            uppercaseFirst( str : string ): string;
-            spliceStr( str : string, index : number, count : number, add : string ): string;
-            camelize( str : string ): string;
-            format( arr : any[], dialect? : string ): string;
-            formatNamedParameters( sql : string, parameters : any, dialect? : string ): string;
-            cloneDeep<T extends Object>( obj : T, fn? : ( value : T ) => any ) : T;
-            mapOptionFieldNames<T extends Object>( options : T, Model : Model<any, any> ) : T;
-            mapValueFieldNames( dataValues : Object, fields : string[], Model : Model<any, any> ) : Object;
-            argsArePrimaryKeys( args : any[], primaryKeys : Object ) : boolean;
-            canTreatArrayAsAnd( arr : any[] ) : boolean;
-            combineTableNames( tableName1 : string, tableName2 : string ): string;
-            singularize( s : string ): string;
-            pluralize( s : string ): string;
-            removeCommentsFromFunctionString( s : string ): string;
-            toDefaultValue( value : DataTypeAbstract ): any;
-            toDefaultValue( value : () => DataTypeAbstract ): any;
-
-            /**
-             * Determine if the default value provided exists and can be described
-             * in a db schema using the DEFAULT directive.
-             */
-            defaultValueSchemable( value : any ) : boolean;
-
-            removeNullValuesFromHash( hash : Object, omitNull? : boolean, options? : Object ): any;
-            inherit( subClass : Object, superClass : Object ): Object;
-            stack(): string;
-            sliceArgs( args : any[], begin? : number ) : any[];
-            now( dialect : string ): Date;
-            tick( f : Function ): void;
-            addTicks( s : string, tickChar? : string ): string;
-            removeTicks( s : string, tickChar? : string ): string;
-
-            fn: fnStatic;
-            col: colStatic;
-            cast: castStatic;
-            literal: literalStatic;
-            and: andStatic;
-            or: orStatic;
-            json: jsonStatic;
-            where: whereStatic;
-
-            validateParameter( value : Object, expectation : Object, options? : Object ) : boolean;
-            formatReferences( obj : Object ) : Object;
-            Promise : typeof Promise;
-
-        }
+declare namespace sequelize {
+
+    //
+    //  Associations
+    // ~~~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/tree/v3.4.1/lib/associations
+    //
+
+
+    /**
+     * The options for the getAssociation mixin of the belongsTo association.
+     * @see BelongsToGetAssociationMixin
+     */
+    interface BelongsToGetAssociationMixinOptions {
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The getAssociation mixin applied to models with belongsTo.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsTo(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
+     *    getRole: Sequelize.BelongsToGetAssociationMixin<RoleInstance>;
+     *    // setRole...
+     *    // createRole...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+     * @see Instance
+     */
+    interface BelongsToGetAssociationMixin<TInstance> {
+        /**
+         * Get the associated instance.
+         * @param options The options to use when getting the association.
+         */
+        (options?: BelongsToGetAssociationMixinOptions): Promise<TInstance>;
+    }
+
+    /**
+     * The options for the setAssociation mixin of the belongsTo association.
+     * @see BelongsToSetAssociationMixin
+     */
+    interface BelongsToSetAssociationMixinOptions {
+        /**
+         * Skip saving this after setting the foreign key if false.
+         */
+        save?: boolean;
+    }
+
+    /**
+     * The setAssociation mixin applied to models with belongsTo.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsTo(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRole...
+     *    setRole: Sequelize.BelongsToSetAssociationMixin<RoleInstance, RoleId>;
+     *    // createRole...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+     * @see Instance
+     */
+    interface BelongsToSetAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Set the associated instance.
+         * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
+         * @param options the options passed to `this.save`.
+         */
+        (
+            newAssociation?: TInstance | TInstancePrimaryKey,
+            options?: BelongsToSetAssociationMixinOptions | InstanceSaveOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the createAssociation mixin of the belongsTo association.
+     * @see BelongsToCreateAssociationMixin
+     */
+    interface BelongsToCreateAssociationMixinOptions { }
+
+    /**
+     * The createAssociation mixin applied to models with belongsTo.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsTo(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRole...
+     *    // setRole...
+     *    createRole: Sequelize.BelongsToCreateAssociationMixin<RoleAttributes>;
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to/
+     * @see Instance
+     */
+    interface BelongsToCreateAssociationMixin<TAttributes> {
+        /**
+         * Create a new instance of the associated model and associate it with this.
+         * @param values The values used to create the association.
+         * @param options The options passed to `target.create` and `setAssociation`.
+         */
+        (
+            values?: TAttributes,
+            options?: BelongsToCreateAssociationMixinOptions | CreateOptions | BelongsToSetAssociationMixinOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the getAssociation mixin of the hasOne association.
+     * @see HasOneGetAssociationMixin
+     */
+    interface HasOneGetAssociationMixinOptions {
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The getAssociation mixin applied to models with hasOne.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasOne(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttrib>, UserAttrib {
+     *    getRole: Sequelize.HasOneGetAssociationMixin<RoleInstance>;
+     *    // setRole...
+     *    // createRole...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
+     * @see Instance
+     */
+    interface HasOneGetAssociationMixin<TInstance> {
+        /**
+         * Get the associated instance.
+         * @param options The options to use when getting the association.
+         */
+        (options?: HasOneGetAssociationMixinOptions): Promise<TInstance>;
+    }
+
+    /**
+     * The options for the setAssociation mixin of the hasOne association.
+     * @see HasOneSetAssociationMixin
+     */
+    interface HasOneSetAssociationMixinOptions {
+        /**
+         * Skip saving this after setting the foreign key if false.
+         */
+        save?: boolean;
+    }
+
+    /**
+     * The setAssociation mixin applied to models with hasOne.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasOne(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRole...
+     *    setRole: Sequelize.HasOneSetAssociationMixin<RoleInstance, RoleId>;
+     *    // createRole...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
+     * @see Instance
+     */
+    interface HasOneSetAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Set the associated instance.
+         * @param newAssociation An instance or the primary key of an instance to associate with this. Pass null or undefined to remove the association.
+         * @param options The options passed to `getAssocation` and `target.save`.
+         */
+        (
+            newAssociation?: TInstance | TInstancePrimaryKey,
+            options?: HasOneSetAssociationMixinOptions | HasOneGetAssociationMixinOptions | InstanceSaveOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the createAssociation mixin of the hasOne association.
+     * @see HasOneCreateAssociationMixin
+     */
+    interface HasOneCreateAssociationMixinOptions { }
+
+    /**
+     * The createAssociation mixin applied to models with hasOne.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasOne(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRole...
+     *    // setRole...
+     *    createRole: Sequelize.HasOneCreateAssociationMixin<RoleAttributes>;
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-one/
+     * @see Instance
+     */
+    interface HasOneCreateAssociationMixin<TAttributes> {
+        /**
+         * Create a new instance of the associated model and associate it with this.
+         * @param values The values used to create the association.
+         * @param options The options passed to `target.create` and `setAssociation`.
+         */
+        (
+            values?: TAttributes,
+            options?: HasOneCreateAssociationMixinOptions | HasOneSetAssociationMixinOptions | CreateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the getAssociations mixin of the hasMany association.
+     * @see HasManyGetAssociationsMixin
+     */
+    interface HasManyGetAssociationsMixinOptions {
+
+        /**
+         * An optional where clause to limit the associated models.
+         */
+        where?: WhereOptions;
+
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The getAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    getRoles: Sequelize.HasManyGetAssociationsMixin<RoleInstance>;
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyGetAssociationsMixin<TInstance> {
+        /**
+         * Get everything currently associated with this, using an optional where clause.
+         * @param options The options to use when getting the associations.
+         */
+        (options?: HasManyGetAssociationsMixinOptions): Promise<TInstance[]>;
+    }
+
+    /**
+     * The options for the setAssociations mixin of the hasMany association.
+     * @see HasManySetAssociationsMixin
+     */
+    interface HasManySetAssociationsMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The setAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    setRoles: Sequelize.HasManySetAssociationsMixin<RoleInstance, RoleId>;
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManySetAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Set the associated models by passing an array of instances or their primary keys.
+         * Everything that it not in the passed array will be un-associated.
+         * @param newAssociations An array of instances or primary key of instances to associate with this. Pass null or undefined to remove all associations.
+         * @param options The options passed to `target.findAll` and `update`.
+         */
+        (
+            newAssociations?: Array<TInstance | TInstancePrimaryKey>,
+            options?: HasManySetAssociationsMixinOptions | FindOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the addAssociations mixin of the hasMany association.
+     * @see HasManyAddAssociationsMixin
+     */
+    interface HasManyAddAssociationsMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The addAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    addRoles: Sequelize.HasManyAddAssociationsMixin<RoleInstance, RoleId>;
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyAddAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Associate several instances with this.
+         * @param newAssociations An array of instances or primary key of instances to associate with this.
+         * @param options The options passed to `target.update`.
+         */
+        (
+            newAssociations?: Array<TInstance | TInstancePrimaryKey>,
+            options?: HasManyAddAssociationsMixinOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the addAssociation mixin of the hasMany association.
+     * @see HasManyAddAssociationMixin
+     */
+    interface HasManyAddAssociationMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The addAssociation mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    addRole: Sequelize.HasManyAddAssociationMixin<RoleInstance, RoleId>;
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyAddAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Associate an instance with this.
+         * @param newAssociation An instance or the primary key of an instance to associate with this.
+         * @param options The options passed to `target.update`.
+         */
+        (
+            newAssociation?: TInstance | TInstancePrimaryKey,
+            options?: HasManyAddAssociationMixinOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the createAssociation mixin of the hasMany association.
+     * @see HasManyCreateAssociationMixin
+     */
+    interface HasManyCreateAssociationMixinOptions { }
+
+    /**
+     * The createAssociation mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    createRole: Sequelize.HasManyCreateAssociationMixin<RoleAttributes>;
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyCreateAssociationMixin<TAttributes> {
+        /**
+         * Create a new instance of the associated model and associate it with this.
+         * @param values The values used to create the association.
+         * @param options The options to use when creating the association.
+         */
+        (
+            values?: TAttributes,
+            options?: HasManyCreateAssociationMixinOptions | CreateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the removeAssociation mixin of the hasMany association.
+     * @see HasManyRemoveAssociationMixin
+     */
+    interface HasManyRemoveAssociationMixinOptions { }
+
+    /**
+     * The removeAssociation mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    removeRole: Sequelize.HasManyRemoveAssociationMixin<RoleInstance, RoleId>;
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyRemoveAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Un-associate the instance.
+         * @param oldAssociated The instance or the primary key of the instance to un-associate.
+         * @param options The options passed to `target.update`.
+         */
+        (
+            oldAssociated?: TInstance | TInstancePrimaryKey,
+            options?: HasManyRemoveAssociationMixinOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the removeAssociations mixin of the hasMany association.
+     * @see HasManyRemoveAssociationsMixin
+     */
+    interface HasManyRemoveAssociationsMixinOptions { }
+
+    /**
+     * The removeAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    removeRoles: Sequelize.HasManyRemoveAssociationsMixin<RoleInstance, RoleId>;
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyRemoveAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Un-associate several instances.
+         * @param oldAssociated An array of instances or primary key of instances to un-associate.
+         * @param options The options passed to `target.update`.
+         */
+        (
+            oldAssociateds?: Array<TInstance | TInstancePrimaryKey>,
+            options?: HasManyRemoveAssociationsMixinOptions | InstanceUpdateOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the hasAssociation mixin of the hasMany association.
+     * @see HasManyHasAssociationMixin
+     */
+    interface HasManyHasAssociationMixinOptions { }
+
+    /**
+     * The hasAssociation mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    hasRole: Sequelize.HasManyHasAssociationMixin<RoleInstance, RoleId>;
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyHasAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Check if an instance is associated with this.
+         * @param target The instance or the primary key of the instance to check.
+         * @param options The options passed to `getAssociations`.
+         */
+        (
+            target: TInstance | TInstancePrimaryKey,
+            options?: HasManyHasAssociationMixinOptions | HasManyGetAssociationsMixinOptions
+        ): Promise<boolean>;
+    }
+
+    /**
+     * The options for the hasAssociations mixin of the hasMany association.
+     * @see HasManyHasAssociationsMixin
+     */
+    interface HasManyHasAssociationsMixinOptions { }
+
+    /**
+     * The removeAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles
+     *    // hasRole...
+     *    hasRoles: Sequelize.HasManyHasAssociationsMixin<RoleInstance, RoleId>;
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyHasAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Check if all instances are associated with this.
+         * @param targets An array of instances or primary key of instances to check.
+         * @param options The options passed to `getAssociations`.
+         */
+        (
+            targets: Array<TInstance | TInstancePrimaryKey>,
+            options?: HasManyHasAssociationsMixinOptions | HasManyGetAssociationsMixinOptions
+        ): Promise<boolean>;
+    }
+
+    /**
+     * The options for the countAssociations mixin of the hasMany association.
+     * @see HasManyCountAssociationsMixin
+     */
+    interface HasManyCountAssociationsMixinOptions {
+
+        /**
+         * An optional where clause to limit the associated models.
+         */
+        where?: WhereOptions;
+
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The countAssociations mixin applied to models with hasMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.hasMany(Role);
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    countRoles: Sequelize.HasManyCountAssociationsMixin;
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/has-many/
+     * @see Instance
+     */
+    interface HasManyCountAssociationsMixin {
+        /**
+         * Count everything currently associated with this, using an optional where clause.
+         * @param options The options to use when counting the associations.
+         */
+        (options?: HasManyCountAssociationsMixinOptions): Promise<number>;
+    }
+
+    /**
+     * The options for the getAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyGetAssociationsMixin
+     */
+    interface BelongsToManyGetAssociationsMixinOptions {
+
+        /**
+         * An optional where clause to limit the associated models.
+         */
+        where?: WhereOptions;
+
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The getAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    getRoles: Sequelize.BelongsToManyGetAssociationsMixin<RoleInstance>;
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyGetAssociationsMixin<TInstance> {
+        /**
+         * Get everything currently associated with this, using an optional where clause.
+         * @param options The options to use when getting the associations.
+         */
+        (options?: BelongsToManyGetAssociationsMixinOptions): Promise<TInstance[]>;
+    }
+
+    /**
+     * The options for the setAssociations mixin of the belongsToMany association.
+     * @see BelongsToManySetAssociationsMixin
+     */
+    interface BelongsToManySetAssociationsMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The setAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    setRoles: Sequelize.BelongsToManySetAssociationsMixin<RoleInstance, RoleId, UserRoleAttributes>;
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManySetAssociationsMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
+        /**
+         * Set the associated models by passing an array of instances or their primary keys.
+         * Everything that it not in the passed array will be un-associated.
+         * @param newAssociations An array of instances or primary key of instances to associate with this. Pass null or undefined to remove all associations.
+         * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
+         */
+        (
+            newAssociations?: Array<TInstance | TInstancePrimaryKey>,
+            options?: BelongsToManySetAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the addAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyAddAssociationsMixin
+     */
+    interface BelongsToManyAddAssociationsMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The addAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    addRoles: Sequelize.BelongsToManyAddAssociationsMixin<RoleInstance, RoleId, UserRoleAttributes>;
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyAddAssociationsMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
+        /**
+         * Associate several instances with this.
+         * @param newAssociations An array of instances or primary key of instances to associate with this.
+         * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
+         */
+        (
+            newAssociations?: Array<TInstance | TInstancePrimaryKey>,
+            options?: BelongsToManyAddAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the addAssociation mixin of the belongsToMany association.
+     * @see BelongsToManyAddAssociationMixin
+     */
+    interface BelongsToManyAddAssociationMixinOptions {
+
+        /**
+         * Run validation for the join model.
+         */
+        validate?: boolean;
+    }
+
+    /**
+     * The addAssociation mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    addRole: Sequelize.BelongsToManyAddAssociationMixin<RoleInstance, RoleId, UserRoleAttributes>;
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyAddAssociationMixin<TInstance, TInstancePrimaryKey, TJoinTableAttributes> {
+        /**
+         * Associate an instance with this.
+         * @param newAssociation An instance or the primary key of an instance to associate with this.
+         * @param options The options passed to `through.findAll`, `bulkCreate`, `update` and `destroy`. Can also hold additional attributes for the join table.
+         */
+        (
+            newAssociation?: TInstance | TInstancePrimaryKey,
+            options?: BelongsToManyAddAssociationMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | TJoinTableAttributes
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the createAssociation mixin of the belongsToMany association.
+     * @see BelongsToManyCreateAssociationMixin
+     */
+    interface BelongsToManyCreateAssociationMixinOptions { }
+
+    /**
+     * The createAssociation mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    createRole: Sequelize.BelongsToManyCreateAssociationMixin<RoleAttributes, UserRoleAttributes>;
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyCreateAssociationMixin<TAttributes, TJoinTableAttributes> {
+        /**
+         * Create a new instance of the associated model and associate it with this.
+         * @param values The values used to create the association.
+         * @param options Options passed to `create` and `add`. Can also hold additional attributes for the join table.
+         */
+        (
+            values?: TAttributes,
+            options?: BelongsToManyCreateAssociationMixinOptions | CreateOptions | TJoinTableAttributes
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the removeAssociation mixin of the belongsToMany association.
+     * @see BelongsToManyRemoveAssociationMixin
+     */
+    interface BelongsToManyRemoveAssociationMixinOptions { }
+
+    /**
+     * The removeAssociation mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    removeRole: Sequelize.BelongsToManyRemoveAssociationMixin<RoleInstance, RoleId>;
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyRemoveAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Un-associate the instance.
+         * @param oldAssociated The instance or the primary key of the instance to un-associate.
+         * @param options The options passed to `through.destroy`.
+         */
+        (
+            oldAssociated?: TInstance | TInstancePrimaryKey,
+            options?: BelongsToManyRemoveAssociationMixinOptions | InstanceDestroyOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the removeAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyRemoveAssociationsMixin
+     */
+    interface BelongsToManyRemoveAssociationsMixinOptions { }
+
+    /**
+     * The removeAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    removeRoles: Sequelize.BelongsToManyRemoveAssociationsMixin<RoleInstance, RoleId>;
+     *    // hasRole...
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyRemoveAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Un-associate several instances.
+         * @param oldAssociated An array of instances or primary key of instances to un-associate.
+         * @param options The options passed to `through.destroy`.
+         */
+        (
+            oldAssociateds?: Array<TInstance | TInstancePrimaryKey>,
+            options?: BelongsToManyRemoveAssociationsMixinOptions | InstanceDestroyOptions
+        ): Promise<void>;
+    }
+
+    /**
+     * The options for the hasAssociation mixin of the belongsToMany association.
+     * @see BelongsToManyHasAssociationMixin
+     */
+    interface BelongsToManyHasAssociationMixinOptions { }
+
+    /**
+     * The hasAssociation mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    hasRole: Sequelize.BelongsToManyHasAssociationMixin<RoleInstance, RoleId>;
+     *    // hasRoles...
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyHasAssociationMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Check if an instance is associated with this.
+         * @param target The instance or the primary key of the instance to check.
+         * @param options The options passed to `getAssociations`.
+         */
+        (
+            target: TInstance | TInstancePrimaryKey,
+            options?: BelongsToManyHasAssociationMixinOptions | BelongsToManyGetAssociationsMixinOptions
+        ): Promise<boolean>;
+    }
+
+    /**
+     * The options for the hasAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyHasAssociationsMixin
+     */
+    interface BelongsToManyHasAssociationsMixinOptions { }
+
+    /**
+     * The removeAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles
+     *    // hasRole...
+     *    hasRoles: Sequelize.BelongsToManyHasAssociationsMixin<RoleInstance, RoleId>;
+     *    // countRoles...
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyHasAssociationsMixin<TInstance, TInstancePrimaryKey> {
+        /**
+         * Check if all instances are associated with this.
+         * @param targets An array of instances or primary key of instances to check.
+         * @param options The options passed to `getAssociations`.
+         */
+        (
+            targets: Array<TInstance | TInstancePrimaryKey>,
+            options?: BelongsToManyHasAssociationsMixinOptions | BelongsToManyGetAssociationsMixinOptions
+        ): Promise<boolean>;
+    }
+
+    /**
+     * The options for the countAssociations mixin of the belongsToMany association.
+     * @see BelongsToManyCountAssociationsMixin
+     */
+    interface BelongsToManyCountAssociationsMixinOptions {
+
+        /**
+         * An optional where clause to limit the associated models.
+         */
+        where?: WhereOptions;
+
+        /**
+         * Apply a scope on the related model, or remove its default scope by passing false.
+         */
+        scope?: string | boolean;
+    }
+
+    /**
+     * The countAssociations mixin applied to models with belongsToMany.
+     * An example of usage is as follows:
+     *
+     * ```js
+     *
+     * User.belongsToMany(Role, { through: UserRole });
+     *
+     * interface UserInstance extends Sequelize.Instance<UserInstance, UserAttributes>, UserAttributes {
+     *    // getRoles...
+     *    // setRoles...
+     *    // addRoles...
+     *    // addRole...
+     *    // createRole...
+     *    // removeRole...
+     *    // removeRoles...
+     *    // hasRole...
+     *    // hasRoles...
+     *    countRoles: Sequelize.BelongsToManyCountAssociationsMixin;
+     * }
+     * ```
+     *
+     * @see http://docs.sequelizejs.com/en/latest/api/associations/belongs-to-many/
+     * @see Instance
+     */
+    interface BelongsToManyCountAssociationsMixin {
+        /**
+         * Count everything currently associated with this, using an optional where clause.
+         * @param options The options to use when counting the associations.
+         */
+        (options?: BelongsToManyCountAssociationsMixinOptions): Promise<number>;
+    }
+
+    /**
+     * Foreign Key Options
+     *
+     * @see AssociationOptions
+     */
+    interface AssociationForeignKeyOptions extends ColumnOptions {
+
+        /**
+         *  Attribute name for the relation
+         */
+        name?: string;
 
     }
 
-    var sequelize : sequelize.SequelizeStatic;
+    /**
+     * Options provided when associating models
+     *
+     * @see Association class
+     */
+    interface AssociationOptions {
 
-    export = sequelize;
+        /**
+         * Set to true to run before-/afterDestroy hooks when an associated model is deleted because of a cascade.
+         * For example if `User.hasOne(Profile, {onDelete: 'cascade', hooks:true})`, the before-/afterDestroy hooks
+         * for profile will be called when a user is deleted. Otherwise the profile will be deleted without invoking
+         * any hooks.
+         *
+         * Defaults to false
+         */
+        hooks?: boolean;
+
+        /**
+         * The alias of this model, in singular form. See also the `name` option passed to `sequelize.define`. If
+         * you create multiple associations between the same tables, you should provide an alias to be able to
+         * distinguish between them. If you provide an alias when creating the assocition, you should provide the
+         * same alias when eager loading and when getting assocated models. Defaults to the singularized name of
+         * target
+         */
+        as?: string | { singular: string, plural: string };
+
+        /**
+         * The name of the foreign key in the target table or an object representing the type definition for the
+         * foreign column (see `Sequelize.define` for syntax). When using an object, you can add a `name` property
+         * to set the name of the column. Defaults to the name of source + primary key of source
+         */
+        foreignKey?: string | AssociationForeignKeyOptions;
+
+        /**
+         * What happens when delete occurs.
+         *
+         * Cascade if this is a n:m, and set null if it is a 1:m
+         *
+         * Defaults to 'SET NULL' or 'CASCADE'
+         */
+        onDelete?: string;
+
+        /**
+         * What happens when update occurs
+         *
+         * Defaults to 'CASCADE'
+         */
+        onUpdate?: string;
+
+        /**
+         * Should on update and on delete constraints be enabled on the foreign key.
+         */
+        constraints?: boolean;
+        foreignKeyConstraint?: boolean;
+
+    }
+
+    /**
+     * Options for Association Scope
+     *
+     * @see AssociationOptionsManyToMany
+     */
+    interface AssociationScope {
+
+        /**
+         * The name of the column that will be used for the associated scope and it's value
+         */
+        [scopeName: string]: any;
+
+    }
+
+    /**
+     * Options provided for many-to-many relationships
+     *
+     * @see AssociationOptionsHasMany
+     * @see AssociationOptionsBelongsToMany
+     */
+    interface AssociationOptionsManyToMany extends AssociationOptions {
+
+        /**
+         * A key/value set that will be used for association create and find defaults on the target.
+         * (sqlite not supported for N:M)
+         */
+        scope?: AssociationScope;
+
+    }
+
+    /**
+     * Options provided when associating models with hasOne relationship
+     *
+     * @see Association class hasOne method
+     */
+    interface AssociationOptionsHasOne extends AssociationOptions {
+
+        /**
+         * A string or a data type to represent the identifier in the table
+         */
+        keyType?: DataTypeAbstract;
+
+    }
+
+    /**
+     * Options provided when associating models with belongsTo relationship
+     *
+     * @see Association class belongsTo method
+     */
+    interface AssociationOptionsBelongsTo extends AssociationOptions {
+
+        /**
+         * The name of the field to use as the key for the association in the target table. Defaults to the primary
+         * key of the target table
+         */
+        targetKey?: string;
+
+        /**
+         * A string or a data type to represent the identifier in the table
+         */
+        keyType?: DataTypeAbstract;
+
+    }
+
+    /**
+     * Options provided when associating models with hasMany relationship
+     *
+     * @see Association class hasMany method
+     */
+    interface AssociationOptionsHasMany extends AssociationOptionsManyToMany {
+
+        /**
+         * A string or a data type to represent the identifier in the table
+         */
+        keyType?: DataTypeAbstract;
+
+    }
+
+    /**
+     * Options provided when associating models with belongsToMany relationship
+     *
+     * @see Association class belongsToMany method
+     */
+    interface AssociationOptionsBelongsToMany extends AssociationOptionsManyToMany {
+
+        /**
+         * The name of the table that is used to join source and target in n:m associations. Can also be a
+         * sequelize
+         * model if you want to define the junction table yourself and add extra attributes to it.
+         *
+         * In 3.4.1 version of Sequelize, hasMany's use of through gives an error, and on the other hand through
+         * option for belongsToMany has been made required.
+         *
+         * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/has-many.js
+         * @see https://github.com/sequelize/sequelize/blob/v3.4.1/lib/associations/belongs-to-many.js
+         */
+        through: Model<any, any> | string | ThroughOptions;
+
+        /**
+         * The name of the foreign key in the join table (representing the target model) or an object representing
+         * the type definition for the other column (see `Sequelize.define` for syntax). When using an object, you
+         * can add a `name` property to set the name of the colum. Defaults to the name of target + primary key of
+         * target
+         */
+        otherKey?: string | AssociationForeignKeyOptions;
+
+    }
+
+    /**
+     * Used for a association table in n:m associations.
+     *
+     * @see AssociationOptionsBelongsToMany
+     */
+    interface ThroughOptions {
+
+        /**
+         * The model used to join both sides of the N:M association.
+         */
+        model: Model<any, any>;
+
+        /**
+         * A key/value set that will be used for association create and find defaults on the through model.
+         * (Remember to add the attributes to the through model)
+         */
+        scope?: AssociationScope;
+
+        /**
+         * If true a unique key will be generated from the foreign keys used (might want to turn this off and create
+         * specific unique keys when using scopes)
+         *
+         * Defaults to true
+         */
+        unique?: boolean;
+
+    }
+
+    /**
+     * Creating assocations in sequelize is done by calling one of the belongsTo / hasOne / hasMany functions on a
+     * model (the source), and providing another model as the first argument to the function (the target).
+     *
+     * * hasOne - adds a foreign key to target
+     * * belongsTo - add a foreign key to source
+     * * hasMany - adds a foreign key to target, unless you also specify that target hasMany source, in which case
+     * a
+     * junction table is created with sourceId and targetId
+     *
+     * Creating an association will add a foreign key constraint to the attributes. All associations use `CASCADE`
+     * on update and `SET NULL` on delete, except for n:m, which also uses `CASCADE` on delete.
+     *
+     * When creating associations, you can provide an alias, via the `as` option. This is useful if the same model
+     * is associated twice, or you want your association to be called something other than the name of the target
+     * model.
+     *
+     * As an example, consider the case where users have many pictures, one of which is their profile picture. All
+     * pictures have a `userId`, but in addition the user model also has a `profilePictureId`, to be able to easily
+     * load the user's profile picture.
+     *
+     * ```js
+     * User.hasMany(Picture)
+     * User.belongsTo(Picture, { as: 'ProfilePicture', constraints: false })
+     *
+     * user.getPictures() // gets you all pictures
+     * user.getProfilePicture() // gets you only the profile picture
+     *
+     * User.findAll({
+     *   where: ...,
+     *   include: [
+     *     { model: Picture }, // load all pictures
+     *     { model: Picture, as: 'ProfilePicture' }, // load the profile picture. Notice that the spelling must be
+     * the exact same as the one in the association
+     *   ]
+     * })
+     * ```
+     * To get full control over the foreign key column added by sequelize, you can use the `foreignKey` option. It
+     * can either be a string, that specifies the name, or and object type definition,
+     * equivalent to those passed to `sequelize.define`.
+     *
+     * ```js
+     * User.hasMany(Picture, { foreignKey: 'uid' })
+     * ```
+     *
+     * The foreign key column in Picture will now be called `uid` instead of the default `userId`.
+     *
+     * ```js
+     * User.hasMany(Picture, {
+     *   foreignKey: {
+     *     name: 'uid',
+     *     allowNull: false
+     *   }
+     * })
+     * ```
+     *
+     * This specifies that the `uid` column can not be null. In most cases this will already be covered by the
+     * foreign key costraints, which sequelize creates automatically, but can be useful in case where the foreign
+     * keys are disabled, e.g. due to circular references (see `constraints: false` below).
+     *
+     * When fetching associated models, you can limit your query to only load some models. These queries are
+     * written
+     * in the same way as queries to `find`/`findAll`. To only get pictures in JPG, you can do:
+     *
+     * ```js
+     * user.getPictures({
+     *   where: {
+     *     format: 'jpg'
+     *   }
+     * })
+     * ```
+     *
+     * There are several ways to update and add new assoications. Continuing with our example of users and
+     * pictures:
+     * ```js
+     * user.addPicture(p) // Add a single picture
+     * user.setPictures([p1, p2]) // Associate user with ONLY these two picture, all other associations will be
+     * deleted user.addPictures([p1, p2]) // Associate user with these two pictures, but don't touch any current
+     * associations
+     * ```
+     *
+     * You don't have to pass in a complete object to the association functions, if your associated model has a
+     * single primary key:
+     *
+     * ```js
+     * user.addPicture(req.query.pid) // Here pid is just an integer, representing the primary key of the picture
+     * ```
+     *
+     * In the example above we have specified that a user belongs to his profile picture. Conceptually, this might
+     * not make sense, but since we want to add the foreign key to the user model this is the way to do it.
+     *
+     * Note how we also specified `constraints: false` for profile picture. This is because we add a foreign key
+     * from user to picture (profilePictureId), and from picture to user (userId). If we were to add foreign keys
+     * to both, it would create a cyclic dependency, and sequelize would not know which table to create first,
+     * since user depends on picture, and picture depends on user. These kinds of problems are detected by
+     * sequelize before the models are synced to the database, and you will get an error along the lines of `Error:
+     * Cyclic dependency found. 'users' is dependent of itself`. If you encounter this, you should either disable
+     * some constraints, or rethink your associations completely.
+     *
+     * @see Sequelize.Model
+     */
+    interface Associations {
+
+        /**
+         * Creates an association between this (the source) and the provided target. The foreign key is added
+         * on the target.
+         *
+         * Example: `User.hasOne(Profile)`. This will add userId to the profile table.
+         *
+         * @param target The model that will be associated with hasOne relationship
+         * @param options Options for the association
+         */
+        hasOne(target: Model<any, any>, options?: AssociationOptionsHasOne): void;
+
+        /**
+         * Creates an association between this (the source) and the provided target. The foreign key is added on the
+         * source.
+         *
+         * Example: `Profile.belongsTo(User)`. This will add userId to the profile table.
+         *
+         * @param target The model that will be associated with hasOne relationship
+         * @param options Options for the association
+         */
+        belongsTo(target: Model<any, any>, options?: AssociationOptionsBelongsTo): void;
+
+        /**
+         * Create an association that is either 1:m or n:m.
+         *
+         * ```js
+         * // Create a 1:m association between user and project
+         * User.hasMany(Project)
+         * ```
+         * ```js
+         * // Create a n:m association between user and project
+         * User.hasMany(Project)
+         * Project.hasMany(User)
+         * ```
+         * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
+         * overridden by providing either a string or a Model as `through` in the options. If you use a through
+         * model with custom attributes, these attributes can be set when adding / setting new associations in two
+         * ways. Consider users and projects from before with a join table that stores whether the project has been
+         * started yet:
+         * ```js
+         * var UserProjects = sequelize.define('userprojects', {
+         *   started: Sequelize.BOOLEAN
+         * })
+         * User.hasMany(Project, { through: UserProjects })
+         * Project.hasMany(User, { through: UserProjects })
+         * ```
+         * ```js
+         * jan.addProject(homework, { started: false }) // The homework project is not started yet
+         * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner have been
+         * started
+         * ```
+         *
+         * If you want to set several target instances, but with different attributes you have to set the
+         * attributes on the instance, using a property with the name of the through model:
+         *
+         * ```js
+         * p1.userprojects {
+         *   started: true
+         * }
+         * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
+         * ```
+         *
+         * Similarily, when fetching through a join table with custom attributes, these attributes will be
+         * available as an object with the name of the through model.
+         * ```js
+         * user.getProjects().then(function (projects) {
+         *   var p1 = projects[0]
+         *   p1.userprojects.started // Is this project started yet?
+         * })
+         * ```
+         *
+         * @param target The model that will be associated with hasOne relationship
+         * @param options Options for the association
+         */
+        hasMany(target: Model<any, any>, options?: AssociationOptionsHasMany): void;
+
+        /**
+         * Create an N:M association with a join table
+         *
+         * ```js
+         * User.belongsToMany(Project)
+         * Project.belongsToMany(User)
+         * ```
+         * By default, the name of the join table will be source+target, so in this case projectsusers. This can be
+         * overridden by providing either a string or a Model as `through` in the options.
+         *
+         * If you use a through model with custom attributes, these attributes can be set when adding / setting new
+         * associations in two ways. Consider users and projects from before with a join table that stores whether
+         * the project has been started yet:
+         * ```js
+         * var UserProjects = sequelize.define('userprojects', {
+         *   started: Sequelize.BOOLEAN
+         * })
+         * User.belongsToMany(Project, { through: UserProjects })
+         * Project.belongsToMany(User, { through: UserProjects })
+         * ```
+         * ```js
+         * jan.addProject(homework, { started: false }) // The homework project is not started yet
+         * jan.setProjects([makedinner, doshopping], { started: true}) // Both shopping and dinner has been started
+         * ```
+         *
+         * If you want to set several target instances, but with different attributes you have to set the
+         * attributes on the instance, using a property with the name of the through model:
+         *
+         * ```js
+         * p1.userprojects {
+         *   started: true
+         * }
+         * user.setProjects([p1, p2], {started: false}) // The default value is false, but p1 overrides that.
+         * ```
+         *
+         * Similarily, when fetching through a join table with custom attributes, these attributes will be
+         * available as an object with the name of the through model.
+         * ```js
+         * user.getProjects().then(function (projects) {
+         *   var p1 = projects[0]
+         *   p1.userprojects.started // Is this project started yet?
+         * })
+         * ```
+         *
+         * @param target The model that will be associated with hasOne relationship
+         * @param options Options for the association
+         *
+         */
+        belongsToMany(target: Model<any, any>, options: AssociationOptionsBelongsToMany): void;
+
+    }
+
+    //
+    //  DataTypes
+    // ~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/data-types.js
+    //
+
+    /**
+     * Abstract DataType interface. Use this if you want to create an interface that has a value any of the
+     * DataTypes that Sequelize supports.
+     */
+    interface DataTypeAbstract {
+
+        /**
+         * Although this is not needed for the definitions itself, we want to make sure that DataTypeAbstract is not
+         * something than can be evaluated to an empty object.
+         */
+        dialectTypes: string;
+
+    }
+
+    interface DataTypeAbstractString<T> extends DataTypeAbstract {
+
+        /**
+         * A variable length string. Default length 255
+         */
+        (options?: { length: number }): T;
+        (length: number): T;
+
+        /**
+         * Property BINARY for the type
+         */
+        BINARY: T;
+
+    }
+
+    interface DataTypeString extends DataTypeAbstractString<DataTypeString> { }
+
+    interface DataTypeChar extends DataTypeAbstractString<DataTypeChar> { }
+
+    interface DataTypeText extends DataTypeAbstract {
+
+        /**
+         * Length of the text field.
+         *
+         * Available lengths: `tiny`, `medium`, `long`
+         */
+        (options?: { length: string }): DataTypeText;
+        (length: string): DataTypeText;
+
+    }
+
+    interface DataTypeAbstractNumber<T> extends DataTypeAbstract {
+        UNSIGNED: T;
+        ZEROFILL: T;
+    }
+
+    interface DataTypeNumber extends DataTypeAbstractNumber<DataTypeNumber> { }
+
+    interface DataTypeInteger extends DataTypeAbstractNumber<DataTypeInteger> {
+
+        /**
+         * Length of the number field.
+         */
+        (options?: { length: number }): DataTypeInteger;
+        (length: number): DataTypeInteger;
+
+    }
+
+    interface DataTypeBigInt extends DataTypeAbstractNumber<DataTypeBigInt> {
+
+        /**
+         * Length of the number field.
+         */
+        (options?: { length: number }): DataTypeBigInt;
+        (length: number): DataTypeBigInt;
+
+    }
+
+    interface DataTypeFloat extends DataTypeAbstractNumber<DataTypeFloat> {
+
+        /**
+         * Length of the number field and decimals of the float
+         */
+        (options?: { length: number, decimals?: number }): DataTypeFloat;
+        (length: number, decimals?: number): DataTypeFloat;
+
+    }
+
+    interface DataTypeReal extends DataTypeAbstractNumber<DataTypeReal> {
+
+        /**
+         * Length of the number field and decimals of the real
+         */
+        (options?: { length: number, decimals?: number }): DataTypeReal;
+        (length: number, decimals?: number): DataTypeReal;
+
+    }
+
+    interface DataTypeDouble extends DataTypeAbstractNumber<DataTypeDouble> {
+
+        /**
+         * Length of the number field and decimals of the real
+         */
+        (options?: { length: number, decimals?: number }): DataTypeDouble;
+        (length: number, decimals?: number): DataTypeDouble;
+
+    }
+
+    interface DataTypeDecimal extends DataTypeAbstractNumber<DataTypeDecimal> {
+
+        /**
+         * Precision and scale for the decimal number
+         */
+        (options?: { precision: number, scale?: number }): DataTypeDecimal;
+        (precision: number, scale?: number): DataTypeDecimal;
+
+    }
+
+    interface DataTypeBoolean extends DataTypeAbstract { }
+
+    interface DataTypeTime extends DataTypeAbstract { }
+
+    interface DataTypeDate extends DataTypeAbstract {
+
+        /**
+         * Length of decimal places of time
+         */
+        (options?: { length?: number }): DataTypeDate;
+        (length?: number): DataTypeDate;
+
+    }
+
+    interface DataTypeDateOnly extends DataTypeAbstract { }
+
+    interface DataTypeHStore extends DataTypeAbstract { }
+
+    interface DataTypeJSONType extends DataTypeAbstract { }
+
+    interface DataTypeJSONB extends DataTypeAbstract { }
+
+    interface DataTypeNow extends DataTypeAbstract { }
+
+    interface DataTypeBlob extends DataTypeAbstract {
+
+        /**
+         * Length of the blob field.
+         *
+         * Available lengths: `tiny`, `medium`, `long`
+         */
+        (options?: { length: string }): DataTypeBlob;
+        (length: string): DataTypeBlob;
+
+    }
+
+    interface DataTypeRange extends DataTypeAbstract {
+
+        /**
+         * Range field for Postgre
+         *
+         * Accepts subtype any of the ranges
+         */
+        (options?: { subtype: DataTypeAbstract }): DataTypeRange;
+        (subtype: DataTypeAbstract): DataTypeRange;
+
+    }
+
+    interface DataTypeUUID extends DataTypeAbstract { }
+
+    interface DataTypeUUIDv1 extends DataTypeAbstract { }
+
+    interface DataTypeUUIDv4 extends DataTypeAbstract { }
+
+    interface DataTypeVirtual extends DataTypeAbstract {
+
+        /**
+         * Virtual field
+         *
+         * Accepts subtype any of the DataTypes
+         * Array of required attributes that are available on the model
+         */
+        new (subtype: DataTypeAbstract, requireAttributes?: Array<string>): DataTypeVirtual;
+    }
+
+    interface DataTypeEnum extends DataTypeAbstract {
+
+        /**
+         * Enum field
+         *
+         * Accepts values
+         */
+        (options?: { values: string | string[] }): DataTypeEnum;
+        (values: string | string[]): DataTypeEnum;
+        (...args: string[]): DataTypeEnum;
+
+    }
+
+    interface DataTypeArray extends DataTypeAbstract {
+
+        /**
+         * Array field for Postgre
+         *
+         * Accepts type any of the DataTypes
+         */
+        (options: { type: DataTypeAbstract }): DataTypeArray;
+        (type: DataTypeAbstract): DataTypeArray;
+
+    }
+
+    interface DataTypeGeometry extends DataTypeAbstract {
+
+        /**
+         * Geometry field for Postgres
+         */
+        (type: string, srid?: number): DataTypeGeometry;
+
+    }
+
+    /**
+     * A convenience class holding commonly used data types. The datatypes are used when definining a new model
+     * using
+     * `Sequelize.define`, like this:
+     *
+     * ```js
+     * sequelize.define('model', {
+ *   column: DataTypes.INTEGER
+ * })
+     * ```
+     * When defining a model you can just as easily pass a string as type, but often using the types defined here
+     * is
+     * beneficial. For example, using `DataTypes.BLOB`, mean that that column will be returned as an instance of
+     * `Buffer` when being fetched by sequelize.
+     *
+     * Some data types have special properties that can be accessed in order to change the data type.
+     * For example, to get an unsigned integer with zerofill you can do `DataTypes.INTEGER.UNSIGNED.ZEROFILL`.
+     * The order you access the properties in do not matter, so `DataTypes.INTEGER.ZEROFILL.UNSIGNED` is fine as
+     * well. The available properties are listed under each data type.
+     *
+     * To provide a length for the data type, you can invoke it like a function: `INTEGER(2)`
+     *
+     * Three of the values provided here (`NOW`, `UUIDV1` and `UUIDV4`) are special default values, that should not
+     * be used to define types. Instead they are used as shorthands for defining default values. For example, to
+     * get a uuid field with a default value generated following v1 of the UUID standard:
+     *
+     * ```js
+     * sequelize.define('model', {
+ *   uuid: {
+ *     type: DataTypes.UUID,
+ *     defaultValue: DataTypes.UUIDV1,
+ *     primaryKey: true
+ *   }
+ * })
+     * ```
+     */
+    interface DataTypes {
+        ABSTRACT: DataTypeAbstract;
+        STRING: DataTypeString;
+        CHAR: DataTypeChar;
+        TEXT: DataTypeText;
+        NUMBER: DataTypeNumber;
+        INTEGER: DataTypeInteger;
+        BIGINT: DataTypeBigInt;
+        FLOAT: DataTypeFloat;
+        TIME: DataTypeTime;
+        DATE: DataTypeDate;
+        DATEONLY: DataTypeDateOnly;
+        BOOLEAN: DataTypeBoolean;
+        NOW: DataTypeNow;
+        BLOB: DataTypeBlob;
+        DECIMAL: DataTypeDecimal;
+        NUMERIC: DataTypeDecimal;
+        UUID: DataTypeUUID;
+        UUIDV1: DataTypeUUIDv1;
+        UUIDV4: DataTypeUUIDv4;
+        HSTORE: DataTypeHStore;
+        JSON: DataTypeJSONType;
+        JSONB: DataTypeJSONB;
+        VIRTUAL: DataTypeVirtual;
+        ARRAY: DataTypeArray;
+        NONE: DataTypeVirtual;
+        ENUM: DataTypeEnum;
+        RANGE: DataTypeRange;
+        REAL: DataTypeReal;
+        DOUBLE: DataTypeDouble;
+        "DOUBLE PRECISION": DataTypeDouble;
+        GEOMETRY: DataTypeGeometry;
+    }
+
+    //
+    //  Deferrable
+    // ~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/deferrable.js
+    //
+
+    /**
+     * Abstract Deferrable interface. Use this if you want to create an interface that has a value any of the
+     * Deferrables that Sequelize supports.
+     */
+    interface DeferrableAbstract {
+
+        /**
+         * Although this is not needed for the definitions itself, we want to make sure that DeferrableAbstract is
+         * not something than can be evaluated to an empty object.
+         */
+        toString(): string;
+        toSql(): string;
+
+    }
+
+    interface DeferrableInitiallyDeferred extends DeferrableAbstract {
+
+        /**
+         * A property that will defer constraints checks to the end of transactions.
+         */
+        (): DeferrableInitiallyDeferred;
+
+    }
+
+    interface DeferrableInitiallyImmediate extends DeferrableAbstract {
+
+        /**
+         * A property that will trigger the constraint checks immediately
+         */
+        (): DeferrableInitiallyImmediate;
+
+    }
+
+    interface DeferrableNot extends DeferrableAbstract {
+
+        /**
+         * A property that will set the constraints to not deferred. This is the default in PostgreSQL and it make
+         * it impossible to dynamically defer the constraints within a transaction.
+         */
+        (): DeferrableNot;
+
+    }
+
+    interface DeferrableSetDeferred extends DeferrableAbstract {
+
+        /**
+         * A property that will trigger an additional query at the beginning of a
+         * transaction which sets the constraints to deferred.
+         *
+         * @param constraints An array of constraint names. Will defer all constraints by default.
+         */
+        (constraints: string[]): DeferrableSetDeferred;
+
+    }
+
+    interface DeferrableSetImmediate extends DeferrableAbstract {
+
+        /**
+         * A property that will trigger an additional query at the beginning of a
+         * transaction which sets the constraints to immediately.
+         *
+         * @param constraints An array of constraint names. Will defer all constraints by default.
+         */
+        (constraints: string[]): DeferrableSetImmediate;
+
+    }
+
+    /**
+     * A collection of properties related to deferrable constraints. It can be used to
+     * make foreign key constraints deferrable and to set the constaints within a
+     * transaction. This is only supported in PostgreSQL.
+     *
+     * The foreign keys can be configured like this. It will create a foreign key
+     * that will check the constraints immediately when the data was inserted.
+     *
+     * ```js
+     * sequelize.define('Model', {
+     *   foreign_id: {
+     *     type: Sequelize.INTEGER,
+     *     references: {
+     *       model: OtherModel,
+     *       key: 'id',
+     *       deferrable: Sequelize.Deferrable.INITIALLY_IMMEDIATE
+     *     }
+     *   }
+     * });
+     * ```
+     *
+     * The constraints can be configured in a transaction like this. It will
+     * trigger a query once the transaction has been started and set the constraints
+     * to be checked at the very end of the transaction.
+     *
+     * ```js
+     * sequelize.transaction({
+ *   deferrable: Sequelize.Deferrable.SET_DEFERRED
+ * });
+     * ```
+     */
+    interface Deferrable {
+        INITIALLY_DEFERRED: DeferrableInitiallyDeferred;
+        INITIALLY_IMMEDIATE: DeferrableInitiallyImmediate;
+        NOT: DeferrableNot;
+        SET_DEFERRED: DeferrableSetDeferred;
+        SET_IMMEDIATE: DeferrableSetImmediate;
+    }
+
+    //
+    //  Errors
+    // ~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/errors.js
+    //
+
+    /**
+     * The Base Error all Sequelize Errors inherit from.
+     */
+    interface BaseError extends Error, ErrorConstructor { }
+
+    interface ValidationError extends BaseError {
+
+        /**
+         * Validation Error. Thrown when the sequelize validation has failed. The error contains an `errors`
+         * property, which is an array with 1 or more ValidationErrorItems, one for each validation that failed.
+         *
+         * @param message Error message
+         * @param errors  Array of ValidationErrorItem objects describing the validation errors
+         */
+        new (message: string, errors?: ValidationErrorItem[]): ValidationError;
+
+        /**
+         * Gets all validation error items for the path / field specified.
+         *
+         * @param path The path to be checked for error items
+         */
+        get(path: string): ValidationErrorItem[];
+
+        /** Array of ValidationErrorItem objects describing the validation errors */
+        errors: ValidationErrorItem[];
+
+    }
+
+    interface ValidationErrorItem extends BaseError {
+
+        /**
+         * Validation Error Item
+         * Instances of this class are included in the `ValidationError.errors` property.
+         *
+         * @param message An error message
+         * @param type The type of the validation error
+         * @param path The field that triggered the validation error
+         * @param value The value that generated the error
+         */
+        new (message: string, type: string, path: string, value: string): ValidationErrorItem;
+
+        /** An error message */
+        message: string;
+
+        /** The type of the validation error */
+        type: string;
+
+        /** The field that triggered the validation error */
+        path: string;
+
+        /** The value that generated the error */
+        value: string;
+
+    }
+
+    interface DatabaseError extends BaseError {
+
+        /**
+         * A base class for all database related errors.
+         */
+        new (parent: Error): DatabaseError;
+
+    }
+
+    interface TimeoutError extends DatabaseError {
+
+        /**
+         * Thrown when a database query times out because of a deadlock
+         */
+        new (parent: Error): TimeoutError;
+
+    }
+
+    interface UniqueConstraintError extends DatabaseError {
+
+        /**
+         * Thrown when a unique constraint is violated in the database
+         */
+        new (options: { parent?: Error, message?: string, errors?: Object }): UniqueConstraintError;
+
+    }
+
+    interface ForeignKeyConstraintError extends DatabaseError {
+
+        /**
+         * Thrown when a foreign key constraint is violated in the database
+         */
+        new (options: { parent?: Error, message?: string, index?: string, fields?: string[], table?: string }): ForeignKeyConstraintError;
+
+    }
+
+    interface ExclusionConstraintError extends DatabaseError {
+
+        /**
+         * Thrown when an exclusion constraint is violated in the database
+         */
+        new (options: { parent?: Error, message?: string, constraint?: string, fields?: string[], table?: string }): ExclusionConstraintError;
+
+    }
+
+    interface ConnectionError extends BaseError {
+
+        /**
+         * A base class for all connection related errors.
+         */
+        new (parent: Error): ConnectionError;
+
+    }
+
+    interface ConnectionRefusedError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database is refused
+         */
+        new (parent: Error): ConnectionRefusedError;
+
+    }
+
+    interface AccessDeniedError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database is refused due to insufficient privileges
+         */
+        new (parent: Error): AccessDeniedError;
+
+    }
+
+    interface HostNotFoundError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database has a hostname that was not found
+         */
+        new (parent: Error): HostNotFoundError;
+
+    }
+
+    interface HostNotReachableError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database has a hostname that was not reachable
+         */
+        new (parent: Error): HostNotReachableError;
+
+    }
+
+    interface InvalidConnectionError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database has invalid values for any of the connection parameters
+         */
+        new (parent: Error): InvalidConnectionError;
+
+    }
+
+    interface ConnectionTimedOutError extends ConnectionError {
+
+        /**
+         * Thrown when a connection to a database times out
+         */
+        new (parent: Error): ConnectionTimedOutError;
+
+    }
+
+    /**
+     * Sequelize provides a host of custom error classes, to allow you to do easier debugging. All of these errors
+     * are exposed on the sequelize object and the sequelize constructor. All sequelize errors inherit from the
+     * base JS error object.
+     */
+    interface Errors {
+        Error: BaseError;
+        ValidationError: ValidationError;
+        ValidationErrorItem: ValidationErrorItem;
+        DatabaseError: DatabaseError;
+        TimeoutError: TimeoutError;
+        UniqueConstraintError: UniqueConstraintError;
+        ExclusionConstraintError: ExclusionConstraintError;
+        ForeignKeyConstraintError: ForeignKeyConstraintError;
+        ConnectionError: ConnectionError;
+        ConnectionRefusedError: ConnectionRefusedError;
+        AccessDeniedError: AccessDeniedError;
+        HostNotFoundError: HostNotFoundError;
+        HostNotReachableError: HostNotReachableError;
+        InvalidConnectionError: InvalidConnectionError;
+        ConnectionTimedOutError: ConnectionTimedOutError;
+    }
+
+    //
+    //  Hooks
+    // ~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/hooks.js
+    //
+
+    /**
+     * Options for Sequelize.define. We mostly duplicate the Hooks here, since there is no way to combine the two
+     * interfaces.
+     *
+     * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
+     * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestroy and
+     * afterBulkUpdate.
+     */
+    interface HooksDefineOptions<TInstance> {
+
+        beforeValidate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterValidate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeCreate?: (attributes: TInstance, options: Object, fn?: Function) => any;
+        afterCreate?: (attributes: TInstance, options: Object, fn?: Function) => any;
+        beforeDestroy?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeDelete?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterDestroy?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterDelete?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeUpdate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterUpdate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeBulkCreate?: (instances: TInstance[], options: Object, fn?: Function) => any;
+        afterBulkCreate?: (instances: TInstance[], options: Object, fn?: Function) => any;
+        beforeBulkDestroy?: (options: Object, fn?: Function) => any;
+        beforeBulkDelete?: (options: Object, fn?: Function) => any;
+        afterBulkDestroy?: (options: Object, fn?: Function) => any;
+        afterBulkDelete?: (options: Object, fn?: Function) => any;
+        beforeBulkUpdate?: (options: Object, fn?: Function) => any;
+        afterBulkUpdate?: (options: Object, fn?: Function) => any;
+        beforeFind?: (options: Object, fn?: Function) => any;
+        beforeFindAfterExpandIncludeAll?: (options: Object, fn?: Function) => any;
+        beforeFindAfterOptions?: (options: Object, fn?: Function) => any;
+        afterFind?: (instancesOrInstance: TInstance[] | TInstance, options: Object,
+            fn?: Function) => any;
+
+    }
+
+    /**
+     * Hooks are function that are called before and after  (bulk-) creation/updating/deletion and validation.
+     * Hooks can be added to you models in three ways:
+     *
+     * 1. By specifying them as options in `sequelize.define`
+     * 2. By calling `hook()` with a string and your hook handler function
+     * 3. By calling the function with the same name as the hook you want
+     *
+     * ```js
+     * // Method 1
+     * sequelize.define(name, { attributes }, {
+     *   hooks: {
+     *     beforeBulkCreate: function () {
+     *       // can be a single function
+     *     },
+     *     beforeValidate: [
+     *       function () {},
+     *       function() {} // Or an array of several
+     *     ]
+     *   }
+     * })
+     *
+     * // Method 2
+     * Model.hook('afterDestroy', function () {})
+     *
+     * // Method 3
+     * Model.afterBulkUpdate(function () {})
+     * ```
+     *
+     * @see Sequelize.define
+     */
+    interface Hooks<TInstance> {
+
+        /**
+         * Add a hook to the model
+         *
+         * @param hookType
+         * @param name Provide a name for the hook function. It can be used to remove the hook later or to order
+         *     hooks based on some sort of priority system in the future.
+         * @param fn The hook function
+         *
+         * @alias hook
+         */
+        addHook(hookType: string, name: string, fn: Function): Hooks<TInstance>;
+        addHook(hookType: string, fn: Function): Hooks<TInstance>;
+        hook(hookType: string, name: string, fn: Function): Hooks<TInstance>;
+        hook(hookType: string, fn: Function): Hooks<TInstance>;
+
+        /**
+         * Remove hook from the model
+         *
+         * @param hookType
+         * @param name
+         */
+        removeHook(hookType: string, name: string): Hooks<TInstance>;
+
+        /**
+         * Check whether the mode has any hooks of this type
+         *
+         * @param hookType
+         *
+         * @alias hasHooks
+         */
+        hasHook(hookType: string): boolean;
+        hasHooks(hookType: string): boolean;
+
+        /**
+         * A hook that is run before validation
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         */
+        beforeValidate(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeValidate(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after validation
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         */
+        afterValidate(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterValidate(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before creating a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with attributes, options
+         */
+        beforeCreate(name: string,
+            fn: (attributes: TInstance, options: Object, fn?: Function) => void): void;
+        beforeCreate(fn: (attributes: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after creating a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with attributes, options
+         */
+        afterCreate(name: string,
+            fn: (attributes: TInstance, options: Object, fn?: Function) => void): void;
+        afterCreate(fn: (attributes: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before destroying a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         * @alias beforeDelete
+         */
+        beforeDestroy(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeDestroy(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeDelete(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeDelete(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after destroying a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         * @alias afterDelete
+         */
+        afterDestroy(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterDestroy(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterDelete(name: string, fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterDelete(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before updating a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         */
+        beforeUpdate(name: string,
+            fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        beforeUpdate(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after updating a single instance
+         *
+         * @param name
+         * @param fn A callback function that is called with instance, options
+         */
+        afterUpdate(name: string, fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+        afterUpdate(fn: (instance: TInstance, options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before creating instances in bulk
+         *
+         * @param name
+         * @param fn A callback function that is called with instances, options
+         */
+        beforeBulkCreate(name: string,
+            fn: (instances: TInstance[], options: Object, fn?: Function) => void): void;
+        beforeBulkCreate(fn: (instances: TInstance[], options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after creating instances in bulk
+         *
+         * @param name
+         * @param fn A callback function that is called with instances, options
+         * @name afterBulkCreate
+         */
+        afterBulkCreate(name: string,
+            fn: (instances: TInstance[], options: Object, fn?: Function) => void): void;
+        afterBulkCreate(fn: (instances: TInstance[], options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before destroying instances in bulk
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         *
+         * @alias beforeBulkDelete
+         */
+        beforeBulkDestroy(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeBulkDestroy(fn: (options: Object, fn?: Function) => void): void;
+        beforeBulkDelete(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeBulkDelete(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after destroying instances in bulk
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         *
+         * @alias afterBulkDelete
+         */
+        afterBulkDestroy(name: string, fn: (options: Object, fn?: Function) => void): void;
+        afterBulkDestroy(fn: (options: Object, fn?: Function) => void): void;
+        afterBulkDelete(name: string, fn: (options: Object, fn?: Function) => void): void;
+        afterBulkDelete(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after updating instances in bulk
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        beforeBulkUpdate(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeBulkUpdate(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after updating instances in bulk
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        afterBulkUpdate(name: string, fn: (options: Object, fn?: Function) => void): void;
+        afterBulkUpdate(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before a find (select) query
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        beforeFind(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeFind(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before a find (select) query, after any { include: {all: ...} } options are expanded
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        beforeFindAfterExpandIncludeAll(name: string,
+            fn: (options: Object, fn?: Function) => void): void;
+        beforeFindAfterExpandIncludeAll(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before a find (select) query, after all option parsing is complete
+         *
+         * @param name
+         * @param fn   A callback function that is called with options
+         */
+        beforeFindAfterOptions(name: string, fn: (options: Object, fn?: Function) => void): void;
+        beforeFindAfterOptions(fn: (options: Object, fn?: Function) => void): void;
+
+        /**
+         * A hook that is run after a find (select) query
+         *
+         * @param name
+         * @param fn   A callback function that is called with instance(s), options
+         */
+        afterFind(name: string,
+            fn: (instancesOrInstance: TInstance[] | TInstance, options: Object,
+                fn?: Function) => void): void;
+        afterFind(fn: (instancesOrInstance: TInstance[] | TInstance, options: Object,
+            fn?: Function) => void): void;
+
+        /**
+         * A hook that is run before a define call
+         *
+         * @param name
+         * @param fn   A callback function that is called with attributes, options
+         */
+        beforeDefine(name: string, fn: (attributes: DefineAttributes, options: Object) => void): void;
+        beforeDefine(fn: (attributes: DefineAttributes, options: Object) => void): void;
+
+        /**
+         * A hook that is run after a define call
+         *
+         * @param name
+         * @param fn   A callback function that is called with factory
+         */
+        afterDefine(name: string, fn: (model: Model<TInstance, any>) => void): void;
+        afterDefine(fn: (model: Model<TInstance, any>) => void): void;
+
+        /**
+         * A hook that is run before Sequelize() call
+         *
+         * @param name
+         * @param fn   A callback function that is called with config, options
+         */
+        beforeInit(name: string, fn: (config: Object, options: Object) => void): void;
+        beforeInit(fn: (config: Object, options: Object) => void): void;
+
+        /**
+         * A hook that is run after Sequelize() call
+         *
+         * @param name
+         * @param fn   A callback function that is called with sequelize
+         */
+        afterInit(name: string, fn: (sequelize: Sequelize) => void): void;
+        afterInit(fn: (sequelize: Sequelize) => void): void;
+
+    }
+
+    //
+    //  Instance
+    // ~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/instance.js
+    //
+
+    /**
+     * Options used for Instance.increment method
+     */
+    interface InstanceIncrementDecrementOptions {
+
+        /**
+         * The number to increment by
+         *
+         * Defaults to 1
+         */
+        by?: number;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * A hash of attributes to describe your search. See above for examples.
+         */
+        where?: WhereOptions | Array<col | and | or | string>;
+
+    }
+
+    /**
+     * Options used for Instance.restore method
+     */
+    interface InstanceRestoreOptions {
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * Options used for Instance.destroy method
+     */
+    interface InstanceDestroyOptions {
+
+        /**
+         * If set to true, paranoid models will actually be deleted
+         */
+        force?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run the query in
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * Options used for Instance.update method
+     */
+    interface InstanceUpdateOptions extends InstanceSaveOptions, InstanceSetOptions {
+
+        /**
+         * A hash of attributes to describe your search. See above for examples.
+         */
+        where?: WhereOptions | Array<col | and | or | string>;
+
+    }
+
+    /**
+     * Options used for Instance.set method
+     */
+    interface InstanceSetOptions {
+
+        /**
+         * If set to true, field and virtual setters will be ignored
+         */
+        raw?: boolean;
+
+        /**
+         * Clear all previously set data values
+         */
+        reset?: boolean;
+
+    }
+
+    /**
+     * Options used for Instance.save method
+     */
+    interface InstanceSaveOptions {
+
+        /**
+         * An optional array of strings, representing database columns. If fields is provided, only those columns
+         * will be validated and saved.
+         */
+        fields?: string[];
+
+        /**
+         * If true, the updatedAt timestamp will not be updated.
+         *
+         * Defaults to false
+         */
+        silent?: boolean;
+
+        /**
+         * If false, validations won't be run.
+         *
+         * Defaults to true
+         */
+        validate?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run the query in
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * This class represents an single instance, a database row. You might see it referred to as both Instance and
+     * instance. You should not instantiate the Instance class directly, instead you access it using the finder and
+     * creation methods on the model.
+     *
+     * Instance instances operate with the concept of a `dataValues` property, which stores the actual values
+     * represented by the instance. By default, the values from dataValues can also be accessed directly from the
+     * Instance, that is:
+     * ```js
+     * instance.field
+     * // is the same as
+     * instance.get('field')
+     * // is the same as
+     * instance.getDataValue('field')
+     * ```
+     * However, if getters and/or setters are defined for `field` they will be invoked, instead of returning the
+     * value from `dataValues`. Accessing properties directly or using `get` is preferred for regular use,
+     * `getDataValue` should only be used for custom getters.
+     *
+     * @see Sequelize.define for more information about getters and setters
+     */
+    interface Instance<TAttributes> {
+
+        /**
+         * Returns true if this instance has not yet been persisted to the database
+         */
+        isNewRecord: boolean;
+
+        /**
+         * Returns the Model the instance was created from.
+         *
+         * @see Model
+         */
+        Model: Model<this, TAttributes>;
+
+        /**
+         * A reference to the sequelize instance
+         */
+        sequelize: Sequelize;
+
+        /**
+         * Get an object representing the query for this instance, use with `options.where`
+         */
+        where(): Object;
+
+        /**
+         * Get the value of the underlying data value
+         */
+        getDataValue(key: string): any;
+
+        /**
+         * Update the underlying data value
+         */
+        setDataValue(key: string, value: any): void;
+
+        /**
+         * If no key is given, returns all values of the instance, also invoking virtual getters.
+         *
+         * If key is given and a field or virtual getter is present for the key it will call that getter - else it
+         * will return the value for key.
+         *
+         * @param options.plain If set to true, included instances will be returned as plain objects
+         */
+        get(key: string, options?: { plain?: boolean, clone?: boolean }): any;
+        get(options?: { plain?: boolean, clone?: boolean }): TAttributes;
+
+        /**
+         * Set is used to update values on the instance (the sequelize representation of the instance that is,
+         * remember that nothing will be persisted before you actually call `save`). In its most basic form `set`
+         * will update a value stored in the underlying `dataValues` object. However, if a custom setter function
+         * is defined for the key, that function will be called instead. To bypass the setter, you can pass `raw:
+         * true` in the options object.
+         *
+         * If set is called with an object, it will loop over the object, and call set recursively for each key,
+         * value pair. If you set raw to true, the underlying dataValues will either be set directly to the object
+         * passed, or used to extend dataValues, if dataValues already contain values.
+         *
+         * When set is called, the previous value of the field is stored and sets a changed flag(see `changed`).
+         *
+         * Set can also be used to build instances for associations, if you have values for those.
+         * When using set with associations you need to make sure the property key matches the alias of the
+         * association while also making sure that the proper include options have been set (from .build() or
+         * .find())
+         *
+         * If called with a dot.seperated key on a JSON/JSONB attribute it will set the value nested and flag the
+         * entire object as changed.
+         *
+         * @param options.raw If set to true, field and virtual setters will be ignored
+         * @param options.reset Clear all previously set data values
+         */
+        set(key: string, value: any, options?: InstanceSetOptions): this;
+        set(keys: Object, options?: InstanceSetOptions): this;
+        setAttributes(key: string, value: any, options?: InstanceSetOptions): this;
+        setAttributes(keys: Object, options?: InstanceSetOptions): this;
+
+        /**
+         * If changed is called with a string it will return a boolean indicating whether the value of that key in
+         * `dataValues` is different from the value in `_previousDataValues`.
+         *
+         * If changed is called without an argument, it will return an array of keys that have changed.
+         *
+         * If changed is called without an argument and no keys have changed, it will return `false`.
+         */
+        changed(key: string): boolean;
+        changed(): boolean | string[];
+
+        /**
+         * Returns the previous value for key from `_previousDataValues`.
+         */
+        previous(key: string): any;
+
+        /**
+         * Validate this instance, and if the validation passes, persist it to the database.
+         *
+         * On success, the callback will be called with this instance. On validation error, the callback will be
+         * called with an instance of `Sequelize.ValidationError`. This error will have a property for each of the
+         * fields for which validation failed, with the error message for that field.
+         */
+        save(options?: InstanceSaveOptions): Promise<this>;
+
+        /**
+         * Refresh the current instance in-place, i.e. update the object with current data from the DB and return
+         * the same object. This is different from doing a `find(Instance.id)`, because that would create and
+         * return a new instance. With this method, all references to the Instance are updated with the new data
+         * and no new objects are created.
+         */
+        reload(options?: FindOptions): Promise<this>;
+
+        /**
+         * Validate the attribute of this instance according to validation rules set in the model definition.
+         *
+         * Emits null if and only if validation successful; otherwise an Error instance containing
+         * { field name : [error msgs] } entries.
+         *
+         * @param options.skip An array of strings. All properties that are in this array will not be validated
+         */
+        validate(options?: { skip?: string[] }): Promise<ValidationError>;
+
+        /**
+         * This is the same as calling `set` and then calling `save`.
+         */
+        update(key: string, value: any, options?: InstanceUpdateOptions): Promise<this>;
+        update(keys: Object, options?: InstanceUpdateOptions): Promise<this>;
+        updateAttributes(key: string, value: any, options?: InstanceUpdateOptions): Promise<this>;
+        updateAttributes(keys: Object, options?: InstanceUpdateOptions): Promise<this>;
+
+        /**
+         * Destroy the row corresponding to this instance. Depending on your setting for paranoid, the row will
+         * either be completely deleted, or have its deletedAt timestamp set to the current time.
+         */
+        destroy(options?: InstanceDestroyOptions): Promise<void>;
+
+        /**
+         * Restore the row corresponding to this instance. Only available for paranoid models.
+         */
+        restore(options?: InstanceRestoreOptions): Promise<void>;
+
+        /**
+         * Increment the value of one or more columns. This is done in the database, which means it does not use
+         * the values currently stored on the Instance. The increment is done using a
+         * ```sql
+         * SET column = column + X
+         * ```
+         * query. To get the correct value after an increment into the Instance you should do a reload.
+         *
+         *```js
+         * instance.increment('number') // increment number by 1
+         * instance.increment(['number', 'count'], { by: 2 }) // increment number and count by 2
+         * instance.increment({ answer: 42, tries: 1}, { by: 2 }) // increment answer by 42, and tries by 1.
+         *                                                        // `by` is ignored, since each column has its own
+         *                                                        // value
+         * ```
+         *
+         * @param fields If a string is provided, that column is incremented by the value of `by` given in options.
+         *               If an array is provided, the same is true for each column.
+         *               If and object is provided, each column is incremented by the value given.
+         */
+        increment(fields: string | string[] | Object,
+            options?: InstanceIncrementDecrementOptions): Promise<this>;
+
+        /**
+         * Decrement the value of one or more columns. This is done in the database, which means it does not use
+         * the values currently stored on the Instance. The decrement is done using a
+         * ```sql
+         * SET column = column - X
+         * ```
+         * query. To get the correct value after an decrement into the Instance you should do a reload.
+         *
+         * ```js
+         * instance.decrement('number') // decrement number by 1
+         * instance.decrement(['number', 'count'], { by: 2 }) // decrement number and count by 2
+         * instance.decrement({ answer: 42, tries: 1}, { by: 2 }) // decrement answer by 42, and tries by 1.
+         *                                                        // `by` is ignored, since each column has its own
+         *                                                        // value
+         * ```
+         *
+         * @param fields If a string is provided, that column is decremented by the value of `by` given in options.
+         *               If an array is provided, the same is true for each column.
+         *               If and object is provided, each column is decremented by the value given
+         */
+        decrement(fields: string | string[] | Object,
+            options?: InstanceIncrementDecrementOptions): Promise<this>;
+
+        /**
+         * Check whether all values of this and `other` Instance are the same
+         */
+        equals(other: Instance<any>): boolean;
+
+        /**
+         * Check if this is eqaul to one of `others` by calling equals
+         */
+        equalsOneOf(others: Instance<any>[]): boolean;
+
+        /**
+         * Convert the instance to a JSON representation. Proxies to calling `get` with no keys. This means get all
+         * values gotten from the DB, and apply all custom getters.
+         */
+        toJSON(): TAttributes;
+
+    }
+
+    //
+    //  Model
+    // ~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/model.js
+    //
+
+    /**
+     * Options to pass to Model on drop
+     */
+    interface DropOptions {
+
+        /**
+         * Also drop all objects depending on this table, such as views. Only works in postgres
+         */
+        cascade?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * Schema Options provided for applying a schema to a model
+     */
+    interface SchemaOptions {
+
+        /**
+         * The character(s) that separates the schema name from the table name
+         */
+        schemaDelimeter?: string;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: Function | boolean;
+
+    }
+
+    /**
+     * Scope Options for Model.scope
+     */
+    interface ScopeOptions {
+
+        /**
+         * The scope(s) to apply. Scopes can either be passed as consecutive arguments, or as an array of arguments.
+         * To apply simple scopes and scope functions with no arguments, pass them as strings. For scope function,
+         * pass an object, with a `method` property. The value can either be a string, if the method does not take
+         * any arguments, or an array, where the first element is the name of the method, and consecutive elements
+         * are arguments to that method. Pass null to remove all scopes, including the default.
+         */
+        method: string | any[];
+
+    }
+
+    /**
+     * Where Complex nested query
+     */
+    interface WhereNested {
+        $and: Array<WhereOptions | WhereLogic>;
+        $or: Array<WhereOptions | WhereLogic>;
+    }
+
+    /**
+     * Nested where Postgre Statement
+     */
+    interface WherePGStatement {
+        $any: Array<string | number>;
+        $all: Array<string | number>;
+    }
+
+    /**
+     * Where Geometry Options
+     */
+    interface WhereGeometryOptions {
+        type: string;
+        coordinates: Array<number[] | number>;
+    }
+
+    /**
+     * Logic of where statement
+     */
+    interface WhereLogic {
+        $ne: string | number | WhereLogic;
+        $in: Array<string | number> | literal;
+        $not: boolean | string | number | WhereOptions;
+        $notIn: Array<string | number> | literal;
+        $gte: number | string | Date;
+        $gt: number | string | Date;
+        $lte: number | string | Date;
+        $lt: number | string | Date;
+        $like: string | WherePGStatement;
+        $iLike: string | WherePGStatement;
+        $ilike: string | WherePGStatement;
+        $notLike: string | WherePGStatement;
+        $notILike: string | WherePGStatement;
+        $between: [number, number];
+        "..": [number, number];
+        $notBetween: [number, number];
+        "!..": [number, number];
+        $overlap: [number, number];
+        "&&": [number, number];
+        $contains: any;
+        "@>": any;
+        $contained: any;
+        "<@": any;
+    }
+
+    /**
+     * A hash of attributes to describe your search. See above for examples.
+     *
+     * We did put Object in the end, because there where query might be a JSON Blob. It cripples a bit the
+     * typesafety, but there is no way to pass the tests if we just remove it.
+     */
+    interface WhereOptions {
+        [field: string]: string | number | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | Array<string | number> | Object;
+    }
+
+    /**
+     * Through options for Include Options
+     */
+    interface IncludeThroughOptions {
+
+        /**
+         * Filter on the join model for belongsToMany relations
+         */
+        where?: WhereOptions;
+
+        /**
+         * A list of attributes to select from the join model for belongsToMany relations
+         */
+        attributes?: string[];
+
+    }
+
+    /**
+     * Association Object for Include Options
+     */
+    interface IncludeAssociation {
+        source: Model<any, any>;
+        target: Model<any, any>;
+        identifier: string;
+    }
+
+    /**
+     * Complex include options
+     */
+    interface IncludeOptions {
+
+        /**
+         * The model you want to eagerly load
+         */
+        model?: Model<any, any>;
+
+        /**
+         * The alias of the relation, in case the model you want to eagerly load is aliassed. For `hasOne` /
+         * `belongsTo`, this should be the singular name, and for `hasMany`, it should be the plural
+         */
+        as?: string;
+
+        /**
+         * The association you want to eagerly load. (This can be used instead of providing a model/as pair)
+         */
+        association?: IncludeAssociation;
+
+        /**
+         * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
+         * unless you explicitly set `required: false`
+         */
+        where?: WhereOptions;
+
+        /**
+         * A list of attributes to select from the child model
+         */
+        attributes?: string[];
+
+        /**
+         * If true, converts to an inner join, which means that the parent model will only be loaded if it has any
+         * matching children. True if `include.where` is set, false otherwise.
+         */
+        required?: boolean;
+
+        /**
+         * Through Options
+         */
+        through?: IncludeThroughOptions;
+
+        /**
+         * Load further nested related models
+         */
+        include?: Array<Model<any, any> | IncludeOptions>;
+
+    }
+
+    /**
+     * Options that are passed to any model creating a SELECT query
+     *
+     * A hash of options to describe the scope of the search
+     */
+    interface FindOptions {
+
+        /**
+         * A hash of attributes to describe your search. See above for examples.
+         */
+        where?: WhereOptions | Array<col | and | or | string>;
+
+        /**
+         * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with
+         * two elements - the first is the name of the attribute in the DB (or some kind of expression such as
+         * `Sequelize.literal`, `Sequelize.fn` and so on), and the second is the name you want the attribute to
+         * have in the returned instance
+         */
+        attributes?: Array<string | [string, string]>;
+
+        /**
+         * If true, only non-deleted records will be returned. If false, both deleted and non-deleted records will
+         * be returned. Only applies if `options.paranoid` is true for the model.
+         */
+        paranoid?: boolean;
+
+        /**
+         * A list of associations to eagerly load using a left join. Supported is either
+         * `{ include: [ Model1, Model2, ...]}` or `{ include: [{ model: Model1, as: 'Alias' }]}`.
+         * If your association are set up with an `as` (eg. `X.hasMany(Y, { as: 'Z }`, you need to specify Z in
+         * the as attribute when eager loading Y).
+         */
+        include?: Array<Model<any, any> | IncludeOptions>;
+
+        /**
+         * Specifies an ordering. If a string is provided, it will be escaped. Using an array, you can provide
+         * several columns / functions to order by. Each element can be further wrapped in a two-element array. The
+         * first element is the column / function to order by, the second is the direction. For example:
+         * `order: [['name', 'DESC']]`. In this way the column will be escaped, but the direction will not.
+         */
+        order?: string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string }> | Array<string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string }>>;
+
+        /**
+         * Limit the results
+         */
+        limit?: number;
+
+        /**
+         * Skip the results;
+         */
+        offset?: number;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * Lock the selected rows. Possible options are transaction.LOCK.UPDATE and transaction.LOCK.SHARE.
+         * Postgres also supports transaction.LOCK.KEY_SHARE, transaction.LOCK.NO_KEY_UPDATE and specific model
+         * locks with joins. See [transaction.LOCK for an example](transaction#lock)
+         */
+        lock?: string | { level: string, of: Model<any, any> };
+
+        /**
+         * Return raw result. See sequelize.query for more information.
+         */
+        raw?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * having ?!?
+         */
+        having?: WhereOptions;
+
+    }
+
+    /**
+     * Options for Model.count method
+     */
+    interface CountOptions {
+
+        /**
+         * A hash of search attributes.
+         */
+        where?: WhereOptions | string[];
+
+        /**
+         * Include options. See `find` for details
+         */
+        include?: Array<Model<any, any> | IncludeOptions>;
+
+        /**
+         * Apply COUNT(DISTINCT(col))
+         */
+        distinct?: boolean;
+
+        /**
+         * Used in conjustion with `group`
+         */
+        attributes?: Array<string | [string, string]>;
+
+        /**
+         * For creating complex counts. Will return multiple rows as needed.
+         *
+         * TODO: Check?
+         */
+        group?: Object;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        transaction?: Transaction;
+    }
+
+    /**
+     * Options for Model.build method
+     */
+    interface BuildOptions {
+
+        /**
+         * If set to true, values will ignore field and virtual setters.
+         */
+        raw?: boolean;
+
+        /**
+         * Is this record new
+         */
+        isNewRecord?: boolean;
+
+        /**
+         * an array of include options - Used to build prefetched/included model instances. See `set`
+         *
+         * TODO: See set
+         */
+        include?: Array<Model<any, any> | IncludeOptions>;
+
+    }
+
+    /**
+     * Options for Model.create method
+     */
+    interface CreateOptions extends BuildOptions {
+
+        /**
+         * If set, only columns matching those in fields will be saved
+         */
+        fields?: string[];
+
+        /**
+         * On Duplicate
+         */
+        onDuplicate?: string;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        silent?: boolean;
+
+        returning?: boolean;
+    }
+
+    /**
+     * Options for Model.findOrInitialize method
+     */
+    interface FindOrInitializeOptions<TAttributes> {
+
+        /**
+         * A hash of search attributes.
+         */
+        where: string | WhereOptions;
+
+        /**
+         * Default values to use if building a new instance
+         */
+        defaults?: TAttributes;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * Options for Model.upsert method
+     */
+    interface UpsertOptions {
+
+        /**
+         * Run validations before the row is inserted
+         */
+        validate?: boolean;
+
+        /**
+         * The fields to insert / update. Defaults to all fields
+         */
+        fields?: string[];
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * An optional parameter to specify the schema search_path (Postgres only)
+         */
+        searchPath?: string;
+
+        /**
+         * Print query execution time in milliseconds when logging SQL.
+         */
+        benchmark?: boolean;
+    }
+
+    /**
+     * Options for Model.bulkCreate method
+     */
+    interface BulkCreateOptions {
+
+        /**
+         * Fields to insert (defaults to all fields)
+         */
+        fields?: string[];
+
+        /**
+         * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
+         * fails validation
+         */
+        validate?: boolean;
+
+        /**
+         * Run before / after bulk create hooks?
+         */
+        hooks?: boolean;
+
+        /**
+         * Run before / after create hooks for each individual Instance? BulkCreate hooks will still be run if
+         * options.hooks is true.
+         */
+        individualHooks?: boolean;
+
+        /**
+         * Ignore duplicate values for primary keys? (not supported by postgres)
+         *
+         * Defaults to false
+         */
+        ignoreDuplicates?: boolean;
+
+        /**
+         * Fields to update if row key already exists (on duplicate key update)? (only supported by mysql &
+         * mariadb). By default, all fields are updated.
+         */
+        updateOnDuplicate?: string[];
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * The options passed to Model.destroy in addition to truncate
+     */
+    interface TruncateOptions {
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+        /**
+         * Only used in conjuction with TRUNCATE. Truncates  all tables that have foreign-key references to the
+         * named table, or to any tables added to the group due to CASCADE.
+         *
+         * Defaults to false;
+         */
+        cascade?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * Options used for Model.destroy
+     */
+    interface DestroyOptions extends TruncateOptions {
+
+        /**
+         * Filter the destroy
+         */
+        where?: WhereOptions;
+
+        /**
+         * Run before / after bulk destroy hooks?
+         */
+        hooks?: boolean;
+
+        /**
+         * If set to true, destroy will SELECT all records matching the where parameter and will execute before /
+         * after destroy hooks on each row
+         */
+        individualHooks?: boolean;
+
+        /**
+         * How many rows to delete
+         */
+        limit?: number;
+
+        /**
+         * Delete instead of setting deletedAt to current timestamp (only applicable if `paranoid` is enabled)
+         */
+        force?: boolean;
+
+        /**
+         * If set to true, dialects that support it will use TRUNCATE instead of DELETE FROM. If a table is
+         * truncated the where and limit options are ignored
+         */
+        truncate?: boolean;
+
+    }
+
+    /**
+     * Options for Model.restore
+     */
+    interface RestoreOptions {
+
+        /**
+         * Filter the restore
+         */
+        where?: WhereOptions;
+
+        /**
+         * Run before / after bulk restore hooks?
+         */
+        hooks?: boolean;
+
+        /**
+         * If set to true, restore will find all records within the where parameter and will execute before / after
+         * bulkRestore hooks on each row
+         */
+        individualHooks?: boolean;
+
+        /**
+         * How many rows to undelete
+         */
+        limit?: number;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * Options used for Model.update
+     */
+    interface UpdateOptions {
+
+        /**
+         * Options to describe the scope of the search.
+         */
+        where: WhereOptions;
+
+        /**
+         * Fields to update (defaults to all fields)
+         */
+        fields?: string[];
+
+        /**
+         * Should each row be subject to validation before it is inserted. The whole insert will fail if one row
+         * fails validation.
+         *
+         * Defaults to true
+         */
+        validate?: boolean;
+
+        /**
+         * Run before / after bulk update hooks?
+         *
+         * Defaults to true
+         */
+        hooks?: boolean;
+
+        /**
+         * Whether or not to update the side effects of any virtual setters.
+         *
+         * Defaults to true
+         */
+        sideEffects?: boolean;
+
+        /**
+         * Run before / after update hooks?. If true, this will execute a SELECT followed by individual UPDATEs.
+         * A select is needed, because the row data needs to be passed to the hooks
+         *
+         * Defaults to false
+         */
+        individualHooks?: boolean;
+
+        /**
+         * Return the affected rows (only for postgres)
+         */
+        returning?: boolean;
+
+        /**
+         * How many rows to update (only for mysql and mariadb)
+         */
+        limit?: number;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * Transaction to run query under
+         */
+        transaction?: Transaction;
+
+    }
+
+    /**
+     * Options used for Model.aggregate
+     */
+    interface AggregateOptions extends QueryOptions {
+
+        /**
+         * A hash of search attributes.
+         */
+        where?: WhereOptions;
+
+        /**
+         * The type of the result. If `field` is a field in this Model, the default will be the type of that field,
+         * otherwise defaults to float.
+         */
+        dataType?: DataTypeAbstract | string;
+
+        /**
+         * Applies DISTINCT to the field being aggregated over
+         */
+        distinct?: boolean;
+
+    }
+
+    /**
+     * A Model represents a table in the database. Sometimes you might also see it referred to as model, or simply
+     * as factory. This class should _not_ be instantiated directly, it is created using `sequelize.define`, and
+     * already created models can be loaded using `sequelize.import`
+     */
+    interface Model<TInstance, TAttributes> extends Hooks<TInstance>, Associations {
+
+        /**
+         * The Instance class
+         */
+        Instance(): TInstance;
+
+        /**
+         * Remove attribute from model definition
+         *
+         * @param attribute
+         */
+        removeAttribute(attribute: string): void;
+
+        /**
+         * Sync this Model to the DB, that is create the table. Upon success, the callback will be called with the
+         * model instance (this)
+         */
+        sync(options?: SyncOptions): Promise<this>;
+
+        /**
+         * Drop the table represented by this Model
+         *
+         * @param options
+         */
+        drop(options?: DropOptions): Promise<void>;
+
+        /**
+         * Apply a schema to this model. For postgres, this will actually place the schema in front of the table
+         * name
+         * - `"schema"."tableName"`, while the schema will be prepended to the table name for mysql and
+         * sqlite - `'schema.tablename'`.
+         *
+         * @param schema The name of the schema
+         * @param options
+         */
+        schema(schema: string, options?: SchemaOptions): this;
+
+        /**
+         * Get the tablename of the model, taking schema into account. The method will return The name as a string
+         * if the model has no schema, or an object with `tableName`, `schema` and `delimiter` properties.
+         *
+         * @param options The hash of options from any query. You can use one model to access tables with matching
+         *     schemas by overriding `getTableName` and using custom key/values to alter the name of the table.
+         *     (eg.
+         *     subscribers_1, subscribers_2)
+         * @param options.logging=false A function that gets executed while running the query to log the sql.
+         */
+        getTableName(options?: { logging: Function }): string | Object;
+
+        /**
+         * Apply a scope created in `define` to the model. First let's look at how to create scopes:
+         * ```js
+         * var Model = sequelize.define('model', attributes, {
+         *   defaultScope: {
+         *     where: {
+         *       username: 'dan'
+         *     },
+         *     limit: 12
+         *   },
+         *   scopes: {
+         *     isALie: {
+         *       where: {
+         *         stuff: 'cake'
+         *       }
+         *     },
+         *     complexFunction: function(email, accessLevel) {
+         *       return {
+         *         where: {
+         *           email: {
+         *             $like: email
+         *           },
+         *           accesss_level {
+         *             $gte: accessLevel
+         *           }
+         *         }
+         *       }
+         *     }
+         *   }
+         * })
+         * ```
+         * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
+         * your query. Here's a couple of examples:
+         * ```js
+         * Model.findAll() // WHERE username = 'dan'
+         * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
+         * ```
+         *
+         * To invoke scope functions you can do:
+         * ```js
+         * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
+         * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
+         * ```
+         *
+         * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
+         *     model will clear the previous scope.
+         */
+        scope(options?: string | string[] | ScopeOptions | WhereOptions): this;
+
+        /**
+         * Search for multiple instances.
+         *
+         * __Simple search using AND and =__
+         * ```js
+         * Model.findAll({
+         *   where: {
+         *     attr1: 42,
+         *     attr2: 'cake'
+         *   }
+         * })
+         * ```
+         * ```sql
+         * WHERE attr1 = 42 AND attr2 = 'cake'
+         *```
+         *
+         * __Using greater than, less than etc.__
+         * ```js
+         *
+         * Model.findAll({
+         *   where: {
+         *     attr1: {
+         *       gt: 50
+         *     },
+         *     attr2: {
+         *       lte: 45
+         *     },
+         *     attr3: {
+         *       in: [1,2,3]
+         *     },
+         *     attr4: {
+         *       ne: 5
+         *     }
+         *   }
+         * })
+         * ```
+         * ```sql
+         * WHERE attr1 > 50 AND attr2 <= 45 AND attr3 IN (1,2,3) AND attr4 != 5
+         * ```
+         * Possible options are: `$ne, $in, $not, $notIn, $gte, $gt, $lte, $lt, $like, $ilike/$iLike, $notLike,
+         * $notILike, '..'/$between, '!..'/$notBetween, '&&'/$overlap, '@>'/$contains, '<@'/$contained`
+         *
+         * __Queries using OR__
+         * ```js
+         * Model.findAll({
+         *   where: Sequelize.and(
+         *     { name: 'a project' },
+         *     Sequelize.or(
+         *       { id: [1,2,3] },
+         *       { id: { gt: 10 } }
+         *     )
+         *   )
+         * })
+         * ```
+         * ```sql
+         * WHERE name = 'a project' AND (id` IN (1,2,3) OR id > 10)
+         * ```
+         *
+         * The success listener is called with an array of instances if the query succeeds.
+         *
+         * @see    {Sequelize#query}
+         */
+        findAll(options?: FindOptions): Promise<TInstance[]>;
+        all(optionz?: FindOptions): Promise<TInstance[]>;
+
+        /**
+         * Search for a single instance by its primary key. This applies LIMIT 1, so the listener will
+         * always be called with a single instance.
+         */
+        findById(identifier?: number | string, options?: FindOptions): Promise<TInstance>;
+        findByPrimary(identifier?: number | string, options?: FindOptions): Promise<TInstance>;
+
+        /**
+         * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single
+         * instance.
+         */
+        findOne(options?: FindOptions): Promise<TInstance>;
+        find(optionz?: FindOptions): Promise<TInstance>;
+
+        /**
+         * Run an aggregation method on the specified field
+         *
+         * @param field The field to aggregate over. Can be a field name or *
+         * @param aggregateFunction The function to use for aggregation, e.g. sum, max etc.
+         * @param options Query options. See sequelize.query for full options
+         * @return Returns the aggregate result cast to `options.dataType`, unless `options.plain` is false, in
+         *     which case the complete data result is returned.
+         */
+        aggregate(field: string, aggregateFunction: Function, options?: AggregateOptions): Promise<Object>;
+
+        /**
+         * Count the number of records matching the provided where clause.
+         *
+         * If you provide an `include` option, the number of matching associations will be counted instead.
+         */
+        count(options?: CountOptions): Promise<number>;
+
+        /**
+         * Find all the rows matching your query, within a specified offset / limit, and get the total number of
+         * rows matching your query. This is very usefull for paging
+         *
+         * ```js
+         * Model.findAndCountAll({
+         *   where: ...,
+         *   limit: 12,
+         *   offset: 12
+         * }).then(function (result) {
+         *   ...
+         * })
+         * ```
+         * In the above example, `result.rows` will contain rows 13 through 24, while `result.count` will return
+         * the
+         * total number of rows that matched your query.
+         *
+         * When you add includes, only those which are required (either because they have a where clause, or
+         * because
+         * `required` is explicitly set to true on the include) will be added to the count part.
+         *
+         * Suppose you want to find all users who have a profile attached:
+         * ```js
+         * User.findAndCountAll({
+         *   include: [
+         *      { model: Profile, required: true}
+         *   ],
+         *   limit 3
+         * });
+         * ```
+         * Because the include for `Profile` has `required` set it will result in an inner join, and only the users
+         * who have a profile will be counted. If we remove `required` from the include, both users with and
+         * without
+         * profiles will be counted
+         */
+        findAndCount(options?: FindOptions): Promise<{ rows: TInstance[], count: number }>;
+        findAndCountAll(options?: FindOptions): Promise<{ rows: TInstance[], count: number }>;
+
+        /**
+         * Find the maximum value of field
+         */
+        max(field: string, options?: AggregateOptions): Promise<any>;
+
+        /**
+         * Find the minimum value of field
+         */
+        min(field: string, options?: AggregateOptions): Promise<any>;
+
+        /**
+         * Find the sum of field
+         */
+        sum(field: string, options?: AggregateOptions): Promise<number>;
+
+        /**
+         * Builds a new model instance. Values is an object of key value pairs, must be defined but can be empty.
+         */
+        build(record?: TAttributes, options?: BuildOptions): TInstance;
+
+        /**
+         * Undocumented bulkBuild
+         */
+        bulkBuild(records: TAttributes[], options?: BuildOptions): TInstance[];
+
+        /**
+         * Builds a new model instance and calls save on it.
+         */
+        create(values?: TAttributes, options?: CreateOptions): Promise<TInstance>;
+
+        /**
+         * Find a row that matches the query, or build (but don't save) the row if none is found.
+         * The successfull result of the promise will be (instance, initialized) - Make sure to use .spread()
+         */
+        findOrInitialize(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
+        findOrBuild(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
+
+        /**
+         * Find a row that matches the query, or build and save the row if none is found
+         * The successful result of the promise will be (instance, created) - Make sure to use .spread()
+         *
+         * If no transaction is passed in the `options` object, a new transaction will be created internally, to
+         * prevent the race condition where a matching row is created by another connection after the find but
+         * before the insert call. However, it is not always possible to handle this case in SQLite, specifically
+         * if one transaction inserts and another tries to select before the first one has comitted. In this case,
+         * an instance of sequelize.TimeoutError will be thrown instead. If a transaction is created, a savepoint
+         * will be created instead, and any unique constraint violation will be handled internally.
+         */
+        findOrCreate(options: FindOrInitializeOptions<TAttributes>): Promise<TInstance>;
+
+        /**
+         * Insert or update a single row. An update will be executed if a row which matches the supplied values on
+         * either the primary key or a unique key is found. Note that the unique index must be defined in your
+         * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
+         * because sequelize fails to identify the row that should be updated.
+         *
+         * **Implementation details:**
+         *
+         * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
+         * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
+         *   unique_constraint UPDATE
+         * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
+         * regardless
+         *   of whether the row already existed or not
+         *
+         * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
+         * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
+         * whether the row was inserted or not.
+         */
+        upsert(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
+        insertOrUpdate(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
+
+        /**
+         * Create and insert multiple instances in bulk.
+         *
+         * The success handler is passed an array of instances, but please notice that these may not completely
+         * represent the state of the rows in the DB. This is because MySQL and SQLite do not make it easy to
+         * obtain
+         * back automatically generated IDs and other default values in a way that can be mapped to multiple
+         * records. To obtain Instances for the newly created values, you will need to query for them again.
+         *
+         * @param records List of objects (key/value pairs) to create instances from
+         */
+        bulkCreate(records: TAttributes[], options?: BulkCreateOptions): Promise<TInstance[]>;
+
+        /**
+         * Truncate all instances of the model. This is a convenient method for Model.destroy({ truncate: true }).
+         */
+        truncate(options?: TruncateOptions): Promise<void>;
+
+        /**
+         * Delete multiple instances, or set their deletedAt timestamp to the current time if `paranoid` is enabled.
+         *
+         * @return Promise<number> The number of destroyed rows
+         */
+        destroy(options?: DestroyOptions): Promise<number>;
+
+        /**
+         * Restore multiple instances if `paranoid` is enabled.
+         */
+        restore(options?: RestoreOptions): Promise<void>;
+
+        /**
+         * Update multiple instances that match the where options. The promise returns an array with one or two
+         * elements. The first element is always the number of affected rows, while the second element is the actual
+         * affected rows (only supported in postgres with `options.returning` true.)
+         */
+        update(values: TAttributes, options: UpdateOptions): Promise<[number, TInstance[]]>;
+
+        /**
+         * Run a describe query on the table. The result will be return to the listener as a hash of attributes and
+         * their types.
+         */
+        describe(): Promise<Object>;
+
+        /**
+         * Unscope the model
+         */
+        unscoped(): this;
+
+    }
+
+    //
+    //  Query Interface
+    // ~~~~~~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-interface.js
+    //
+
+    /**
+     * Most of the methods accept options and use only the logger property of the options. That's why the most used
+     * interface type for options in a method is separated here as another interface.
+     */
+    interface QueryInterfaceOptions {
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: boolean | Function;
+
+    }
+
+    /**
+     * The interface that Sequelize uses to talk to all databases.
+     *
+     * This interface is available through sequelize.QueryInterface. It should not be commonly used, but it's
+     * referenced anyway, so it can be used.
+     */
+    interface QueryInterface {
+
+        /**
+         * Returns the dialect-specific sql generator.
+         *
+         * We don't have a definition for the QueryGenerator, because I doubt it is commonly in use separately.
+         */
+        QueryGenerator: any;
+
+        /**
+         * Returns the current sequelize instance.
+         */
+        sequelize: Sequelize;
+
+        /**
+         * Queries the schema (table list).
+         *
+         * @param schema The schema to query. Applies only to Postgres.
+         */
+        createSchema(schema?: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Drops the specified schema (table).
+         *
+         * @param schema The schema to query. Applies only to Postgres.
+         */
+        dropSchema(schema?: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Drops all tables.
+         */
+        dropAllSchemas(options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Queries all table names in the database.
+         *
+         * @param options
+         */
+        showAllSchemas(options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Return database version
+         */
+        databaseVersion(options?: QueryInterfaceOptions): Promise<string>;
+
+        /**
+         * Creates a table with specified attributes.
+         *
+         * @param tableName     Name of table to create
+         * @param attributes    Hash of attributes, key is attribute name, value is data type
+         * @param options       Query options.
+         */
+        createTable(tableName: string | { schema?: string, tableName?: string }, attributes: DefineAttributes,
+            options?: QueryOptions): Promise<void>;
+
+        /**
+         * Drops the specified table.
+         *
+         * @param tableName Table name.
+         * @param options   Query options, particularly "force".
+         */
+        dropTable(tableName: string, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Drops all tables.
+         *
+         * @param options
+         */
+        dropAllTables(options?: QueryOptions): Promise<void>;
+
+        /**
+         * Drops all defined enums
+         *
+         * @param options
+         */
+        dropAllEnums(options?: QueryOptions): Promise<void>;
+
+        /**
+         * Renames a table
+         */
+        renameTable(before: string, after: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Returns all tables
+         */
+        showAllTables(options?: QueryOptions): Promise<string[]>;
+
+        /**
+         * Describe a table
+         */
+        describeTable(tableName: string | { schema?: string, tableName?: string },
+            options?: string | { schema?: string, schemaDelimeter?: string, logging?: boolean | Function }): Promise<Object>;
+
+        /**
+         * Adds a new column to a table
+         */
+        addColumn(table: string, key: string, attribute: DefineAttributeColumnOptions | DataTypeAbstract,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Removes a column from a table
+         */
+        removeColumn(table: string, attribute: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Changes a column
+         */
+        changeColumn(tableName: string | { schema?: string, tableName?: string }, attributeName: string,
+            dataTypeOrOptions?: string | DataTypeAbstract | DefineAttributeColumnOptions,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Renames a column
+         */
+        renameColumn(tableName: string | { schema?: string, tableName?: string }, attrNameBefore: string,
+            attrNameAfter: string,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Adds a new index to a table
+         */
+        addIndex(tableName: string | Object, attributes: string[], options?: QueryOptions,
+            rawTablename?: string): Promise<void>;
+
+        /**
+         * Shows the index of a table
+         */
+        showIndex(tableName: string | Object, options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Put a name to an index
+         */
+        nameIndexes(indexes: string[], rawTablename: string): Promise<void>;
+
+        /**
+         * Returns all foreign key constraints of a table
+         */
+        getForeignKeysForTables(tableNames: string, options?: QueryInterfaceOptions): Promise<Object>;
+
+        /**
+         * Removes an index of a table
+         */
+        removeIndex(tableName: string, indexNameOrAttributes: string[] | string,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Inserts a new record
+         */
+        insert(instance: Instance<any>, tableName: string, values: Object,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Inserts or Updates a record in the database
+         */
+        upsert(tableName: string, values: Object, updateValues: Object, model: Model<any, any>,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Inserts multiple records at once
+         */
+        bulkInsert(tableName: string, records: Object[], options?: QueryOptions,
+            attributes?: string[] | string): Promise<Object>;
+
+        /**
+         * Updates a row
+         */
+        update(instance: Instance<any>, tableName: string, values: Object, identifier: Object,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Updates multiple rows at once
+         */
+        bulkUpdate(tableName: string, values: Object, identifier: Object, options?: QueryOptions,
+            attributes?: string[] | string): Promise<Object>;
+
+        /**
+         * Deletes a row
+         */
+        "delete"(instance: Instance<any>, tableName: string, identifier: Object,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Deletes multiple rows at once
+         */
+        bulkDelete(tableName: string, identifier: Object, options?: QueryOptions,
+            model?: Model<any, any>): Promise<Object>;
+
+        /**
+         * Returns selected rows
+         */
+        select(model: Model<any, any>, tableName: string, options?: QueryOptions): Promise<Object[]>;
+
+        /**
+         * Increments a row value
+         */
+        increment(instance: Instance<any>, tableName: string, values: Object, identifier: Object,
+            options?: QueryOptions): Promise<Object>;
+
+        /**
+         * Selects raw without parsing the string into an object
+         */
+        rawSelect(tableName: string, options: QueryOptions, attributeSelector: string | string[],
+            model?: Model<any, any>): Promise<string[]>;
+
+        /**
+         * Postgres only. Creates a trigger on specified table to call the specified function with supplied
+         * parameters.
+         */
+        createTrigger(tableName: string, triggerName: string, timingType: string, fireOnArray: any[],
+            functionName: string, functionParams: any[], optionsArray: string[],
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Postgres only. Drops the specified trigger.
+         */
+        dropTrigger(tableName: string, triggerName: string, options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Postgres only. Renames a trigger
+         */
+        renameTrigger(tableName: string, oldTriggerName: string, newTriggerName: string,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Postgres only. Create a function
+         */
+        createFunction(functionName: string, params: any[], returnType: string, language: string,
+            body: string, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Postgres only. Drops a function
+         */
+        dropFunction(functionName: string, params: any[],
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Postgres only. Rename a function
+         */
+        renameFunction(oldFunctionName: string, params: any[], newFunctionName: string,
+            options?: QueryInterfaceOptions): Promise<void>;
+
+        /**
+         * Escape an identifier (e.g. a table or attribute name). If force is true, the identifier will be quoted
+         * even if the `quoteIdentifiers` option is false.
+         */
+        quoteIdentifier(identifier: string, force: boolean): string;
+
+        /**
+         * Escape a table name
+         */
+        quoteTable(identifier: string): string;
+
+        /**
+         * Split an identifier into .-separated tokens and quote each part. If force is true, the identifier will be
+         * quoted even if the `quoteIdentifiers` option is false.
+         */
+        quoteIdentifiers(identifiers: string, force: boolean): string;
+
+        /**
+         * Escape a value (e.g. a string, number or date)
+         */
+        escape(value?: string | number | Date): string;
+
+        /**
+         * Set option for autocommit of a transaction
+         */
+        setAutocommit(transaction: Transaction, value: boolean, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Set the isolation level of a transaction
+         */
+        setIsolationLevel(transaction: Transaction, value: string, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Begin a new transaction
+         */
+        startTransaction(transaction: Transaction, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Defer constraints
+         */
+        deferConstraints(transaction: Transaction, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Commit an already started transaction
+         */
+        commitTransaction(transaction: Transaction, options?: QueryOptions): Promise<void>;
+
+        /**
+         * Rollback ( revert ) a transaction that has'nt been commited
+         */
+        rollbackTransaction(transaction: Transaction, options?: QueryOptions): Promise<void>;
+
+    }
+
+    //
+    //  Query Types
+    // ~~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/query-types.js
+    //
+
+    interface QueryTypes {
+        SELECT: string; // 'SELECT'
+        INSERT: string; // 'INSERT'
+        UPDATE: string; // 'UPDATE'
+        BULKUPDATE: string; // 'BULKUPDATE'
+        BULKDELETE: string; // 'BULKDELETE'
+        DELETE: string; // 'DELETE'
+        UPSERT: string; // 'UPSERT'
+        VERSION: string; // 'VERSION'
+        SHOWTABLES: string; // 'SHOWTABLES'
+        SHOWINDEXES: string; // 'SHOWINDEXES'
+        DESCRIBE: string; // 'DESCRIBE'
+        RAW: string; // 'RAW'
+        FOREIGNKEYS: string; // 'FOREIGNKEYS'
+    }
+
+    //
+    //  Sequelize
+    // ~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/sequelize.js
+    //
+
+    /**
+     * General column options
+     *
+     * @see Define
+     * @see AssociationForeignKeyOptions
+     */
+    interface ColumnOptions {
+
+        /**
+         * If false, the column will have a NOT NULL constraint, and a not null validation will be run before an
+         * instance is saved.
+         */
+        allowNull?: boolean;
+
+        /**
+         *  If set, sequelize will map the attribute name to a different name in the database
+         */
+        field?: string;
+
+        /**
+         * A literal default value, a JavaScript function, or an SQL function (see `sequelize.fn`)
+         */
+        defaultValue?: any;
+
+    }
+
+    /**
+     * References options for the column's attributes
+     *
+     * @see AttributeColumnOptions
+     */
+    interface DefineAttributeColumnReferencesOptions {
+
+        /**
+         * If this column references another table, provide it here as a Model, or a string
+         */
+        model?: string | Model<any, any>;
+
+        /**
+         * The column of the foreign table that this column references
+         */
+        key?: string;
+
+        /**
+         * When to check for the foreign key constraing
+         *
+         * PostgreSQL only
+         */
+        deferrable?: Deferrable;
+
+    }
+
+    /**
+     * Column options for the model schema attributes
+     *
+     * @see Attributes
+     */
+    interface DefineAttributeColumnOptions extends ColumnOptions {
+
+        /**
+         * A string or a data type
+         */
+        type: string | DataTypeAbstract;
+
+        /**
+         * If true, the column will get a unique constraint. If a string is provided, the column will be part of a
+         * composite unique index. If multiple columns have the same string, they will be part of the same unique
+         * index
+         */
+        unique?: boolean | string | { name: string, msg: string };
+
+        /**
+         * Primary key flag
+         */
+        primaryKey?: boolean;
+
+        /**
+         * Is this field an auto increment field
+         */
+        autoIncrement?: boolean;
+
+        /**
+         * Comment for the database
+         */
+        comment?: string;
+
+        /**
+         * An object with reference configurations
+         */
+        references?: DefineAttributeColumnReferencesOptions;
+
+        /**
+         * What should happen when the referenced key is updated. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION
+         */
+        onUpdate?: string;
+
+        /**
+         * What should happen when the referenced key is deleted. One of CASCADE, RESTRICT, SET DEFAULT, SET NULL or
+         * NO ACTION
+         */
+        onDelete?: string;
+
+        /**
+         * Provide a custom getter for this column. Use `this.getDataValue(String)` to manipulate the underlying
+         * values.
+         */
+        get?: () => any;
+
+        /**
+         * Provide a custom setter for this column. Use `this.setDataValue(String, Value)` to manipulate the
+         * underlying values.
+         */
+        set?: (val: any) => void;
+
+        /**
+         * An object of validations to execute for this column every time the model is saved. Can be either the
+         * name of a validation provided by validator.js, a validation function provided by extending validator.js
+         * (see the
+         * `DAOValidator` property for more details), or a custom validation function. Custom validation functions
+         * are called with the value of the field, and can possibly take a second callback argument, to signal that
+         * they are asynchronous. If the validator is sync, it should throw in the case of a failed validation, it
+         * it is async, the callback should be called with the error text.
+         */
+        validate?: DefineValidateOptions;
+
+        /**
+         * Usage in object notation
+         *
+         * ```js
+         * sequelize.define('model', {
+         *     states: {
+         *       type:   Sequelize.ENUM,
+         *       values: ['active', 'pending', 'deleted']
+         *     }
+         *   })
+         * ```
+         */
+        values?: string[];
+
+    }
+
+    /**
+     * Interface for Attributes provided for a column
+     *
+     * @see Sequelize.define
+     */
+    interface DefineAttributes {
+
+        /**
+         * The description of a database column
+         */
+        [name: string]: string | DataTypeAbstract | DefineAttributeColumnOptions;
+
+    }
+
+    /**
+     * Interface for query options
+     *
+     * @see Options
+     */
+    interface QueryOptions {
+
+        /**
+         * If true, sequelize will not try to format the results of the query, or build an instance of a model from
+         * the result
+         */
+        raw?: boolean;
+
+        /**
+         * The transaction that the query should be executed under
+         */
+        transaction?: Transaction;
+
+        /**
+         * The type of query you are executing. The query type affects how results are formatted before they are
+         * passed back. The type is a string, but `Sequelize.QueryTypes` is provided as convenience shortcuts.
+         */
+        type?: string;
+
+        /**
+         * If true, transforms objects with `.` separated property names into nested objects using
+         * [dottie.js](https://github.com/mickhansen/dottie.js). For example { 'user.username': 'john' } becomes
+         * { user: { username: 'john' }}. When `nest` is true, the query type is assumed to be `'SELECT'`,
+         * unless otherwise specified
+         *
+         * Defaults to false
+         */
+        nest?: boolean;
+
+        /**
+         * Sets the query type to `SELECT` and return a single row
+         */
+        plain?: boolean;
+
+        /**
+         * Either an object of named parameter replacements in the format `:param` or an array of unnamed
+         * replacements to replace `?` in your SQL.
+         */
+        replacements?: Object | string[];
+
+        /**
+         * Force the query to use the write pool, regardless of the query type.
+         *
+         * Defaults to false
+         */
+        useMaster?: boolean;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: Function;
+
+        /**
+         * A sequelize instance used to build the return instance
+         */
+        instance?: Instance<any>;
+
+        /**
+         * A sequelize model used to build the returned model instances (used to be called callee)
+         */
+        model?: Model<any, any>;
+
+        // TODO: force, cascade
+
+    }
+
+    /**
+     * Model validations, allow you to specify format/content/inheritance validations for each attribute of the
+     * model.
+     *
+     * Validations are automatically run on create, update and save. You can also call validate() to manually
+     * validate an instance.
+     *
+     * The validations are implemented by validator.js.
+     */
+    interface DefineValidateOptions {
+
+        /**
+         * is: ["^[a-z]+$",'i'] // will only allow letters
+         * is: /^[a-z]+$/i      // same as the previous example using real RegExp
+         */
+        is?: string | Array<string | RegExp> | RegExp | { msg: string, args: string | Array<string | RegExp> | RegExp };
+
+        /**
+         * not: ["[a-z]",'i']  // will not allow letters
+         */
+        not?: string | Array<string | RegExp> | RegExp | { msg: string, args: string | Array<string | RegExp> | RegExp };
+
+        /**
+         * checks for email format (foo@bar.com)
+         */
+        isEmail?: boolean | { msg: string };
+
+        /**
+         * checks for url format (http://foo.com)
+         */
+        isUrl?: boolean | { msg: string };
+
+        /**
+         * checks for IPv4 (129.89.23.1) or IPv6 format
+         */
+        isIP?: boolean | { msg: string };
+
+        /**
+         * checks for IPv4 (129.89.23.1)
+         */
+        isIPv4?: boolean | { msg: string };
+
+        /**
+         * checks for IPv6 format
+         */
+        isIPv6?: boolean | { msg: string };
+
+        /**
+         * will only allow letters
+         */
+        isAlpha?: boolean | { msg: string };
+
+        /**
+         * will only allow alphanumeric characters, so "_abc" will fail
+         */
+        isAlphanumeric?: boolean | { msg: string };
+
+        /**
+         * will only allow numbers
+         */
+        isNumeric?: boolean | { msg: string };
+
+        /**
+         * checks for valid integers
+         */
+        isInt?: boolean | { msg: string };
+
+        /**
+         * checks for valid floating point numbers
+         */
+        isFloat?: boolean | { msg: string };
+
+        /**
+         * checks for any numbers
+         */
+        isDecimal?: boolean | { msg: string };
+
+        /**
+         * checks for lowercase
+         */
+        isLowercase?: boolean | { msg: string };
+
+        /**
+         * checks for uppercase
+         */
+        isUppercase?: boolean | { msg: string };
+
+        /**
+         * won't allow null
+         */
+        notNull?: boolean | { msg: string };
+
+        /**
+         * only allows null
+         */
+        isNull?: boolean | { msg: string };
+
+        /**
+         * don't allow empty strings
+         */
+        notEmpty?: boolean | { msg: string };
+
+        /**
+         * only allow a specific value
+         */
+        equals?: string | { msg: string };
+
+        /**
+         * force specific substrings
+         */
+        contains?: string | { msg: string };
+
+        /**
+         * check the value is not one of these
+         */
+        notIn?: string[][] | { msg: string, args: string[][] };
+
+        /**
+         * check the value is one of these
+         */
+        isIn?: string[][] | { msg: string, args: string[][] };
+
+        /**
+         * don't allow specific substrings
+         */
+        notContains?: string[] | string | { msg: string, args: string[] | string };
+
+        /**
+         * only allow values with length between 2 and 10
+         */
+        len?: [number, number] | { msg: string, args: [number, number] };
+
+        /**
+         * only allow uuids
+         */
+        isUUID?: number | { msg: string, args: number };
+
+        /**
+         * only allow date strings
+         */
+        isDate?: boolean | { msg: string, args: boolean };
+
+        /**
+         * only allow date strings after a specific date
+         */
+        isAfter?: string | { msg: string, args: string };
+
+        /**
+         * only allow date strings before a specific date
+         */
+        isBefore?: string | { msg: string, args: string };
+
+        /**
+         * only allow values
+         */
+        max?: number | { msg: string, args: number };
+
+        /**
+         * only allow values >= 23
+         */
+        min?: number | { msg: string, args: number };
+
+        /**
+         * only allow arrays
+         */
+        isArray?: boolean | { msg: string, args: boolean };
+
+        /**
+         * check for valid credit card numbers
+         */
+        isCreditCard?: boolean | { msg: string, args: boolean };
+
+        /**
+         * custom validations are also possible
+         *
+         * Implementation notes :
+         *
+         * We can't enforce any other method to be a function, so :
+         *
+         * ```typescript
+         * [name: string] : ( value : any ) => boolean;
+         * ```
+         *
+         * doesn't work in combination with the properties above
+         *
+         * @see https://github.com/Microsoft/TypeScript/issues/1889
+         */
+        [name: string]: any;
+
+    }
+
+    /**
+     * Interface for indexes property in DefineOptions
+     *
+     * @see DefineOptions
+     */
+    interface DefineIndexesOptions {
+
+        /**
+         * The name of the index. Defaults to model name + _ + fields concatenated
+         */
+        name?: string;
+
+        /**
+         * Index type. Only used by mysql. One of `UNIQUE`, `FULLTEXT` and `SPATIAL`
+         */
+        index?: string;
+
+        /**
+         * The method to create the index by (`USING` statement in SQL). BTREE and HASH are supported by mysql and
+         * postgres, and postgres additionally supports GIST and GIN.
+         */
+        method?: string;
+
+        /**
+         * Should the index by unique? Can also be triggered by setting type to `UNIQUE`
+         *
+         * Defaults to false
+         */
+        unique?: boolean;
+
+        /**
+         * PostgreSQL will build the index without taking any write locks. Postgres only
+         *
+         * Defaults to false
+         */
+        concurrently?: boolean;
+
+        /**
+         * An array of the fields to index. Each field can either be a string containing the name of the field,
+         * a sequelize object (e.g `sequelize.fn`), or an object with the following attributes: `attribute`
+         * (field name), `length` (create a prefix index of length chars), `order` (the direction the column
+         * should be sorted in), `collate` (the collation (sort order) for the column)
+         */
+        fields?: Array<string | { attribute: string, length: number, order: string, collate: string }>;
+
+    }
+
+    /**
+     * Interface for name property in DefineOptions
+     *
+     * @see DefineOptions
+     */
+    interface DefineNameOptions {
+
+        /**
+         * Singular model name
+         */
+        singular?: string;
+
+        /**
+         * Plural model name
+         */
+        plural?: string;
+
+    }
+
+    /**
+     * Interface for getterMethods in DefineOptions
+     *
+     * @see DefineOptions
+     */
+    interface DefineGetterMethodsOptions {
+        [name: string]: () => any;
+    }
+
+    /**
+     * Interface for setterMethods in DefineOptions
+     *
+     * @see DefineOptions
+     */
+    interface DefineSetterMethodsOptions {
+        [name: string]: (val: any) => void;
+    }
+
+    /**
+     * Interface for Define Scope Options
+     *
+     * @see DefineOptions
+     */
+    interface DefineScopeOptions {
+
+        /**
+         * Name of the scope and it's query
+         */
+        [scopeName: string]: FindOptions | Function;
+
+    }
+
+    /**
+     * Options for model definition
+     *
+     * @see Sequelize.define
+     */
+    interface DefineOptions<TInstance> {
+
+        /**
+         * Define the default search scope to use for this model. Scopes have the same form as the options passed to
+         * find / findAll.
+         */
+        defaultScope?: FindOptions;
+
+        /**
+         * More scopes, defined in the same way as defaultScope above. See `Model.scope` for more information about
+         * how scopes are defined, and what you can do with them
+         */
+        scopes?: DefineScopeOptions;
+
+        /**
+         * Don't persits null values. This means that all columns with null values will not be saved.
+         */
+        omitNull?: boolean;
+
+        /**
+         * Adds createdAt and updatedAt timestamps to the model. Default true.
+         */
+        timestamps?: boolean;
+
+        /**
+         * Calling destroy will not delete the model, but instead set a deletedAt timestamp if this is true. Needs
+         * timestamps=true to work. Default false.
+         */
+        paranoid?: boolean;
+
+        /**
+         * Converts all camelCased columns to underscored if true. Default false.
+         */
+        underscored?: boolean;
+
+        /**
+         * Converts camelCased model names to underscored tablenames if true. Default false.
+         */
+        underscoredAll?: boolean;
+
+        /**
+         * If freezeTableName is true, sequelize will not try to alter the DAO name to get the table name.
+         * Otherwise, the dao name will be pluralized. Default false.
+         */
+        freezeTableName?: boolean;
+
+        /**
+         * An object with two attributes, `singular` and `plural`, which are used when this model is associated to
+         * others.
+         */
+        name?: DefineNameOptions;
+
+        /**
+         * Indexes for the provided database table
+         */
+        indexes?: DefineIndexesOptions[];
+
+        /**
+         * Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps
+         * must be true. Not affected by underscored setting.
+         */
+        createdAt?: string | boolean;
+
+        /**
+         * Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps
+         * must be true. Not affected by underscored setting.
+         */
+        deletedAt?: string | boolean;
+
+        /**
+         * Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps
+         * must be true. Not affected by underscored setting.
+         */
+        updatedAt?: string | boolean;
+
+        /**
+         * Defaults to pluralized model name, unless freezeTableName is true, in which case it uses model name
+         * verbatim
+         */
+        tableName?: string;
+
+        /**
+         * Provide getter functions that work like those defined per column. If you provide a getter method with
+         * the
+         * same name as a column, it will be used to access the value of that column. If you provide a name that
+         * does not match a column, this function will act as a virtual getter, that can fetch multiple other
+         * values
+         */
+        getterMethods?: DefineGetterMethodsOptions;
+
+        /**
+         * Provide setter functions that work like those defined per column. If you provide a setter method with
+         * the
+         * same name as a column, it will be used to update the value of that column. If you provide a name that
+         * does not match a column, this function will act as a virtual setter, that can act on and set other
+         * values, but will not be persisted
+         */
+        setterMethods?: DefineSetterMethodsOptions;
+
+        /**
+         * Provide functions that are added to each instance (DAO). If you override methods provided by sequelize,
+         * you can access the original method using `this.constructor.super_.prototype`, e.g.
+         * `this.constructor.super_.prototype.toJSON.apply(this, arguments)`
+         */
+        instanceMethods?: Object;
+
+        /**
+         * Provide functions that are added to the model (Model). If you override methods provided by sequelize,
+         * you can access the original method using `this.constructor.prototype`, e.g.
+         * `this.constructor.prototype.find.apply(this, arguments)`
+         */
+        classMethods?: Object;
+
+        schema?: string;
+
+        /**
+         * You can also change the database engine, e.g. to MyISAM. InnoDB is the default.
+         */
+        engine?: string;
+
+        charset?: string;
+
+        /**
+         * Finaly you can specify a comment for the table in MySQL and PG
+         */
+        comment?: string;
+
+        collate?: string;
+
+        /**
+         * Set the initial AUTO_INCREMENT value for the table in MySQL.
+         */
+        initialAutoIncrement?: string;
+
+        /**
+         * An object of hook function that are called before and after certain lifecycle events.
+         * The possible hooks are: beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy,
+         * beforeBulkUpdate, beforeCreate, beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate,
+         * afterBulkCreate, afterBulkDestory and afterBulkUpdate. See Hooks for more information about hook
+         * functions and their signatures. Each property can either be a function, or an array of functions.
+         */
+        hooks?: HooksDefineOptions<TInstance>;
+
+        /**
+         * An object of model wide validations. Validations have access to all model values via `this`. If the
+         * validator function takes an argument, it is asumed to be async, and is called with a callback that
+         * accepts an optional error.
+         */
+        validate?: DefineValidateOptions;
+
+    }
+
+    /**
+     * Sync Options
+     *
+     * @see Sequelize.sync
+     */
+    interface SyncOptions {
+
+        /**
+         * If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table
+         */
+        force?: boolean;
+
+        /**
+         * Match a regex against the database name before syncing, a safety check for cases where force: true is
+         * used in tests but not live code
+         */
+        match?: RegExp;
+
+        /**
+         * A function that logs sql queries, or false for no logging
+         */
+        logging?: Function | boolean;
+
+        /**
+         * The schema that the tables should be created in. This can be overriden for each table in sequelize.define
+         */
+        schema?: string;
+
+    }
+
+    interface SetOptions { }
+
+    /**
+     * Connection Pool options
+     *
+     * @see Options
+     */
+    interface PoolOptions {
+
+        /**
+         * Maximum connections of the pool
+         */
+        maxConnections?: number;
+
+        /**
+         * Minimum connections of the pool
+         */
+        minConnections?: number;
+
+        /**
+         * The maximum time, in milliseconds, that a connection can be idle before being released.
+         */
+        maxIdleTime?: number;
+
+        /**
+         * A function that validates a connection. Called with client. The default function checks that client is an
+         * object, and that its state is not disconnected.
+         */
+        validateConnection?: (client?: any) => boolean;
+
+    }
+
+    /**
+     * Interface for replication Options in the sequelize constructor
+     *
+     * @see Options
+     */
+    interface ReplicationOptions {
+
+        read?: {
+            host?: string;
+            port?: string | number;
+            username?: string;
+            password?: string;
+            database?: string;
+        };
+
+        write?: {
+            host?: string;
+            port?: string | number;
+            username?: string;
+            password?: string;
+            database?: string;
+        };
+
+    }
+
+    /**
+     * Options for the constructor of Sequelize main class
+     */
+    interface Options {
+
+        /**
+         * The dialect of the database you are connecting to. One of mysql, postgres, sqlite, mariadb and mssql.
+         *
+         * Defaults to 'mysql'
+         */
+        dialect?: string;
+
+        /**
+         * If specified, load the dialect library from this path. For example, if you want to use pg.js instead of
+         * pg when connecting to a pg database, you should specify 'pg.js' here
+         */
+        dialectModulePath?: string;
+
+        /**
+         * An object of additional options, which are passed directly to the connection library
+         */
+        dialectOptions?: Object;
+
+        /**
+         * Only used by sqlite.
+         *
+         * Defaults to ':memory:'
+         */
+        storage?: string;
+
+        /**
+         * The host of the relational database.
+         *
+         * Defaults to 'localhost'
+         */
+        host?: string;
+
+        /**
+         * The port of the relational database.
+         */
+        port?: number;
+
+        /**
+         * The protocol of the relational database.
+         *
+         * Defaults to 'tcp'
+         */
+        protocol?: string;
+
+        /**
+         * Default options for model definitions. See sequelize.define for options
+         */
+        define?: DefineOptions<any>;
+
+        /**
+         * Default options for sequelize.query
+         */
+        query?: QueryOptions;
+
+        /**
+         * Default options for sequelize.set
+         */
+        set?: SetOptions;
+
+        /**
+         * Default options for sequelize.sync
+         */
+        sync?: SyncOptions;
+
+        /**
+         * The timezone used when converting a date from the database into a JavaScript date. The timezone is also
+         * used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP
+         * and other time related functions have in the right timezone. For best cross platform performance use the
+         * format
+         * +/-HH:MM. Will also accept string versions of timezones used by moment.js (e.g. 'America/Los_Angeles');
+         * this is useful to capture daylight savings time changes.
+         *
+         * Defaults to '+00:00'
+         */
+        timezone?: string;
+
+        /**
+         * A function that gets executed everytime Sequelize would log something.
+         *
+         * Defaults to console.log
+         */
+        logging?: boolean | Function;
+
+        /**
+         * A flag that defines if null values should be passed to SQL queries or not.
+         *
+         * Defaults to false
+         */
+        omitNull?: boolean;
+
+        /**
+         * A flag that defines if native library shall be used or not. Currently only has an effect for postgres
+         *
+         * Defaults to false
+         */
+        native?: boolean;
+
+        /**
+         * Use read / write replication. To enable replication, pass an object, with two properties, read and write.
+         * Write should be an object (a single server for handling writes), and read an array of object (several
+         * servers to handle reads). Each read/write server can have the following properties: `host`, `port`,
+         * `username`, `password`, `database`
+         *
+         * Defaults to false
+         */
+        replication?: ReplicationOptions;
+
+        /**
+         * Connection pool options
+         */
+        pool?: PoolOptions;
+
+        /**
+         * Set to `false` to make table names and attributes case-insensitive on Postgres and skip double quoting of
+         * them.
+         *
+         * Defaults to true
+         */
+        quoteIdentifiers?: boolean;
+
+        /**
+         * Set the default transaction isolation level. See `Sequelize.Transaction.ISOLATION_LEVELS` for possible
+         * options.
+         *
+         * Defaults to 'REPEATABLE_READ'
+         */
+        isolationLevel?: string;
+
+        /**
+         * Set the default transaction type. See `Sequelize.Transaction.TYPES` for possible
+         * options.
+         *
+         * Defaults to 'DEFERRED'
+         */
+        transactionType?: string;
+
+    }
+
+    /**
+     * Sequelize methods that are available both for the static and the instance class of Sequelize
+     */
+    interface SequelizeStaticAndInstance extends Errors {
+
+        /**
+         * A reference to sequelize utilities. Most users will not need to use these utils directly. However, you
+         * might want to use `Sequelize.Utils._`, which is a reference to the lodash library, if you don't already
+         * have it imported in your project.
+         */
+        Utils: Utils;
+
+        /**
+         * A modified version of bluebird promises, that allows listening for sql events
+         */
+        Promise: typeof Promise;
+
+        /**
+         * Available query types for use with `sequelize.query`
+         */
+        QueryTypes: QueryTypes;
+
+        /**
+         * Exposes the validator.js object, so you can extend it with custom validation functions.
+         * The validator is exposed both on the instance, and on the constructor.
+         */
+        Validator: Validator;
+
+        /**
+         * A Model represents a table in the database. Sometimes you might also see it referred to as model, or
+         * simply as factory. This class should not be instantiated directly, it is created using sequelize.define,
+         * and already created models can be loaded using sequelize.import
+         */
+        Model: Model<any, any>;
+
+        /**
+         * A reference to the sequelize transaction class. Use this to access isolationLevels when creating a
+         * transaction
+         */
+        Transaction: TransactionStatic;
+
+        /**
+         * A reference to the deferrable collection. Use this to access the different deferrable options.
+         */
+        Deferrable: Deferrable;
+
+        /**
+         * A reference to the sequelize instance class.
+         */
+        Instance: Instance<any>;
+
+        /**
+         * Creates a object representing a database function. This can be used in search queries, both in where and
+         * order parts, and as default values in column definitions. If you want to refer to columns in your
+         * function, you should use `sequelize.col`, so that the columns are properly interpreted as columns and
+         * not a strings.
+         *
+         * Convert a user's username to upper case
+         * ```js
+         * instance.updateAttributes({
+         *   username: self.sequelize.fn('upper', self.sequelize.col('username'))
+         * })
+         * ```
+         * @param fn The function you want to call
+         * @param args All further arguments will be passed as arguments to the function
+         */
+        fn(fn: string, ...args: any[]): fn;
+
+        /**
+         * Creates a object representing a column in the DB. This is often useful in conjunction with
+         * `sequelize.fn`, since raw string arguments to fn will be escaped.
+         *
+         * @param col The name of the column
+         */
+        col(col: string): col;
+
+        /**
+         * Creates a object representing a call to the cast function.
+         *
+         * @param val The value to cast
+         * @param type The type to cast it to
+         */
+        cast(val: any, type: string): cast;
+
+        /**
+         * Creates a object representing a literal, i.e. something that will not be escaped.
+         *
+         * @param val
+         */
+        literal(val: any): literal;
+        asIs(val: any): literal;
+
+        /**
+         * An AND query
+         *
+         * @param args Each argument will be joined by AND
+         */
+        and(...args: Array<string | Object>): and;
+
+        /**
+         * An OR query
+         *
+         * @param args Each argument will be joined by OR
+         */
+        or(...args: Array<string | Object>): or;
+
+        /**
+         * Creates an object representing nested where conditions for postgres's json data-type.
+         *
+         * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
+         *     notation or a string using postgres json syntax.
+         * @param value An optional value to compare against. Produces a string of the form "<json path> =
+         *     '<value>'".
+         */
+        json(conditionsOrPath: string | Object, value?: string | number | boolean): json;
+
+        /**
+         * A way of specifying attr = condition.
+         *
+         * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
+         * or
+         * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
+         * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
+         *
+         * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
+         * string to be escaped, use `sequelize.literal`.
+         *
+         * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
+         *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
+         *     POJO syntax
+         * @param comparator Comparator
+         * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
+         *     etc.)
+         */
+        where(attr: Object, comparator: string, logic: string | Object): where;
+        where(attr: Object, logic: string | Object): where;
+        condition(attr: Object, logic: string | Object): where;
+
+    }
+
+    /**
+     * Sequelize methods available only for the static class ( basically this is the constructor and some extends )
+     */
+    interface SequelizeStatic extends SequelizeStaticAndInstance, DataTypes {
+
+        /**
+         * Instantiate sequelize with name of database, username and password
+         *
+         * #### Example usage
+         *
+         * ```javascript
+         * // without password and options
+         * var sequelize = new Sequelize('database', 'username')
+         *
+         * // without options
+         * var sequelize = new Sequelize('database', 'username', 'password')
+         *
+         * // without password / with blank password
+         * var sequelize = new Sequelize('database', 'username', null, {})
+         *
+         * // with password and options
+         * var sequelize = new Sequelize('my_database', 'john', 'doe', {})
+         *
+         * // with uri (see below)
+         * var sequelize = new Sequelize('mysql://localhost:3306/database', {})
+         * ```
+         *
+         * @param database The name of the database
+         * @param username The username which is used to authenticate against the
+         *     database.
+         * @param password The password which is used to authenticate against the
+         *     database.
+         * @param options An object with options.
+         */
+        new (database: string, username: string, password: string, options?: Options): Sequelize;
+        new (database: string, username: string, options?: Options): Sequelize;
+
+        /**
+         * Instantiate sequelize with an URI
+         * @name Sequelize
+         * @constructor
+         *
+         * @param uri A full database URI
+         * @param options See above for possible options
+         */
+        new (uri: string, options?: Options): Sequelize;
+
+        /**
+         * Provide access to continuation-local-storage (http://docs.sequelizejs.com/en/latest/api/sequelize/#transactionoptions-promise)
+         */
+        cls: any;
+
+    }
+
+    interface QueryOptionsTransactionRequired { }
+    interface ModelsHashInterface {
+        [name: string]: Model<any, any>;
+    }
+
+    /**
+     * This is the main class, the entry point to sequelize. To use it, you just need to
+     * import sequelize:
+     *
+     * ```js
+     * var Sequelize = require('sequelize');
+     * ```
+     *
+     * In addition to sequelize, the connection library for the dialect you want to use
+     * should also be installed in your project. You don't need to import it however, as
+     * sequelize will take care of that.
+     */
+    interface Sequelize extends SequelizeStaticAndInstance, Hooks<any> {
+
+        /**
+         * A reference to Sequelize constructor from sequelize. Useful for accessing DataTypes, Errors etc.
+         */
+        Sequelize: SequelizeStatic;
+
+        /**
+         * Defined models.
+         */
+        models: ModelsHashInterface;
+
+        /**
+         * Returns the specified dialect.
+         */
+        getDialect(): string;
+
+        /**
+         * Returns an instance of QueryInterface.
+         */
+        getQueryInterface(): QueryInterface;
+
+        /**
+         * Define a new model, representing a table in the DB.
+         *
+         * The table columns are define by the hash that is given as the second argument. Each attribute of the
+         * hash
+         * represents a column. A short table definition might look like this:
+         *
+         * ```js
+         * sequelize.define('modelName', {
+         *     columnA: {
+         *         type: Sequelize.BOOLEAN,
+         *         validate: {
+         *           is: ["[a-z]",'i'],        // will only allow letters
+         *           max: 23,                  // only allow values <= 23
+         *           isIn: {
+         *             args: [['en', 'zh']],
+         *             msg: "Must be English or Chinese"
+         *           }
+         *         },
+         *         field: 'column_a'
+         *         // Other attributes here
+         *     },
+         *     columnB: Sequelize.STRING,
+         *     columnC: 'MY VERY OWN COLUMN TYPE'
+         * })
+         *
+         * sequelize.models.modelName // The model will now be available in models under the name given to define
+         * ```
+         *
+         * As shown above, column definitions can be either strings, a reference to one of the datatypes that are
+         * predefined on the Sequelize constructor, or an object that allows you to specify both the type of the
+         * column, and other attributes such as default values, foreign key constraints and custom setters and
+         * getters.
+         *
+         * For a list of possible data types, see
+         * http://docs.sequelizejs.com/en/latest/docs/models-definition/#data-types
+         *
+         * For more about getters and setters, see
+         * http://docs.sequelizejs.com/en/latest/docs/models-definition/#getters-setters
+         *
+         * For more about instance and class methods, see
+         * http://docs.sequelizejs.com/en/latest/docs/models-definition/#expansion-of-models
+         *
+         * For more about validation, see
+         * http://docs.sequelizejs.com/en/latest/docs/models-definition/#validations
+         *
+         * @param modelName  The name of the model. The model will be stored in `sequelize.models` under this name
+         * @param attributes An object, where each attribute is a column of the table. Each column can be either a
+         *                   DataType, a string or a type-description object, with the properties described below:
+         * @param options    These options are merged with the default define options provided to the Sequelize
+         *                   constructor
+         */
+        define<TInstance, TAttributes>(modelName: string, attributes: DefineAttributes,
+            options?: DefineOptions<TInstance>): Model<TInstance, TAttributes>;
+
+        /**
+         * Fetch a Model which is already defined
+         *
+         * @param modelName The name of a model defined with Sequelize.define
+         */
+        model<TInstance, TAttributes>(modelName: string): Model<TInstance, TAttributes>;
+
+        /**
+         * Checks whether a model with the given name is defined
+         *
+         * @param modelName The name of a model defined with Sequelize.define
+         */
+        isDefined(modelName: string): boolean;
+
+        /**
+         * Imports a model defined in another file
+         *
+         * Imported models are cached, so multiple calls to import with the same path will not load the file
+         * multiple times
+         *
+         * See https://github.com/sequelize/sequelize/blob/master/examples/using-multiple-model-files/Task.js for a
+         * short example of how to define your models in separate files so that they can be imported by
+         * sequelize.import
+         *
+         * @param path The path to the file that holds the model you want to import. If the part is relative, it
+         *     will be resolved relatively to the calling file
+         *
+         * @param defineFunction An optional function that provides model definitions. Useful if you do not
+         *     want to use the module root as the define function
+         */
+        import<TInstance, TAttributes>(path: string, defineFunction?: (sequelize: Sequelize, dataTypes: DataTypes) => Model<TInstance, TAttributes>): Model<TInstance, TAttributes>;
+
+        /**
+         * Execute a query on the DB, with the posibility to bypass all the sequelize goodness.
+         *
+         * By default, the function will return two arguments: an array of results, and a metadata object,
+         * containing number of affected rows etc. Use `.spread` to access the results.
+         *
+         * If you are running a type of query where you don't need the metadata, for example a `SELECT` query, you
+         * can pass in a query type to make sequelize format the results:
+         *
+         * ```js
+         * sequelize.query('SELECT...').spread(function (results, metadata) {
+         *   // Raw query - use spread
+         * });
+         *
+         * sequelize.query('SELECT...', { type: sequelize.QueryTypes.SELECT }).then(function (results) {
+         *   // SELECT query - use then
+         * })
+         * ```
+         *
+         * @param sql
+         * @param options Query options
+         */
+        query(sql: string | { query: string, values: any[] }, options?: QueryOptions): Promise<any>;
+
+        /**
+         * Execute a query which would set an environment or user variable. The variables are set per connection,
+         * so this function needs a transaction.
+         *
+         * Only works for MySQL.
+         *
+         * @param variables Object with multiple variables.
+         * @param options Query options.
+         */
+        set(variables: Object, options: QueryOptionsTransactionRequired): Promise<any>;
+
+        /**
+         * Escape value.
+         *
+         * @param value Value that needs to be escaped
+         */
+        escape(value: string): string;
+
+        /**
+         * Create a new database schema.
+         *
+         * Note,that this is a schema in the
+         * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+         * not a database table. In mysql and sqlite, this command will do nothing.
+         *
+         * @param schema Name of the schema
+         * @param options Options supplied
+         * @param options.logging A function that logs sql queries, or false for no logging
+         */
+        createSchema(schema: string, options: { logging?: boolean | Function }): Promise<any>;
+
+        /**
+         * Show all defined schemas
+         *
+         * Note,that this is a schema in the
+         * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+         * not a database table. In mysql and sqlite, this will show all tables.
+         *
+         * @param options Options supplied
+         * @param options.logging A function that logs sql queries, or false for no logging
+         */
+        showAllSchemas(options: { logging?: boolean | Function }): Promise<any>;
+
+        /**
+         * Drop a single schema
+         *
+         * Note,that this is a schema in the
+         * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+         * not a database table. In mysql and sqlite, this drop a table matching the schema name
+         *
+         * @param schema Name of the schema
+         * @param options Options supplied
+         * @param options.logging A function that logs sql queries, or false for no logging
+         */
+        dropSchema(schema: string, options: { logging?: boolean | Function }): Promise<any>;
+
+        /**
+         * Drop all schemas
+         *
+         * Note,that this is a schema in the
+         * [postgres sense of the word](http://www.postgresql.org/docs/9.1/static/ddl-schemas.html),
+         * not a database table. In mysql and sqlite, this is the equivalent of drop all tables.
+         *
+         * @param options Options supplied
+         * @param options.logging A function that logs sql queries, or false for no logging
+         */
+        dropAllSchemas(options: { logging?: boolean | Function }): Promise<any>;
+
+        /**
+         * Sync all defined models to the DB.
+         *
+         * @param options Sync Options
+         */
+        sync(options?: SyncOptions): Promise<any>;
+
+        /**
+         * Truncate all tables defined through the sequelize models. This is done
+         * by calling Model.truncate() on each model.
+         *
+         * @param {object} [options] The options passed to Model.destroy in addition to truncate
+         * @param {Boolean|function} [options.transaction]
+         * @param {Boolean|function} [options.logging] A function that logs sql queries, or false for no logging
+         */
+        truncate(options?: DestroyOptions): Promise<any>;
+
+        /**
+         * Drop all tables defined through this sequelize instance. This is done by calling Model.drop on each model
+         * @see {Model#drop} for options
+         *
+         * @param options The options passed to each call to Model.drop
+         */
+        drop(options?: DropOptions): Promise<any>;
+
+        /**
+         * Test the connection by trying to authenticate
+         *
+         * @param options Query Options for authentication
+         */
+        authenticate(options?: QueryOptions): Promise<void>;
+        validate(options?: QueryOptions): Promise<ValidationError>;
+
+        /**
+         * Start a transaction. When using transactions, you should pass the transaction in the options argument
+         * in order for the query to happen under that transaction
+         *
+         * ```js
+         * sequelize.transaction().then(function (t) {
+         *   return User.find(..., { transaction: t}).then(function (user) {
+         *     return user.updateAttributes(..., { transaction: t});
+         *   })
+         *   .then(t.commit.bind(t))
+         *   .catch(t.rollback.bind(t));
+         * })
+         * ```
+         *
+         * A syntax for automatically committing or rolling back based on the promise chain resolution is also
+         * supported:
+         *
+         * ```js
+         * sequelize.transaction(function (t) { // Note that we use a callback rather than a promise.then()
+         *   return User.find(..., { transaction: t}).then(function (user) {
+         *     return user.updateAttributes(..., { transaction: t});
+         *   });
+         * }).then(function () {
+         *   // Commited
+         * }).catch(function (err) {
+         *   // Rolled back
+         *   console.error(err);
+         * });
+         * ```
+         *
+         * If you have [CLS](https://github.com/othiym23/node-continuation-local-storage) enabled, the transaction
+         * will automatically be passed to any query that runs witin the callback. To enable CLS, add it do your
+         * project, create a namespace and set it on the sequelize constructor:
+         *
+         * ```js
+         * var cls = require('continuation-local-storage'),
+         *     ns = cls.createNamespace('....');
+         * var Sequelize = require('sequelize');
+         * Sequelize.cls = ns;
+         * ```
+         * Note, that CLS is enabled for all sequelize instances, and all instances will share the same namespace
+         *
+         * @param options Transaction Options
+         * @param autoCallback Callback for the transaction
+         */
+        transaction(options: TransactionOptions,
+            autoCallback: (t: Transaction) => Promise<any>): Promise<any>;
+        transaction(autoCallback: (t: Transaction) => Promise<any>): Promise<any>;
+        transaction(): Promise<Transaction>;
+
+        /**
+         * Close all connections used by this sequelize instance, and free all references so the instance can be
+         * garbage collected.
+         *
+         * Normally this is done on process exit, so you only need to call this method if you are creating multiple
+         * instances, and want to garbage collect some of them.
+         */
+        close(): void;
+
+        /**
+         * Returns the database version
+         */
+        databaseVersion(): Promise<string>;
+
+    }
+
+    //
+    //  Validator
+    // ~~~~~~~~~~~
+
+    /**
+     * Validator Interface
+     */
+    interface Validator extends ValidatorJS.ValidatorStatic {
+
+        notEmpty(str: string): boolean;
+        len(str: string, min: number, max: number): boolean;
+        isUrl(str: string): boolean;
+        isIPv6(str: string): boolean;
+        isIPv4(str: string): boolean;
+        notIn(str: string, values: string[]): boolean;
+        regex(str: string, pattern: string, modifiers: string): boolean;
+        notRegex(str: string, pattern: string, modifiers: string): boolean;
+        isDecimal(str: string): boolean;
+        min(str: string, val: number): boolean;
+        max(str: string, val: number): boolean;
+        not(str: string, pattern: string, modifiers: string): boolean;
+        contains(str: string, element: string[]): boolean;
+        notContains(str: string, element: string[]): boolean;
+        is(str: string, pattern: string, modifiers: string): boolean;
+
+    }
+
+    //
+    //  Transaction
+    // ~~~~~~~~~~~~~
+    //
+    //  https://github.com/sequelize/sequelize/blob/v3.4.1/lib/transaction.js
+    //
+
+    /**
+     * The transaction object is used to identify a running transaction. It is created by calling
+     * `Sequelize.transaction()`.
+     *
+     * To run a query under a transaction, you should pass the transaction in the options object.
+     */
+    interface Transaction {
+
+        /**
+         * Possible options for row locking. Used in conjuction with `find` calls:
+         *
+         * @see TransactionStatic
+         */
+        LOCK: TransactionLock;
+
+        /**
+         * Commit the transaction
+         */
+        commit(): Promise<void>;
+
+        /**
+         * Rollback (abort) the transaction
+         */
+        rollback(): Promise<void>;
+
+    }
+
+    /**
+     * The transaction static object
+     *
+     * @see Transaction
+     */
+    interface TransactionStatic {
+
+        /**
+         * Isolations levels can be set per-transaction by passing `options.isolationLevel` to
+         * `sequelize.transaction`. Default to `REPEATABLE_READ` but you can override the default isolation level
+         * by passing
+         * `options.isolationLevel` in `new Sequelize`.
+         *
+         * The possible isolations levels to use when starting a transaction:
+         *
+         * ```js
+         * {
+         *   READ_UNCOMMITTED: "READ UNCOMMITTED",
+         *   READ_COMMITTED: "READ COMMITTED",
+         *   REPEATABLE_READ: "REPEATABLE READ",
+         *   SERIALIZABLE: "SERIALIZABLE"
+         * }
+         * ```
+         *
+         * Pass in the desired level as the first argument:
+         *
+         * ```js
+         * return sequelize.transaction({
+         *   isolationLevel: Sequelize.Transaction.SERIALIZABLE
+         * }, function (t) {
+         *
+         *  // your transactions
+         *
+         * }).then(function(result) {
+         *   // transaction has been committed. Do something after the commit if required.
+         * }).catch(function(err) {
+         *   // do something with the err.
+         * });
+         * ```
+         *
+         * @see ISOLATION_LEVELS
+         */
+        ISOLATION_LEVELS: TransactionIsolationLevels;
+
+        /**
+         * Transaction type can be set per-transaction by passing `options.type` to
+         * `sequelize.transaction`. Default to `DEFERRED` but you can override the default isolation level
+         * by passing `options.transactionType` in `new Sequelize`.
+         *
+         * The transaction types to use when starting a transaction:
+         *
+         * ```js
+         * {
+         *   DEFERRED: "DEFERRED",
+         *   IMMEDIATE: "IMMEDIATE",
+         *   EXCLUSIVE: "EXCLUSIVE"
+         * }
+         * ```
+         *
+         * Pass in the transaction type the first argument:
+         *
+         * ```js
+         * return sequelize.transaction({
+         *   type: Sequelize.Transaction.EXCLUSIVE
+         * }, function (t) {
+         *
+         *  // your transactions
+         *
+         * }).then(function(result) {
+         *   // transaction has been committed. Do something after the commit if required.
+         * }).catch(function(err) {
+         *   // do something with the err.
+         * });
+         * ```
+         *
+         * @see Sequelize.Transaction.TYPES
+         */
+        TYPES: TransactionTypes;
+
+        /**
+         * Possible options for row locking. Used in conjuction with `find` calls:
+         *
+         * ```js
+         * t1 // is a transaction
+         * t1.LOCK.UPDATE,
+         * t1.LOCK.SHARE,
+         * t1.LOCK.KEY_SHARE, // Postgres 9.3+ only
+         * t1.LOCK.NO_KEY_UPDATE // Postgres 9.3+ only
+         * ```
+         *
+         * Usage:
+         * ```js
+         * t1 // is a transaction
+         * Model.findAll({
+         *   where: ...,
+         *   transaction: t1,
+         *   lock: t1.LOCK...
+         * });
+         * ```
+         *
+         * Postgres also supports specific locks while eager loading by using OF:
+         * ```js
+         * UserModel.findAll({
+         *   where: ...,
+         *   include: [TaskModel, ...],
+         *   transaction: t1,
+         *   lock: {
+         *     level: t1.LOCK...,
+         *     of: UserModel
+         *   }
+         * });
+         * ```
+         * UserModel will be locked but TaskModel won't!
+         */
+        LOCK: TransactionLock;
+
+    }
+
+    /**
+     * Isolations levels can be set per-transaction by passing `options.isolationLevel` to `sequelize.transaction`.
+     * Default to `REPEATABLE_READ` but you can override the default isolation level by passing
+     * `options.isolationLevel` in `new Sequelize`.
+     */
+    interface TransactionIsolationLevels {
+        READ_UNCOMMITTED: string; // 'READ UNCOMMITTED'
+        READ_COMMITTED: string; // 'READ COMMITTED'
+        REPEATABLE_READ: string; // 'REPEATABLE READ'
+        SERIALIZABLE: string; // 'SERIALIZABLE'
+    }
+
+    /**
+     * Transaction type can be set per-transaction by passing `options.type` to `sequelize.transaction`.
+     * Default to `DEFERRED` but you can override the default isolation level by passing
+     * `options.transactionType` in `new Sequelize`.
+     */
+    interface TransactionTypes {
+        DEFERRED: string; // 'DEFERRED'
+        IMMEDIATE: string; // 'IMMEDIATE'
+        EXCLUSIVE: string; // 'EXCLUSIVE'
+    }
+
+    /**
+     * Possible options for row locking. Used in conjuction with `find` calls:
+     */
+    interface TransactionLock {
+        UPDATE: string; // 'UPDATE'
+        SHARE: string; // 'SHARE'
+        KEY_SHARE: string; // 'KEY SHARE'
+        NO_KEY_UPDATE: string; // 'NO KEY UPDATE'
+    }
+
+    /**
+     * Options provided when the transaction is created
+     *
+     * @see sequelize.transaction()
+     */
+    interface TransactionOptions {
+
+        autocommit?: boolean;
+
+        /**
+         *  See `Sequelize.Transaction.ISOLATION_LEVELS` for possible options
+         */
+        isolationLevel?: string;
+
+        /**
+         *  See `Sequelize.Transaction.TYPES` for possible options
+         */
+        type?: string;
+
+        /**
+         * A function that gets executed while running the query to log the sql.
+         */
+        logging?: Function;
+
+    }
+
+    //
+    //  Utils
+    // ~~~~~~~
+
+    interface fn {
+        clone: fnStatic;
+    }
+
+    interface fnStatic {
+        /**
+         * @param fn The function you want to call
+         * @param args All further arguments will be passed as arguments to the function
+         */
+        new (fn: string, ...args: any[]): fn;
+    }
+
+    interface col {
+        col: string;
+    }
+
+    interface colStatic {
+        /**
+         * Creates a object representing a column in the DB. This is often useful in conjunction with
+         * `sequelize.fn`, since raw string arguments to fn will be escaped.
+         * @see {Sequelize#fn}
+         *
+         * @param col The name of the column
+         */
+        new (col: string): col;
+    }
+
+    interface cast {
+        val: any;
+        type: string;
+    }
+
+    interface castStatic {
+        /**
+         * Creates a object representing a call to the cast function.
+         *
+         * @param val The value to cast
+         * @param type The type to cast it to
+         */
+        new (val: any, type: string): cast;
+    }
+
+    interface literal {
+        val: any;
+    }
+
+    interface literalStatic {
+        /**
+         * Creates a object representing a literal, i.e. something that will not be escaped.
+         *
+         * @param val
+         */
+        new (val: any): literal;
+    }
+
+    interface and {
+        args: any[];
+    }
+
+    interface andStatic {
+        /**
+         * An AND query
+         *
+         * @param args Each argument will be joined by AND
+         */
+        new (...args: Array<string | Object>): and;
+    }
+
+    interface or {
+        args: any[];
+    }
+
+    interface orStatic {
+        /**
+         * An OR query
+         * @see {Model#find}
+         *
+         * @param args Each argument will be joined by OR
+         */
+        new (...args: Array<string | Object>): or;
+    }
+
+    interface json {
+        conditions?: Object;
+        path?: string;
+        value?: string | number | boolean;
+    }
+
+    interface jsonStatic {
+        /**
+         * Creates an object representing nested where conditions for postgres's json data-type.
+         * @see {Model#find}
+         *
+         * @method json
+         * @param conditionsOrPath A hash containing strings/numbers or other nested hash, a string using dot
+         *     notation or a string using postgres json syntax.
+         * @param value An optional value to compare against. Produces a string of the form "<json path> =
+         *     '<value>'".
+         */
+        new (conditionsOrPath: string | Object, value?: string | number | boolean): json;
+    }
+
+    interface where {
+        attribute: Object;
+        comparator?: string;
+        logic: string | Object;
+    }
+
+    interface whereStatic {
+        /**
+         * A way of specifying attr = condition.
+         *
+         * The attr can either be an object taken from `Model.rawAttributes` (for example `Model.rawAttributes.id`
+         * or
+         * `Model.rawAttributes.name`). The attribute should be defined in your model definition. The attribute can
+         * also be an object from one of the sequelize utility functions (`sequelize.fn`, `sequelize.col` etc.)
+         *
+         * For string attributes, use the regular `{ where: { attr: something }}` syntax. If you don't want your
+         * string to be escaped, use `sequelize.literal`.
+         *
+         * @param attr The attribute, which can be either an attribute object from `Model.rawAttributes` or a
+         *     sequelize object, for example an instance of `sequelize.fn`. For simple string attributes, use the
+         *     POJO syntax
+         * @param comparator Comparator
+         * @param logic The condition. Can be both a simply type, or a further condition (`.or`, `.and`, `.literal`
+         *     etc.)
+         */
+        new (attr: Object, comparator: string, logic: string | Object): where;
+        new (attr: Object, logic: string | Object): where;
+    }
+
+    interface SequelizeLoDash extends _.LoDashStatic {
+
+        camelizeIf(str: string, condition: boolean): string;
+        underscoredIf(str: string, condition: boolean): string;
+        /**
+         * * Returns an array with some falsy values removed. The values null, "", undefined and NaN are considered
+         * falsey.
+         *
+         * @param arr Array to compact.
+         */
+        compactLite<T>(arr: T[]): T[];
+        matchesDots(dots: string | string[], value: Object): (item: Object) => boolean;
+
+    }
+
+    interface Utils {
+
+        _: SequelizeLoDash;
+
+        /**
+         * Same concept as _.merge, but don't overwrite properties that have already been assigned
+         */
+        mergeDefaults: typeof _.merge;
+
+        lowercaseFirst(str: string): string;
+        uppercaseFirst(str: string): string;
+        spliceStr(str: string, index: number, count: number, add: string): string;
+        camelize(str: string): string;
+        format(arr: any[], dialect?: string): string;
+        formatNamedParameters(sql: string, parameters: any, dialect?: string): string;
+        cloneDeep<T extends Object>(obj: T, fn?: (value: T) => any): T;
+        mapOptionFieldNames<T extends Object>(options: T, Model: Model<any, any>): T;
+        mapValueFieldNames(dataValues: Object, fields: string[], Model: Model<any, any>): Object;
+        argsArePrimaryKeys(args: any[], primaryKeys: Object): boolean;
+        canTreatArrayAsAnd(arr: any[]): boolean;
+        combineTableNames(tableName1: string, tableName2: string): string;
+        singularize(s: string): string;
+        pluralize(s: string): string;
+        removeCommentsFromFunctionString(s: string): string;
+        toDefaultValue(value: DataTypeAbstract): any;
+        toDefaultValue(value: () => DataTypeAbstract): any;
+
+        /**
+         * Determine if the default value provided exists and can be described
+         * in a db schema using the DEFAULT directive.
+         */
+        defaultValueSchemable(value: any): boolean;
+
+        removeNullValuesFromHash(hash: Object, omitNull?: boolean, options?: Object): any;
+        inherit(subClass: Object, superClass: Object): Object;
+        stack(): string;
+        sliceArgs(args: any[], begin?: number): any[];
+        now(dialect: string): Date;
+        tick(f: Function): void;
+        addTicks(s: string, tickChar?: string): string;
+        removeTicks(s: string, tickChar?: string): string;
+
+        fn: fnStatic;
+        col: colStatic;
+        cast: castStatic;
+        literal: literalStatic;
+        and: andStatic;
+        or: orStatic;
+        json: jsonStatic;
+        where: whereStatic;
+
+        validateParameter(value: Object, expectation: Object, options?: Object): boolean;
+        formatReferences(obj: Object): Object;
+        Promise: typeof Promise;
+
+    }
 
 }
+
+declare var sequelize: sequelize.SequelizeStatic;
+
+export = sequelize;
diff --git a/serve-favicon/serve-favicon.d.ts b/serve-favicon/serve-favicon.d.ts
index eadd64876b..6a4b7bc1c6 100644
--- a/serve-favicon/serve-favicon.d.ts
+++ b/serve-favicon/serve-favicon.d.ts
@@ -12,20 +12,19 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "serve-favicon" {
-    import express = require('express');
 
+import express = require('express');
+
+/**
+ * Node.js middleware for serving a favicon.
+ */
+declare function serveFavicon(path: string, options?: {
     /**
-     * Node.js middleware for serving a favicon.
-     */
-    function serveFavicon(path: string, options?: {
-        /**
-        * The cache-control max-age directive in ms, defaulting to 1 day. This can also be a string accepted by the ms module.
-        */
-        maxAge?: number;
-    }): express.RequestHandler;
-    
-    namespace serveFavicon{}
+    * The cache-control max-age directive in ms, defaulting to 1 day. This can also be a string accepted by the ms module.
+    */
+    maxAge?: number;
+}): express.RequestHandler;
 
-    export = serveFavicon;
-}
\ No newline at end of file
+declare namespace serveFavicon { }
+
+export = serveFavicon;
diff --git a/serve-index/serve-index.d.ts b/serve-index/serve-index.d.ts
index 0003733f98..c114310b37 100644
--- a/serve-index/serve-index.d.ts
+++ b/serve-index/serve-index.d.ts
@@ -5,40 +5,39 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module 'serve-index' {
-  import * as express from 'express';
-  import * as fs from 'fs';
 
-  namespace serveIndex {
+import * as express from 'express';
+import * as fs from 'fs';
+
+declare namespace serveIndex {
     interface File {
-      name: string;
-      stat: fs.Stats;
+        name: string;
+        stat: fs.Stats;
     }
 
     interface Locals {
-      directory: string;
-      displayIcons: boolean;
-      fileList: Array<File>;
-      name: string;
-      stat: fs.Stats;
-      path: string;
-      style: string;
-      viewName: string;
+        directory: string;
+        displayIcons: boolean;
+        fileList: Array<File>;
+        name: string;
+        stat: fs.Stats;
+        path: string;
+        style: string;
+        viewName: string;
     }
 
     type templateCallback = (error: Error, htmlString?: string) => void;
 
     interface Options {
-      filter?: (filename: string, index: number, files: Array<File>, dir: string) => boolean;
-      hidden?: boolean;
-      icons?: boolean;
-      stylesheet?: string;
-      template?: string | ((locals: Locals, callback: templateCallback) => void);
-      view?: string;
+        filter?: (filename: string, index: number, files: Array<File>, dir: string) => boolean;
+        hidden?: boolean;
+        icons?: boolean;
+        stylesheet?: string;
+        template?: string | ((locals: Locals, callback: templateCallback) => void);
+        view?: string;
     }
-  }
-
-  function serveIndex(path: string, options?: serveIndex.Options): express.Handler;
-
-  export = serveIndex;
 }
+
+declare function serveIndex(path: string, options?: serveIndex.Options): express.Handler;
+
+export = serveIndex;
diff --git a/serve-static/serve-static.d.ts b/serve-static/serve-static.d.ts
index d62979d96d..3ff8eb0c04 100644
--- a/serve-static/serve-static.d.ts
+++ b/serve-static/serve-static.d.ts
@@ -13,74 +13,73 @@
 /// <reference path="../express-serve-static-core/express-serve-static-core.d.ts" />
 /// <reference path="../mime/mime.d.ts" />
 
-declare module "serve-static" {
-    import * as express from "express-serve-static-core";
+
+import * as express from "express-serve-static-core";
+
+/**
+ * Create a new middleware function to serve files from within a given root directory.
+ * The file to serve will be determined by combining req.url with the provided root directory.
+ * When a file is not found, instead of sending a 404 response, this module will instead call next() to move on to the next middleware, allowing for stacking and fall-backs.
+ */
+declare function serveStatic(root: string, options?: {
+    /**
+     * Set how "dotfiles" are treated when encountered. A dotfile is a file or directory that begins with a dot (".").
+     * Note this check is done on the path itself without checking if the path actually exists on the disk.
+     * If root is specified, only the dotfiles above the root are checked (i.e. the root itself can be within a dotfile when when set to "deny").
+     * The default value is 'ignore'.
+     * 'allow' No special treatment for dotfiles
+     * 'deny' Send a 403 for any request for a dotfile
+     * 'ignore' Pretend like the dotfile does not exist and call next()
+     */
+    dotfiles?: string;
 
     /**
-     * Create a new middleware function to serve files from within a given root directory.
-     * The file to serve will be determined by combining req.url with the provided root directory.
-     * When a file is not found, instead of sending a 404 response, this module will instead call next() to move on to the next middleware, allowing for stacking and fall-backs.
+     * Enable or disable etag generation, defaults to true.
      */
-    function serveStatic(root: string, options?: {
-        /**
-         * Set how "dotfiles" are treated when encountered. A dotfile is a file or directory that begins with a dot (".").
-         * Note this check is done on the path itself without checking if the path actually exists on the disk.
-         * If root is specified, only the dotfiles above the root are checked (i.e. the root itself can be within a dotfile when when set to "deny").
-         * The default value is 'ignore'.
-         * 'allow' No special treatment for dotfiles
-         * 'deny' Send a 403 for any request for a dotfile
-         * 'ignore' Pretend like the dotfile does not exist and call next()
-         */
-        dotfiles?: string;
+    etag?: boolean;
 
-        /**
-         * Enable or disable etag generation, defaults to true.
-         */
-        etag?: boolean;
+    /**
+     * Set file extension fallbacks. When set, if a file is not found, the given extensions will be added to the file name and search for.
+     * The first that exists will be served. Example: ['html', 'htm'].
+     * The default value is false.
+     */
+    extensions?: string[];
 
-        /**
-         * Set file extension fallbacks. When set, if a file is not found, the given extensions will be added to the file name and search for.
-         * The first that exists will be served. Example: ['html', 'htm'].
-         * The default value is false.
-         */
-        extensions?: string[];
+    /**
+     * By default this module will send "index.html" files in response to a request on a directory.
+     * To disable this set false or to supply a new index pass a string or an array in preferred order.
+     */
+    index?: boolean | string | string[];
 
-        /**
-         * By default this module will send "index.html" files in response to a request on a directory.
-         * To disable this set false or to supply a new index pass a string or an array in preferred order.
-         */
-        index?: boolean|string|string[];
+    /**
+     * Enable or disable Last-Modified header, defaults to true. Uses the file system's last modified value.
+     */
+    lastModified?: boolean;
 
-        /**
-         * Enable or disable Last-Modified header, defaults to true. Uses the file system's last modified value.
-         */
-        lastModified?: boolean;
+    /**
+     * Provide a max-age in milliseconds for http caching, defaults to 0. This can also be a string accepted by the ms module.
+     */
+    maxAge?: number | string;
 
-        /**
-         * Provide a max-age in milliseconds for http caching, defaults to 0. This can also be a string accepted by the ms module.
-         */
-        maxAge?: number|string;
+    /**
+     * Redirect to trailing "/" when the pathname is a dir. Defaults to true.
+     */
+    redirect?: boolean;
 
-        /**
-         * Redirect to trailing "/" when the pathname is a dir. Defaults to true.
-         */
-        redirect?: boolean;
+    /**
+     * Function to set custom headers on response. Alterations to the headers need to occur synchronously.
+     * The function is called as fn(res, path, stat), where the arguments are:
+     * res the response object
+     * path the file path that is being sent
+     * stat the stat object of the file that is being sent
+     */
+    setHeaders?: (res: express.Response, path: string, stat: any) => any;
+}): express.Handler;
 
-        /**
-         * Function to set custom headers on response. Alterations to the headers need to occur synchronously.
-         * The function is called as fn(res, path, stat), where the arguments are:
-         * res the response object
-         * path the file path that is being sent
-         * stat the stat object of the file that is being sent
-         */
-        setHeaders?: (res: express.Response, path: string, stat: any) => any;
-    }): express.Handler;
+import * as m from "mime";
 
-    import * as m from "mime";
-
-    namespace serveStatic {
-        var mime: typeof m;
-    }
-
-    export = serveStatic;
+declare namespace serveStatic {
+    var mime: typeof m;
 }
+
+export = serveStatic;
diff --git a/shelljs/shelljs.d.ts b/shelljs/shelljs.d.ts
index 949f723ff9..6f7853089a 100644
--- a/shelljs/shelljs.d.ts
+++ b/shelljs/shelljs.d.ts
@@ -6,531 +6,526 @@
 
 ///<reference path="../node/node.d.ts"/>
 
-declare module "shelljs"
-{
-    import child = require("child_process");
 
-    /**
-     * Changes to directory dir for the duration of the script
-     * @param {string} dir Directory to change in.
-     */
-    export function cd(dir: string): void;
-
-    /**
-     * Returns the current directory.
-     * @return {string} The current directory.
-     */
-    export function pwd(): string;
-
-    /**
-     * Returns array of files in the given path, or in current directory if no path provided.
-     * @param  {string[]} ...paths Paths to search.
-     * @return {string[]}          An array of files in the given path(s).
-     */
-    export function ls(...paths: string[]): string[];
-
-    /**
-     * Returns array of files in the given path, or in current directory if no path provided.
-     * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
-     * @param  {string[]} ...paths Paths to search.
-     * @return {string[]}          An array of files in the given path(s).
-     */
-    export function ls(options: string, ...paths: string[]): string[];
-
-    /**
-     * Returns array of files in the given path, or in current directory if no path provided.
-     * @param  {string[]} paths Paths to search.
-     * @return {string[]}       An array of files in the given path(s).
-     */
-    export function ls(paths: string[]): string[];
-
-    /**
-     * Returns array of files in the given path, or in current directory if no path provided.
-     * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
-     * @param  {string[]} paths    Paths to search.
-     * @return {string[]}          An array of files in the given path(s).
-     */
-    export function ls(options: string, paths: string[]): string[];
-
-    /**
-     * Returns array of all files (however deep) in the given paths.
-     * @param {string[]} ...path   The path(s) to search.
-     * @return {string[]}          An array of all files (however deep) in the given path(s).
-     */
-    export function find(...path: string[]): string[];
-
-    /**
-     * Returns array of all files (however deep) in the given paths.
-     * @param {string[]} path   The path(s) to search.
-     * @return {string[]}       An array of all files (however deep) in the given path(s).
-     */
-    export function find(path: string[]): string[];
-
-    /**
-     * Copies files. The wildcard * is accepted.
-     * @param {string} source  The source.
-     * @param {string}   dest  The destination.
-     */
-    export function cp(source: string, dest: string): void;
-
-    /**
-     * Copies files. The wildcard * is accepted.
-     * @param {string[]} source  The source.
-     * @param {string}   dest    The destination.
-     */
-    export function cp(source: string[], dest: string): void;
-
-    /**
-     * Copies files. The wildcard * is accepted.
-     * @param {string}   options Available options: -f (force), -r, -R (recursive)
-     * @param {strin]}   source  The source.
-     * @param {string}   dest    The destination.
-     */
-    export function cp(options: string, source: string, dest: string): void;
-
-    /**
-     * Copies files. The wildcard * is accepted.
-     * @param {string}   options Available options: -f (force), -r, -R (recursive)
-     * @param {string[]} source  The source.
-     * @param {string}   dest    The destination.
-     */
-    export function cp(options: string, source: string[], dest: string): void;
-
-    /**
-     * Removes files. The wildcard * is accepted.
-     * @param {string[]} ...files Files to remove.
-     */
-    export function rm(...files: string[]): void;
-
-    /**
-     * Removes files. The wildcard * is accepted.
-     * @param {string[]} files Files to remove.
-     */
-    export function rm(files: string[]): void;
-
-    /**
-     * Removes files. The wildcard * is accepted.
-     * @param {string}   options  Available options: -f (force), -r, -R (recursive)
-     * @param {string[]} ...files Files to remove.
-     */
-    export function rm(options: string, ...files: string[]): void;
-
-    /**
-     * Removes files. The wildcard * is accepted.
-     * @param {string}   options  Available options: -f (force), -r, -R (recursive)
-     * @param {string[]} ...files Files to remove.
-     */
-    export function rm(options: string, files: string[]): void;
-
-    /**
-     * Moves files. The wildcard * is accepted.
-     * @param {string} source The source.
-     * @param {string} dest   The destination.
-     */
-    export function mv(source: string, dest: string): void;
-    
-    /**
-     * Moves files. The wildcard * is accepted.
-     * @param {string[]} source The source.
-     * @param {string}   dest   The destination.
-     */
-    export function mv(source: string[], dest: string): void;
-
-    /**
-     * Creates directories.
-     * @param {string[]} ...dir Directories to create.
-     */
-    export function mkdir(...dir: string[]): void;
-
-    /**
-     * Creates directories.
-     * @param {string[]} dir Directories to create.
-     */
-    export function mkdir(dir: string[]): void;
-
-    /**
-     * Creates directories.
-     * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
-     * @param {string[]} ...dir  The directories to create.
-     */
-    export function mkdir(options: string, ...dir: string[]): void;
-
-    /**
-     * Creates directories.
-     * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
-     * @param {string[]} dir     The directories to create.
-     */
-    export function mkdir(options: string, dir: string[]): void;
-
-    /**
-     * Evaluates expression using the available primaries and returns corresponding value.
-     * @param  {string}  option '-b': true if path is a block device; '-c': true if path is a character device; '-d': true if path is a directory; '-e': true if path exists; '-f': true if path is a regular file; '-L': true if path is a symboilc link; '-p': true if path is a pipe (FIFO); '-S': true if path is a socket
-     * @param  {string}  path   The path.
-     * @return {boolean}        See option parameter.
-     */
-    export function test(option: string, path: string): boolean;
-
-    /**
-     * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
-     * @param  {string[]} ...files Files to use.
-     * @return {string}            A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
-     */
-    export function cat(...files: string[]): string;
-
-    /**
-     * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
-     * @param  {string[]} files Files to use.
-     * @return {string}         A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
-     */
-    export function cat(files: string[]): string;
-
-
-    // Does not work yet.
-    export interface String
-    {
-        /**
-         * Analogous to the redirection operator > in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc). Like Unix redirections, to() will overwrite any existing file!
-         * @param {string} file The file to use.
-         */
-        to(file: string): void;
-
-        /**
-         * Analogous to the redirect-and-append operator >> in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc).
-         * @param {string} file The file to append to.
-         */
-        toEnd(file: string): void;
-    }
-
-    /**
-     * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
-     * @param  {RegExp} searchRegex The regular expression to use for search.
-     * @param  {string} replacement The replacement.
-     * @param  {string} file        The file to process.
-     * @return {string}             The new string after replacement.
-     */
-    export function sed(searchRegex: RegExp, replacement: string, file: string): string;
-
-    /**
-     * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
-     * @param  {string} searchRegex The regular expression to use for search.
-     * @param  {string} replacement The replacement.
-     * @param  {string} file        The file to process.
-     * @return {string}             The new string after replacement.
-     */
-    export function sed(searchRegex: string, replacement: string, file: string): string;
-
-    /**
-     * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
-     * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
-     * @param  {RegExp} searchRegex The regular expression to use for search.
-     * @param  {string} replacement The replacement.
-     * @param  {string} file        The file to process.
-     * @return {string}             The new string after replacement.
-     */
-    export function sed(options: string, searchRegex: RegExp, replacement: string, file: string): string;
-
-    /**
-     * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
-     * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
-     * @param  {string} searchRegex The regular expression to use for search.
-     * @param  {string} replacement The replacement.
-     * @param  {string} file        The file to process.
-     * @return {string}             The new string after replacement.
-     */
-    export function sed(options: string, searchRegex: string, replacement: string, file: string): string;
-
-    /**
-     * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
-     * @param  {RegExp}   regex_filter The regular expression to use.
-     * @param  {string[]} ...files     The files to process.
-     * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
-     */
-    export function grep(regex_filter: RegExp, ...files: string[]): string;
-
-    /**
-     * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
-     * @param  {RegExp}   regex_filter The regular expression to use.
-     * @param  {string[]} ...files     The files to process.
-     * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
-     */
-    export function grep(regex_filter: RegExp, files: string[]): string;
-
-    /**
-     * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
-     * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
-     * @param  {string}   regex_filter The regular expression to use.
-     * @param  {string[]} ...files     The files to process.
-     * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
-     */
-    export function grep(options: string, regex_filter: string, ...files: string[]): string;
-
-    /**
-     * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
-     * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
-     * @param  {string}   regex_filter The regular expression to use.
-     * @param  {string[]} files        The files to process.
-     * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
-     */
-    export function grep(options: string, regex_filter: string, files: string[]): string;
-
-    /**
-     * Searches for command in the system's PATH. On Windows looks for .exe, .cmd, and .bat extensions.
-     * @param  {string} command The command to search for.
-     * @return {string}         Returns string containing the absolute path to the command.
-     */
-    export function which(command: string): string;
-
-    /**
-     * Prints string to stdout, and returns string with additional utility methods like .to().
-     * @param  {string[]} ...text The text to print.
-     * @return {string}           Returns the string that was passed as argument.
-     */
-    export function echo(...text: string[]): string;
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function pushd(dir: "+N"): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function pushd(dir: "-N"): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {string}     dir Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
-     * @return {string[]}       Returns an array of paths in the stack.
-     */
-    export function pushd(dir: string): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
-     * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function pushd(options: string, dir: "+N"): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
-     * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function pushd(options: string, dir: "-N"): string[];
-
-    /**
-     * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
-     * @param  {string}   dir     Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
-     * @return {string[]}         Returns an array of paths in the stack.
-     */
-    export function pushd(options: string, dir: string): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {"+N"}     dir Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function popd(dir: "+N"): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function popd(): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {"-N"}     dir Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
-     * @return {string[]}     Returns an array of paths in the stack.
-     */
-    export function popd(dir: "-N"): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {string}     dir You can only use -N and +N.
-     * @return {string[]}       Returns an array of paths in the stack.
-     */
-    export function popd(dir: string): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
-     * @param  {"+N"}     dir     Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
-     * @return {string[]}         Returns an array of paths in the stack.
-     */
-    export function popd(options: string, dir: "+N"): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
-     * @param  {"-N"}     dir     Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
-     * @return {string[]}         Returns an array of paths in the stack.
-     */
-    export function popd(options: string, dir: "-N"): string[];
-
-    /**
-     * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
-     * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
-     * @param  {string}   dir     You can only use -N and +N.
-     * @return {string[]}         Returns an array of paths in the stack.
-     */
-    export function popd(options: string, dir: string): string[];
-
-    /**
-     * Clears the directory stack by deleting all of the elements.
-     * @param  {"-c"}     options Clears the directory stack by deleting all of the elements.
-     * @return {string[]}         Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     */
-    export function dirs(options: "-c"): string[];
-
-    /**
-     * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     * @param  {"+N"}   options Displays the Nth directory (counting from the left of the list printed by dirs when invoked without options), starting with zero.
-     * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     */
-    export function dirs(options: "+N"): string;
-
-    /**
-     * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     * @param  {"-N"}   options Displays the Nth directory (counting from the right of the list printed by dirs when invoked without options), starting with zero.
-     * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     */
-    export function dirs(options: "-N"): string;
-
-    /**
-     * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     * @param  {string} options Available options: -c, -N, +N. You can only use those.
-     * @return {any}            Returns an array of paths in the stack, or a single path if +N or -N was specified.
-     */
-    export function dirs(options: string): any;
-
-    /**
-     * Links source to dest. Use -f to force the link, should dest already exist.
-     * @param {string} source The source.
-     * @param {string} dest   The destination.
-     */
-    export function ln(source: string, dest: string): void;
-
-    /**
-     * Links source to dest. Use -f to force the link, should dest already exist.
-     * @param {string} options Available options: s (symlink), f (force)
-     * @param {string} source The source.
-     * @param {string} dest   The destination.
-     */
-    export function ln(options: string, source: string, dest: string): void;
-
-    /**
-     * Exits the current process with the given exit code.
-     * @param {number} code The exit code.
-     */
-    export function exit(code: number): void;
-
-    /**
-     * Object containing environment variables (both getter and setter). Shortcut to process.env.
-     */
-    export var env: { [key: string]: string };
-    
-    /**
-     * Executes the given command synchronously.
-     * @param  {string}                 command The command to execute.
-     * @return {ExecOutputReturnValue}          Returns an object containing the return code and output as string.
-     */
-    export function exec(command: string): ExecOutputReturnValue;
-    /**
-     * Executes the given command synchronously.
-     * @param  {string}                                     command The command to execute.
-     * @param  {ExecOptions}                                options Silence and synchronous options.
-     * @return {ExecOutputReturnValue | child.ChildProcess}         Returns an object containing the return code and output as string, or if {async:true} was passed, a ChildProcess.
-     */
-    export function exec(command: string, options: ExecOptions): ExecOutputReturnValue | child.ChildProcess;
-    /**
-     * Executes the given command synchronously.
-     * @param  {string}          command  The command to execute.
-     * @param  {ExecOptions}     options  Silence and synchronous options.
-     * @param  {ExecCallback}    callback Receives code and output asynchronously.
-     */
-    export function exec(command: string, options: ExecOptions, callback: ExecCallback): child.ChildProcess;
-    /**
-     * Executes the given command synchronously.
-     * @param  {string}          command  The command to execute.
-     * @param  {ExecCallback}    callback Receives code and output asynchronously.
-     */
-    export function exec(command: string, callback: ExecCallback): child.ChildProcess;
-
-    export interface ExecCallback {
-        (code: number, output: string): any;
-    }
-
-    export interface ExecOptions {
-        silent?: boolean;
-        async?: boolean;
-    }
-
-    export interface ExecOutputReturnValue
-    {
-        code: number;
-        output: string;
-    }
-
-    /**
-     * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
-     * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
-     * - There is no "quiet" option since default behavior is to run silent.
-     * @param {number} octalMode The access mode. Octal.
-     * @param {string} file      The file to use.
-     */
-    export function chmod(octalMode: number, file: string): void;
-
-    /**
-     * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
-     * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
-     * - There is no "quiet" option since default behavior is to run silent.
-     * @param {string} mode      The access mode. Can be an octal string or a symbolic mode string.
-     * @param {string} file      The file to use.
-     */
-    export function chmod(mode: string, file: string): void;
-
-    // Non-Unix commands
-
-    /**
-     * Searches and returns string containing a writeable, platform-dependent temporary directory. Follows Python's tempfile algorithm.
-     * @return {string} The temp file path.
-     */
-    export function tempdir(): string;
-
-    /**
-     * Tests if error occurred in the last command.
-     * @return {string} Returns null if no error occurred, otherwise returns string explaining the error
-     */
-    export function error(): string;
-
-    // Configuration
-
-    interface ShellConfig
-    {
-        /**
-         * Suppresses all command output if true, except for echo() calls. Default is false.
-         * @type {boolean}
-         */
-        silent: boolean;
-
-        /**
-         * If true the script will die on errors. Default is false.
-         * @type {boolean}
-         */
-        fatal: boolean;
-    }
-
-    /**
-     * The shelljs configuration.
-     * @type {ShellConfig}
-     */
-    export var config: ShellConfig;
+import child = require("child_process");
+
+/**
+ * Changes to directory dir for the duration of the script
+ * @param {string} dir Directory to change in.
+ */
+declare export function cd(dir: string): void;
+
+/**
+ * Returns the current directory.
+ * @return {string} The current directory.
+ */
+declare export function pwd(): string;
+
+/**
+ * Returns array of files in the given path, or in current directory if no path provided.
+ * @param  {string[]} ...paths Paths to search.
+ * @return {string[]}          An array of files in the given path(s).
+ */
+declare export function ls(...paths: string[]): string[];
+
+/**
+ * Returns array of files in the given path, or in current directory if no path provided.
+ * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
+ * @param  {string[]} ...paths Paths to search.
+ * @return {string[]}          An array of files in the given path(s).
+ */
+declare export function ls(options: string, ...paths: string[]): string[];
+
+/**
+ * Returns array of files in the given path, or in current directory if no path provided.
+ * @param  {string[]} paths Paths to search.
+ * @return {string[]}       An array of files in the given path(s).
+ */
+declare export function ls(paths: string[]): string[];
+
+/**
+ * Returns array of files in the given path, or in current directory if no path provided.
+ * @param  {string}   options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
+ * @param  {string[]} paths    Paths to search.
+ * @return {string[]}          An array of files in the given path(s).
+ */
+declare export function ls(options: string, paths: string[]): string[];
+
+/**
+ * Returns array of all files (however deep) in the given paths.
+ * @param {string[]} ...path   The path(s) to search.
+ * @return {string[]}          An array of all files (however deep) in the given path(s).
+ */
+declare export function find(...path: string[]): string[];
+
+/**
+ * Returns array of all files (however deep) in the given paths.
+ * @param {string[]} path   The path(s) to search.
+ * @return {string[]}       An array of all files (however deep) in the given path(s).
+ */
+declare export function find(path: string[]): string[];
+
+/**
+ * Copies files. The wildcard * is accepted.
+ * @param {string} source  The source.
+ * @param {string}   dest  The destination.
+ */
+declare export function cp(source: string, dest: string): void;
+
+/**
+ * Copies files. The wildcard * is accepted.
+ * @param {string[]} source  The source.
+ * @param {string}   dest    The destination.
+ */
+declare export function cp(source: string[], dest: string): void;
+
+/**
+ * Copies files. The wildcard * is accepted.
+ * @param {string}   options Available options: -f (force), -r, -R (recursive)
+ * @param {strin]}   source  The source.
+ * @param {string}   dest    The destination.
+ */
+declare export function cp(options: string, source: string, dest: string): void;
+
+/**
+ * Copies files. The wildcard * is accepted.
+ * @param {string}   options Available options: -f (force), -r, -R (recursive)
+ * @param {string[]} source  The source.
+ * @param {string}   dest    The destination.
+ */
+declare export function cp(options: string, source: string[], dest: string): void;
+
+/**
+ * Removes files. The wildcard * is accepted.
+ * @param {string[]} ...files Files to remove.
+ */
+declare export function rm(...files: string[]): void;
+
+/**
+ * Removes files. The wildcard * is accepted.
+ * @param {string[]} files Files to remove.
+ */
+declare export function rm(files: string[]): void;
+
+/**
+ * Removes files. The wildcard * is accepted.
+ * @param {string}   options  Available options: -f (force), -r, -R (recursive)
+ * @param {string[]} ...files Files to remove.
+ */
+declare export function rm(options: string, ...files: string[]): void;
+
+/**
+ * Removes files. The wildcard * is accepted.
+ * @param {string}   options  Available options: -f (force), -r, -R (recursive)
+ * @param {string[]} ...files Files to remove.
+ */
+declare export function rm(options: string, files: string[]): void;
+
+/**
+ * Moves files. The wildcard * is accepted.
+ * @param {string} source The source.
+ * @param {string} dest   The destination.
+ */
+declare export function mv(source: string, dest: string): void;
+
+/**
+ * Moves files. The wildcard * is accepted.
+ * @param {string[]} source The source.
+ * @param {string}   dest   The destination.
+ */
+declare export function mv(source: string[], dest: string): void;
+
+/**
+ * Creates directories.
+ * @param {string[]} ...dir Directories to create.
+ */
+declare export function mkdir(...dir: string[]): void;
+
+/**
+ * Creates directories.
+ * @param {string[]} dir Directories to create.
+ */
+declare export function mkdir(dir: string[]): void;
+
+/**
+ * Creates directories.
+ * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
+ * @param {string[]} ...dir  The directories to create.
+ */
+declare export function mkdir(options: string, ...dir: string[]): void;
+
+/**
+ * Creates directories.
+ * @param {string}   options Available options: p (full paths, will create intermediate dirs if necessary)
+ * @param {string[]} dir     The directories to create.
+ */
+declare export function mkdir(options: string, dir: string[]): void;
+
+/**
+ * Evaluates expression using the available primaries and returns corresponding value.
+ * @param  {string}  option '-b': true if path is a block device; '-c': true if path is a character device; '-d': true if path is a directory; '-e': true if path exists; '-f': true if path is a regular file; '-L': true if path is a symboilc link; '-p': true if path is a pipe (FIFO); '-S': true if path is a socket
+ * @param  {string}  path   The path.
+ * @return {boolean}        See option parameter.
+ */
+declare export function test(option: string, path: string): boolean;
+
+/**
+ * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
+ * @param  {string[]} ...files Files to use.
+ * @return {string}            A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
+ */
+declare export function cat(...files: string[]): string;
+
+/**
+ * Returns a string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file). Wildcard * accepted.
+ * @param  {string[]} files Files to use.
+ * @return {string}         A string containing the given file, or a concatenated string containing the files if more than one file is given (a new line character is introduced between each file).
+ */
+declare export function cat(files: string[]): string;
+
+
+// Does not work yet.
+export interface String {
+    /**
+     * Analogous to the redirection operator > in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc). Like Unix redirections, to() will overwrite any existing file!
+     * @param {string} file The file to use.
+     */
+    to(file: string): void;
+
+    /**
+     * Analogous to the redirect-and-append operator >> in Unix, but works with JavaScript strings (such as those returned by cat, grep, etc).
+     * @param {string} file The file to append to.
+     */
+    toEnd(file: string): void;
 }
+
+/**
+ * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
+ * @param  {RegExp} searchRegex The regular expression to use for search.
+ * @param  {string} replacement The replacement.
+ * @param  {string} file        The file to process.
+ * @return {string}             The new string after replacement.
+ */
+declare export function sed(searchRegex: RegExp, replacement: string, file: string): string;
+
+/**
+ * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
+ * @param  {string} searchRegex The regular expression to use for search.
+ * @param  {string} replacement The replacement.
+ * @param  {string} file        The file to process.
+ * @return {string}             The new string after replacement.
+ */
+declare export function sed(searchRegex: string, replacement: string, file: string): string;
+
+/**
+ * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
+ * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
+ * @param  {RegExp} searchRegex The regular expression to use for search.
+ * @param  {string} replacement The replacement.
+ * @param  {string} file        The file to process.
+ * @return {string}             The new string after replacement.
+ */
+declare export function sed(options: string, searchRegex: RegExp, replacement: string, file: string): string;
+
+/**
+ * Reads an input string from file and performs a JavaScript replace() on the input using the given search regex and replacement string or function. Returns the new string after replacement.
+ * @param  {string} options     Available options: -i (Replace contents of 'file' in-place. Note that no backups will be created!)
+ * @param  {string} searchRegex The regular expression to use for search.
+ * @param  {string} replacement The replacement.
+ * @param  {string} file        The file to process.
+ * @return {string}             The new string after replacement.
+ */
+declare export function sed(options: string, searchRegex: string, replacement: string, file: string): string;
+
+/**
+ * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
+ * @param  {RegExp}   regex_filter The regular expression to use.
+ * @param  {string[]} ...files     The files to process.
+ * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ */
+declare export function grep(regex_filter: RegExp, ...files: string[]): string;
+
+/**
+ * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
+ * @param  {RegExp}   regex_filter The regular expression to use.
+ * @param  {string[]} ...files     The files to process.
+ * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ */
+declare export function grep(regex_filter: RegExp, files: string[]): string;
+
+/**
+ * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
+ * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
+ * @param  {string}   regex_filter The regular expression to use.
+ * @param  {string[]} ...files     The files to process.
+ * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ */
+declare export function grep(options: string, regex_filter: string, ...files: string[]): string;
+
+/**
+ * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
+ * @param  {string}   options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
+ * @param  {string}   regex_filter The regular expression to use.
+ * @param  {string[]} files        The files to process.
+ * @return {string}                Returns a string containing all lines of the file that match the given regex_filter.
+ */
+declare export function grep(options: string, regex_filter: string, files: string[]): string;
+
+/**
+ * Searches for command in the system's PATH. On Windows looks for .exe, .cmd, and .bat extensions.
+ * @param  {string} command The command to search for.
+ * @return {string}         Returns string containing the absolute path to the command.
+ */
+declare export function which(command: string): string;
+
+/**
+ * Prints string to stdout, and returns string with additional utility methods like .to().
+ * @param  {string[]} ...text The text to print.
+ * @return {string}           Returns the string that was passed as argument.
+ */
+declare export function echo(...text: string[]): string;
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+declare export function pushd(dir: "+N"): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+declare export function pushd(dir: "-N"): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {string}     dir Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
+ * @return {string[]}       Returns an array of paths in the stack.
+ */
+declare export function pushd(dir: string): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param  {"+N"}     dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+declare export function pushd(options: string, dir: "+N"): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param  {"-N"}     dir Brings the Nth directory (counting from the right of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+declare export function pushd(options: string, dir: "-N"): string[];
+
+/**
+ * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param  {string}   dir     Makes the current working directory be the top of the stack, and then executes the equivalent of cd dir.
+ * @return {string[]}         Returns an array of paths in the stack.
+ */
+declare export function pushd(options: string, dir: string): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {"+N"}     dir Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+declare export function popd(dir: "+N"): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+declare export function popd(): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {"-N"}     dir Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
+ * @return {string[]}     Returns an array of paths in the stack.
+ */
+declare export function popd(dir: "-N"): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {string}     dir You can only use -N and +N.
+ * @return {string[]}       Returns an array of paths in the stack.
+ */
+declare export function popd(dir: string): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param  {"+N"}     dir     Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
+ * @return {string[]}         Returns an array of paths in the stack.
+ */
+declare export function popd(options: string, dir: "+N"): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param  {"-N"}     dir     Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
+ * @return {string[]}         Returns an array of paths in the stack.
+ */
+declare export function popd(options: string, dir: "-N"): string[];
+
+/**
+ * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
+ * @param  {string}   options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param  {string}   dir     You can only use -N and +N.
+ * @return {string[]}         Returns an array of paths in the stack.
+ */
+declare export function popd(options: string, dir: string): string[];
+
+/**
+ * Clears the directory stack by deleting all of the elements.
+ * @param  {"-c"}     options Clears the directory stack by deleting all of the elements.
+ * @return {string[]}         Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ */
+declare export function dirs(options: "-c"): string[];
+
+/**
+ * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param  {"+N"}   options Displays the Nth directory (counting from the left of the list printed by dirs when invoked without options), starting with zero.
+ * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ */
+declare export function dirs(options: "+N"): string;
+
+/**
+ * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param  {"-N"}   options Displays the Nth directory (counting from the right of the list printed by dirs when invoked without options), starting with zero.
+ * @return {string[]}       Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ */
+declare export function dirs(options: "-N"): string;
+
+/**
+ * Display the list of currently remembered directories. Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ * @param  {string} options Available options: -c, -N, +N. You can only use those.
+ * @return {any}            Returns an array of paths in the stack, or a single path if +N or -N was specified.
+ */
+declare export function dirs(options: string): any;
+
+/**
+ * Links source to dest. Use -f to force the link, should dest already exist.
+ * @param {string} source The source.
+ * @param {string} dest   The destination.
+ */
+declare export function ln(source: string, dest: string): void;
+
+/**
+ * Links source to dest. Use -f to force the link, should dest already exist.
+ * @param {string} options Available options: s (symlink), f (force)
+ * @param {string} source The source.
+ * @param {string} dest   The destination.
+ */
+declare export function ln(options: string, source: string, dest: string): void;
+
+/**
+ * Exits the current process with the given exit code.
+ * @param {number} code The exit code.
+ */
+declare export function exit(code: number): void;
+
+/**
+ * Object containing environment variables (both getter and setter). Shortcut to process.env.
+ */
+declare export var env: { [key: string]: string };
+
+/**
+ * Executes the given command synchronously.
+ * @param  {string}                 command The command to execute.
+ * @return {ExecOutputReturnValue}          Returns an object containing the return code and output as string.
+ */
+declare export function exec(command: string): ExecOutputReturnValue;
+/**
+ * Executes the given command synchronously.
+ * @param  {string}                                     command The command to execute.
+ * @param  {ExecOptions}                                options Silence and synchronous options.
+ * @return {ExecOutputReturnValue | child.ChildProcess}         Returns an object containing the return code and output as string, or if {async:true} was passed, a ChildProcess.
+ */
+declare export function exec(command: string, options: ExecOptions): ExecOutputReturnValue | child.ChildProcess;
+/**
+ * Executes the given command synchronously.
+ * @param  {string}          command  The command to execute.
+ * @param  {ExecOptions}     options  Silence and synchronous options.
+ * @param  {ExecCallback}    callback Receives code and output asynchronously.
+ */
+declare export function exec(command: string, options: ExecOptions, callback: ExecCallback): child.ChildProcess;
+/**
+ * Executes the given command synchronously.
+ * @param  {string}          command  The command to execute.
+ * @param  {ExecCallback}    callback Receives code and output asynchronously.
+ */
+declare export function exec(command: string, callback: ExecCallback): child.ChildProcess;
+
+export interface ExecCallback {
+    (code: number, output: string): any;
+}
+
+export interface ExecOptions {
+    silent?: boolean;
+    async?: boolean;
+}
+
+export interface ExecOutputReturnValue {
+    code: number;
+    output: string;
+}
+
+/**
+ * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
+ * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
+ * - There is no "quiet" option since default behavior is to run silent.
+ * @param {number} octalMode The access mode. Octal.
+ * @param {string} file      The file to use.
+ */
+declare export function chmod(octalMode: number, file: string): void;
+
+/**
+ * Alters the permissions of a file or directory by either specifying the absolute permissions in octal form or expressing the changes in symbols. This command tries to mimic the POSIX behavior as much as possible. Notable exceptions:
+ * - In symbolic modes, 'a-r' and '-r' are identical. No consideration is given to the umask.
+ * - There is no "quiet" option since default behavior is to run silent.
+ * @param {string} mode      The access mode. Can be an octal string or a symbolic mode string.
+ * @param {string} file      The file to use.
+ */
+declare export function chmod(mode: string, file: string): void;
+
+// Non-Unix commands
+
+/**
+ * Searches and returns string containing a writeable, platform-dependent temporary directory. Follows Python's tempfile algorithm.
+ * @return {string} The temp file path.
+ */
+declare export function tempdir(): string;
+
+/**
+ * Tests if error occurred in the last command.
+ * @return {string} Returns null if no error occurred, otherwise returns string explaining the error
+ */
+declare export function error(): string;
+
+// Configuration
+
+interface ShellConfig {
+    /**
+     * Suppresses all command output if true, except for echo() calls. Default is false.
+     * @type {boolean}
+     */
+    silent: boolean;
+
+    /**
+     * If true the script will die on errors. Default is false.
+     * @type {boolean}
+     */
+    fatal: boolean;
+}
+
+/**
+ * The shelljs configuration.
+ * @type {ShellConfig}
+ */
+declare export var config: ShellConfig;
diff --git a/shortid/shortid.d.ts b/shortid/shortid.d.ts
index bc295f7628..89c67760d6 100644
--- a/shortid/shortid.d.ts
+++ b/shortid/shortid.d.ts
@@ -3,10 +3,9 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "shortid" {
-	export function generate(): string;
-	export function characters(string: string): string;
-	export function isValid(id: any): boolean;
-	export function worker(integer: number): void;
-	export function seed(float: number): void;
-}
+
+declare export function generate(): string;
+declare export function characters(string: string): string;
+declare export function isValid(id: any): boolean;
+declare export function worker(integer: number): void;
+declare export function seed(float: number): void;
diff --git a/shuffle-array/shuffle-array.d.ts b/shuffle-array/shuffle-array.d.ts
index 880396c4a0..710607bf51 100644
--- a/shuffle-array/shuffle-array.d.ts
+++ b/shuffle-array/shuffle-array.d.ts
@@ -3,40 +3,38 @@
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "shuffle-array" {
-	/**
-	 * copy - Sets if should return a shuffled copy of the given array. By default it's a falsy value.
-	 * rng - Specifies a custom random number generator.
-	 */
-	interface ShuffleOption {
-		copy?: boolean;
-		rng?: () => number;
-	}
-	/**
-	 * picks - Specifies how many random elements you want to pick. By default it picks 1.
-	 * rng - Specifies a custom random number generator.
-	 */
-	interface PickOption {
-		picks?: number;
-		rng?: () => number;
-	}
-	interface ShuffleArray {
-		/**
-		 * Randomizes the order of the elements in a given array.
-		 *
-		 * arr - The given array.
-		 * options - Optional configuration options.
-		 */
-		<T>(arr: T[], options?: ShuffleOption): T[];
-		/**
-		 * Pick one or more random elements from the given array.
-		 *
-		 * arr - The given array.
-		 * options - Optional configuration options.
-		 */
-		pick<T>(arr: T[], options?: Object): T[];
-	}
-	var shuffle: ShuffleArray;
-	export = shuffle;
-}
 
+/**
+ * copy - Sets if should return a shuffled copy of the given array. By default it's a falsy value.
+ * rng - Specifies a custom random number generator.
+ */
+interface ShuffleOption {
+    copy?: boolean;
+    rng?: () => number;
+}
+/**
+ * picks - Specifies how many random elements you want to pick. By default it picks 1.
+ * rng - Specifies a custom random number generator.
+ */
+interface PickOption {
+    picks?: number;
+    rng?: () => number;
+}
+interface ShuffleArray {
+    /**
+     * Randomizes the order of the elements in a given array.
+     *
+     * arr - The given array.
+     * options - Optional configuration options.
+     */
+    <T>(arr: T[], options?: ShuffleOption): T[];
+    /**
+     * Pick one or more random elements from the given array.
+     *
+     * arr - The given array.
+     * options - Optional configuration options.
+     */
+    pick<T>(arr: T[], options?: Object): T[];
+}
+declare var shuffle: ShuffleArray;
+export = shuffle;
diff --git a/simple-cw-node/simple-cw-node.d.ts b/simple-cw-node/simple-cw-node.d.ts
index 5634ac5a1f..1a9c6f3514 100644
--- a/simple-cw-node/simple-cw-node.d.ts
+++ b/simple-cw-node/simple-cw-node.d.ts
@@ -5,82 +5,81 @@
 
 /// <reference path="../superagent/superagent.d.ts" />
 
-declare module "simple-cw-node" {
-	import superagent = require("superagent");
-	// TODO 1. update superagent with generics
-	// TODO 2. create underscore.deffered .d.ts file
-	// TODO 3. refactor & improve specialized parameter methods
 
-	// Merged declaration, ChatWork is both a callable function and a namespace
-	function ChatWork():ChatWork.ChatWork;
+import superagent = require("superagent");
+// TODO 1. update superagent with generics
+// TODO 2. create underscore.deffered .d.ts file
+// TODO 3. refactor & improve specialized parameter methods
 
-	namespace ChatWork {
-		interface ChatWorkInitOptions {
-			token:string;
-		}
+// Merged declaration, ChatWork is both a callable function and a namespace
+declare function ChatWork(): ChatWork.ChatWork;
 
-		interface ChatWork {
-			apiVersion:string;
-			sdkVersion:string;
-			token:string;
-			Deferred: any; // _.Deferred
-			when: any; // _.when
+declare namespace ChatWork {
+    interface ChatWorkInitOptions {
+        token: string;
+    }
 
-			init(options:ChatWorkInitOptions):void;
+    interface ChatWork {
+        apiVersion: string;
+        sdkVersion: string;
+        token: string;
+        Deferred: any; // _.Deferred
+        when: any; // _.when
 
-			// http://developer.chatwork.com/ja/endpoint_me.html
-			get(api:"me", callback:(err:Error, res:superagent.Response)=>void):void;
+        init(options: ChatWorkInitOptions): void;
 
-			// http://developer.chatwork.com/ja/endpoint_my.html
-			get(api:"my/status", callback:(err:Error, res:superagent.Response)=>void):void;
-			get(api:"my/tasks", callback:(err:Error, res:superagent.Response)=>void):void;
+        // http://developer.chatwork.com/ja/endpoint_me.html
+        get(api: "me", callback: (err: Error, res: superagent.Response) => void): void;
 
-			// http://developer.chatwork.com/ja/endpoint_contacts.html
-			get(api:"contacts", callback:(err:Error, res:superagent.Response)=>void):void;
+        // http://developer.chatwork.com/ja/endpoint_my.html
+        get(api: "my/status", callback: (err: Error, res: superagent.Response) => void): void;
+        get(api: "my/tasks", callback: (err: Error, res: superagent.Response) => void): void;
 
-			// http://developer.chatwork.com/ja/endpoint_rooms.html
-			get(api:"rooms", callback:(err:Error, res:superagent.Response)=>void):void;
-			post(api:"rooms", args:any, callback:(err:Error, res:superagent.Response)=>void):void;
+        // http://developer.chatwork.com/ja/endpoint_contacts.html
+        get(api: "contacts", callback: (err: Error, res: superagent.Response) => void): void;
 
-			// can't create specialized parameter
-			// specialized parameter required compile-time constant string literal
-			// GET      /rooms/{room_id}
-			// PUT      /rooms/{room_id}
-			// DELETE   /rooms/{room_id}
-			// GET      /rooms/{room_id}/members
-			// PUT      /rooms/{room_id}/members
-			// GET      /rooms/{room_id}/messages <- not implemented yet
-			// POST     /rooms/{room_id}/messages
-			// GET      /rooms/{room_id}/messages/{message_id}
-			// GET      /rooms/{room_id}/tasks
-			// POST     /rooms/{room_id}/tasks
-			// GET      /rooms/{room_id}/tasks/{task_id}
-			// GET      /rooms/{room_id}/files
-			// GET      /rooms/{room_id}/files/{file_id}
+        // http://developer.chatwork.com/ja/endpoint_rooms.html
+        get(api: "rooms", callback: (err: Error, res: superagent.Response) => void): void;
+        post(api: "rooms", args: any, callback: (err: Error, res: superagent.Response) => void): void;
 
-			// General functions
+        // can't create specialized parameter
+        // specialized parameter required compile-time constant string literal
+        // GET      /rooms/{room_id}
+        // PUT      /rooms/{room_id}
+        // DELETE   /rooms/{room_id}
+        // GET      /rooms/{room_id}/members
+        // PUT      /rooms/{room_id}/members
+        // GET      /rooms/{room_id}/messages <- not implemented yet
+        // POST     /rooms/{room_id}/messages
+        // GET      /rooms/{room_id}/messages/{message_id}
+        // GET      /rooms/{room_id}/tasks
+        // POST     /rooms/{room_id}/tasks
+        // GET      /rooms/{room_id}/tasks/{task_id}
+        // GET      /rooms/{room_id}/files
+        // GET      /rooms/{room_id}/files/{file_id}
 
-			api(method:string, api:string):any; // return same type as _.Deferred()
-			api(method:string, api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			api(method:string, api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
+        // General functions
 
-			get(api:string):any; // return same type as _.Deferred()
-			get(api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			get(api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
+        api(method: string, api: string): any; // return same type as _.Deferred()
+        api(method: string, api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        api(method: string, api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
 
-			post(api:string):any; // return same type as _.Deferred()
-			post(api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			post(api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
+        get(api: string): any; // return same type as _.Deferred()
+        get(api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        get(api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
 
-			put(api:string):any; // return same type as _.Deferred()
-			put(api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			put(api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
+        post(api: string): any; // return same type as _.Deferred()
+        post(api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        post(api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
 
-			del(api:string):any; // return same type as _.Deferred()
-			del(api:string, callback:(err:Error, res:superagent.Response)=>void):void;
-			del(api:string, args:any, callback:(err:Error, res:superagent.Response)=>void):void;
-		}
-	}
+        put(api: string): any; // return same type as _.Deferred()
+        put(api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        put(api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
 
-	export = ChatWork;
+        del(api: string): any; // return same type as _.Deferred()
+        del(api: string, callback: (err: Error, res: superagent.Response) => void): void;
+        del(api: string, args: any, callback: (err: Error, res: superagent.Response) => void): void;
+    }
 }
+
+export = ChatWork;
diff --git a/ski/ski.d.ts b/ski/ski.d.ts
index 3632f18fb6..ebb5808613 100644
--- a/ski/ski.d.ts
+++ b/ski/ski.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "ski" {
-	export function S<T, S, U>(x: (z: U) => (y: S) => T, y: (z: U) => S, z: U): T;
-	export function K<T, S>(x: T): (y?: S) => T
-	export function I<T>(x: T): T;
-}
+
+declare export function S<T, S, U>(x: (z: U) => (y: S) => T, y: (z: U) => S, z: U): T;
+declare export function K<T, S>(x: T): (y?: S) => T
+declare export function I<T>(x: T): T;
diff --git a/slate-irc/slate-irc.d.ts b/slate-irc/slate-irc.d.ts
index 5f9d947bca..953036ebc4 100644
--- a/slate-irc/slate-irc.d.ts
+++ b/slate-irc/slate-irc.d.ts
@@ -5,94 +5,93 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "slate-irc" {
-  import * as net from "net";
 
-  function IRC(socket: net.Socket): IRC.Client;
+import * as net from "net";
 
-  namespace IRC {
+declare function IRC(socket: net.Socket): IRC.Client;
+
+declare namespace IRC {
     interface DataEvent {
-      prefix: string;
-      command: string;
-      params: string;
-      trailing: string;
-      string: string;
+        prefix: string;
+        command: string;
+        params: string;
+        trailing: string;
+        string: string;
     }
 
     interface MOTDEvent {
-      motd: string[];
+        motd: string[];
     }
 
     interface MessageEvent {
-      from: string;
-      hostmask: any;
-      to: string;
-      message: string;
+        from: string;
+        hostmask: any;
+        to: string;
+        message: string;
     }
 
     interface JoinEvent {
-      nick: string;
-      hostmask: string;
-      channel: string;
+        nick: string;
+        hostmask: string;
+        channel: string;
     }
 
     interface PartEvent {
-      nick: string;
-      hostmask: string;
-      channels: string[];
+        nick: string;
+        hostmask: string;
+        channels: string[];
     }
 
     interface NickEvent {
-      nick: string;
-      hostmask: string;
-      new: string;
+        nick: string;
+        hostmask: string;
+        new: string;
     }
 
     interface QuitEvent {
-      nick: string;
-      hostmask: string;
-      message: string;
+        nick: string;
+        hostmask: string;
+        message: string;
     }
 
     class Client {
-      me: string;
+        me: string;
 
-      write(str: string): void;
+        write(str: string): void;
 
-      pass(pass: string): void;
-      nick(nick: string): void;
-      user(username: string, realname: string): void;
+        pass(pass: string): void;
+        nick(nick: string): void;
+        user(username: string, realname: string): void;
 
-      invite(name: string, channel: string): void;
-      send(target: string, msg: string): void;
-      action(target: string, msg: string): void;
-      notice(target: string, msg: string): void;
-      ctcp(target: string, msg: string): void;
+        invite(name: string, channel: string): void;
+        send(target: string, msg: string): void;
+        action(target: string, msg: string): void;
+        notice(target: string, msg: string): void;
+        ctcp(target: string, msg: string): void;
 
-      join(channel: string, key?: string): void;
-      part(channel: string, msg?: string): void;
-      names(channel: string, callback: (error: Error, names: { name: string; mode: string; }[]) => void): void;
+        join(channel: string, key?: string): void;
+        part(channel: string, msg?: string): void;
+        names(channel: string, callback: (error: Error, names: { name: string; mode: string; }[]) => void): void;
 
-      away(message: string): void;
-      topic(channel: string, topic: string): void;
-      kick(channels: string|string[], nicks: string|string[], msg: string): void;
-      oper(name: string, password: string): void;
-      mode(target: string, flags: string, params: string): void;
-      quit(msg: string): void;
-      whois(target: string, mask: string, callback: Function): void;
+        away(message: string): void;
+        topic(channel: string, topic: string): void;
+        kick(channels: string | string[], nicks: string | string[], msg: string): void;
+        oper(name: string, password: string): void;
+        mode(target: string, flags: string, params: string): void;
+        quit(msg: string): void;
+        whois(target: string, mask: string, callback: Function): void;
 
-      on(event: string, callback: Function): void;
-      on(event: "data", callback: (event: DataEvent) => void): void;
-      on(event: "welcome", callback: (name: string) => void): void;
-      on(event: "message", callback: (event: MessageEvent) => void): void;
-      on(event: "notice", callback: (event: MessageEvent) => void): void;
-      on(event: "motd", callback: (event: MOTDEvent) => void): void;
-      on(event: "join", callback: (event: JoinEvent) => void): void;
-      on(event: "part", callback: (event: PartEvent) => void): void;
-      on(event: "nick", callback: (event: NickEvent) => void): void;
-      on(event: "quit", callback: (event: QuitEvent) => void): void;
+        on(event: string, callback: Function): void;
+        on(event: "data", callback: (event: DataEvent) => void): void;
+        on(event: "welcome", callback: (name: string) => void): void;
+        on(event: "message", callback: (event: MessageEvent) => void): void;
+        on(event: "notice", callback: (event: MessageEvent) => void): void;
+        on(event: "motd", callback: (event: MOTDEvent) => void): void;
+        on(event: "join", callback: (event: JoinEvent) => void): void;
+        on(event: "part", callback: (event: PartEvent) => void): void;
+        on(event: "nick", callback: (event: NickEvent) => void): void;
+        on(event: "quit", callback: (event: QuitEvent) => void): void;
     }
-  }
-
-  export = IRC;
 }
+
+export = IRC;
diff --git a/smoothie/smoothie.d.ts b/smoothie/smoothie.d.ts
index 98f205f598..55acf18594 100644
--- a/smoothie/smoothie.d.ts
+++ b/smoothie/smoothie.d.ts
@@ -8,185 +8,175 @@
 //      rest of DefinitelyTyped.
 /// <reference path="../node/node.d.ts" />
 
-declare module "smoothie"
-{
-    export interface ITimeSeriesOptions
-    {
-        resetBounds?: boolean;
-        resetBoundsInterval?: number;
-    }
 
-    export interface ITimeSeriesPresentationOptions
-    {
-        strokeStyle?: string;
-        fillStyle?: string;
-        lineWidth?: number;
-    }
+export interface ITimeSeriesOptions {
+    resetBounds?: boolean;
+    resetBoundsInterval?: number;
+}
 
-    export class TimeSeries
-    {
-        /**
-         * Initialises a new <code>TimeSeries</code> with optional data options.
-         *
-         * Options are of the form (defaults shown):
-         *
-         * <pre>
-         * {
-         *   resetBounds: true,        // enables/disables automatic scaling of the y-axis
-         *   resetBoundsInterval: 3000 // the period between scaling calculations, in millis
-         * }
-         * </pre>
-         *
-         * Presentation options for TimeSeries are specified as an argument to <code>SmoothieChart.addTimeSeries</code>.
-         */
-        constructor(options?: ITimeSeriesOptions);
+export interface ITimeSeriesPresentationOptions {
+    strokeStyle?: string;
+    fillStyle?: string;
+    lineWidth?: number;
+}
 
-        /**
-         * Clears all data and state from this TimeSeries object.
-         */
-        clear(): void;
-
-        /**
-         * Recalculate the min/max values for this <code>TimeSeries</code> object.
-         *
-         * This causes the graph to scale itself in the y-axis.
-         */
-        resetBounds(): void;
-
-        /**
-         * Adds a new data point to the <code>TimeSeries</code>, preserving chronological order.
-         *
-         * @param timestamp the position, in time, of this data point
-         * @param value the value of this data point
-         * @param sumRepeatedTimeStampValues if <code>timestamp</code> has an exact match in the series, this flag controls
-         * whether it is replaced, or the values summed (defaults to false.)
-         */
-        append(timestamp: number, value: number, sumRepeatedTimeStampValues?: boolean): void;
-
-        dropOldData(oldestValidTime: number, maxDataSetLength: number): void;
-    }
-
-    export interface IGridOptions
-    {
-        /** The background colour of the chart. */
-        fillStyle?: string;
-        /** The pixel width of grid lines. */
-        lineWidth?: number;
-        /** Colour of grid lines. */
-        strokeStyle?: string;
-        /** Distance between vertical grid lines. */
-        millisPerLine?: number;
-        /** Controls whether grid lines are 1px sharp, or softened. */
-        sharpLines?: boolean;
-        /** Number of vertical sections marked out by horizontal grid lines. */
-        verticalSections?: number;
-        /** Whether the grid lines trace the border of the chart or not. */
-        borderVisible?: boolean;
-    }
-
-    export interface ILabelOptions
-    {
-        /** Enables/disables labels showing the min/max values. */
-        disabled?: boolean;
-        /** Colour for text of labels. */
-        fillStyle?: string;
-        fontSize?: number;
-        fontFamily?: string;
-        precision?: number;
-    }
-
-    export interface IRange { min: number; max: number }
-
-    export interface IHorizontalLine
-    {
-        value?: number;
-        color?: string;
-        lineWidth?: number;
-    }
-
-    export interface IChartOptions
-    {
-        /** Specify to clamp the lower y-axis to a given value. */
-        minValue?: number;
-        /** Specify to clamp the upper y-axis to a given value. */
-        maxValue?: number;
-        /** Allows proportional padding to be added above the chart. for 10% padding, specify 1.1. */
-        maxValueScale?: number;
-        yRangeFunction?: (range:IRange)=>IRange;
-        /** Controls the rate at which y-value zoom animation occurs. */
-        scaleSmoothing?: number;
-        /** Sets the speed at which the chart pans by. */
-        millisPerPixel?: number;
-        /** Whether to render at different DPI depending upon the device. Enabled by default. */
-        enableDpiScaling?: boolean;
-        yMinFormatter?: (min:number, precision:number)=>string;
-        yMaxFormatter?: (max:number, precision:number)=>string;
-        maxDataSetLength?: number;
-        /** One of: 'bezier', 'linear', 'step' */
-        interpolation?: string;
-        /** Optional function to format time stamps for bottom of chart. You may use <code>SmoothieChart.timeFormatter</code>, or your own/ */
-        timestampFormatter?: (date:Date)=>string;
-        horizontalLines?: IHorizontalLine[];
-
-        grid?: IGridOptions;
-
-        labels?: ILabelOptions;
-    }
+declare export class TimeSeries {
+    /**
+     * Initialises a new <code>TimeSeries</code> with optional data options.
+     *
+     * Options are of the form (defaults shown):
+     *
+     * <pre>
+     * {
+     *   resetBounds: true,        // enables/disables automatic scaling of the y-axis
+     *   resetBoundsInterval: 3000 // the period between scaling calculations, in millis
+     * }
+     * </pre>
+     *
+     * Presentation options for TimeSeries are specified as an argument to <code>SmoothieChart.addTimeSeries</code>.
+     */
+    constructor(options?: ITimeSeriesOptions);
 
     /**
-     * Initialises a new <code>SmoothieChart</code>.
-     *
-     * Options are optional and may be sparsely populated. Just specify the values you
-     * need and the rest will be given sensible defaults.
+     * Clears all data and state from this TimeSeries object.
      */
-    export class SmoothieChart
-    {
-        constructor(chartOptions?: IChartOptions);
+    clear(): void;
 
-        /**
-         * Adds a <code>TimeSeries</code> to this chart, with optional presentation options.
-         */
-        addTimeSeries(series: TimeSeries, seriesOptions?: ITimeSeriesPresentationOptions): void;
+    /**
+     * Recalculate the min/max values for this <code>TimeSeries</code> object.
+     *
+     * This causes the graph to scale itself in the y-axis.
+     */
+    resetBounds(): void;
 
-        /**
-         * Removes the specified <code>TimeSeries</code> from the chart.
-         */
-        removeTimeSeries(series: TimeSeries): void;
+    /**
+     * Adds a new data point to the <code>TimeSeries</code>, preserving chronological order.
+     *
+     * @param timestamp the position, in time, of this data point
+     * @param value the value of this data point
+     * @param sumRepeatedTimeStampValues if <code>timestamp</code> has an exact match in the series, this flag controls
+     * whether it is replaced, or the values summed (defaults to false.)
+     */
+    append(timestamp: number, value: number, sumRepeatedTimeStampValues?: boolean): void;
 
-        /**
-         * Gets render options for the specified <code>TimeSeries</code>.
-         *
-         * As you may use a single <code>TimeSeries</code> in multiple charts with different formatting in each usage,
-         * these settings are stored in the chart.
-         */
-        getTimeSeriesOptions(timeSeries: TimeSeries): ITimeSeriesPresentationOptions;
-
-        /**
-         * Brings the specified <code>TimeSeries</code> to the top of the chart. It will be rendered last.
-         */
-        bringToFront(timeSeries: TimeSeries): void;
-
-        /**
-         * Instructs the <code>SmoothieChart</code> to start rendering to the provided canvas, with specified delay.
-         *
-         * @param canvas the target canvas element
-         * @param delayMillis an amount of time to wait before a data point is shown. This can prevent the end of the series
-         * from appearing on screen, with new values flashing into view, at the expense of some latency.
-         */
-        streamTo(canvas: HTMLCanvasElement, delayMillis?: number): void;
-
-        /**
-         * Starts the animation of this chart. Called by <code>streamTo</code>.
-         */
-        start(): void;
-
-        /**
-         * Stops the animation of this chart.
-         */
-        stop(): void;
-
-        updateValueRange(): void;
-
-        render(canvas?: HTMLCanvasElement, time?: number): void;
-    }
+    dropOldData(oldestValidTime: number, maxDataSetLength: number): void;
+}
+
+export interface IGridOptions {
+    /** The background colour of the chart. */
+    fillStyle?: string;
+    /** The pixel width of grid lines. */
+    lineWidth?: number;
+    /** Colour of grid lines. */
+    strokeStyle?: string;
+    /** Distance between vertical grid lines. */
+    millisPerLine?: number;
+    /** Controls whether grid lines are 1px sharp, or softened. */
+    sharpLines?: boolean;
+    /** Number of vertical sections marked out by horizontal grid lines. */
+    verticalSections?: number;
+    /** Whether the grid lines trace the border of the chart or not. */
+    borderVisible?: boolean;
+}
+
+export interface ILabelOptions {
+    /** Enables/disables labels showing the min/max values. */
+    disabled?: boolean;
+    /** Colour for text of labels. */
+    fillStyle?: string;
+    fontSize?: number;
+    fontFamily?: string;
+    precision?: number;
+}
+
+export interface IRange { min: number; max: number }
+
+export interface IHorizontalLine {
+    value?: number;
+    color?: string;
+    lineWidth?: number;
+}
+
+export interface IChartOptions {
+    /** Specify to clamp the lower y-axis to a given value. */
+    minValue?: number;
+    /** Specify to clamp the upper y-axis to a given value. */
+    maxValue?: number;
+    /** Allows proportional padding to be added above the chart. for 10% padding, specify 1.1. */
+    maxValueScale?: number;
+    yRangeFunction?: (range: IRange) => IRange;
+    /** Controls the rate at which y-value zoom animation occurs. */
+    scaleSmoothing?: number;
+    /** Sets the speed at which the chart pans by. */
+    millisPerPixel?: number;
+    /** Whether to render at different DPI depending upon the device. Enabled by default. */
+    enableDpiScaling?: boolean;
+    yMinFormatter?: (min: number, precision: number) => string;
+    yMaxFormatter?: (max: number, precision: number) => string;
+    maxDataSetLength?: number;
+    /** One of: 'bezier', 'linear', 'step' */
+    interpolation?: string;
+    /** Optional function to format time stamps for bottom of chart. You may use <code>SmoothieChart.timeFormatter</code>, or your own/ */
+    timestampFormatter?: (date: Date) => string;
+    horizontalLines?: IHorizontalLine[];
+
+    grid?: IGridOptions;
+
+    labels?: ILabelOptions;
+}
+
+/**
+ * Initialises a new <code>SmoothieChart</code>.
+ *
+ * Options are optional and may be sparsely populated. Just specify the values you
+ * need and the rest will be given sensible defaults.
+ */
+declare export class SmoothieChart {
+    constructor(chartOptions?: IChartOptions);
+
+    /**
+     * Adds a <code>TimeSeries</code> to this chart, with optional presentation options.
+     */
+    addTimeSeries(series: TimeSeries, seriesOptions?: ITimeSeriesPresentationOptions): void;
+
+    /**
+     * Removes the specified <code>TimeSeries</code> from the chart.
+     */
+    removeTimeSeries(series: TimeSeries): void;
+
+    /**
+     * Gets render options for the specified <code>TimeSeries</code>.
+     *
+     * As you may use a single <code>TimeSeries</code> in multiple charts with different formatting in each usage,
+     * these settings are stored in the chart.
+     */
+    getTimeSeriesOptions(timeSeries: TimeSeries): ITimeSeriesPresentationOptions;
+
+    /**
+     * Brings the specified <code>TimeSeries</code> to the top of the chart. It will be rendered last.
+     */
+    bringToFront(timeSeries: TimeSeries): void;
+
+    /**
+     * Instructs the <code>SmoothieChart</code> to start rendering to the provided canvas, with specified delay.
+     *
+     * @param canvas the target canvas element
+     * @param delayMillis an amount of time to wait before a data point is shown. This can prevent the end of the series
+     * from appearing on screen, with new values flashing into view, at the expense of some latency.
+     */
+    streamTo(canvas: HTMLCanvasElement, delayMillis?: number): void;
+
+    /**
+     * Starts the animation of this chart. Called by <code>streamTo</code>.
+     */
+    start(): void;
+
+    /**
+     * Stops the animation of this chart.
+     */
+    stop(): void;
+
+    updateValueRange(): void;
+
+    render(canvas?: HTMLCanvasElement, time?: number): void;
 }
diff --git a/snake-case/snake-case.d.ts b/snake-case/snake-case.d.ts
index df4a4652be..493fe072c7 100644
--- a/snake-case/snake-case.d.ts
+++ b/snake-case/snake-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "snake-case" {
-	function snakeCase(string: string, locale?: string): string;
-	export = snakeCase;
-}
+
+declare function snakeCase(string: string, locale?: string): string;
+export = snakeCase;
diff --git a/soap/soap.d.ts b/soap/soap.d.ts
index 36f50309b7..8912fd0ad8 100644
--- a/soap/soap.d.ts
+++ b/soap/soap.d.ts
@@ -5,17 +5,15 @@
 
 /// <reference path='../node/node.d.ts' />
 
-declare module 'soap' {
-    import * as events from 'events';
 
-    class WSSecurity {
-        constructor(username: string, password: string, options: any);
-    }
-    interface Client extends events.EventEmitter {
-        setSecurity(s: WSSecurity): void;
-        [method: string]: (args: any, fn: (err: any, result: any) => void, options?: any) => void;
-        addSoapHeader(headJSON: any): void;
-    }
-    function createClient(wsdlPath: string, options: any, fn: (err: any, client: Client) => void): void;
+import * as events from 'events';
 
-}
\ No newline at end of file
+declare class WSSecurity {
+    constructor(username: string, password: string, options: any);
+}
+interface Client extends events.EventEmitter {
+    setSecurity(s: WSSecurity): void;
+    [method: string]: (args: any, fn: (err: any, result: any) => void, options?: any) => void;
+    addSoapHeader(headJSON: any): void;
+}
+declare function createClient(wsdlPath: string, options: any, fn: (err: any, client: Client) => void): void;
diff --git a/socket.io.users/socket.io.users.d.ts b/socket.io.users/socket.io.users.d.ts
index 0a6c78473e..8933e75e3a 100644
--- a/socket.io.users/socket.io.users.d.ts
+++ b/socket.io.users/socket.io.users.d.ts
@@ -8,72 +8,70 @@
 /// <reference path="../express-session/express-session.d.ts" />
 /// <reference path="../socket.io/socket.io.d.ts" />
 
-declare module "socket.io.users" {
-	import { EventEmitter } from 'events';
-	import { Application } from "express";
-	import { SessionOptions } from "express-session";
 
-	var CONNECTION_EVENTS: string[];
-	var Middleware: () => (socket: SocketIO.Socket, next: () => any) => void;
-	var Session: (app: Application, options?: SessionOptions) => void;
+import { EventEmitter } from 'events';
+import { Application } from "express";
+import { SessionOptions } from "express-session";
 
-	type SocketUserList = {
-		[namespace: string]: Users;
-	};
+declare var CONNECTION_EVENTS: string[];
+declare var Middleware: () => (socket: SocketIO.Socket, next: () => any) => void;
+declare var Session: (app: Application, options?: SessionOptions) => void;
 
-	class Namespaces {
-		private static socketUsersList: any;
-		static attach(namespace: string, socketUsersObj: Users): void;
-		static get(namespace: string): Users;
-	}
-
-	class User {
-		id: string | number;
-		socket: SocketIO.Socket;
-		sockets: SocketIO.Socket[];
-		rooms: string[];
-		ip: string;
-		remoteAddresses: string[];
-		store: any;
-		attach(socket: SocketIO.Socket): void;
-		detachSocket(socket: SocketIO.Socket): void;
-		detach(): void;
-		join(room: string): boolean;
-		leave(room: string): void;
-		leaveAll(): void;
-		/** same as in, checks if this user is inside a room */
-		belong(room: string): boolean;
-		/** same as belong, checks if this user is inside a room  */
-		in(room: string): boolean;
-		set(key: string, value: any, callback?: () => void): void;
-		get: (key: string) => any;
-		toString(): string;
-		emit(...args: any[]): void;
-		to(room: string): SocketIO.Socket;
-	}
-
-
-	class Users extends EventEmitter {
-		namespace: string;
-		users: User[];
-		constructor(namespace?: string);
-		static of(namespace?: string): Users;
-		takeId: (request: any) => string | number;
-		create(socket: SocketIO.Socket): User;
-		getById(id: string | number): User;
-		get(socket: SocketIO.Socket): User;
-		list(): User[];
-		size(): number;
-		push(_user: User): void;
-		add(socket: SocketIO.Socket): User;
-		indexOf(user: User): number;
-		remove(user: User): void;
-		room(room: string): User[];
-		in(room: string): User[];
-		from(room: string): User[];
-		update(user: User): void;
-		emitAll(...args: any[]): void;
-		registerSocketEvents(currentUser: User): void;
-	}
+type SocketUserList = {
+    [namespace: string]: Users;
+};
 
+declare class Namespaces {
+    private static socketUsersList: any;
+    static attach(namespace: string, socketUsersObj: Users): void;
+    static get(namespace: string): Users;
+}
+
+declare class User {
+    id: string | number;
+    socket: SocketIO.Socket;
+    sockets: SocketIO.Socket[];
+    rooms: string[];
+    ip: string;
+    remoteAddresses: string[];
+    store: any;
+    attach(socket: SocketIO.Socket): void;
+    detachSocket(socket: SocketIO.Socket): void;
+    detach(): void;
+    join(room: string): boolean;
+    leave(room: string): void;
+    leaveAll(): void;
+    /** same as in, checks if this user is inside a room */
+    belong(room: string): boolean;
+    /** same as belong, checks if this user is inside a room  */
+    in(room: string): boolean;
+    set(key: string, value: any, callback?: () => void): void;
+    get: (key: string) => any;
+    toString(): string;
+    emit(...args: any[]): void;
+    to(room: string): SocketIO.Socket;
+}
+
+
+declare class Users extends EventEmitter {
+    namespace: string;
+    users: User[];
+    constructor(namespace?: string);
+    static of(namespace?: string): Users;
+    takeId: (request: any) => string | number;
+    create(socket: SocketIO.Socket): User;
+    getById(id: string | number): User;
+    get(socket: SocketIO.Socket): User;
+    list(): User[];
+    size(): number;
+    push(_user: User): void;
+    add(socket: SocketIO.Socket): User;
+    indexOf(user: User): number;
+    remove(user: User): void;
+    room(room: string): User[];
+    in(room: string): User[];
+    from(room: string): User[];
+    update(user: User): void;
+    emitAll(...args: any[]): void;
+    registerSocketEvents(currentUser: User): void;
 }
diff --git a/sockjs-node/sockjs-node.d.ts b/sockjs-node/sockjs-node.d.ts
index 1804495127..12461d6f43 100644
--- a/sockjs-node/sockjs-node.d.ts
+++ b/sockjs-node/sockjs-node.d.ts
@@ -5,53 +5,52 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "sockjs" {
-    import http = require('http');
 
-    export interface ServerOptions {
-        sockjs_url?: string;
-        prefix?: string;
-        response_limit?: number;
-        websocket?: boolean;
-        jsessionid?: any;
-        log?: (severity: string, message: string) => void;
-        heartbeat_delay?: number;
-        disconnect_delay?: number;
-    }
+import http = require('http');
 
-    export function createServer(options?: ServerOptions): Server;
-
-    export interface Server extends NodeJS.EventEmitter {
-        installHandlers(server: http.Server, options?: ServerOptions): any;
-
-        on(event: 'connection', listener: (conn: Connection) => any): this;
-        on(event: string, listener: Function): this;
-    }
-
-    export interface Connection extends NodeJS.ReadWriteStream {
-        remoteAddress: string;
-        remotePort: number;
-        address: {
-            [key: string]: {
-                address: string;
-                port: number;
-            };
-        };
-        headers: {
-            [key: string]: string;
-        };
-        url: string;
-        pathname: string;
-        prefix: string;
-        protocol: string;
-        readyState: number;
-        id: string;
-
-        close(code?: string, reason?: string): boolean;
-        destroy(): void;
-
-        on(event: 'data', listener: (message: string) => any): this;
-        on(event: 'close', listener: () => void): this;
-        on(event: string, listener: Function): this;
-    }
+export interface ServerOptions {
+    sockjs_url?: string;
+    prefix?: string;
+    response_limit?: number;
+    websocket?: boolean;
+    jsessionid?: any;
+    log?: (severity: string, message: string) => void;
+    heartbeat_delay?: number;
+    disconnect_delay?: number;
+}
+
+declare export function createServer(options?: ServerOptions): Server;
+
+export interface Server extends NodeJS.EventEmitter {
+    installHandlers(server: http.Server, options?: ServerOptions): any;
+
+    on(event: 'connection', listener: (conn: Connection) => any): this;
+    on(event: string, listener: Function): this;
+}
+
+export interface Connection extends NodeJS.ReadWriteStream {
+    remoteAddress: string;
+    remotePort: number;
+    address: {
+        [key: string]: {
+            address: string;
+            port: number;
+        };
+    };
+    headers: {
+        [key: string]: string;
+    };
+    url: string;
+    pathname: string;
+    prefix: string;
+    protocol: string;
+    readyState: number;
+    id: string;
+
+    close(code?: string, reason?: string): boolean;
+    destroy(): void;
+
+    on(event: 'data', listener: (message: string) => any): this;
+    on(event: 'close', listener: () => void): this;
+    on(event: string, listener: Function): this;
 }
diff --git a/source-map-support/source-map-support.d.ts b/source-map-support/source-map-support.d.ts
index b672e5291a..4505345a4e 100644
--- a/source-map-support/source-map-support.d.ts
+++ b/source-map-support/source-map-support.d.ts
@@ -5,39 +5,38 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'source-map-support' {
-	/**
-	 * Output of retrieveSourceMap().
-	 */
-	export interface UrlAndMap {
-		url: string;
-		map: string|Buffer;
-	}
 
-	/**
-	 * Options to install().
-	 */
-	export interface Options {
-		handleUncaughtExceptions?: boolean;
-		emptyCacheBetweenOperations?: boolean;
-		retrieveFile?: (path: string) => string;
-		retrieveSourceMap?: (source: string) => UrlAndMap;
-	}
-
-	export interface Position {
-		source: string;
-		line: number;
-		column: number;
-	}
-
-	export function wrapCallSite(frame: any /* StackFrame */): any /* StackFrame */;
-	export function getErrorSource(error: Error): string;
-	export function mapSourcePosition(position: Position): Position;
-	export function retrieveSourceMap(source: string): UrlAndMap;
-
-	/**
-	 * Install SourceMap support.
-	 * @param options Can be used to e.g. disable uncaughtException handler.
-	 */
-	export function install(options?: Options): void;
+/**
+ * Output of retrieveSourceMap().
+ */
+export interface UrlAndMap {
+    url: string;
+    map: string | Buffer;
 }
+
+/**
+ * Options to install().
+ */
+export interface Options {
+    handleUncaughtExceptions?: boolean;
+    emptyCacheBetweenOperations?: boolean;
+    retrieveFile?: (path: string) => string;
+    retrieveSourceMap?: (source: string) => UrlAndMap;
+}
+
+export interface Position {
+    source: string;
+    line: number;
+    column: number;
+}
+
+declare export function wrapCallSite(frame: any /* StackFrame */): any /* StackFrame */;
+declare export function getErrorSource(error: Error): string;
+declare export function mapSourcePosition(position: Position): Position;
+declare export function retrieveSourceMap(source: string): UrlAndMap;
+
+/**
+ * Install SourceMap support.
+ * @param options Can be used to e.g. disable uncaughtException handler.
+ */
+declare export function install(options?: Options): void;
diff --git a/speakeasy/speakeasy.d.ts b/speakeasy/speakeasy.d.ts
index 4017c4f7eb..08ad64b51a 100644
--- a/speakeasy/speakeasy.d.ts
+++ b/speakeasy/speakeasy.d.ts
@@ -3,49 +3,48 @@
 // Definitions by: Lucas Woo <https://github.com/legendecas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "speakeasy" {
 
-    interface IKey {
-        ascii: string;
-        base32: string;
-        hex: string;
-        qr_code_ascii: string;
-        qr_code_hex: string;
-        qr_code_base32: string;
-        google_auth_qr: string;
-    }
 
-    interface GenerateOptions {
-        length?: number;
-        symbols?: boolean;
-        qr_codes?: boolean;
-        google_auth_qr?: boolean;
-        name?: string;
-    }
-
-    interface TotpOptions {
-        key: string;
-        step?: number;
-        time?: number;
-        initial_time?: number;
-        length?: number;
-        encoding?: string;
-    }
-
-    interface HotpOptions {
-        key: string;
-        counter: number;
-        length?: number;
-        encoding?: string;
-    }
-
-    export function generate_key(options: GenerateOptions): IKey;
-
-    export function hotp(options: HotpOptions): string;
-
-    export function counter(options: HotpOptions): string;
-
-    export function totp(options: TotpOptions): string;
-
-    export function time(options: TotpOptions): string;
+interface IKey {
+    ascii: string;
+    base32: string;
+    hex: string;
+    qr_code_ascii: string;
+    qr_code_hex: string;
+    qr_code_base32: string;
+    google_auth_qr: string;
 }
+
+interface GenerateOptions {
+    length?: number;
+    symbols?: boolean;
+    qr_codes?: boolean;
+    google_auth_qr?: boolean;
+    name?: string;
+}
+
+interface TotpOptions {
+    key: string;
+    step?: number;
+    time?: number;
+    initial_time?: number;
+    length?: number;
+    encoding?: string;
+}
+
+interface HotpOptions {
+    key: string;
+    counter: number;
+    length?: number;
+    encoding?: string;
+}
+
+declare export function generate_key(options: GenerateOptions): IKey;
+
+declare export function hotp(options: HotpOptions): string;
+
+declare export function counter(options: HotpOptions): string;
+
+declare export function totp(options: TotpOptions): string;
+
+declare export function time(options: TotpOptions): string;
diff --git a/split/split.d.ts b/split/split.d.ts
index 71eb97845e..54049f39d9 100644
--- a/split/split.d.ts
+++ b/split/split.d.ts
@@ -5,13 +5,12 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "split" {
 
-    interface SplitOptions {
-        maxLength: number
-    }
 
-    function split(matcher?:any, mapper?:any, options?: SplitOptions):any;
+interface SplitOptions {
+    maxLength: number
+}
 
-    export = split;
-}
\ No newline at end of file
+declare function split(matcher?: any, mapper?: any, options?: SplitOptions): any;
+
+export = split;
diff --git a/sprintf/sprintf.d.ts b/sprintf/sprintf.d.ts
index 04f3fc48da..89264c941f 100644
--- a/sprintf/sprintf.d.ts
+++ b/sprintf/sprintf.d.ts
@@ -5,7 +5,6 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/sprintff.d.ts
 
-declare module "sprintf" {
-	export function sprintf(fmt: string, ...args: any[]): string;
-	export function vsprintf(fmt: string, args: any[]): string;
-}
+
+declare export function sprintf(fmt: string, ...args: any[]): string;
+declare export function vsprintf(fmt: string, args: any[]): string;
diff --git a/sql.js/sql.js.d.ts b/sql.js/sql.js.d.ts
index 67f0a183c2..6aea5a0d12 100644
--- a/sql.js/sql.js.d.ts
+++ b/sql.js/sql.js.d.ts
@@ -5,63 +5,61 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "sql.js" {
 
-    class Database {
-        constructor(data: Buffer);
-        constructor(data: Uint8Array);
-        constructor(data: number[]);
 
-        run(sql: string): Database;
-        run(sql: string, params: { [key: string]: number | string | Uint8Array }): Database;
-        run(sql: string, params: (number | string | Uint8Array)[]): Database;
+declare class Database {
+    constructor(data: Buffer);
+    constructor(data: Uint8Array);
+    constructor(data: number[]);
 
-        exec(sql: string): QueryResults[];
+    run(sql: string): Database;
+    run(sql: string, params: { [key: string]: number | string | Uint8Array }): Database;
+    run(sql: string, params: (number | string | Uint8Array)[]): Database;
 
-        each(sql: string, callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
-        each(sql: string, params: { [key: string]: number | string | Uint8Array }, callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
-        each(sql: string, params: (number | string | Uint8Array)[], callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
+    exec(sql: string): QueryResults[];
 
-        prepare(sql: string): Statement;
-        prepare(sql: string, params: { [key: string]: number | string | Uint8Array }): Statement;
-        prepare(sql: string, params: (number | string | Uint8Array)[]): Statement;
+    each(sql: string, callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
+    each(sql: string, params: { [key: string]: number | string | Uint8Array }, callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
+    each(sql: string, params: (number | string | Uint8Array)[], callback: (obj: { [columnName: string]: number | string | Uint8Array }) => void, done: () => void): void;
 
-        export(): Uint8Array;
+    prepare(sql: string): Statement;
+    prepare(sql: string, params: { [key: string]: number | string | Uint8Array }): Statement;
+    prepare(sql: string, params: (number | string | Uint8Array)[]): Statement;
 
-        close(): void;
-    }
-
-    class Statement {
-        bind(): boolean;
-        bind(values: { [key: string]: number | string | Uint8Array }): boolean;
-        bind(values: (number | string | Uint8Array)[]): boolean;
-
-        step(): boolean;
-
-        get(): (number | string | Uint8Array)[];
-        get(params: { [key: string]: number | string | Uint8Array }): (number | string | Uint8Array)[];
-        get(params: (number | string | Uint8Array)[]): (number | string | Uint8Array)[];
-
-        getColumnNames(): string[];
-
-        getAsObject(): { [columnName: string]: number | string | Uint8Array };
-        getAsObject(params: { [key: string]: number | string | Uint8Array }): { [columnName: string]: number | string | Uint8Array };
-        getAsObject(params: (number | string | Uint8Array)[]): { [columnName: string]: number | string | Uint8Array };
-
-        run(): void;
-        run(values: { [key: string]: number | string | Uint8Array }): void;
-        run(values: (number | string | Uint8Array)[]): void;
-
-        reset(): void;
-
-        freemem(): void;
-
-        free(): boolean;
-    }
-
-    interface QueryResults {
-        columns: string[];
-        values: (number | string | Uint8Array)[][];
-    }
+    export(): Uint8Array;
 
+    close(): void;
+}
+
+declare class Statement {
+    bind(): boolean;
+    bind(values: { [key: string]: number | string | Uint8Array }): boolean;
+    bind(values: (number | string | Uint8Array)[]): boolean;
+
+    step(): boolean;
+
+    get(): (number | string | Uint8Array)[];
+    get(params: { [key: string]: number | string | Uint8Array }): (number | string | Uint8Array)[];
+    get(params: (number | string | Uint8Array)[]): (number | string | Uint8Array)[];
+
+    getColumnNames(): string[];
+
+    getAsObject(): { [columnName: string]: number | string | Uint8Array };
+    getAsObject(params: { [key: string]: number | string | Uint8Array }): { [columnName: string]: number | string | Uint8Array };
+    getAsObject(params: (number | string | Uint8Array)[]): { [columnName: string]: number | string | Uint8Array };
+
+    run(): void;
+    run(values: { [key: string]: number | string | Uint8Array }): void;
+    run(values: (number | string | Uint8Array)[]): void;
+
+    reset(): void;
+
+    freemem(): void;
+
+    free(): boolean;
+}
+
+interface QueryResults {
+    columns: string[];
+    values: (number | string | Uint8Array)[][];
 }
diff --git a/sqlite3/sqlite3.d.ts b/sqlite3/sqlite3.d.ts
index dbc205cc0e..a84005b785 100644
--- a/sqlite3/sqlite3.d.ts
+++ b/sqlite3/sqlite3.d.ts
@@ -5,77 +5,76 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "sqlite3" {
-    import events = require("events");
-    
-    export var OPEN_READONLY: number;
-    export var OPEN_READWRITE: number;
-    export var OPEN_CREATE: number;
-    
-    export var cached: {
-        Database(filename: string, callback?: (err: Error) => void): Database;
-        Database(filename: string, mode?: number, callback?: (err: Error) => void): Database;
-    };
-    
-    export interface RunResult {
-        lastID: number;
-        changes: number;
-    }
-    
-    export class Statement {
-        public bind(callback?: (err: Error) => void): Statement;
-        public bind(...params: any[]): Statement;
-        
-        public reset(callback?: (err: Error) => void): Statement;
-        
-        public finalize(callback?: (err: Error) => void): Statement;
-        
-        public run(callback?: (err: Error) => void): Statement;
-        public run(...params: any[]): Statement;
-        
-        public get(callback?: (err: Error, row: any) => void): Statement;
-        public get(...params: any[]): Statement;
-        
-        public all(callback?: (err: Error, rows: any[]) => void): Statement;
-        public all(...params: any[]): Statement;
-        
-        public each(callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Statement;
-        public each(...params: any[]): Statement;
-    }
-    
-    export class Database extends events.EventEmitter {
-        constructor(filename: string, callback?: (err: Error) => void);
-        constructor(filename: string, mode?: number, callback?: (err: Error) => void);
-        
-        public close(callback?: (err: Error) => void): void;
-        
-        public run(sql: string, callback?: (err: Error) => void): Database;
-        public run(sql: string, ...params: any[]): Database;
-        
-        public get(sql: string, callback?: (err: Error, row: any) => void): Database;
-        public get(sql: string, ...params: any[]): Database;
-        
-        public all(sql: string, callback?: (err: Error, rows: any[]) => void): Database;
-        public all(sql: string, ...params: any[]): Database;
-        
-        public each(sql: string, callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Database;
-        public each(sql: string, ...params: any[]): Database;
-        
-        public exec(sql: string, callback?: (err: Error) => void): Database;
-        
-        public prepare(sql: string, callback?: (err: Error) => void): Statement;
-        public prepare(sql: string, ...params: any[]): Statement;
-        
-        public serialize(callback?: () => void): void;
-        public parallelize(callback?: () => void): void;
 
-        public on(event: "trace", listener: (sql: string) => void): this;
-        public on(event: "profile", listener: (sql: string, time: number) => void): this;
-        public on(event: "error", listener: (err: Error) => void): this;
-        public on(event: "open", listener: () => void): this;
-        public on(event: "close", listener: () => void): this;
-        public on(event: string, listener: Function): this;
-    }
-    
-    function verbose(): void;
+import events = require("events");
+
+declare export var OPEN_READONLY: number;
+declare export var OPEN_READWRITE: number;
+declare export var OPEN_CREATE: number;
+
+declare export var cached: {
+    Database(filename: string, callback?: (err: Error) => void): Database;
+    Database(filename: string, mode?: number, callback?: (err: Error) => void): Database;
+};
+
+export interface RunResult {
+    lastID: number;
+    changes: number;
 }
+
+declare export class Statement {
+    public bind(callback?: (err: Error) => void): Statement;
+    public bind(...params: any[]): Statement;
+
+    public reset(callback?: (err: Error) => void): Statement;
+
+    public finalize(callback?: (err: Error) => void): Statement;
+
+    public run(callback?: (err: Error) => void): Statement;
+    public run(...params: any[]): Statement;
+
+    public get(callback?: (err: Error, row: any) => void): Statement;
+    public get(...params: any[]): Statement;
+
+    public all(callback?: (err: Error, rows: any[]) => void): Statement;
+    public all(...params: any[]): Statement;
+
+    public each(callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Statement;
+    public each(...params: any[]): Statement;
+}
+
+declare export class Database extends events.EventEmitter {
+    constructor(filename: string, callback?: (err: Error) => void);
+    constructor(filename: string, mode?: number, callback?: (err: Error) => void);
+
+    public close(callback?: (err: Error) => void): void;
+
+    public run(sql: string, callback?: (err: Error) => void): Database;
+    public run(sql: string, ...params: any[]): Database;
+
+    public get(sql: string, callback?: (err: Error, row: any) => void): Database;
+    public get(sql: string, ...params: any[]): Database;
+
+    public all(sql: string, callback?: (err: Error, rows: any[]) => void): Database;
+    public all(sql: string, ...params: any[]): Database;
+
+    public each(sql: string, callback?: (err: Error, row: any) => void, complete?: (err: Error, count: number) => void): Database;
+    public each(sql: string, ...params: any[]): Database;
+
+    public exec(sql: string, callback?: (err: Error) => void): Database;
+
+    public prepare(sql: string, callback?: (err: Error) => void): Statement;
+    public prepare(sql: string, ...params: any[]): Statement;
+
+    public serialize(callback?: () => void): void;
+    public parallelize(callback?: () => void): void;
+
+    public on(event: "trace", listener: (sql: string) => void): this;
+    public on(event: "profile", listener: (sql: string, time: number) => void): this;
+    public on(event: "error", listener: (err: Error) => void): this;
+    public on(event: "open", listener: () => void): this;
+    public on(event: "close", listener: () => void): this;
+    public on(event: string, listener: Function): this;
+}
+
+declare function verbose(): void;
diff --git a/squirejs/squirejs.d.ts b/squirejs/squirejs.d.ts
index 90c12d2365..d9037cf8cb 100644
--- a/squirejs/squirejs.d.ts
+++ b/squirejs/squirejs.d.ts
@@ -3,26 +3,25 @@
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'squirejs' {
-    class Squire {
-        constructor();
-        constructor(context: string);
-        mock(name: string, mock: any): Squire;
-        mock(mocks: {[name: string]: any}): Squire;
-        require(dependencies: string[], callback: Function, errback?: Function): Squire;
-        store(name: string | string[]): Squire;
-        clean(): Squire;
-        clean(name: string | string[]): Squire;
-        remove(): String;
-        run(dependencies: string[], test: Function): (done: Function) => void;
-    }
 
-    namespace Squire {
-        namespace Helpers {
-            export function returns<T>(what: T): () => T;
-            export function constructs<T>(what: T): () => (() => T);
-        }
-    }
-
-    export = Squire;
+declare class Squire {
+    constructor();
+    constructor(context: string);
+    mock(name: string, mock: any): Squire;
+    mock(mocks: { [name: string]: any }): Squire;
+    require(dependencies: string[], callback: Function, errback?: Function): Squire;
+    store(name: string | string[]): Squire;
+    clean(): Squire;
+    clean(name: string | string[]): Squire;
+    remove(): String;
+    run(dependencies: string[], test: Function): (done: Function) => void;
 }
+
+declare namespace Squire {
+    namespace Helpers {
+        export function returns<T>(what: T): () => T;
+        export function constructs<T>(what: T): () => (() => T);
+    }
+}
+
+export = Squire;
diff --git a/ssh2/ssh2.d.ts b/ssh2/ssh2.d.ts
index bae9ac653a..53fd48e355 100644
--- a/ssh2/ssh2.d.ts
+++ b/ssh2/ssh2.d.ts
@@ -5,426 +5,424 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "ssh2" {
-    import stream = require('stream');
 
-    namespace ssh2 {
-        interface Client extends NodeJS.EventEmitter {
-            Server: ServerStatic;
-            new(): Client;
-            /**
-             * SFTPStream.STATUS_CODE from ssh2-streams.
-             */
-            SFTP_STATUS_CODE: Sftp.StatusCode;
-            /**
-             * SFTPStream.OPEN_MODE from ssh2-streams.
-             */
-            SFTP_OPEN_MODE: Sftp.OpenMode;
-            //TODO: Type ssh2-streams
-            /**
-             * utility methods from ssh2-streams.
-             */
-            utils: Utils;
+import stream = require('stream');
 
-            connect(config: ConnectConfig): void;
-            end(): void;
-            destroy(): void;
-            exec(command: string, options: ExecOption, callback: ChannelCallback): boolean;
-            exec(command: string, callback: ChannelCallback): boolean;
-            shell(window: boolean|PseudoTtySettings, options: boolean|number|X11Settings, callback: ChannelCallback): boolean;
-            shell(window: boolean|PseudoTtySettings, callback: ChannelCallback): boolean;
-            shell(callback: ChannelCallback): boolean;
-            subsys(subsystem: string, callback: ChannelCallback): boolean;
-            sftp(callback: SftpCallback): boolean;
-            forwardIn(bindAddr: string, bindPort: number, callback?: ForwardInCallback): boolean;
-            unforwardIn(bindAddr: string, bindPort: number, callback?: ErrorCallback): boolean;
-            forwardOut(srcIP: string, srcPort: number, dstIP: string, dstPort: number, callback: ChannelCallback): boolean;
-            openssh_noMoreSessions(callback?: ErrorCallback): boolean;
-            openssh_forwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
-            openssh_unforwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
-            openssh_forwardOutStreamLocal(socketPath: string, callback?: ChannelCallback): boolean;
-        }
+declare namespace ssh2 {
+    interface Client extends NodeJS.EventEmitter {
+        Server: ServerStatic;
+        new (): Client;
+        /**
+         * SFTPStream.STATUS_CODE from ssh2-streams.
+         */
+        SFTP_STATUS_CODE: Sftp.StatusCode;
+        /**
+         * SFTPStream.OPEN_MODE from ssh2-streams.
+         */
+        SFTP_OPEN_MODE: Sftp.OpenMode;
+        //TODO: Type ssh2-streams
+        /**
+         * utility methods from ssh2-streams.
+         */
+        utils: Utils;
 
-        interface ConnectConfig {
-            /**
-             * @description Hostname or IP address of the server.
-             * @default 'localhost'
-             */
-            host?: string;
-            /**
-             * @description Port number of the server.
-             * @default 22
-             */
-            port?: number;
-            /**
-             * @description Only connect via resolved IPv4 address for `host`.
-             * @default false
-             */
-            forceIPv4?: boolean;
-            /**
-             * @description Only connect via resolved IPv6 address for `host`.
-             * @default false
-             */
-            forceIPv6?: boolean;
-            /**
-             * @description 'md5' or 'sha1'. The host's key is hashed using this method and passed to the **hostVerifier** function.
-             * @default (none)
-             */
-            hostHash?: string;
-            /**
-             * @description Function that is passed a string hex hash of the host's key for verification purposes.
-             * Return `true` to continue with the handshake or `false` to reject and disconnect.
-             */
-            hostVerifier?: (keyHash: string) => boolean;
-            /**
-             * @description Username for authentication.
-             */
-            username?: string;
-            /**
-             * @description Password for password-based user authentication.
-             */
-            password?: string;
-            /**
-             * @description Path to ssh-agent's UNIX socket for ssh-agent-based user authentication.
-             * Windows users: set to 'pageant' for authenticating with Pageant or (actual) path to a cygwin "UNIX socket."
-             */
-            agent?: string;
-            /**
-             * @description Buffer or string that contains a private key for either key-based or hostbased user authentication (OpenSSH format).
-             */
-            privateKey?: Buffer|string;
-            /**
-             * @description For an encrypted private key, this is the passphrase used to decrypt it.
-             */
-            passphrase?: string;
-            /**
-             * @description Along with **localUsername** and **privateKey**, set this to a non-empty string for hostbased user authentication.
-             */
-            localHostname?: string;
-            /**
-             * @description Along with **localHostname** and **privateKey**, set this to a non-empty string for hostbased user authentication.
-             */
-            localUsername?: string;
-            /**
-             * @description Try keyboard-interactive user authentication if primary user authentication method fails.
-             * If you set this to `true`, you need to handle the `keyboard-interactive` event.
-             */
-            tryKeyboard: boolean;
-            /**
-             * @description How often (in milliseconds) to send SSH-level keepalive packets to the server
-             * (in a similar way as OpenSSH's ServerAliveInterval config option). Set to 0 to disable.
-             * @default 0
-             */
-            keepaliveInterval?: number;
-            /**
-             * @description How many consecutive, unanswered SSH-level keepalive packets that can be sent to the server
-             * before disconnection (similar to OpenSSH's ServerAliveCountMax config option).
-             * @default 3
-             */
-            keepaliveCountMax?: number;
-            /**
-             * @description How long (in milliseconds) to wait for the SSH handshake to complete.
-             * @default 20000
-             */
-            readyTimeout?: number;
-            /**
-             * @description Performs a strict server vendor check before sending vendor-specific requests,
-             * etc. (e.g. check for OpenSSH server when using `openssh_noMoreSessions()`)
-             * @default true
-             */
-            strictVendor?: boolean;
-            /**
-             * A ReadableStream to use for communicating with the server instead of creating and using a new TCP connection (useful for connection hopping).
-             */
-            sock?: NodeJS.ReadableStream;
-            /**
-             * @description Set to `true` to use OpenSSH agent forwarding (`auth-agent@openssh.com`) for the life of the connection. `agent` must also be set to use this feature.
-             * @default false
-             */
-            agentForward?: boolean;
-            /**
-             * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
-             */
-            debug: (information: string) => any;
-        }
-
-        interface ExecOption {
-            /**
-             * @description An environment to use for the execution of the command.
-             */
-            env?: any;
-            /**
-             * @description Set to true to allocate a pseudo-tty with defaults, or an object containing specific pseudo-tty settings
-             * (see 'Pseudo-TTY settings'). Setting up a pseudo-tty can be useful when working with remote processes
-             * that expect input from an actual terminal (e.g. sudo's password prompt).
-             */
-            pty?: boolean|PseudoTtySettings;
-            /**
-             * @description Set to true to use defaults below, set to a number to specify a specific screen number,
-             * or an object.
-             */
-            x11?: boolean|number|X11Settings;
-        }
-
-        interface X11Settings {
-            /**
-             * Allow just a single connection?
-             * @default false
-             */
-            single?: boolean;
-            /**
-             * Screen number to use
-             * @default 0
-             */
-            screen?: number;
-        }
-
-        interface PseudoTtySettings {
-            /**
-             * @description * Number of rows
-             * @default 24
-             */
-            rows?: number;
-            /**
-             * @description * Number of columns
-             * @default 80
-             */
-            cols?: number;
-            /**
-             * @description * Height in pixels
-             * @default 480
-             */
-            height?: number;
-            /**
-             * @description * Width in pixels
-             * @default 640
-             */
-            width?: number;
-            /**
-             * @description The value to use for $TERM
-             * @default 'vt100'
-             */
-            term?: string;
-        }
-
-        interface ForwardInCallback {
-            (err?: Error, bindPort?: number): void;
-        }
-
-        interface ChannelCallback {
-            (err?: Error, channel?: Channel): void;
-        }
-
-        interface SftpCallback {
-            (err?: Error, sftp?: Sftp.Wrapper): void;
-        }
-
-        interface ErrorCallback {
-            (err?: Error): void;
-        }
-
-        interface Channel extends stream.Duplex {
-            new(info?: any, client?: any, options?: any): Channel;
-            eof(): boolean;
-            close(): boolean;
-            destroy(): void;
-            setWindow(rows: number, cols: number, height: number, width: number): boolean;
-            signal(signalName: string): boolean;
-            exit(name: string, coreDumped: boolean, msg: string): boolean;
-            exit(status: number): boolean;
-            stderr?: ServerStderr;
-        }
-
-        interface ServerStderr extends NodeJS.WritableStream {
-            new(channel: Channel): ServerStderr;
-        }
-
-        interface ServerStatic {
-            new(config: ServerConfig, listener?: any): Server;
-            createServer(config: ServerConfig, listener?: any): Server;
-            KEEPALIVE_INTERVAL: number;
-            KEEPALIVE_CLIENT_INTERVAL: number;
-            KEEPALIVE_CLIENT_COUNT_MAX: number;
-        }
-
-        interface Server extends NodeJS.EventEmitter {
-            listen(port: number, hostname?: string, backlog?: number, callback?: Function): Server;
-            listen(port: number, hostname?: string, callback?: Function): Server;
-            listen(path: string, callback?: Function): Server;
-            listen(handle: any, listeningListener?: Function): Server;
-            address(): { port: number; family: string; address: string; };
-            getConnections(callback: any): any; //TODO: No type
-            close(callback?: Function): Server;
-            ref(): void;
-            unref(): void;
-        }
-
-        interface ServerConfig {
-            /**
-             * @description Buffer or string that contains the host private key (OpenSSH format).
-             */
-            privateKey: Buffer|string;
-            /**
-             * @description For an encrypted host private key, this is the passphrase used to decrypt it.
-             */
-            passphrase?: string;
-            /**
-             * @description A message that is sent to clients immediately upon connection, before handshaking begins.
-             */
-            banner?: string;
-            /**
-             * @description A custom server software name/version identifier.
-             * @default 'ssh2js' + moduleVersion + 'srv'
-             */
-            indent?: string;
-            /**
-             * @description This is the highWaterMark to use for the parser stream.
-             * @default 32 * 1024
-             */
-            highWaterMark?: number;
-            /**
-             * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
-             */
-            debug?: (information: string) => any;
-        }
-
-        // utility methods from ssh2-streams.
-        interface Utils {
-            iv_inc: Function;
-            isStreamCipher: Function;
-            isGCM: Function;
-            readInt: Function;
-            readString: Function;
-            parseKey: Function;
-            genPublicKey: Function;
-            convertPPKPrivate: Function;
-            verifyPPKMAC: Function;
-            decryptKey: Function;
-        }
-
-        namespace Sftp {
-            // SFTPStream.STATUS_CODE from ssh2-streams.
-            interface StatusCode {
-                OK: number;
-                EOF: number;
-                NO_SUCH_FILE: number;
-                PERMISSION_DENIED: number;
-                FAILURE: number;
-                BAD_MESSAGE: number;
-                NO_CONNECTION: number;
-                CONNECTION_LOST: number;
-                OP_UNSUPPORTED: number;
-            }
-
-            // SFTPStream.OPEN_MODE from ssh2-streams.
-            interface OpenMode {
-                READ: number;
-                WRITE: number;
-                APPEND: number;
-                CREAT: number;
-                TRUNC: number;
-                EXCL: number;
-            }
-
-            interface Attributes {
-                mode: number;
-                uid: number;
-                gid: number;
-                size: number;
-                atime: number;
-                mtime: number;
-            }
-            interface InputAttributes {
-                mode?: number;
-                uid?: number;
-                gid?: number;
-                size?: number;
-                atime?: number;
-                mtime?: number;
-            }
-            interface Stats extends Attributes {
-                isDirectory(): boolean;
-                isFile(): boolean;
-                isBlockDevice(): boolean;
-                isCharacterDevice(): boolean;
-                isSymbloicLink(): boolean;
-                isFIFO(): boolean;
-                isSocket(): boolean;
-            }
-
-            interface Wrapper extends NodeJS.EventEmitter {
-                fastGet(remotePath: string, localPath: string, callback: (err: any) => void): void;
-                fastGet(remotePath: string, localPath: string, options: TransferOptions, callback: (err: any) => void): void;
-                fastPut(localPath: string, remotePath: string, callback: (err: any) => void): void;
-                fastPut(localPath: string, remotePath: string, options: TransferOptions, callback: (err: any) => void): void;
-
-                createReadStream(path: string, options?: ReadStreamOptions): stream.Readable;
-                createWriteStream(path: string, options?: WriteStreamOptions): stream.Writable;
-                open(filename: string, mode: string, callback: (err: any, handle: Buffer) => void): boolean;
-                open(filename: string, mode: string, attributes: InputAttributes, callback: (err: any, handle: Buffer) => void): boolean;
-                close(handle: Buffer, callback: (err: any) => void): boolean;
-                readData(handle: Buffer, buffer: Buffer, offset: number, length: number, position: number,
-                        callback: (err: any, bytesRead: number, buffer: Buffer, position: number) => void): boolean;
-                writeData(handle: Buffer, buffer: Buffer, offset: number, length: number, position: number,
-                        callback: (err: any) => void): boolean;
-                fstat(handle: Buffer, callback: (err: any, stats: Stats) => void): boolean;
-                fsetstat(handle: Buffer, attributes: InputAttributes, callback: (err: any) => void): boolean;
-                futimes(handle: Buffer, atime: number | Date, mtime: number | Date, callback: (err: any) => void): boolean;
-                fchown(handle: Buffer, uid: number, gid: number, callback: (err: any) => void): boolean;
-                fchmod(handle: Buffer, mode: number | string, callback: (err: any) => void): boolean;
-                opendir(path: string, callback: (err: any, handle: Buffer) => void): boolean;
-                readdir(location: string | Buffer, callback: (err: any, list: ReadDirItem[]) => void): boolean;
-                unlink(path: string, callback: (err: any) => void): boolean;
-                rename(srcPath: string, destPath: string, callback: (err: any) => void): boolean;
-                mkdir(path: string, callback: (err: any) => void): boolean;
-                mkdir(path: string, attributes: InputAttributes, callback: (err: any) => void): boolean;
-                rmdir(path: string, callback: (err: any) => void): boolean;
-                stat(path: string, callback: (err: any, stats: Stats) => void): boolean;
-                lstat(path: string, callback: (err: any, stats: Stats) => void): boolean;
-                setstat(path: string, attributes: InputAttributes, callback: (err: any) => void): boolean;
-                utimes(path: string, atime: number | Date, mtime: number | Date, callback: (err: any) => void): boolean;
-                chown(path: string, uid: number, gid: number, callback: (err: any) => void): boolean;
-                chmod(path: string, mode: number | string, callback: (err: any) => void): boolean;
-                readlink(path: string, callback: (err: any, target: string) => void): boolean;
-                symlink(targetPath: string, linkPath: string, callback: (err: any) => void): boolean;
-                realpath(path: string, callback: (err: any, absPath: string) => void): boolean;
-
-                ext_openssh_rename(srcPath: string, destPath: string, callback: (err: any) => void): boolean;
-                ext_openssh_statvfs(path: string, callback: (err: any, fsInfo: any) => void): boolean;
-                ext_openssh_fstatvfs(handle: Buffer, callback: (err: any, fsInfo: any) => void): boolean;
-                ext_openssh_hardlink(targetPath: string, linkPath: string, callback: (err: any) => void): boolean;
-                ext_openssh_fsync(handle: Buffer, callback: (err: any, fsInfo: any) => void): boolean;
-            }
-
-            interface TransferOptions {
-                concurrency?: number;
-                chunkSize?: number;
-                step?: (total_transferred: number, chunk: number, total: number) => void;
-            }
-            interface ReadStreamOptions {
-                flags?: string;
-                encoding?: string;
-                handle?: Buffer;
-                mode?: number;
-                autoClose?: boolean;
-                start?: number;
-                end?: number;
-            }
-            interface WriteStreamOptions {
-                flags?: string;
-                encoding?: string;
-                mode?: number;
-            }
-            interface ReadDirItem {
-              filename: string;
-              longname: string;
-              attrs: Attributes;
-            }
-        }
+        connect(config: ConnectConfig): void;
+        end(): void;
+        destroy(): void;
+        exec(command: string, options: ExecOption, callback: ChannelCallback): boolean;
+        exec(command: string, callback: ChannelCallback): boolean;
+        shell(window: boolean | PseudoTtySettings, options: boolean | number | X11Settings, callback: ChannelCallback): boolean;
+        shell(window: boolean | PseudoTtySettings, callback: ChannelCallback): boolean;
+        shell(callback: ChannelCallback): boolean;
+        subsys(subsystem: string, callback: ChannelCallback): boolean;
+        sftp(callback: SftpCallback): boolean;
+        forwardIn(bindAddr: string, bindPort: number, callback?: ForwardInCallback): boolean;
+        unforwardIn(bindAddr: string, bindPort: number, callback?: ErrorCallback): boolean;
+        forwardOut(srcIP: string, srcPort: number, dstIP: string, dstPort: number, callback: ChannelCallback): boolean;
+        openssh_noMoreSessions(callback?: ErrorCallback): boolean;
+        openssh_forwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
+        openssh_unforwardInStreamLocal(socketPath: string, callback?: ErrorCallback): boolean;
+        openssh_forwardOutStreamLocal(socketPath: string, callback?: ChannelCallback): boolean;
     }
 
-    var ssh2: ssh2.Client;
+    interface ConnectConfig {
+        /**
+         * @description Hostname or IP address of the server.
+         * @default 'localhost'
+         */
+        host?: string;
+        /**
+         * @description Port number of the server.
+         * @default 22
+         */
+        port?: number;
+        /**
+         * @description Only connect via resolved IPv4 address for `host`.
+         * @default false
+         */
+        forceIPv4?: boolean;
+        /**
+         * @description Only connect via resolved IPv6 address for `host`.
+         * @default false
+         */
+        forceIPv6?: boolean;
+        /**
+         * @description 'md5' or 'sha1'. The host's key is hashed using this method and passed to the **hostVerifier** function.
+         * @default (none)
+         */
+        hostHash?: string;
+        /**
+         * @description Function that is passed a string hex hash of the host's key for verification purposes.
+         * Return `true` to continue with the handshake or `false` to reject and disconnect.
+         */
+        hostVerifier?: (keyHash: string) => boolean;
+        /**
+         * @description Username for authentication.
+         */
+        username?: string;
+        /**
+         * @description Password for password-based user authentication.
+         */
+        password?: string;
+        /**
+         * @description Path to ssh-agent's UNIX socket for ssh-agent-based user authentication.
+         * Windows users: set to 'pageant' for authenticating with Pageant or (actual) path to a cygwin "UNIX socket."
+         */
+        agent?: string;
+        /**
+         * @description Buffer or string that contains a private key for either key-based or hostbased user authentication (OpenSSH format).
+         */
+        privateKey?: Buffer | string;
+        /**
+         * @description For an encrypted private key, this is the passphrase used to decrypt it.
+         */
+        passphrase?: string;
+        /**
+         * @description Along with **localUsername** and **privateKey**, set this to a non-empty string for hostbased user authentication.
+         */
+        localHostname?: string;
+        /**
+         * @description Along with **localHostname** and **privateKey**, set this to a non-empty string for hostbased user authentication.
+         */
+        localUsername?: string;
+        /**
+         * @description Try keyboard-interactive user authentication if primary user authentication method fails.
+         * If you set this to `true`, you need to handle the `keyboard-interactive` event.
+         */
+        tryKeyboard: boolean;
+        /**
+         * @description How often (in milliseconds) to send SSH-level keepalive packets to the server
+         * (in a similar way as OpenSSH's ServerAliveInterval config option). Set to 0 to disable.
+         * @default 0
+         */
+        keepaliveInterval?: number;
+        /**
+         * @description How many consecutive, unanswered SSH-level keepalive packets that can be sent to the server
+         * before disconnection (similar to OpenSSH's ServerAliveCountMax config option).
+         * @default 3
+         */
+        keepaliveCountMax?: number;
+        /**
+         * @description How long (in milliseconds) to wait for the SSH handshake to complete.
+         * @default 20000
+         */
+        readyTimeout?: number;
+        /**
+         * @description Performs a strict server vendor check before sending vendor-specific requests,
+         * etc. (e.g. check for OpenSSH server when using `openssh_noMoreSessions()`)
+         * @default true
+         */
+        strictVendor?: boolean;
+        /**
+         * A ReadableStream to use for communicating with the server instead of creating and using a new TCP connection (useful for connection hopping).
+         */
+        sock?: NodeJS.ReadableStream;
+        /**
+         * @description Set to `true` to use OpenSSH agent forwarding (`auth-agent@openssh.com`) for the life of the connection. `agent` must also be set to use this feature.
+         * @default false
+         */
+        agentForward?: boolean;
+        /**
+         * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
+         */
+        debug: (information: string) => any;
+    }
 
-    export = ssh2;
+    interface ExecOption {
+        /**
+         * @description An environment to use for the execution of the command.
+         */
+        env?: any;
+        /**
+         * @description Set to true to allocate a pseudo-tty with defaults, or an object containing specific pseudo-tty settings
+         * (see 'Pseudo-TTY settings'). Setting up a pseudo-tty can be useful when working with remote processes
+         * that expect input from an actual terminal (e.g. sudo's password prompt).
+         */
+        pty?: boolean | PseudoTtySettings;
+        /**
+         * @description Set to true to use defaults below, set to a number to specify a specific screen number,
+         * or an object.
+         */
+        x11?: boolean | number | X11Settings;
+    }
+
+    interface X11Settings {
+        /**
+         * Allow just a single connection?
+         * @default false
+         */
+        single?: boolean;
+        /**
+         * Screen number to use
+         * @default 0
+         */
+        screen?: number;
+    }
+
+    interface PseudoTtySettings {
+        /**
+         * @description * Number of rows
+         * @default 24
+         */
+        rows?: number;
+        /**
+         * @description * Number of columns
+         * @default 80
+         */
+        cols?: number;
+        /**
+         * @description * Height in pixels
+         * @default 480
+         */
+        height?: number;
+        /**
+         * @description * Width in pixels
+         * @default 640
+         */
+        width?: number;
+        /**
+         * @description The value to use for $TERM
+         * @default 'vt100'
+         */
+        term?: string;
+    }
+
+    interface ForwardInCallback {
+        (err?: Error, bindPort?: number): void;
+    }
+
+    interface ChannelCallback {
+        (err?: Error, channel?: Channel): void;
+    }
+
+    interface SftpCallback {
+        (err?: Error, sftp?: Sftp.Wrapper): void;
+    }
+
+    interface ErrorCallback {
+        (err?: Error): void;
+    }
+
+    interface Channel extends stream.Duplex {
+        new (info?: any, client?: any, options?: any): Channel;
+        eof(): boolean;
+        close(): boolean;
+        destroy(): void;
+        setWindow(rows: number, cols: number, height: number, width: number): boolean;
+        signal(signalName: string): boolean;
+        exit(name: string, coreDumped: boolean, msg: string): boolean;
+        exit(status: number): boolean;
+        stderr?: ServerStderr;
+    }
+
+    interface ServerStderr extends NodeJS.WritableStream {
+        new (channel: Channel): ServerStderr;
+    }
+
+    interface ServerStatic {
+        new (config: ServerConfig, listener?: any): Server;
+        createServer(config: ServerConfig, listener?: any): Server;
+        KEEPALIVE_INTERVAL: number;
+        KEEPALIVE_CLIENT_INTERVAL: number;
+        KEEPALIVE_CLIENT_COUNT_MAX: number;
+    }
+
+    interface Server extends NodeJS.EventEmitter {
+        listen(port: number, hostname?: string, backlog?: number, callback?: Function): Server;
+        listen(port: number, hostname?: string, callback?: Function): Server;
+        listen(path: string, callback?: Function): Server;
+        listen(handle: any, listeningListener?: Function): Server;
+        address(): { port: number; family: string; address: string; };
+        getConnections(callback: any): any; //TODO: No type
+        close(callback?: Function): Server;
+        ref(): void;
+        unref(): void;
+    }
+
+    interface ServerConfig {
+        /**
+         * @description Buffer or string that contains the host private key (OpenSSH format).
+         */
+        privateKey: Buffer | string;
+        /**
+         * @description For an encrypted host private key, this is the passphrase used to decrypt it.
+         */
+        passphrase?: string;
+        /**
+         * @description A message that is sent to clients immediately upon connection, before handshaking begins.
+         */
+        banner?: string;
+        /**
+         * @description A custom server software name/version identifier.
+         * @default 'ssh2js' + moduleVersion + 'srv'
+         */
+        indent?: string;
+        /**
+         * @description This is the highWaterMark to use for the parser stream.
+         * @default 32 * 1024
+         */
+        highWaterMark?: number;
+        /**
+         * @description Set this to a function that receives a single string argument to get detailed (local) debug information.
+         */
+        debug?: (information: string) => any;
+    }
+
+    // utility methods from ssh2-streams.
+    interface Utils {
+        iv_inc: Function;
+        isStreamCipher: Function;
+        isGCM: Function;
+        readInt: Function;
+        readString: Function;
+        parseKey: Function;
+        genPublicKey: Function;
+        convertPPKPrivate: Function;
+        verifyPPKMAC: Function;
+        decryptKey: Function;
+    }
+
+    namespace Sftp {
+        // SFTPStream.STATUS_CODE from ssh2-streams.
+        interface StatusCode {
+            OK: number;
+            EOF: number;
+            NO_SUCH_FILE: number;
+            PERMISSION_DENIED: number;
+            FAILURE: number;
+            BAD_MESSAGE: number;
+            NO_CONNECTION: number;
+            CONNECTION_LOST: number;
+            OP_UNSUPPORTED: number;
+        }
+
+        // SFTPStream.OPEN_MODE from ssh2-streams.
+        interface OpenMode {
+            READ: number;
+            WRITE: number;
+            APPEND: number;
+            CREAT: number;
+            TRUNC: number;
+            EXCL: number;
+        }
+
+        interface Attributes {
+            mode: number;
+            uid: number;
+            gid: number;
+            size: number;
+            atime: number;
+            mtime: number;
+        }
+        interface InputAttributes {
+            mode?: number;
+            uid?: number;
+            gid?: number;
+            size?: number;
+            atime?: number;
+            mtime?: number;
+        }
+        interface Stats extends Attributes {
+            isDirectory(): boolean;
+            isFile(): boolean;
+            isBlockDevice(): boolean;
+            isCharacterDevice(): boolean;
+            isSymbloicLink(): boolean;
+            isFIFO(): boolean;
+            isSocket(): boolean;
+        }
+
+        interface Wrapper extends NodeJS.EventEmitter {
+            fastGet(remotePath: string, localPath: string, callback: (err: any) => void): void;
+            fastGet(remotePath: string, localPath: string, options: TransferOptions, callback: (err: any) => void): void;
+            fastPut(localPath: string, remotePath: string, callback: (err: any) => void): void;
+            fastPut(localPath: string, remotePath: string, options: TransferOptions, callback: (err: any) => void): void;
+
+            createReadStream(path: string, options?: ReadStreamOptions): stream.Readable;
+            createWriteStream(path: string, options?: WriteStreamOptions): stream.Writable;
+            open(filename: string, mode: string, callback: (err: any, handle: Buffer) => void): boolean;
+            open(filename: string, mode: string, attributes: InputAttributes, callback: (err: any, handle: Buffer) => void): boolean;
+            close(handle: Buffer, callback: (err: any) => void): boolean;
+            readData(handle: Buffer, buffer: Buffer, offset: number, length: number, position: number,
+                callback: (err: any, bytesRead: number, buffer: Buffer, position: number) => void): boolean;
+            writeData(handle: Buffer, buffer: Buffer, offset: number, length: number, position: number,
+                callback: (err: any) => void): boolean;
+            fstat(handle: Buffer, callback: (err: any, stats: Stats) => void): boolean;
+            fsetstat(handle: Buffer, attributes: InputAttributes, callback: (err: any) => void): boolean;
+            futimes(handle: Buffer, atime: number | Date, mtime: number | Date, callback: (err: any) => void): boolean;
+            fchown(handle: Buffer, uid: number, gid: number, callback: (err: any) => void): boolean;
+            fchmod(handle: Buffer, mode: number | string, callback: (err: any) => void): boolean;
+            opendir(path: string, callback: (err: any, handle: Buffer) => void): boolean;
+            readdir(location: string | Buffer, callback: (err: any, list: ReadDirItem[]) => void): boolean;
+            unlink(path: string, callback: (err: any) => void): boolean;
+            rename(srcPath: string, destPath: string, callback: (err: any) => void): boolean;
+            mkdir(path: string, callback: (err: any) => void): boolean;
+            mkdir(path: string, attributes: InputAttributes, callback: (err: any) => void): boolean;
+            rmdir(path: string, callback: (err: any) => void): boolean;
+            stat(path: string, callback: (err: any, stats: Stats) => void): boolean;
+            lstat(path: string, callback: (err: any, stats: Stats) => void): boolean;
+            setstat(path: string, attributes: InputAttributes, callback: (err: any) => void): boolean;
+            utimes(path: string, atime: number | Date, mtime: number | Date, callback: (err: any) => void): boolean;
+            chown(path: string, uid: number, gid: number, callback: (err: any) => void): boolean;
+            chmod(path: string, mode: number | string, callback: (err: any) => void): boolean;
+            readlink(path: string, callback: (err: any, target: string) => void): boolean;
+            symlink(targetPath: string, linkPath: string, callback: (err: any) => void): boolean;
+            realpath(path: string, callback: (err: any, absPath: string) => void): boolean;
+
+            ext_openssh_rename(srcPath: string, destPath: string, callback: (err: any) => void): boolean;
+            ext_openssh_statvfs(path: string, callback: (err: any, fsInfo: any) => void): boolean;
+            ext_openssh_fstatvfs(handle: Buffer, callback: (err: any, fsInfo: any) => void): boolean;
+            ext_openssh_hardlink(targetPath: string, linkPath: string, callback: (err: any) => void): boolean;
+            ext_openssh_fsync(handle: Buffer, callback: (err: any, fsInfo: any) => void): boolean;
+        }
+
+        interface TransferOptions {
+            concurrency?: number;
+            chunkSize?: number;
+            step?: (total_transferred: number, chunk: number, total: number) => void;
+        }
+        interface ReadStreamOptions {
+            flags?: string;
+            encoding?: string;
+            handle?: Buffer;
+            mode?: number;
+            autoClose?: boolean;
+            start?: number;
+            end?: number;
+        }
+        interface WriteStreamOptions {
+            flags?: string;
+            encoding?: string;
+            mode?: number;
+        }
+        interface ReadDirItem {
+            filename: string;
+            longname: string;
+            attrs: Attributes;
+        }
+    }
 }
 
+declare var ssh2: ssh2.Client;
+
+export = ssh2;
diff --git a/stack-mapper/stack-mapper.d.ts b/stack-mapper/stack-mapper.d.ts
index e6776e4ca6..ee282bb165 100644
--- a/stack-mapper/stack-mapper.d.ts
+++ b/stack-mapper/stack-mapper.d.ts
@@ -3,44 +3,43 @@
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "stack-mapper" {
 
-	namespace stackMapper {
 
-		export class StackMapper {
+declare namespace stackMapper {
 
-			/**
-			 * Maps the trace statements of the given error stack and replaces locations
-			 * referencing code in the generated file with the locations inside the original files.
-			 *
-			 * @name map
-			 * @function
-			 * @param {Array} array of callsite objects (see readme for details about Callsite object)
-			 * @return {Array.<Object>} info about the error stack with adapted locations, each with the following properties
-			 *    - filename: original filename
-			 *    - line: origial line in that filename of the trace
-			 *    - column: origial column on that line of the trace
-			 */
-			public map(stack: Callsite[]): Callsite[];
-		}
+    export class StackMapper {
 
-		export interface Callsite {
-			filename: string;
-			line: number;
-			column: number;
-		}
+        /**
+         * Maps the trace statements of the given error stack and replaces locations
+         * referencing code in the generated file with the locations inside the original files.
+         *
+         * @name map
+         * @function
+         * @param {Array} array of callsite objects (see readme for details about Callsite object)
+         * @return {Array.<Object>} info about the error stack with adapted locations, each with the following properties
+         *    - filename: original filename
+         *    - line: origial line in that filename of the trace
+         *    - column: origial column on that line of the trace
+         */
+        public map(stack: Callsite[]): Callsite[];
+    }
 
-	}
+    export interface Callsite {
+        filename: string;
+        line: number;
+        column: number;
+    }
 
-	/**
-	 * Returns a Stackmapper that will use the given source map to map error trace locations.
-	 *
-	 * @name stackMapper
-	 * @function
-	 * @param {Object} sourcemap source map for the generated file
-	 * @return {StackMapper} stack mapper for the particular source map
-	 */
-	function stackMapper(sourcemap: any): stackMapper.StackMapper;
-
-	export = stackMapper;
 }
+
+/**
+ * Returns a Stackmapper that will use the given source map to map error trace locations.
+ *
+ * @name stackMapper
+ * @function
+ * @param {Object} sourcemap source map for the generated file
+ * @return {StackMapper} stack mapper for the particular source map
+ */
+declare function stackMapper(sourcemap: any): stackMapper.StackMapper;
+
+export = stackMapper;
diff --git a/stack-trace/stack-trace.d.ts b/stack-trace/stack-trace.d.ts
index 800a3da051..a829b1a082 100644
--- a/stack-trace/stack-trace.d.ts
+++ b/stack-trace/stack-trace.d.ts
@@ -3,18 +3,17 @@
 // Definitions by: Exceptionless <https://github.com/exceptionless>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'stack-trace' {
-  export interface StackFrame {
-    getTypeName():string;
-    getFunctionName():string;
-    getMethodName():string;
-    getFileName():string;
-    getTypeName():string;
-    getLineNumber():number;
-    getColumnNumber():number;
-    isNative():boolean;
-  }
 
-  export function get(belowFn?:() => void): StackFrame[];
-  export function parse(err:Error): StackFrame[];
+export interface StackFrame {
+    getTypeName(): string;
+    getFunctionName(): string;
+    getMethodName(): string;
+    getFileName(): string;
+    getTypeName(): string;
+    getLineNumber(): number;
+    getColumnNumber(): number;
+    isNative(): boolean;
 }
+
+declare export function get(belowFn?: () => void): StackFrame[];
+declare export function parse(err: Error): StackFrame[];
diff --git a/static-eval/static-eval.d.ts b/static-eval/static-eval.d.ts
index 251030fb02..a3a4117237 100644
--- a/static-eval/static-eval.d.ts
+++ b/static-eval/static-eval.d.ts
@@ -2,15 +2,14 @@
 // Project: https://github.com/substack/static-eval
 // Definitions by: Ben Liddicott <https://github.com/benliddicott/DefinitelyTyped>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
- 
+
 /// <reference path="../esprima/esprima.d.ts" />
 
-declare module 'static-eval' {
-    /**
-    * Evaluates the given ESTree.Expression, with the given named variables in place.
-    * @param ast [ESTree.Expression] An esprima expression derived from parse.body[].expression
-    * @param vars Named variables, objects or functions which may be referenced in the expression.
-    */
-    function evaluate(ast : ESTree.Expression, vars: { [name: string]: any }): any;
-    export =evaluate;
-}
+
+/**
+* Evaluates the given ESTree.Expression, with the given named variables in place.
+* @param ast [ESTree.Expression] An esprima expression derived from parse.body[].expression
+* @param vars Named variables, objects or functions which may be referenced in the expression.
+*/
+declare function evaluate(ast: ESTree.Expression, vars: { [name: string]: any }): any;
+export =evaluate;
diff --git a/statsd-client/statsd-client.d.ts b/statsd-client/statsd-client.d.ts
index 2fabcfb83f..b3084f7024 100644
--- a/statsd-client/statsd-client.d.ts
+++ b/statsd-client/statsd-client.d.ts
@@ -3,101 +3,100 @@
 // Definitions by: Peter Kooijmans <https://github.com/peterkooijmans/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "statsd-client" {
 
-	interface CommonOptions {
-		/**
-		 * Prefix all stats with this value (default "").
-		 */
-		prefix?: string;
 
-		/**
-		 * Print what is being sent to stderr (default false).
-		 */
-		debug?: boolean;
+interface CommonOptions {
+    /**
+     * Prefix all stats with this value (default "").
+     */
+    prefix?: string;
 
-		/**
-		 * User specifically wants to use tcp (default false)
-		 */
-		tcp?: boolean;
+    /**
+     * Print what is being sent to stderr (default false).
+     */
+    debug?: boolean;
 
-		/**
-		 * Dual-use timer. Will flush metrics every interval. For UDP, 
-		 * it auto-closes the socket after this long without activity 
-		 * (default 1000 ms; 0 disables this). For TCP, it auto-closes 
-		 * the socket after socketTimeoutsToClose number of timeouts 
-		 * have elapsed without activity.
-		 */
-		socketTimeout?: number;
-	}
+    /**
+     * User specifically wants to use tcp (default false)
+     */
+    tcp?: boolean;
 
-	interface TcpOptions extends CommonOptions {
-		/**
-		 * Where to send the stats (default localhost).
-		 */
-		host?: string;
-
-		/**
-		 * Port to contact the statsd-daemon on (default 8125).
-		 */
-		port?: number;
-
-		/**
-		 * Number of timeouts in which the socket auto-closes if it 
-		 * has been inactive. (default 10; 1 to auto-close after a 
-		 * single timeout).
-		 */
-		socketTimeoutsToClose: number;
-	}
-
-	interface UdpOptions extends CommonOptions {
-		/**
-		 * Where to send the stats (default localhost).
-		 */
-		host?: string;
-
-		/**
-		 * Port to contact the statsd-daemon on (default 8125).
-		 */
-		port?: number;
-	}
-
-	interface HttpOptions extends CommonOptions {
-		/**
-		 * Where to send the stats (default localhost).
-		 */
-		host?: string;
-
-		/**
-		 * Additional headers to send (default {}).
-		 */
-		headers?: { [index : string] : string };
-
-		/**
-		 * What HTTP method to use (default "PUT").
-		 */
-		method?: string;
-	}
-
-	class StatsdClient {
-		constructor(options: TcpOptions | UdpOptions | HttpOptions);
-
-		counter(metric: string, delta: number): void;
-		increment(metric: string, delta?: number): void;
-		decrement(metric: string, delta?: number): void;
-
-		gauge(name: string, value: number): void;
-		gaugeDelta(name: string, delta: number): void;
-
-		set(name: string, value: number): void;
-
-		timing(name: string, start: Date): void;
-		timing(name: string, duration: number): void;
-
-		close(): void;
-
-		getChildClient(name: string): StatsdClient;
-	}
-
-	export = StatsdClient;
+    /**
+     * Dual-use timer. Will flush metrics every interval. For UDP, 
+     * it auto-closes the socket after this long without activity 
+     * (default 1000 ms; 0 disables this). For TCP, it auto-closes 
+     * the socket after socketTimeoutsToClose number of timeouts 
+     * have elapsed without activity.
+     */
+    socketTimeout?: number;
 }
+
+interface TcpOptions extends CommonOptions {
+    /**
+     * Where to send the stats (default localhost).
+     */
+    host?: string;
+
+    /**
+     * Port to contact the statsd-daemon on (default 8125).
+     */
+    port?: number;
+
+    /**
+     * Number of timeouts in which the socket auto-closes if it 
+     * has been inactive. (default 10; 1 to auto-close after a 
+     * single timeout).
+     */
+    socketTimeoutsToClose: number;
+}
+
+interface UdpOptions extends CommonOptions {
+    /**
+     * Where to send the stats (default localhost).
+     */
+    host?: string;
+
+    /**
+     * Port to contact the statsd-daemon on (default 8125).
+     */
+    port?: number;
+}
+
+interface HttpOptions extends CommonOptions {
+    /**
+     * Where to send the stats (default localhost).
+     */
+    host?: string;
+
+    /**
+     * Additional headers to send (default {}).
+     */
+    headers?: { [index: string]: string };
+
+    /**
+     * What HTTP method to use (default "PUT").
+     */
+    method?: string;
+}
+
+declare class StatsdClient {
+    constructor(options: TcpOptions | UdpOptions | HttpOptions);
+
+    counter(metric: string, delta: number): void;
+    increment(metric: string, delta?: number): void;
+    decrement(metric: string, delta?: number): void;
+
+    gauge(name: string, value: number): void;
+    gaugeDelta(name: string, delta: number): void;
+
+    set(name: string, value: number): void;
+
+    timing(name: string, start: Date): void;
+    timing(name: string, duration: number): void;
+
+    close(): void;
+
+    getChildClient(name: string): StatsdClient;
+}
+
+export = StatsdClient;
diff --git a/statuses/statuses.d.ts b/statuses/statuses.d.ts
index 239b5fd320..f6e22d2176 100644
--- a/statuses/statuses.d.ts
+++ b/statuses/statuses.d.ts
@@ -3,19 +3,18 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'statuses' {
-    interface Status {
-        [code: number]: string;
-        [msg: string]: any | number;
 
-        codes: Array<number>;
-        redirect: {[code: number]: boolean};
-        empty: {[code: number]: boolean};
-        retry: {[code: number]: boolean};
+interface Status {
+    [code: number]: string;
+    [msg: string]: any | number;
 
-        (code: number | string): number;
-    }
+    codes: Array<number>;
+    redirect: { [code: number]: boolean };
+    empty: { [code: number]: boolean };
+    retry: { [code: number]: boolean };
 
-    var status: Status;
-    export = status;
+    (code: number | string): number;
 }
+
+declare var status: Status;
+export = status;
diff --git a/stream-meter/stream-meter.d.ts b/stream-meter/stream-meter.d.ts
index f1c200e40f..96ac4b0b3e 100644
--- a/stream-meter/stream-meter.d.ts
+++ b/stream-meter/stream-meter.d.ts
@@ -4,18 +4,17 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference path="../node/node.d.ts" />
 
-declare module "stream-meter" {
-    import {Transform} from 'stream';
 
-    function m(maxBytes?:number):m.StreamMeter;
+import {Transform} from 'stream';
 
-    namespace m {
-        export interface StreamMeter extends Transform {
-            constructor(maxBytes?: number): StreamMeter;
-            bytes: number;
-            maxBytes: number;
-        }
+declare function m(maxBytes?: number): m.StreamMeter;
+
+declare namespace m {
+    export interface StreamMeter extends Transform {
+        constructor(maxBytes?: number): StreamMeter;
+        bytes: number;
+        maxBytes: number;
     }
+}
 
-   export = m;
-}
\ No newline at end of file
+export = m;
diff --git a/stream-series/stream-series.d.ts b/stream-series/stream-series.d.ts
index 63e73dffda..fd4ba97add 100644
--- a/stream-series/stream-series.d.ts
+++ b/stream-series/stream-series.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "stream-series" {
-    function series<T extends NodeJS.ReadableStream>(...streams: T[]): NodeJS.ReadWriteStream;
-    export = series;
-}
+
+declare function series<T extends NodeJS.ReadableStream>(...streams: T[]): NodeJS.ReadWriteStream;
+export = series;
diff --git a/stream-to-array/stream-to-array.d.ts b/stream-to-array/stream-to-array.d.ts
index ed3e498b77..f59fc29f98 100644
--- a/stream-to-array/stream-to-array.d.ts
+++ b/stream-to-array/stream-to-array.d.ts
@@ -6,7 +6,6 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'stream-to-array' {
-	function toArray(stream: NodeJS.ReadableStream, callback: (err: any, arr: any[]) => void): NodeJS.ReadWriteStream;
-	export = toArray;
-}
+
+declare function toArray(stream: NodeJS.ReadableStream, callback: (err: any, arr: any[]) => void): NodeJS.ReadWriteStream;
+export = toArray;
diff --git a/strip-json-comments/strip-json-comments.d.ts b/strip-json-comments/strip-json-comments.d.ts
index 8dbe55a70b..c623893e07 100644
--- a/strip-json-comments/strip-json-comments.d.ts
+++ b/strip-json-comments/strip-json-comments.d.ts
@@ -3,11 +3,10 @@
 // Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "strip-json-comments" {
-    interface StripJsonOptions {
-        whitespace?: boolean;
-    }
 
-    function stripJsonComments(input: string, opts?: StripJsonOptions): string;
-    export = stripJsonComments;
+interface StripJsonOptions {
+    whitespace?: boolean;
 }
+
+declare function stripJsonComments(input: string, opts?: StripJsonOptions): string;
+export = stripJsonComments;
diff --git a/superagent/superagent.d.ts b/superagent/superagent.d.ts
index fa0ac1827f..5bbf981f44 100644
--- a/superagent/superagent.d.ts
+++ b/superagent/superagent.d.ts
@@ -5,112 +5,110 @@
 
 /// <reference path='../node/node.d.ts' />
 
-declare module "superagent" {
-  import stream = require('stream');
 
-  type CallbackHandler = (err: any, res: request.Response) => void;
+import stream = require('stream');
 
-  var request: request.SuperAgentStatic;
+type CallbackHandler = (err: any, res: request.Response) => void;
 
-  namespace request {
+declare var request: request.SuperAgentStatic;
+
+declare namespace request {
     interface SuperAgentStatic extends SuperAgent<SuperAgentRequest> {
-      (url: string): SuperAgentRequest;
-      (method: string, url: string): SuperAgentRequest;
+        (url: string): SuperAgentRequest;
+        (method: string, url: string): SuperAgentRequest;
 
-      agent(): SuperAgent<SuperAgentRequest>;
+        agent(): SuperAgent<SuperAgentRequest>;
     }
 
     interface SuperAgent<Req extends Request<any>> extends stream.Stream {
-      get(url: string, callback?: CallbackHandler): Req;
-      post(url: string, callback?: CallbackHandler): Req;
-      put(url: string, callback?: CallbackHandler): Req;
-      head(url: string, callback?: CallbackHandler): Req;
-      del(url: string, callback?: CallbackHandler): Req;
-      delete(url: string, callback?: CallbackHandler): Req;
-      options(url: string, callback?: CallbackHandler): Req;
-      trace(url: string, callback?: CallbackHandler): Req;
-      copy(url: string, callback?: CallbackHandler): Req;
-      lock(url: string, callback?: CallbackHandler): Req;
-      mkcol(url: string, callback?: CallbackHandler): Req;
-      move(url: string, callback?: CallbackHandler): Req;
-      purge(url: string, callback?: CallbackHandler): Req;
-      propfind(url: string, callback?: CallbackHandler): Req;
-      proppatch(url: string, callback?: CallbackHandler): Req;
-      unlock(url: string, callback?: CallbackHandler): Req;
-      report(url: string, callback?: CallbackHandler): Req;
-      mkactivity(url: string, callback?: CallbackHandler): Req;
-      checkout(url: string, callback?: CallbackHandler): Req;
-      merge(url: string, callback?: CallbackHandler): Req;
-      // m-search(url: string, callback?: CallbackHandler): Req;
-      notify(url: string, callback?: CallbackHandler): Req;
-      subscribe(url: string, callback?: CallbackHandler): Req;
-      unsubscribe(url: string, callback?: CallbackHandler): Req;
-      patch(url: string, callback?: CallbackHandler): Req;
-      search(url: string, callback?: CallbackHandler): Req;
-      connect(url: string, callback?: CallbackHandler): Req;
+        get(url: string, callback?: CallbackHandler): Req;
+        post(url: string, callback?: CallbackHandler): Req;
+        put(url: string, callback?: CallbackHandler): Req;
+        head(url: string, callback?: CallbackHandler): Req;
+        del(url: string, callback?: CallbackHandler): Req;
+        delete(url: string, callback?: CallbackHandler): Req;
+        options(url: string, callback?: CallbackHandler): Req;
+        trace(url: string, callback?: CallbackHandler): Req;
+        copy(url: string, callback?: CallbackHandler): Req;
+        lock(url: string, callback?: CallbackHandler): Req;
+        mkcol(url: string, callback?: CallbackHandler): Req;
+        move(url: string, callback?: CallbackHandler): Req;
+        purge(url: string, callback?: CallbackHandler): Req;
+        propfind(url: string, callback?: CallbackHandler): Req;
+        proppatch(url: string, callback?: CallbackHandler): Req;
+        unlock(url: string, callback?: CallbackHandler): Req;
+        report(url: string, callback?: CallbackHandler): Req;
+        mkactivity(url: string, callback?: CallbackHandler): Req;
+        checkout(url: string, callback?: CallbackHandler): Req;
+        merge(url: string, callback?: CallbackHandler): Req;
+        // m-search(url: string, callback?: CallbackHandler): Req;
+        notify(url: string, callback?: CallbackHandler): Req;
+        subscribe(url: string, callback?: CallbackHandler): Req;
+        unsubscribe(url: string, callback?: CallbackHandler): Req;
+        patch(url: string, callback?: CallbackHandler): Req;
+        search(url: string, callback?: CallbackHandler): Req;
+        connect(url: string, callback?: CallbackHandler): Req;
 
-      parse(fn: Function): Req;
-      saveCookies(res: Response): void;
-      attachCookies(req: Req): void;
+        parse(fn: Function): Req;
+        saveCookies(res: Response): void;
+        attachCookies(req: Req): void;
     }
 
     interface Response extends NodeJS.ReadableStream {
-      text: string;
-      body: any;
-      files: any;
-      header: any;
-      type: string;
-      charset: string;
-      status: number;
-      statusType: number;
-      info: boolean;
-      ok: boolean;
-      redirect: boolean;
-      clientError: boolean;
-      serverError: boolean;
-      error: Error;
-      accepted: boolean;
-      noContent: boolean;
-      badRequest: boolean;
-      unauthorized: boolean;
-      notAcceptable: boolean;
-      notFound: boolean;
-      forbidden: boolean;
-      get(header: string): string;
+        text: string;
+        body: any;
+        files: any;
+        header: any;
+        type: string;
+        charset: string;
+        status: number;
+        statusType: number;
+        info: boolean;
+        ok: boolean;
+        redirect: boolean;
+        clientError: boolean;
+        serverError: boolean;
+        error: Error;
+        accepted: boolean;
+        noContent: boolean;
+        badRequest: boolean;
+        unauthorized: boolean;
+        notAcceptable: boolean;
+        notFound: boolean;
+        forbidden: boolean;
+        get(header: string): string;
     }
 
     interface Request<Req extends Request<any>> /* extends NodeJS.WritableStream */ {
-      abort(): void;
-      accept(type: string): Req;
-      attach(field: string, file: string, filename?: string): Req;
-      auth(user: string, name: string): Req;
-      buffer(val: boolean): Req;
-      clearTimeout(): Req;
-      end(callback?: CallbackHandler): Req;
-      field(name: string, val: string): Req;
-      get(field: string): string;
-      on(name: string, handler: Function): Req;
-      on(name: 'error', handler: (err: any) => void): Req;
-      part(): Req;
-      pipe(stream: NodeJS.WritableStream, options?: Object): stream.Writable;
-      query(val: Object): Req;
-      redirects(n: number): Req;
-      send(data: string): Req;
-      send(data: Object): Req;
-      send(): Req;
-      set(field: string, val: string): Req;
-      set(field: Object): Req;
-      timeout(ms: number): Req;
-      type(val: string): Req;
-      use(fn: Function): Req;
-      withCredentials(): Req;
-      write(data: string, encoding?: string): Req;
-      write(data: Buffer, encoding?: string): Req;
+        abort(): void;
+        accept(type: string): Req;
+        attach(field: string, file: string, filename?: string): Req;
+        auth(user: string, name: string): Req;
+        buffer(val: boolean): Req;
+        clearTimeout(): Req;
+        end(callback?: CallbackHandler): Req;
+        field(name: string, val: string): Req;
+        get(field: string): string;
+        on(name: string, handler: Function): Req;
+        on(name: 'error', handler: (err: any) => void): Req;
+        part(): Req;
+        pipe(stream: NodeJS.WritableStream, options?: Object): stream.Writable;
+        query(val: Object): Req;
+        redirects(n: number): Req;
+        send(data: string): Req;
+        send(data: Object): Req;
+        send(): Req;
+        set(field: string, val: string): Req;
+        set(field: Object): Req;
+        timeout(ms: number): Req;
+        type(val: string): Req;
+        use(fn: Function): Req;
+        withCredentials(): Req;
+        write(data: string, encoding?: string): Req;
+        write(data: Buffer, encoding?: string): Req;
     }
-    interface SuperAgentRequest extends Request<Request<Request<Request<any>>>> {}
+    interface SuperAgentRequest extends Request<Request<Request<Request<any>>>> { }
 
-  }
-
-  export = request;
 }
 
+export = request;
diff --git a/supertest-as-promised/supertest-as-promised.d.ts b/supertest-as-promised/supertest-as-promised.d.ts
index a7256e5bbf..af1f80d5ee 100644
--- a/supertest-as-promised/supertest-as-promised.d.ts
+++ b/supertest-as-promised/supertest-as-promised.d.ts
@@ -6,40 +6,39 @@
 /// <reference path='../superagent/superagent.d.ts' />
 /// <reference path="../bluebird/bluebird.d.ts" />
 
-declare module "supertest-as-promised" {
-  // Mostly copy-pasted from supertest.d.ts
 
-  import * as superagent from 'superagent';
-  import * as PromiseBluebird from 'bluebird';
+// Mostly copy-pasted from supertest.d.ts
 
-  function supertest(app: any): supertest.SuperTest;
+import * as superagent from 'superagent';
+import * as PromiseBluebird from 'bluebird';
 
-  namespace supertest {
+declare function supertest(app: any): supertest.SuperTest;
+
+declare namespace supertest {
     function agent(app?: any): supertest.SuperTest;
 
     interface SuperTest extends superagent.SuperAgent<Test> {
     }
 
     interface Promise<T> extends PromiseBluebird<T> {
-      toPromise(): PromiseBluebird<T>;
+        toPromise(): PromiseBluebird<T>;
     }
 
     interface Test extends superagent.Request<Test> {
-      url: string;
-      serverAddress(app: any, path: string): string;
-      expect(status: number): Promise<supertest.Response>;
-      expect(status: number, body: string): Promise<supertest.Response>;
-      expect(body: string): Promise<supertest.Response>;
-      expect(body: RegExp): Promise<supertest.Response>;
-      expect(body: Object): Promise<supertest.Response>;
-      expect(field: string, val: string): Promise<supertest.Response>;
-      expect(field: string, val: RegExp): Promise<supertest.Response>;
-      expect(checker: (res: Response) => any): Promise<supertest.Response>;
+        url: string;
+        serverAddress(app: any, path: string): string;
+        expect(status: number): Promise<supertest.Response>;
+        expect(status: number, body: string): Promise<supertest.Response>;
+        expect(body: string): Promise<supertest.Response>;
+        expect(body: RegExp): Promise<supertest.Response>;
+        expect(body: Object): Promise<supertest.Response>;
+        expect(field: string, val: string): Promise<supertest.Response>;
+        expect(field: string, val: RegExp): Promise<supertest.Response>;
+        expect(checker: (res: Response) => any): Promise<supertest.Response>;
     }
 
     interface Response extends superagent.Response {
     }
-  }
-
-  export = supertest;
 }
+
+export = supertest;
diff --git a/supertest/supertest.d.ts b/supertest/supertest.d.ts
index 430c9f15c5..a9e724ad87 100644
--- a/supertest/supertest.d.ts
+++ b/supertest/supertest.d.ts
@@ -5,36 +5,35 @@
 
 /// <reference path='../superagent/superagent.d.ts' />
 
-declare module "supertest" {
-  import superagent = require('superagent');
 
-  type CallbackHandler = (err: any, res: supertest.Response) => void;
+import superagent = require('superagent');
 
-  function supertest(app: any): supertest.SuperTest;
+type CallbackHandler = (err: any, res: supertest.Response) => void;
 
-  namespace supertest {
+declare function supertest(app: any): supertest.SuperTest;
+
+declare namespace supertest {
     function agent(app?: any): supertest.SuperTest;
 
     interface SuperTest extends superagent.SuperAgent<Test> {
     }
 
     interface Test extends superagent.Request<Test> {
-      url: string;
-      serverAddress(app: any, path: string): string;
-      expect(status: number, callback?: CallbackHandler): Test;
-      expect(status: number, body: string, callback?: CallbackHandler): Test;
-      expect(body: string, callback?: CallbackHandler): Test;
-      expect(body: RegExp, callback?: CallbackHandler): Test;
-      expect(body: Object, callback?: CallbackHandler): Test;
-      expect(field: string, val: string, callback?: CallbackHandler): Test;
-      expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
-      expect(checker: (res: Response) => any): Test;
-      end(callback?: CallbackHandler): Test;
+        url: string;
+        serverAddress(app: any, path: string): string;
+        expect(status: number, callback?: CallbackHandler): Test;
+        expect(status: number, body: string, callback?: CallbackHandler): Test;
+        expect(body: string, callback?: CallbackHandler): Test;
+        expect(body: RegExp, callback?: CallbackHandler): Test;
+        expect(body: Object, callback?: CallbackHandler): Test;
+        expect(field: string, val: string, callback?: CallbackHandler): Test;
+        expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
+        expect(checker: (res: Response) => any): Test;
+        end(callback?: CallbackHandler): Test;
     }
 
     interface Response extends superagent.Response {
     }
-  }
-
-  export = supertest;
 }
+
+export = supertest;
diff --git a/svg-sprite/svg-sprite.d.ts b/svg-sprite/svg-sprite.d.ts
index 4848d1359b..071cb6d5a9 100644
--- a/svg-sprite/svg-sprite.d.ts
+++ b/svg-sprite/svg-sprite.d.ts
@@ -7,356 +7,354 @@
 /// <reference path="../vinyl/vinyl.d.ts" />
 /// <reference path="../winston/winston.d.ts" />
 
-declare module "svg-sprite" {
-    import File = require('vinyl');
-    import winston = require('winston');
 
-    namespace sprite {
-        interface SVGSpriterConstructor extends NodeJS.EventEmitter {
-            /**
-             * The spriter's constructor (always the entry point)
-             * @param config Main configuration for the spriting process
-             */
-            new(config: Config): SVGSpriter;
-        }
-
-        interface SVGSpriter {
-            /**
-             * Registering source SVG files
-             * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
-             * @param name The "local" part of the file path, possibly including subdirectories which will get traversed to CSS selectors using the shape.id.separator configuration option.
-             * @param svg SVG file content.
-             */
-            add(file: string|File, name: string, svg: string): SVGSpriter;
-            /**
-             * Registering source SVG files
-             * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
-             */
-            add(file: File): SVGSpriter;
-            /**
-             * Triggering the sprite compilation
-             * @param config Configuration object setting the output mode parameters for a single compilation run. If omitted, the mode property of the main configuration used for the constructor will be used.
-             * @param callback Callback triggered when the compilation has finished.
-             */
-            compile(config: Config, callback: CompileCallback): SVGSpriter;
-            /**
-             * Triggering the sprite compilation
-             * @param callback Callback triggered when the compilation has finished.
-             */
-            compile(callback: CompileCallback): void;
-            /**
-             * Accessing the intermediate SVG resources
-             * @param dest Base directory for the SVG files in case the will be written to disk.
-             * @param callback Callback triggered when the shapes are available.
-             */
-            getShapes(dest: string, callback: GetShapesCallback): void;
-        }
-
-        interface Config {
-            /**
-             * Main output directory
-             * @default '.'
-             */
-            dest?: string;
-            /**
-             * Logging verbosity or custom logger
-             */
-            log?: string|winston.LoggerInstance;
-            /**
-             * SVG shape configuration
-             */
-            shape?: Shape;
-            /**
-             * Sprite SVG options
-             */
-            svg?: Svg;
-            /**
-             * Custom templating variables
-             */
-            variables?: any;
-            /**
-             * Output mode configurations
-             */
-            mode?: Mode;
-        }
+import File = require('vinyl');
+import winston = require('winston');
 
+declare namespace sprite {
+    interface SVGSpriterConstructor extends NodeJS.EventEmitter {
         /**
-         * All settings affecting the SVG shapes of the sprite
+         * The spriter's constructor (always the entry point)
+         * @param config Main configuration for the spriting process
          */
-        interface Shape {
-            /**
-             * SVG shape ID related options
-             */
-            id?: {
-                /**
-                 * Separator for directory name traversal
-                 */
-                separator?: string;
-                /**
-                 * SVG shape ID generator callback
-                 */
-                generator?: string|((svg: string) => string);
-                /**
-                 * File name separator for shape states (e.g. ':hover')
-                 */
-                pseudo?: string;
-                /**
-                 * Whitespace replacement for shape IDs
-                 */
-                whitespace?: string;
-            };
-            /**
-             * Dimension related options
-             */
-            dimension?: {
-                /**
-                 * Max. shape width
-                 */
-                maxWidth?: number;
-                /**
-                 * Max. shape height
-                 */
-                maxHeight?: number;
-                /**
-                 * Floating point precision
-                 */
-                precision?: number;
-                /**
-                 * Width and height attributes on embedded shapes
-                 */
-                attributes?: boolean;
-            };
-            /**
-             * Spacing related options
-             */
-            spacing?: {
-                /**
-                 * Padding around all shapes
-                 */
-                padding?: number|number[];
-                /**
-                 * Padding strategy (similar to CSS `box-sizing`)
-                 */
-                box?: string;
-            };
-            /**
-             * List of transformations / optimizations
-             */
-            transform?: (string|CustomConfigurationTransform|CustomCallbackTransform)[];
-            /**
-             * Path to YAML file with meta / accessibility data
-             */
-            meta?: string;
-            /**
-             * Path to YAML file with extended alignment data
-             */
-            align?: string;
-            /**
-             * Output directory for optimized intermediate SVG shapes
-             */
-            dest?: string;
-        }
+        new (config: Config): SVGSpriter;
+    }
 
+    interface SVGSpriter {
         /**
-         * Pre-defined shape transformation with custom configuration
+         * Registering source SVG files
+         * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
+         * @param name The "local" part of the file path, possibly including subdirectories which will get traversed to CSS selectors using the shape.id.separator configuration option.
+         * @param svg SVG file content.
          */
-        interface CustomConfigurationTransform {
-            [transformationName: string]: {
-                plugins?: { [transformationName: string]: boolean }[];
-            }
-        }
-
+        add(file: string | File, name: string, svg: string): SVGSpriter;
         /**
-         * Custom callback transformation
+         * Registering source SVG files
+         * @param file Absolute path to the SVG file or a vinyl file object carrying all the necessary values (the following arguments are ignored then).
          */
-        interface CustomCallbackTransform {
-            [transformationName: string]: {
-                /**
-                 * Custom callback transformation
-                 * @param shape SVG shape object
-                 * @param sprite SVG spriter
-                 * @param callback Callback
-                 */
-                (shape: any, sprite: SVGSpriter, callback: Function): any;
-            }
-        }
+        add(file: File): SVGSpriter;
+        /**
+         * Triggering the sprite compilation
+         * @param config Configuration object setting the output mode parameters for a single compilation run. If omitted, the mode property of the main configuration used for the constructor will be used.
+         * @param callback Callback triggered when the compilation has finished.
+         */
+        compile(config: Config, callback: CompileCallback): SVGSpriter;
+        /**
+         * Triggering the sprite compilation
+         * @param callback Callback triggered when the compilation has finished.
+         */
+        compile(callback: CompileCallback): void;
+        /**
+         * Accessing the intermediate SVG resources
+         * @param dest Base directory for the SVG files in case the will be written to disk.
+         * @param callback Callback triggered when the shapes are available.
+         */
+        getShapes(dest: string, callback: GetShapesCallback): void;
+    }
 
-        interface Svg {
+    interface Config {
+        /**
+         * Main output directory
+         * @default '.'
+         */
+        dest?: string;
+        /**
+         * Logging verbosity or custom logger
+         */
+        log?: string | winston.LoggerInstance;
+        /**
+         * SVG shape configuration
+         */
+        shape?: Shape;
+        /**
+         * Sprite SVG options
+         */
+        svg?: Svg;
+        /**
+         * Custom templating variables
+         */
+        variables?: any;
+        /**
+         * Output mode configurations
+         */
+        mode?: Mode;
+    }
+
+    /**
+     * All settings affecting the SVG shapes of the sprite
+     */
+    interface Shape {
+        /**
+         * SVG shape ID related options
+         */
+        id?: {
             /**
-             * Output an XML declaration at the very beginning of each compiled sprite.
-             * If you provide a non-empty string here, it will be used one-to-one as declaration (e.g. <?xml version="1.0" encoding="utf-8"?>).
-             * If you set this to TRUE, *svg-sprite* will look at the registered shapes for an XML declaration and use the first one it can find.
-             * @default true
+             * Separator for directory name traversal
              */
-            xmlDeclaration?: boolean|string;
+            separator?: string;
             /**
-             * Include a <DOCTYPE> declaration in each compiled sprite. If you provide a non-empty string here,
-             * it will be used one-to-one as declaration (e.g. <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">).
-             * If you set this to TRUE, *svg-sprite* will look at the registered shapes for a DOCTYPE declaration and use the first one it can find.
-             * @default true
+             * SVG shape ID generator callback
              */
-            doctypeDeclaration?: boolean|string;
+            generator?: string | ((svg: string) => string);
             /**
-             * In order to avoid ID clashes, the default behavior is to namespace all IDs in the source SVGs before compiling them into a sprite.
-             * Each ID is prepended with a unique string. In some situations, it might be desirable to disable ID namespacing, e.g. when you want to script the resulting sprite.
-             * Just set svg.namespaceIDs to FALSE then and be aware that you might also want to disable SVGO's ID minification (shape.transform.svgo.plugins: [{cleanupIDs: false}]).
-             * @default true
+             * File name separator for shape states (e.g. ':hover')
              */
-            namespaceIDs?: boolean;
+            pseudo?: string;
             /**
-             * In order to avoid CSS class name ambiguities, the default behavior is to namespace CSS class names in the source SVGs before compiling them into a sprite.
-             * Each class name is prepended with a unique string. Disable this option to keep the class names untouched.
-             * @default true
+             * Whitespace replacement for shape IDs
              */
-            namespaceClassnames?: boolean;
+            whitespace?: string;
+        };
+        /**
+         * Dimension related options
+         */
+        dimension?: {
             /**
-             * If truthy, width and height attributes will be set on the sprite's <svg> element (where applicable).
-             * @default true
+             * Max. shape width
              */
-            dimensionAttributes?: boolean;
+            maxWidth?: number;
             /**
-             * Shorthand for applying custom attributes to the outermost <svg> element.
-             * Please be aware that certain attributes (e.g. viewBox) will be calculated dynamically and override custom rootAttributes in any case.
+             * Max. shape height
              */
-            rootAttributes?: any;
+            maxHeight?: number;
             /**
-             * Floating point precision for CSS positioning values (defaults to -1 meaning highest possible precision).
+             * Floating point precision
              */
             precision?: number;
             /**
-             * Callback (or list of callbacks) that will be applied to the resulting SVG sprites as global [post-processing transformation](#svg-sprite-customization).
-             * transform: Function∣Array
+             * Width and height attributes on embedded shapes
              */
-            transform?: SvgTransformer|SvgTransformer[];
-        }
+            attributes?: boolean;
+        };
+        /**
+         * Spacing related options
+         */
+        spacing?: {
+            /**
+             * Padding around all shapes
+             */
+            padding?: number | number[];
+            /**
+             * Padding strategy (similar to CSS `box-sizing`)
+             */
+            box?: string;
+        };
+        /**
+         * List of transformations / optimizations
+         */
+        transform?: (string | CustomConfigurationTransform | CustomCallbackTransform)[];
+        /**
+         * Path to YAML file with meta / accessibility data
+         */
+        meta?: string;
+        /**
+         * Path to YAML file with extended alignment data
+         */
+        align?: string;
+        /**
+         * Output directory for optimized intermediate SVG shapes
+         */
+        dest?: string;
+    }
 
-        interface SvgTransformer {
-            /**
-             * Custom sprite SVG transformation
-             * @param svg Sprite SVG
-             * @return Processed SVG
-             */
-            (svg: string): string;
-        }
-
-        interface Mode {
-            css?: CssAndViewSpecificModeConfig|boolean;
-            view?: CssAndViewSpecificModeConfig|boolean;
-            defs?: DefsAndSymbolSpecificModeConfig|boolean;
-            symbol?: DefsAndSymbolSpecificModeConfig|boolean;
-            stack?: ModeConfig|boolean;
-            [customConfigName: string]: ModeConfig;
-        }
-
-        interface ModeConfig {
-            /**
-             * Base directory for sprite and CSS file output. If not absolute, the path will be resolved using the main output directory (see global dest option).
-             * @default "<mode>"
-             */
-            dest?: string;
-            /**
-             * Used for prefixing the [shape ID](#shape-ids) during CSS selector construction. If the value is empty,
-             * no prefix will be used. The prefix may contain the placeholder "%s" (e.g. ".svg %s-svg"),
-             * which will then get replaced by the shape ID. Please be aware that "%" is a special character
-             * in this context and that you'll have to escape it by another percent sign ("%%") in case you want
-             * to output it to your stylesheets (e.g. for a [Sass placeholder selector](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#placeholder_selectors_)).
-             * @default ".svg-%s"
-             */
-            prefix?: string;
-            /**
-             * A non-empty string value will trigger the creation of additional CSS rules specifying the dimensions of each shape in the sprite.
-             * The string will be used as suffix to mode.<mode>.prefix during CSS selector construction and may contain the placeholder "%s",
-             * which will get replaced by the value of mode.<mode>.prefix.
-             * A boolean TRUE will cause the dimensions to be included directly into each shape's CSS rule (only available for «css» and «view» sprites).
-             * @default "-dims"
-             */
-            dimensions?: string|boolean;
-            /**
-             * SVG sprite path and file name, relative to the mode.<mode>.dest directory.
-             * You may omit the file extension, in which case it will be set to ".svg" automatically.
-             * @default "svg/sprite.<mode>.svg"
-             */
-            sprite?: string;
-            /**
-             * Add a content based hash to the name of the sprite file so that clients reliably reload the sprite
-             * when it's content changes («cache busting»). Defaults to false except for «css» and «view» sprites.
-             * @default true∣false
-             */
-            bust?: boolean;
-            /**
-             * Collection of [stylesheet rendering configurations](#rendering-configurations).
-             * The keys are used as file extensions as well as file return keys. At present,
-             * there are default templates for the file extensions css ([CSS](http://www.w3.org/Style/CSS/)),
-             * scss ([Sass](http://sass-lang.com/)), less ([Less](http://lesscss.org/)) and styl ([Stylus](http://learnboost.github.io/stylus/)),
-             * which all reside in the directory tmpl/css. Example: {css: true, scss: {dest: '_sprite.scss'}}
-             * @default {}
-             */
-            render?: { [key: string]: RenderingConfiguration|boolean };
-            /**
-             * Enabling this will trigger the creation of an HTML document demoing the usage of the sprite. Please see below for details on [rendering configurations](#rendering-configurations).
-             * @default false
-             */
-            example?: RenderingConfiguration|boolean;
-            /**
-             * Specify svg-sprite which output mode to use with this configuration
-             */
-            mode?: string;
-        }
-
-        interface RenderingConfiguration {
-            /**
-             * HTML document Mustache template
-             * @default "tmpl/<mode>/sprite.html"
-             */
-            template?: string;
-            /**
-             * HTML document destination
-             * @default "sprite.<mode>.html"
-             */
-            dest?: string;
-        }
-
-        interface CssAndViewSpecificModeConfig extends ModeConfig {
-            /**
-             * The arrangement of the shapes within the sprite. Might be "vertical", "horizontal", "diagonal" or "packed"
-             * (with the latter being the most compact type). It depends on your project which layout is best for you.
-             * @default "packed"
-             */
-            layout?: string;
-            /**
-             * If given and not empty, this will be the selector name of a CSS rule commonly specifying the background-image
-             * and background-repeat properties for all the shapes in the sprite (thus saving some bytes by not unnecessarily repeating them for each shape)
-             */
-            common?: string;
-            /**
-             * If given and not empty, a mixin with this name will be added to supporting output formats (e.g. Sass, LESS, Stylus),
-             * specifying the background-image and background-repeat properties for all the shapes in the sprite.
-             * You may use it for creating custom CSS within @media rules. The mixin acts much like the common rule.
-             * In fact, you can even combine the two - if both are enabled, the common rule will use the mixin internally.
-             */
-            mixin?: string;
-        }
-
-        interface DefsAndSymbolSpecificModeConfig extends ModeConfig {
-            /**
-             * If you want to embed the sprite into your HTML source, you will want to set this to true
-             * in order to prevent the creation of SVG namespace declarations and to set some other attributes for effectively hiding the library sprite.
-             * @default false
-             */
-            inline?: boolean;
-        }
-
-        interface CompileCallback {
-            (error: Error, result: any, data: any): any;
-        }
-
-        interface GetShapesCallback {
-            (error: Error, result: File[]): any;
+    /**
+     * Pre-defined shape transformation with custom configuration
+     */
+    interface CustomConfigurationTransform {
+        [transformationName: string]: {
+            plugins?: { [transformationName: string]: boolean }[];
         }
     }
 
-    var sprite: sprite.SVGSpriterConstructor;
+    /**
+     * Custom callback transformation
+     */
+    interface CustomCallbackTransform {
+        [transformationName: string]: {
+            /**
+             * Custom callback transformation
+             * @param shape SVG shape object
+             * @param sprite SVG spriter
+             * @param callback Callback
+             */
+            (shape: any, sprite: SVGSpriter, callback: Function): any;
+        }
+    }
 
-    export = sprite;
+    interface Svg {
+        /**
+         * Output an XML declaration at the very beginning of each compiled sprite.
+         * If you provide a non-empty string here, it will be used one-to-one as declaration (e.g. <?xml version="1.0" encoding="utf-8"?>).
+         * If you set this to TRUE, *svg-sprite* will look at the registered shapes for an XML declaration and use the first one it can find.
+         * @default true
+         */
+        xmlDeclaration?: boolean | string;
+        /**
+         * Include a <DOCTYPE> declaration in each compiled sprite. If you provide a non-empty string here,
+         * it will be used one-to-one as declaration (e.g. <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">).
+         * If you set this to TRUE, *svg-sprite* will look at the registered shapes for a DOCTYPE declaration and use the first one it can find.
+         * @default true
+         */
+        doctypeDeclaration?: boolean | string;
+        /**
+         * In order to avoid ID clashes, the default behavior is to namespace all IDs in the source SVGs before compiling them into a sprite.
+         * Each ID is prepended with a unique string. In some situations, it might be desirable to disable ID namespacing, e.g. when you want to script the resulting sprite.
+         * Just set svg.namespaceIDs to FALSE then and be aware that you might also want to disable SVGO's ID minification (shape.transform.svgo.plugins: [{cleanupIDs: false}]).
+         * @default true
+         */
+        namespaceIDs?: boolean;
+        /**
+         * In order to avoid CSS class name ambiguities, the default behavior is to namespace CSS class names in the source SVGs before compiling them into a sprite.
+         * Each class name is prepended with a unique string. Disable this option to keep the class names untouched.
+         * @default true
+         */
+        namespaceClassnames?: boolean;
+        /**
+         * If truthy, width and height attributes will be set on the sprite's <svg> element (where applicable).
+         * @default true
+         */
+        dimensionAttributes?: boolean;
+        /**
+         * Shorthand for applying custom attributes to the outermost <svg> element.
+         * Please be aware that certain attributes (e.g. viewBox) will be calculated dynamically and override custom rootAttributes in any case.
+         */
+        rootAttributes?: any;
+        /**
+         * Floating point precision for CSS positioning values (defaults to -1 meaning highest possible precision).
+         */
+        precision?: number;
+        /**
+         * Callback (or list of callbacks) that will be applied to the resulting SVG sprites as global [post-processing transformation](#svg-sprite-customization).
+         * transform: Function∣Array
+         */
+        transform?: SvgTransformer | SvgTransformer[];
+    }
+
+    interface SvgTransformer {
+        /**
+         * Custom sprite SVG transformation
+         * @param svg Sprite SVG
+         * @return Processed SVG
+         */
+        (svg: string): string;
+    }
+
+    interface Mode {
+        css?: CssAndViewSpecificModeConfig | boolean;
+        view?: CssAndViewSpecificModeConfig | boolean;
+        defs?: DefsAndSymbolSpecificModeConfig | boolean;
+        symbol?: DefsAndSymbolSpecificModeConfig | boolean;
+        stack?: ModeConfig | boolean;
+        [customConfigName: string]: ModeConfig;
+    }
+
+    interface ModeConfig {
+        /**
+         * Base directory for sprite and CSS file output. If not absolute, the path will be resolved using the main output directory (see global dest option).
+         * @default "<mode>"
+         */
+        dest?: string;
+        /**
+         * Used for prefixing the [shape ID](#shape-ids) during CSS selector construction. If the value is empty,
+         * no prefix will be used. The prefix may contain the placeholder "%s" (e.g. ".svg %s-svg"),
+         * which will then get replaced by the shape ID. Please be aware that "%" is a special character
+         * in this context and that you'll have to escape it by another percent sign ("%%") in case you want
+         * to output it to your stylesheets (e.g. for a [Sass placeholder selector](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#placeholder_selectors_)).
+         * @default ".svg-%s"
+         */
+        prefix?: string;
+        /**
+         * A non-empty string value will trigger the creation of additional CSS rules specifying the dimensions of each shape in the sprite.
+         * The string will be used as suffix to mode.<mode>.prefix during CSS selector construction and may contain the placeholder "%s",
+         * which will get replaced by the value of mode.<mode>.prefix.
+         * A boolean TRUE will cause the dimensions to be included directly into each shape's CSS rule (only available for «css» and «view» sprites).
+         * @default "-dims"
+         */
+        dimensions?: string | boolean;
+        /**
+         * SVG sprite path and file name, relative to the mode.<mode>.dest directory.
+         * You may omit the file extension, in which case it will be set to ".svg" automatically.
+         * @default "svg/sprite.<mode>.svg"
+         */
+        sprite?: string;
+        /**
+         * Add a content based hash to the name of the sprite file so that clients reliably reload the sprite
+         * when it's content changes («cache busting»). Defaults to false except for «css» and «view» sprites.
+         * @default true∣false
+         */
+        bust?: boolean;
+        /**
+         * Collection of [stylesheet rendering configurations](#rendering-configurations).
+         * The keys are used as file extensions as well as file return keys. At present,
+         * there are default templates for the file extensions css ([CSS](http://www.w3.org/Style/CSS/)),
+         * scss ([Sass](http://sass-lang.com/)), less ([Less](http://lesscss.org/)) and styl ([Stylus](http://learnboost.github.io/stylus/)),
+         * which all reside in the directory tmpl/css. Example: {css: true, scss: {dest: '_sprite.scss'}}
+         * @default {}
+         */
+        render?: { [key: string]: RenderingConfiguration | boolean };
+        /**
+         * Enabling this will trigger the creation of an HTML document demoing the usage of the sprite. Please see below for details on [rendering configurations](#rendering-configurations).
+         * @default false
+         */
+        example?: RenderingConfiguration | boolean;
+        /**
+         * Specify svg-sprite which output mode to use with this configuration
+         */
+        mode?: string;
+    }
+
+    interface RenderingConfiguration {
+        /**
+         * HTML document Mustache template
+         * @default "tmpl/<mode>/sprite.html"
+         */
+        template?: string;
+        /**
+         * HTML document destination
+         * @default "sprite.<mode>.html"
+         */
+        dest?: string;
+    }
+
+    interface CssAndViewSpecificModeConfig extends ModeConfig {
+        /**
+         * The arrangement of the shapes within the sprite. Might be "vertical", "horizontal", "diagonal" or "packed"
+         * (with the latter being the most compact type). It depends on your project which layout is best for you.
+         * @default "packed"
+         */
+        layout?: string;
+        /**
+         * If given and not empty, this will be the selector name of a CSS rule commonly specifying the background-image
+         * and background-repeat properties for all the shapes in the sprite (thus saving some bytes by not unnecessarily repeating them for each shape)
+         */
+        common?: string;
+        /**
+         * If given and not empty, a mixin with this name will be added to supporting output formats (e.g. Sass, LESS, Stylus),
+         * specifying the background-image and background-repeat properties for all the shapes in the sprite.
+         * You may use it for creating custom CSS within @media rules. The mixin acts much like the common rule.
+         * In fact, you can even combine the two - if both are enabled, the common rule will use the mixin internally.
+         */
+        mixin?: string;
+    }
+
+    interface DefsAndSymbolSpecificModeConfig extends ModeConfig {
+        /**
+         * If you want to embed the sprite into your HTML source, you will want to set this to true
+         * in order to prevent the creation of SVG namespace declarations and to set some other attributes for effectively hiding the library sprite.
+         * @default false
+         */
+        inline?: boolean;
+    }
+
+    interface CompileCallback {
+        (error: Error, result: any, data: any): any;
+    }
+
+    interface GetShapesCallback {
+        (error: Error, result: File[]): any;
+    }
 }
 
+declare var sprite: sprite.SVGSpriterConstructor;
+
+export = sprite;
diff --git a/swaggerize-express/swaggerize-express.d.ts b/swaggerize-express/swaggerize-express.d.ts
index a73350b765..34592717b0 100644
--- a/swaggerize-express/swaggerize-express.d.ts
+++ b/swaggerize-express/swaggerize-express.d.ts
@@ -18,272 +18,271 @@
 
 /// <reference path="../express/express.d.ts" />
 
-declare module "swaggerize-express" {
-    import express = require('express');
-    function swaggerize(options: swaggerize.Options): express.RequestHandler;
 
-    namespace swaggerize {
-        export module Swagger {
-            export interface ApiDefinition {
-                swagger: string
-                info: InfoObject
-                host?: string
-                basePath?: string
-                schemes?: string[]
-                consumes?: MimeTypes
-                produces?: MimeTypes
-                paths: PathsObject
-                definitions?: DefinitionsObject
-                parameters?: ParametersDefinitionsObject
-                responses?: ResponsesDefinitionsObject
-                securityDefinitions?: SecurityDefinitionsObject
-                security?: SecurityRequirementObject[]
-                tags?: TagObject[]
-                externalDocs?: ExternalDocumentationObject
-            }
+import express = require('express');
+declare function swaggerize(options: swaggerize.Options): express.RequestHandler;
 
-            type MimeTypes = string[]
-
-            export interface InfoObject {
-                title: string
-                description?: string
-                termsOfService?: string
-                contact?: ContactObject
-                license?: LicenseObject
-                version: string
-            }
-
-            export interface ContactObject {
-                name?: string
-                url?: string
-                email?: string
-            }
-
-            export interface LicenseObject {
-                name: string
-                url?: string
-            }
-
-            export interface PathsObject {
-                [index: string]: PathItemObject|any
-            }
-
-            export interface PathItemObject {
-                $ref?: string
-                get?: OperationObject
-                put?: OperationObject
-                post?: OperationObject
-                'delete'?: OperationObject
-                options?: OperationObject
-                head?: OperationObject
-                patch?: OperationObject
-                parameters?: Parameters
-            }
-
-            export interface OperationObject {
-                tags?: string[]
-                summary?: string
-                description?: string
-                externalDocs?: ExternalDocumentationObject
-                operationId?: string
-                consumes?: MimeTypes
-                produces?: MimeTypes
-                parameters?: Parameters
-                responses: ResponsesObject
-                schemes?: string[]
-                deprecated?: boolean
-                security?: SecurityRequirementObject[]
-            }
-
-            export interface DefinitionsObject {
-                [index: string]: SchemaObject
-            }
-
-            export interface ResponsesObject {
-                [index: string]: Response|any
-                'default': Response
-            }
-
-            type Response = ResponseObject|ReferenceObject
-
-            export interface ResponsesDefinitionsObject {
-                [index: string]: ResponseObject
-            }
-
-            export interface ResponseObject {
-                description: string
-                schema?: SchemaObject
-                headers?: HeadersObject
-                examples?: ExampleObject
-            }
-
-            export interface HeadersObject {
-                [index: string]: HeaderObject
-            }
-
-            export interface HeaderObject extends ItemsObject {
-            }
-
-            export interface ExampleObject {
-                [index: string]: any
-            }
-
-            export interface SecurityDefinitionsObject {
-                [index: string]: SecuritySchemeObject
-            }
-
-            export interface SecuritySchemeObject {
-                type: string
-                description?: string
-                name: string
-                'in': string
-                flow: string
-                authorizationUrl: string
-                tokenUrl: string
-                scopes: ScopesObject
-            }
-
-            export interface ScopesObject {
-                [index: string]: any
-            }
-
-            export interface SecurityRequirementObject {
-                [index: string]: string[]
-            }
-
-            export interface TagObject {
-                name: string
-                description?: string
-                externalDocs?: ExternalDocumentationObject
-            }
-
-            export interface ItemsObject {
-                type: string
-                format?: string
-                items?: ItemsObject
-                collectionFormat?: string
-                'default'?: any
-                maximum?: number
-                exclusiveMaximum: boolean
-                minimum?: number
-                exclusiveMinimum?: boolean
-                maxLength?: number
-                minLength?: number
-                pattern?: string
-                maxItems?: number
-                minItems?: number
-                uniqueItems?: boolean
-                'enum'?: any[]
-                multipleOf?: number
-            }
-
-            export interface ParametersDefinitionsObject {
-                [index: string]: ParameterObject
-            }
-
-            type Parameters = (ParameterObject|ReferenceObject)[]
-
-            export interface ParameterObject {
-                name: string
-                'in': string
-                description?: string
-                required?: boolean
-            }
-
-            export interface InBodyParameterObject extends ParameterObject {
-                schema: SchemaObject
-            }
-
-            export interface GeneralParameterObject extends ParameterObject, ItemsObject {
-                allowEmptyValue?: boolean
-            }
-
-            export interface ReferenceObject {
-                $ref: string
-            }
-
-            export interface ExternalDocumentationObject {
-                [index: string]: any
-                description?: string
-                url: string
-            }
-
-            export interface SchemaObject extends IJsonSchema {
-                [index: string]: any
-                discriminator?: string
-                readOnly?: boolean
-                xml?: XMLObject
-                externalDocs: ExternalDocumentationObject
-                example: any
-            }
-
-            export interface XMLObject {
-                [index: string]: any
-                name?: string
-                namespace?: string
-                prefix?: string
-                attribute?: boolean
-                wrapped?: boolean
-            }
+declare namespace swaggerize {
+    export module Swagger {
+        export interface ApiDefinition {
+            swagger: string
+            info: InfoObject
+            host?: string
+            basePath?: string
+            schemes?: string[]
+            consumes?: MimeTypes
+            produces?: MimeTypes
+            paths: PathsObject
+            definitions?: DefinitionsObject
+            parameters?: ParametersDefinitionsObject
+            responses?: ResponsesDefinitionsObject
+            securityDefinitions?: SecurityDefinitionsObject
+            security?: SecurityRequirementObject[]
+            tags?: TagObject[]
+            externalDocs?: ExternalDocumentationObject
         }
 
-        export interface Options {
-            api: Swagger.ApiDefinition
-            docspath: String
-            handlers: String
+        type MimeTypes = string[]
+
+        export interface InfoObject {
+            title: string
+            description?: string
+            termsOfService?: string
+            contact?: ContactObject
+            license?: LicenseObject
+            version: string
         }
 
-        export interface IConfig {
-            api: Swagger.ApiDefinition
-            routes: express.IRoute[]
+        export interface ContactObject {
+            name?: string
+            url?: string
+            email?: string
         }
 
-        export interface SwaggerizedExpress extends express.Express {
-            swagger: IConfig
+        export interface LicenseObject {
+            name: string
+            url?: string
+        }
+
+        export interface PathsObject {
+            [index: string]: PathItemObject | any
+        }
+
+        export interface PathItemObject {
+            $ref?: string
+            get?: OperationObject
+            put?: OperationObject
+            post?: OperationObject
+            'delete'?: OperationObject
+            options?: OperationObject
+            head?: OperationObject
+            patch?: OperationObject
+            parameters?: Parameters
+        }
+
+        export interface OperationObject {
+            tags?: string[]
+            summary?: string
+            description?: string
+            externalDocs?: ExternalDocumentationObject
+            operationId?: string
+            consumes?: MimeTypes
+            produces?: MimeTypes
+            parameters?: Parameters
+            responses: ResponsesObject
+            schemes?: string[]
+            deprecated?: boolean
+            security?: SecurityRequirementObject[]
+        }
+
+        export interface DefinitionsObject {
+            [index: string]: SchemaObject
+        }
+
+        export interface ResponsesObject {
+            [index: string]: Response | any
+            'default': Response
+        }
+
+        type Response = ResponseObject | ReferenceObject
+
+        export interface ResponsesDefinitionsObject {
+            [index: string]: ResponseObject
+        }
+
+        export interface ResponseObject {
+            description: string
+            schema?: SchemaObject
+            headers?: HeadersObject
+            examples?: ExampleObject
+        }
+
+        export interface HeadersObject {
+            [index: string]: HeaderObject
+        }
+
+        export interface HeaderObject extends ItemsObject {
+        }
+
+        export interface ExampleObject {
+            [index: string]: any
+        }
+
+        export interface SecurityDefinitionsObject {
+            [index: string]: SecuritySchemeObject
+        }
+
+        export interface SecuritySchemeObject {
+            type: string
+            description?: string
+            name: string
+            'in': string
+            flow: string
+            authorizationUrl: string
+            tokenUrl: string
+            scopes: ScopesObject
+        }
+
+        export interface ScopesObject {
+            [index: string]: any
+        }
+
+        export interface SecurityRequirementObject {
+            [index: string]: string[]
+        }
+
+        export interface TagObject {
+            name: string
+            description?: string
+            externalDocs?: ExternalDocumentationObject
+        }
+
+        export interface ItemsObject {
+            type: string
+            format?: string
+            items?: ItemsObject
+            collectionFormat?: string
+            'default'?: any
+            maximum?: number
+            exclusiveMaximum: boolean
+            minimum?: number
+            exclusiveMinimum?: boolean
+            maxLength?: number
+            minLength?: number
+            pattern?: string
+            maxItems?: number
+            minItems?: number
+            uniqueItems?: boolean
+            'enum'?: any[]
+            multipleOf?: number
+        }
+
+        export interface ParametersDefinitionsObject {
+            [index: string]: ParameterObject
+        }
+
+        type Parameters = (ParameterObject | ReferenceObject)[]
+
+        export interface ParameterObject {
+            name: string
+            'in': string
+            description?: string
+            required?: boolean
+        }
+
+        export interface InBodyParameterObject extends ParameterObject {
+            schema: SchemaObject
+        }
+
+        export interface GeneralParameterObject extends ParameterObject, ItemsObject {
+            allowEmptyValue?: boolean
+        }
+
+        export interface ReferenceObject {
+            $ref: string
+        }
+
+        export interface ExternalDocumentationObject {
+            [index: string]: any
+            description?: string
+            url: string
+        }
+
+        export interface SchemaObject extends IJsonSchema {
+            [index: string]: any
+            discriminator?: string
+            readOnly?: boolean
+            xml?: XMLObject
+            externalDocs: ExternalDocumentationObject
+            example: any
+        }
+
+        export interface XMLObject {
+            [index: string]: any
+            name?: string
+            namespace?: string
+            prefix?: string
+            attribute?: boolean
+            wrapped?: boolean
         }
     }
 
-    interface IJsonSchema {
-        id?: string
-        $schema?: string
-        title?: string
-        description?: string
-        multipleOf?: number
-        maximum?: number
-        exclusiveMaximum?: boolean
-        minimum?: number
-        exclusiveMinimum?: boolean
-        maxLength?: number
-        minLength?: number
-        pattern?: string
-        additionalItems?: boolean | IJsonSchema
-        items?: IJsonSchema | IJsonSchema[]
-        maxItems?: number
-        minItems?: number
-        uniqueItems?: boolean
-        maxProperties?: number
-        minProperties?: number
-        required?: string[]
-        additionalProperties?: boolean | IJsonSchema
-        definitions?: {
-            [name: string]: IJsonSchema
-        }
-        properties?: {
-            [name: string]: IJsonSchema
-        }
-        patternProperties?: {
-            [name: string]: IJsonSchema
-        }
-        dependencies?: {
-            [name: string]: IJsonSchema | string[]
-        }
-        'enum'?: any[]
-        type?: string | string[]
-        allOf?: IJsonSchema[]
-        anyOf?: IJsonSchema[]
-        oneOf?: IJsonSchema[]
-        not?: IJsonSchema
+    export interface Options {
+        api: Swagger.ApiDefinition
+        docspath: String
+        handlers: String
     }
 
-    export = swaggerize;
+    export interface IConfig {
+        api: Swagger.ApiDefinition
+        routes: express.IRoute[]
+    }
+
+    export interface SwaggerizedExpress extends express.Express {
+        swagger: IConfig
+    }
 }
+
+interface IJsonSchema {
+    id?: string
+    $schema?: string
+    title?: string
+    description?: string
+    multipleOf?: number
+    maximum?: number
+    exclusiveMaximum?: boolean
+    minimum?: number
+    exclusiveMinimum?: boolean
+    maxLength?: number
+    minLength?: number
+    pattern?: string
+    additionalItems?: boolean | IJsonSchema
+    items?: IJsonSchema | IJsonSchema[]
+    maxItems?: number
+    minItems?: number
+    uniqueItems?: boolean
+    maxProperties?: number
+    minProperties?: number
+    required?: string[]
+    additionalProperties?: boolean | IJsonSchema
+    definitions?: {
+        [name: string]: IJsonSchema
+    }
+    properties?: {
+        [name: string]: IJsonSchema
+    }
+    patternProperties?: {
+        [name: string]: IJsonSchema
+    }
+    dependencies?: {
+        [name: string]: IJsonSchema | string[]
+    }
+    'enum'?: any[]
+    type?: string | string[]
+    allOf?: IJsonSchema[]
+    anyOf?: IJsonSchema[]
+    oneOf?: IJsonSchema[]
+    not?: IJsonSchema
+}
+
+export = swaggerize;
diff --git a/swap-case/swap-case.d.ts b/swap-case/swap-case.d.ts
index d3c85813c6..bd3e957813 100644
--- a/swap-case/swap-case.d.ts
+++ b/swap-case/swap-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "swap-case" {
-	function swapCase(string: string, locale?: string): string;
-	export = swapCase;
-}
+
+declare function swapCase(string: string, locale?: string): string;
+export = swapCase;
diff --git a/swig-email-templates/swig-email-templates.d.ts b/swig-email-templates/swig-email-templates.d.ts
index ad762b9da7..d0f6c791ef 100644
--- a/swig-email-templates/swig-email-templates.d.ts
+++ b/swig-email-templates/swig-email-templates.d.ts
@@ -5,17 +5,16 @@
 
 /// <reference path="../swig/swig.d.ts" />
 
-declare module "swig-email-templates" {
-    import swig = require('swig');
 
-    interface SwigRender<T> {
-        (file:string, context:T, callback:(err:any, html:string, text:string)=>any):any;
-    }
+import swig = require('swig');
 
-    interface SwigEmailTemplatesOptions extends swig.SwigOptions {
-        root?: string;
-    }
-
-    function init<T>(options:SwigEmailTemplatesOptions, cb:(err:any, render:SwigRender<T>)=>any):any;
-    export = init
+interface SwigRender<T> {
+    (file: string, context: T, callback: (err: any, html: string, text: string) => any): any;
 }
+
+interface SwigEmailTemplatesOptions extends swig.SwigOptions {
+    root?: string;
+}
+
+declare function init<T>(options: SwigEmailTemplatesOptions, cb: (err: any, render: SwigRender<T>) => any): any;
+export = init
diff --git a/swig/swig.d.ts b/swig/swig.d.ts
index 5e5914afb0..8406fce58a 100644
--- a/swig/swig.d.ts
+++ b/swig/swig.d.ts
@@ -5,154 +5,153 @@
 
 // API Documentation : http://paularmstrong.github.io/swig/docs/api/
 
-declare module "swig" {
-    export class Swig {
-        constructor(options?: SwigOptions);
 
-        setFilter(
-            name: string,
-            method: (input: any, ...args: any[]) => string
-            ): void;
-        setTag(
-            name: string,
-            parse: (str?: string, line?: string, parser?: Object, types?: lexer.TYPES, stack?: any, opts?: Object, swig?: Swig) => boolean,
-            compile: (compiler?: (content?: string, parents?: any, options?: any, blockName?: string) => string, args?: any[], content?: string, parents?: any, options?: any, blockName?: string) => string,
-            ends?: boolean,
-            blockLevel?: boolean
-            ): void;
-        setExtension(name: string, object: any): void;
-        parseFile(pathName: string, options?: any): parser.ParseReturn;
-        precompile(source: string, options?: SwigOptions): any;
-        compile(source: string, options?: SwigOptions): (locals?: any) => string;
-        compileFile(pathname: string, options: SwigOptions, cb: (err: Error, compiledRender: (locals?: any) => string) => void): void;
-        compileFile(pathname: string, options?: SwigOptions): (locals?: any) => string;
-        render(source: string, options?: SwigOptions): string;
-        renderFile(pathName: string, locals: any, cb: (err: Error, output: string) => void): void;
-        renderFile(pathName: string, locals?: any): string;
-        run(templateFn: Function, locals?: any, filePath?: string): string;
-        invalidateCache(): void;
+declare export class Swig {
+    constructor(options?: SwigOptions);
 
-        loaders: typeof loaders;
-    }
-
-    export module lexer {
-        export enum TYPES {
-            /** Whitespace */
-            WHITESPACE = 0,
-            /** Plain string */
-            STRING = 1,
-            /** Variable filter */
-            FILTER = 2,
-            /** Empty variable filter */
-            FILTEREMPTY = 3,
-            /** Function */
-            FUNCTION = 4,
-            /** Function with no arguments */
-            FUNCTIONEMPTY = 5,
-            /** Open parenthesis */
-            PARENOPEN = 6,
-            /** Close parenthesis */
-            PARENCLOSE = 7,
-            /** Comma */
-            COMMA = 8,
-            /** Variable */
-            VAR = 9,
-            /** Number */
-            NUMBER = 10,
-            /** Math operator */
-            OPERATOR = 11,
-            /** Open square bracket */
-            BRACKETOPEN = 12,
-            /** Close square bracket */
-            BRACKETCLOSE = 13,
-            /** Key on an object using dot-notation */
-            DOTKEY = 14,
-            /** Start of an array */
-            ARRAYOPEN = 15,
-            /** End of an array
-             * Currently unused
-            ARRAYCLOSE = 16, */
-            /** Open curly brace */
-            CURLYOPEN = 17,
-            /** Close curly brace */
-            CURLYCLOSE = 18,
-            /** Colon (:) */
-            COLON = 19,
-            /** JavaScript-valid comparator */
-            COMPARATOR = 20,
-            /** Boolean logic */
-            LOGIC = 21,
-            /** Boolean logic "not" */
-            NOT = 22,
-            /** true or false */
-            BOOL = 23,
-            /** Variable assignment */
-            ASSIGNMENT = 24,
-            /** Start of a method */
-            METHODOPEN = 25,
-            /** End of a method
-             * Currently unused
-            METHODEND = 26, */
-            /** Unknown type */
-            UNKNOWN = 100
-        }
-
-        export function read(str: string): string[];
-    }
-
-    export module parser {
-        interface ParseReturn {
-            name: string;
-            parent: any;
-            tokens: any[];
-            blocks: any;
-        }
-    }
-
-    export interface SwigOptions {
-        autoescape?: boolean;
-        cache?: any;
-        cmtControls?: string[];
-        loader?: TemplateLoader;
-        locals?: any;
-        tagControls?: string[];
-        varControls?: string[];
-    }
-
-    export interface TemplateLoader {
-        resolve(to: string, from: string): string;
-        load(identifier: string, callback?: (err: Error, data: any) => void): void;
-        load(identifier:string): any;
-    }
-
-    export module loaders {
-        export function fs(basepath?: string, encoding?: string): TemplateLoader;
-        export function memory(mapping: any, basepath?: string): TemplateLoader;
-    }
-
-    export var version: string;
-    export function setDefaults(options: SwigOptions): void;
-    export function setDefaultTZOffset(offset: number): void;
-    export function setFilter(
+    setFilter(
         name: string,
         method: (input: any, ...args: any[]) => string
-        ): void;
-    export function setTag(
+    ): void;
+    setTag(
         name: string,
         parse: (str?: string, line?: string, parser?: Object, types?: lexer.TYPES, stack?: any, opts?: Object, swig?: Swig) => boolean,
         compile: (compiler?: (content?: string, parents?: any, options?: any, blockName?: string) => string, args?: any[], content?: string, parents?: any, options?: any, blockName?: string) => string,
         ends?: boolean,
         blockLevel?: boolean
-        ): void;
-    export function setExtension(name: string, object: any): void;
-    export function parseFile(pathName: string, options?: any): parser.ParseReturn;
-    export function precompile(source: string, options?: SwigOptions): any;
-    export function compile(source: string, options?: SwigOptions): (locals?: any) => string;
-    export function compileFile(pathname: string, options: SwigOptions, cb: (err: Error, compiledRender: (locals?: any) => string) => void): void;
-    export function compileFile(pathname: string, options?: SwigOptions): (locals?: any) => string;
-    export function render(source: string, options?: SwigOptions): string;
-    export function renderFile(pathName: string, locals: any, cb: (err: Error, output: string) => void): void;
-    export function renderFile(pathName: string, locals?: any): string
-    export function run(templateFn: Function, locals?: any, filePath?: string): string;
-    export function invalidateCache(): void;
+    ): void;
+    setExtension(name: string, object: any): void;
+    parseFile(pathName: string, options?: any): parser.ParseReturn;
+    precompile(source: string, options?: SwigOptions): any;
+    compile(source: string, options?: SwigOptions): (locals?: any) => string;
+    compileFile(pathname: string, options: SwigOptions, cb: (err: Error, compiledRender: (locals?: any) => string) => void): void;
+    compileFile(pathname: string, options?: SwigOptions): (locals?: any) => string;
+    render(source: string, options?: SwigOptions): string;
+    renderFile(pathName: string, locals: any, cb: (err: Error, output: string) => void): void;
+    renderFile(pathName: string, locals?: any): string;
+    run(templateFn: Function, locals?: any, filePath?: string): string;
+    invalidateCache(): void;
+
+    loaders: typeof loaders;
 }
+
+declare export module lexer {
+    export enum TYPES {
+        /** Whitespace */
+        WHITESPACE = 0,
+        /** Plain string */
+        STRING = 1,
+        /** Variable filter */
+        FILTER = 2,
+        /** Empty variable filter */
+        FILTEREMPTY = 3,
+        /** Function */
+        FUNCTION = 4,
+        /** Function with no arguments */
+        FUNCTIONEMPTY = 5,
+        /** Open parenthesis */
+        PARENOPEN = 6,
+        /** Close parenthesis */
+        PARENCLOSE = 7,
+        /** Comma */
+        COMMA = 8,
+        /** Variable */
+        VAR = 9,
+        /** Number */
+        NUMBER = 10,
+        /** Math operator */
+        OPERATOR = 11,
+        /** Open square bracket */
+        BRACKETOPEN = 12,
+        /** Close square bracket */
+        BRACKETCLOSE = 13,
+        /** Key on an object using dot-notation */
+        DOTKEY = 14,
+        /** Start of an array */
+        ARRAYOPEN = 15,
+        /** End of an array
+         * Currently unused
+        ARRAYCLOSE = 16, */
+        /** Open curly brace */
+        CURLYOPEN = 17,
+        /** Close curly brace */
+        CURLYCLOSE = 18,
+        /** Colon (:) */
+        COLON = 19,
+        /** JavaScript-valid comparator */
+        COMPARATOR = 20,
+        /** Boolean logic */
+        LOGIC = 21,
+        /** Boolean logic "not" */
+        NOT = 22,
+        /** true or false */
+        BOOL = 23,
+        /** Variable assignment */
+        ASSIGNMENT = 24,
+        /** Start of a method */
+        METHODOPEN = 25,
+        /** End of a method
+         * Currently unused
+        METHODEND = 26, */
+        /** Unknown type */
+        UNKNOWN = 100
+    }
+
+    export function read(str: string): string[];
+}
+
+declare export module parser {
+    interface ParseReturn {
+        name: string;
+        parent: any;
+        tokens: any[];
+        blocks: any;
+    }
+}
+
+export interface SwigOptions {
+    autoescape?: boolean;
+    cache?: any;
+    cmtControls?: string[];
+    loader?: TemplateLoader;
+    locals?: any;
+    tagControls?: string[];
+    varControls?: string[];
+}
+
+export interface TemplateLoader {
+    resolve(to: string, from: string): string;
+    load(identifier: string, callback?: (err: Error, data: any) => void): void;
+    load(identifier: string): any;
+}
+
+declare export module loaders {
+    export function fs(basepath?: string, encoding?: string): TemplateLoader;
+    export function memory(mapping: any, basepath?: string): TemplateLoader;
+}
+
+declare export var version: string;
+declare export function setDefaults(options: SwigOptions): void;
+declare export function setDefaultTZOffset(offset: number): void;
+declare export function setFilter(
+    name: string,
+    method: (input: any, ...args: any[]) => string
+): void;
+declare export function setTag(
+    name: string,
+    parse: (str?: string, line?: string, parser?: Object, types?: lexer.TYPES, stack?: any, opts?: Object, swig?: Swig) => boolean,
+    compile: (compiler?: (content?: string, parents?: any, options?: any, blockName?: string) => string, args?: any[], content?: string, parents?: any, options?: any, blockName?: string) => string,
+    ends?: boolean,
+    blockLevel?: boolean
+): void;
+declare export function setExtension(name: string, object: any): void;
+declare export function parseFile(pathName: string, options?: any): parser.ParseReturn;
+declare export function precompile(source: string, options?: SwigOptions): any;
+declare export function compile(source: string, options?: SwigOptions): (locals?: any) => string;
+declare export function compileFile(pathname: string, options: SwigOptions, cb: (err: Error, compiledRender: (locals?: any) => string) => void): void;
+declare export function compileFile(pathname: string, options?: SwigOptions): (locals?: any) => string;
+declare export function render(source: string, options?: SwigOptions): string;
+declare export function renderFile(pathName: string, locals: any, cb: (err: Error, output: string) => void): void;
+declare export function renderFile(pathName: string, locals?: any): string
+declare export function run(templateFn: Function, locals?: any, filePath?: string): string;
+declare export function invalidateCache(): void;
diff --git a/swiz/swiz.d.ts b/swiz/swiz.d.ts
index 93a8ff72e4..3708e178c2 100644
--- a/swiz/swiz.d.ts
+++ b/swiz/swiz.d.ts
@@ -5,191 +5,190 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/swiz.d.ts
 
-declare module "swiz" {
-	export class Cidr {
-		constructor(x: string, y?: string);
-		isInCIDR(x: any): boolean;
-	}
 
-	export class Valve {
-		constructor(schema: IValveSchema, baton?: any);
-		setSchema(schema: IValveSchema): Valve;
-		addFinalValidator(func: (obj: any, callback: (err: Error, cleaned: any) => void) => void): Valve;
-		addChainValidator(name: string, description: string, func: (value: any, callback: (err: Error, cleaned: any) => void) => void): void;
-		check(obj: any, options: ICheckOptions, callback: (err: any, cleaned: any) => void): void;
-		check(obj: any, callback: (err: any, cleaned: any) => void): void;
-		checkUpdate(existing: any, obj: any, callback: (err: any, cleaned: any) => void): void;
-		help(schema: IValveSchema): any;
-	}
-
-	export interface ICheckOptions {
-		strict?: boolean;
-	}
-
-	export interface IValveSchema  {
-		[index: string]: IValveSchemaMember;
-	}
-
-	export interface IValveSchemaMember {}
-
-	export interface IValveSchemaMemberArray extends IValveSchemaMember {
-		[index: string]: IValveSchemaMember;
-	}
-
-	export function Chain(): IChain;
-
-	export function chain(): IChain;
-
-	export interface IChain extends IValveSchemaMember {
-		getValidatorPos(name: string): number;
-		hasValidator(name: string): number;
-		getValidatorAtPos(pos: number): IValidator;
-		isUnique(): IChain;
-		toUnique(): IChain;
-		notIPBlacklisted(): IChain;
-		isCIDR(): IChain;
-		isEmail(): IChain;
-		isUrl(): IChain;
-		isAddressPair(): IChain;
-		isIP(): IChain;
-		isIPv4(): IChain;
-		isIPv6(): IChain;
-		isHostnameOrIp(): IChain;
-		isAllowedFQDNOrIP(blacklist?: string[]): IChain;
-		isHostname(): IChain;
-		isAlpha(): IChain;
-		isAlphanumeric(): IChain;
-		isNumeric(): IChain;
-		isInt(): IChain;
-		isLowercase(): IChain;
-		isUppercase(): IChain;
-		isDecimal(): IChain;
-		isFloat(): IChain;
-		notNull(): IChain;
-		isNull(): IChain;
-		notEmpty(): IChain;
-		equals(arg: any): IChain;
-		contains(arg: any): IChain;
-		notContains(arg: any): IChain;
-		notIn(values: any[], caseSensitive?: boolean): IChain;
-		regex(pattern: RegExp): IChain;
-		regex(pattern: string, modifiers?: string): IChain;
-		is(pattern: string, modifiers?: string): IChain;
-		notRegex(pattern: RegExp): IChain;
-		notRegex(pattern: string, modifiers?: string): IChain;
-		not(pattern: string, modifiers: string): IChain;
-		len(min: number, max?: number): IChain;
-		numItems(min: number, max: number): IChain;
-		toFloat(): IChain;
-		toInt(): IChain;
-		toBoolean(): IChain;
-		toBooleanStrict(): IChain;
-		entityDecode(): IChain;
-		entityEncode(): IChain;
-		trim(chars?: string): IChain;
-		ltrim(chars?: string): IChain;
-		rtrim(chars: string): IChain;
-		ifNull(replace: string): IChain;
-		xss(is_image?: boolean): IChain;
-		enumerated(map: any): IChain;
-		inArray(array: any[]): IChain;
-		isString(): IChain;
-		isBoolean(): IChain;
-		range(min: any, max: any): IChain;
-		optional(): IChain;
-		isPort(): IChain;
-		isV1UUID(): IChain;
-		immutable(): IChain;
-		updateRequired(): IChain;
-		isArray(chain: IChain): IChain;
-		isHash(keyChain: IChain, valueChain: IChain): IChain;
-		rename(target: string): IChain;
-		custom(name: string): IChain;
-	}
-
-	export function defToValve(def: struct.IObj[]): IValveSchema[];
-
-	export class Swiz {
-		constructor(defs: struct.IObj[], options?: ISwizOptions);
-		buildObject(obj: any, callback: (err: any, result: any) => void): void;
-		buildObjectSync(obj: any): any;
-		serializeJson(obj: any): string;
-		serializeXml(obj: any): string;
-		deserializeXml(xml: string): any;
-		serialize(mode: SERIALIZATION, version: number, obj: ISerializable, callback: (err: any, result: string) => void): void;
-		serializeForPagination(mode: SERIALIZATION, array: any[], metadata: any, callback: (err: any, result: string) => void): void;
-		deserialize(mode: SERIALIZATION, version: number, raw: string, callback: (err: any, result: any) => void): void;
-		getFieldDefinition(stype: string, name: string): struct.IField;
-	}
-
-	export interface ISerializable {
-		getSerializerType(): string;
-	}
-
-	export interface ISwizOptions {
-		stripNulls?: boolean;
-		stripSerializerType?: boolean;
-		for?: string;
-	}
-
-	interface IValidator {
-		name: string;
-		func(value: any, baton: any, callback: Function): void;
-		help: string;
-	}
-
-	export function stripSerializerTypes(obj: any): any;
-
-	export module struct {
-		export function Obj(name: string, options?: IObjOptions): IObj;
-		export function Field(name: string, options?: IFieldOptions): IField;
-		export function coerce(value: any, coerceTo: string): any;
-
-		export interface IObj {
-			name: string;
-			options: IObjOptions;
-			singular: string;
-			plural: string;
-			fields: IField[];
-		}
-
-		export interface IField {
-			name: string;
-			options: IFieldOptions;
-			src: string;
-			singular: string;
-			plural: string;
-			desc?: string;
-			val?: IChain;
-			attribute: boolean;
-			enumerated: boolean;
-			ignorePublic: boolean;
-			filterFrom: string[];
-			coerceTo: any;
-		}
-
-		export interface IObjOptions {
-			singular?: string;
-			plural?: string;
-			fields?: IField[];
-		}
-
-		export interface IFieldOptions {
-			src?: string;
-			singular?: string;
-			plural?: string;
-			desc?: string;
-			val?: IChain;
-			attribute?: boolean;
-			enumerated?: any;
-			ignorePublic?: boolean;
-			filterFrom?: string[];
-			coerceTo?: string;
-		}
-	}
-
-	export enum SERIALIZATION {
-		SERIALIZATION_JSON,
-		SERIALIZATION_XML
-	}
+declare export class Cidr {
+    constructor(x: string, y?: string);
+    isInCIDR(x: any): boolean;
+}
+
+declare export class Valve {
+    constructor(schema: IValveSchema, baton?: any);
+    setSchema(schema: IValveSchema): Valve;
+    addFinalValidator(func: (obj: any, callback: (err: Error, cleaned: any) => void) => void): Valve;
+    addChainValidator(name: string, description: string, func: (value: any, callback: (err: Error, cleaned: any) => void) => void): void;
+    check(obj: any, options: ICheckOptions, callback: (err: any, cleaned: any) => void): void;
+    check(obj: any, callback: (err: any, cleaned: any) => void): void;
+    checkUpdate(existing: any, obj: any, callback: (err: any, cleaned: any) => void): void;
+    help(schema: IValveSchema): any;
+}
+
+export interface ICheckOptions {
+    strict?: boolean;
+}
+
+export interface IValveSchema {
+    [index: string]: IValveSchemaMember;
+}
+
+export interface IValveSchemaMember { }
+
+export interface IValveSchemaMemberArray extends IValveSchemaMember {
+    [index: string]: IValveSchemaMember;
+}
+
+declare export function Chain(): IChain;
+
+declare export function chain(): IChain;
+
+export interface IChain extends IValveSchemaMember {
+    getValidatorPos(name: string): number;
+    hasValidator(name: string): number;
+    getValidatorAtPos(pos: number): IValidator;
+    isUnique(): IChain;
+    toUnique(): IChain;
+    notIPBlacklisted(): IChain;
+    isCIDR(): IChain;
+    isEmail(): IChain;
+    isUrl(): IChain;
+    isAddressPair(): IChain;
+    isIP(): IChain;
+    isIPv4(): IChain;
+    isIPv6(): IChain;
+    isHostnameOrIp(): IChain;
+    isAllowedFQDNOrIP(blacklist?: string[]): IChain;
+    isHostname(): IChain;
+    isAlpha(): IChain;
+    isAlphanumeric(): IChain;
+    isNumeric(): IChain;
+    isInt(): IChain;
+    isLowercase(): IChain;
+    isUppercase(): IChain;
+    isDecimal(): IChain;
+    isFloat(): IChain;
+    notNull(): IChain;
+    isNull(): IChain;
+    notEmpty(): IChain;
+    equals(arg: any): IChain;
+    contains(arg: any): IChain;
+    notContains(arg: any): IChain;
+    notIn(values: any[], caseSensitive?: boolean): IChain;
+    regex(pattern: RegExp): IChain;
+    regex(pattern: string, modifiers?: string): IChain;
+    is(pattern: string, modifiers?: string): IChain;
+    notRegex(pattern: RegExp): IChain;
+    notRegex(pattern: string, modifiers?: string): IChain;
+    not(pattern: string, modifiers: string): IChain;
+    len(min: number, max?: number): IChain;
+    numItems(min: number, max: number): IChain;
+    toFloat(): IChain;
+    toInt(): IChain;
+    toBoolean(): IChain;
+    toBooleanStrict(): IChain;
+    entityDecode(): IChain;
+    entityEncode(): IChain;
+    trim(chars?: string): IChain;
+    ltrim(chars?: string): IChain;
+    rtrim(chars: string): IChain;
+    ifNull(replace: string): IChain;
+    xss(is_image?: boolean): IChain;
+    enumerated(map: any): IChain;
+    inArray(array: any[]): IChain;
+    isString(): IChain;
+    isBoolean(): IChain;
+    range(min: any, max: any): IChain;
+    optional(): IChain;
+    isPort(): IChain;
+    isV1UUID(): IChain;
+    immutable(): IChain;
+    updateRequired(): IChain;
+    isArray(chain: IChain): IChain;
+    isHash(keyChain: IChain, valueChain: IChain): IChain;
+    rename(target: string): IChain;
+    custom(name: string): IChain;
+}
+
+declare export function defToValve(def: struct.IObj[]): IValveSchema[];
+
+declare export class Swiz {
+    constructor(defs: struct.IObj[], options?: ISwizOptions);
+    buildObject(obj: any, callback: (err: any, result: any) => void): void;
+    buildObjectSync(obj: any): any;
+    serializeJson(obj: any): string;
+    serializeXml(obj: any): string;
+    deserializeXml(xml: string): any;
+    serialize(mode: SERIALIZATION, version: number, obj: ISerializable, callback: (err: any, result: string) => void): void;
+    serializeForPagination(mode: SERIALIZATION, array: any[], metadata: any, callback: (err: any, result: string) => void): void;
+    deserialize(mode: SERIALIZATION, version: number, raw: string, callback: (err: any, result: any) => void): void;
+    getFieldDefinition(stype: string, name: string): struct.IField;
+}
+
+export interface ISerializable {
+    getSerializerType(): string;
+}
+
+export interface ISwizOptions {
+    stripNulls?: boolean;
+    stripSerializerType?: boolean;
+    for?: string;
+}
+
+interface IValidator {
+    name: string;
+    func(value: any, baton: any, callback: Function): void;
+    help: string;
+}
+
+declare export function stripSerializerTypes(obj: any): any;
+
+declare export module struct {
+    export function Obj(name: string, options?: IObjOptions): IObj;
+    export function Field(name: string, options?: IFieldOptions): IField;
+    export function coerce(value: any, coerceTo: string): any;
+
+    export interface IObj {
+        name: string;
+        options: IObjOptions;
+        singular: string;
+        plural: string;
+        fields: IField[];
+    }
+
+    export interface IField {
+        name: string;
+        options: IFieldOptions;
+        src: string;
+        singular: string;
+        plural: string;
+        desc?: string;
+        val?: IChain;
+        attribute: boolean;
+        enumerated: boolean;
+        ignorePublic: boolean;
+        filterFrom: string[];
+        coerceTo: any;
+    }
+
+    export interface IObjOptions {
+        singular?: string;
+        plural?: string;
+        fields?: IField[];
+    }
+
+    export interface IFieldOptions {
+        src?: string;
+        singular?: string;
+        plural?: string;
+        desc?: string;
+        val?: IChain;
+        attribute?: boolean;
+        enumerated?: any;
+        ignorePublic?: boolean;
+        filterFrom?: string[];
+        coerceTo?: string;
+    }
+}
+
+declare export enum SERIALIZATION {
+    SERIALIZATION_JSON,
+    SERIALIZATION_XML
 }
diff --git a/tabtab/tabtab.d.ts b/tabtab/tabtab.d.ts
index a777c9aba5..2a1e5fceba 100644
--- a/tabtab/tabtab.d.ts
+++ b/tabtab/tabtab.d.ts
@@ -3,89 +3,87 @@
 // Definitions by: Vojtěch Habarta <https://github.com/vojtechhabarta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "tabtab" {
 
-    /**
-     * Main completion method, has support for installation and actual completion.
-     * @param name Name of the command to complete.
-     * @param cb Get called when a tab-completion command happens.
-     */
-    export function complete(name: string, cb: CallBack): void;
 
-    /**
-     * Main completion method, has support for installation and actual completion.
-     * @param name Name of the command to complete.
-     * @param completer Name of the command to call on completion.
-     * @param cb Get called when a tab-completion command happens.
-     */
-    export function complete(name: string, completer: string, cb: CallBack): void;
+/**
+ * Main completion method, has support for installation and actual completion.
+ * @param name Name of the command to complete.
+ * @param cb Get called when a tab-completion command happens.
+ */
+declare export function complete(name: string, cb: CallBack): void;
 
-    /**
-     * Simple helper function to know if the script is run in the context of a completion command.
-     */
-    export function isComplete(): boolean;
+/**
+ * Main completion method, has support for installation and actual completion.
+ * @param name Name of the command to complete.
+ * @param completer Name of the command to call on completion.
+ * @param cb Get called when a tab-completion command happens.
+ */
+declare export function complete(name: string, completer: string, cb: CallBack): void;
 
-    /**
-     * Helper to return the list of short and long options, parsed from the usual --help output of a command (cake/rake -H, vagrant, commander -h, optimist.help(), ...).
-     */
-    export function parseOut(str: string): { shorts: string[]; longs: string[] };
+/**
+ * Simple helper function to know if the script is run in the context of a completion command.
+ */
+declare export function isComplete(): boolean;
 
-    /**
-     * Same purpose as parseOut, but for parsing tasks from an help command (cake/rake -T, vagrant, etc.).
-     */
-    export function parseTasks(str: string, prefix: string, reg?: RegExp|string): string[];
+/**
+ * Helper to return the list of short and long options, parsed from the usual --help output of a command (cake/rake -H, vagrant, commander -h, optimist.help(), ...).
+ */
+declare export function parseOut(str: string): { shorts: string[]; longs: string[] };
 
-    /**
-     * Helper to return completion output and log to standard output.
-     * @param values Array of values to complete against.
-     * @param data The data object returned by the complete callback, used mainly to filter results accordingly upon the text that is supplied by the user.
-     * @param prefix A prefix to add to the completion results, useful for options to add dashes (eg. - or --).
-     */
-    export function log(values: string[], data: Data, prefix?: string): void;
+/**
+ * Same purpose as parseOut, but for parsing tasks from an help command (cake/rake -T, vagrant, etc.).
+ */
+declare export function parseTasks(str: string, prefix: string, reg?: RegExp | string): string[];
 
-    interface CallBack {
-        (error?: Error, data?: Data, text?: string): any;
-    }
-
-    /**
-     * Holds interesting values to drive the output of the completion.
-     */
-    interface Data {
-
-        /**
-         * full command being completed
-         */
-        line: string;
-
-        /**
-         * number of words
-         */
-        words: number;
-
-        /**
-         * cursor position
-         */
-        point: number;
-
-        /**
-         * tabing in the middle of a word: foo bar baz bar foobarrrrrrr
-         */
-        partial: string;
-
-        /**
-         * last word of the line
-         */
-        last: string;
-
-        /**
-         * last partial of the line
-         */
-        lastPartial: string;
-
-        /**
-         * the previous word
-         */
-        prev: string;
-    }
+/**
+ * Helper to return completion output and log to standard output.
+ * @param values Array of values to complete against.
+ * @param data The data object returned by the complete callback, used mainly to filter results accordingly upon the text that is supplied by the user.
+ * @param prefix A prefix to add to the completion results, useful for options to add dashes (eg. - or --).
+ */
+declare export function log(values: string[], data: Data, prefix?: string): void;
 
+interface CallBack {
+    (error?: Error, data?: Data, text?: string): any;
+}
+
+/**
+ * Holds interesting values to drive the output of the completion.
+ */
+interface Data {
+
+    /**
+     * full command being completed
+     */
+    line: string;
+
+    /**
+     * number of words
+     */
+    words: number;
+
+    /**
+     * cursor position
+     */
+    point: number;
+
+    /**
+     * tabing in the middle of a word: foo bar baz bar foobarrrrrrr
+     */
+    partial: string;
+
+    /**
+     * last word of the line
+     */
+    last: string;
+
+    /**
+     * last partial of the line
+     */
+    lastPartial: string;
+
+    /**
+     * the previous word
+     */
+    prev: string;
 }
diff --git a/tape/tape.d.ts b/tape/tape.d.ts
index 0a9a422efa..c24e458718 100644
--- a/tape/tape.d.ts
+++ b/tape/tape.d.ts
@@ -5,198 +5,197 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'tape' {
-	export = tape;
 
-	/**
-	 * Create a new test with an optional name string and optional opts object.
-	 * cb(t) fires with the new test object t once all preceeding tests have finished.
-	 * Tests execute serially.
-	 */
-	function tape(name: string, cb: tape.TestCase): void;
-	function tape(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
-	function tape(cb: tape.TestCase): void;
-	function tape(opts: tape.TestOptions, cb: tape.TestCase): void;
+export = tape;
 
-	namespace tape {
+/**
+ * Create a new test with an optional name string and optional opts object.
+ * cb(t) fires with the new test object t once all preceeding tests have finished.
+ * Tests execute serially.
+ */
+declare function tape(name: string, cb: tape.TestCase): void;
+declare function tape(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
+declare function tape(cb: tape.TestCase): void;
+declare function tape(opts: tape.TestOptions, cb: tape.TestCase): void;
 
-		interface TestCase {
-			(test: Test): void;
-		}
+declare namespace tape {
 
-		/**
-		 * Available opts options for the tape function.
-		 */
-		interface TestOptions {
-			skip?: boolean;		// See tape.skip.
-			timeout?: number;	// Set a timeout for the test, after which it will fail. See tape.timeoutAfter.
-		}
+    interface TestCase {
+        (test: Test): void;
+    }
 
-		/**
-		 * Options for the createStream function.
-		 */
-		interface StreamOptions {
-			objectMode?: boolean;
-		}
+    /**
+     * Available opts options for the tape function.
+     */
+    interface TestOptions {
+        skip?: boolean;		// See tape.skip.
+        timeout?: number;	// Set a timeout for the test, after which it will fail. See tape.timeoutAfter.
+    }
 
-		/**
-		 * Generate a new test that will be skipped over.
-		 */
-		export function skip(name: string, cb: tape.TestCase): void;
+    /**
+     * Options for the createStream function.
+     */
+    interface StreamOptions {
+        objectMode?: boolean;
+    }
 
-		/**
-		 * Like test(name, cb) except if you use .only this is the only test case that will run for the entire process, all other test cases using tape will be ignored.
-		 */
-		export function only(name: string, cb: tape.TestCase): void;
+    /**
+     * Generate a new test that will be skipped over.
+     */
+    export function skip(name: string, cb: tape.TestCase): void;
 
-		/**
-		 * Create a new test harness instance, which is a function like test(), but with a new pending stack and test state.
-		 */
-		export function createHarness(): typeof tape;
-		/**
-		 * Create a stream of output, bypassing the default output stream that writes messages to console.log().
-		 * By default stream will be a text stream of TAP output, but you can get an object stream instead by setting opts.objectMode to true.
-		 */
-		export function createStream(opts?: tape.StreamOptions): NodeJS.ReadableStream;
+    /**
+     * Like test(name, cb) except if you use .only this is the only test case that will run for the entire process, all other test cases using tape will be ignored.
+     */
+    export function only(name: string, cb: tape.TestCase): void;
 
-		interface Test {
-			/**
-			 * Create a subtest with a new test handle st from cb(st) inside the current test.
-			 * cb(st) will only fire when t finishes.
-			 * Additional tests queued up after t will not be run until all subtests finish.
-			 */
-			test(name: string, cb: tape.TestCase): void;
+    /**
+     * Create a new test harness instance, which is a function like test(), but with a new pending stack and test state.
+     */
+    export function createHarness(): typeof tape;
+    /**
+     * Create a stream of output, bypassing the default output stream that writes messages to console.log().
+     * By default stream will be a text stream of TAP output, but you can get an object stream instead by setting opts.objectMode to true.
+     */
+    export function createStream(opts?: tape.StreamOptions): NodeJS.ReadableStream;
 
-			/**
-			 * Declare that n assertions should be run. end() will be called automatically after the nth assertion.
-			 * If there are any more assertions after the nth, or after end() is called, they will generate errors.
-			 */
-			plan(n: number): void;
+    interface Test {
+        /**
+         * Create a subtest with a new test handle st from cb(st) inside the current test.
+         * cb(st) will only fire when t finishes.
+         * Additional tests queued up after t will not be run until all subtests finish.
+         */
+        test(name: string, cb: tape.TestCase): void;
 
-			/**
-			 * Declare the end of a test explicitly.
-			 * If err is passed in t.end will assert that it is falsey.
-			 */
-			end(err?: any): void;
+        /**
+         * Declare that n assertions should be run. end() will be called automatically after the nth assertion.
+         * If there are any more assertions after the nth, or after end() is called, they will generate errors.
+         */
+        plan(n: number): void;
 
-			/**
-			 * Generate a failing assertion with a message msg.
-			 */
-			fail(msg?: string): void;
+        /**
+         * Declare the end of a test explicitly.
+         * If err is passed in t.end will assert that it is falsey.
+         */
+        end(err?: any): void;
 
-			/**
-			 * Generate a passing assertion with a message msg.
-			 */
-			pass(msg?: string): void;
+        /**
+         * Generate a failing assertion with a message msg.
+         */
+        fail(msg?: string): void;
 
-			/**
-			 * Automatically timeout the test after X ms.
-			 */
-			timeoutAfter(ms: number): void;
+        /**
+         * Generate a passing assertion with a message msg.
+         */
+        pass(msg?: string): void;
 
-			/**
-			 * Generate an assertion that will be skipped over.
-			 */
-			skip(msg?: string): void;
+        /**
+         * Automatically timeout the test after X ms.
+         */
+        timeoutAfter(ms: number): void;
 
-			/**
-			 * Assert that value is truthy with an optional description message msg.
-			 */
-			ok(value: any, msg?: string): void;
-			true(value: any, msg?: string): void;
-			assert(value: any, msg?: string): void;
+        /**
+         * Generate an assertion that will be skipped over.
+         */
+        skip(msg?: string): void;
 
-			/**
-			 * Assert that value is falsy with an optional description message msg.
-			 */
-			notOk(value: any, msg?: string): void;
-			false(value: any, msg?: string): void;
-			notok(value: any, msg?: string): void;
+        /**
+         * Assert that value is truthy with an optional description message msg.
+         */
+        ok(value: any, msg?: string): void;
+        true(value: any, msg?: string): void;
+        assert(value: any, msg?: string): void;
 
-			/**
-			 * Assert that err is falsy.
-			 * If err is non-falsy, use its err.message as the description message.
-			 */
-			error(err: any, msg?: string): void;
-			ifError(err: any, msg?: string): void;
-			ifErr(err: any, msg?: string): void;
-			iferror(err: any, msg?: string): void;
+        /**
+         * Assert that value is falsy with an optional description message msg.
+         */
+        notOk(value: any, msg?: string): void;
+        false(value: any, msg?: string): void;
+        notok(value: any, msg?: string): void;
 
-			/**
-			 * Assert that a === b with an optional description msg.
-			 */
-			equal(a: any, b: any, msg?: string): void;
-			equals(a: any, b: any, msg?: string): void;
-			isEqual(a: any, b: any, msg?: string): void;
-			is(a: any, b: any, msg?: string): void;
-			strictEqual(a: any, b: any, msg?: string): void;
-			strictEquals(a: any, b: any, msg?: string): void;
+        /**
+         * Assert that err is falsy.
+         * If err is non-falsy, use its err.message as the description message.
+         */
+        error(err: any, msg?: string): void;
+        ifError(err: any, msg?: string): void;
+        ifErr(err: any, msg?: string): void;
+        iferror(err: any, msg?: string): void;
 
-			/**
-			 * Assert that a !== b with an optional description msg.
-			 */
-			notEqual(a: any, b: any, msg?: string): void;
-			notEquals(a: any, b: any, msg?: string): void;
-			notStrictEqual(a: any, b: any, msg?: string): void;
-			notStrictEquals(a: any, b: any, msg?: string): void;
-			isNotEqual(a: any, b: any, msg?: string): void;
-			isNot(a: any, b: any, msg?: string): void;
-			not(a: any, b: any, msg?: string): void;
-			doesNotEqual(a: any, b: any, msg?: string): void;
-			isInequal(a: any, b: any, msg?: string): void;
+        /**
+         * Assert that a === b with an optional description msg.
+         */
+        equal(a: any, b: any, msg?: string): void;
+        equals(a: any, b: any, msg?: string): void;
+        isEqual(a: any, b: any, msg?: string): void;
+        is(a: any, b: any, msg?: string): void;
+        strictEqual(a: any, b: any, msg?: string): void;
+        strictEquals(a: any, b: any, msg?: string): void;
 
-			/**
-			 * Assert that a and b have the same structure and nested values using node's deepEqual() algorithm with strict comparisons (===) on leaf nodes and an optional description msg.
-			 */
-			deepEqual(a: any, b: any, msg?: string): void;
-			deepEquals(a: any, b: any, msg?: string): void;
-			isEquivalent(a: any, b: any, msg?: string): void;
-			same(a: any, b: any, msg?: string): void;
+        /**
+         * Assert that a !== b with an optional description msg.
+         */
+        notEqual(a: any, b: any, msg?: string): void;
+        notEquals(a: any, b: any, msg?: string): void;
+        notStrictEqual(a: any, b: any, msg?: string): void;
+        notStrictEquals(a: any, b: any, msg?: string): void;
+        isNotEqual(a: any, b: any, msg?: string): void;
+        isNot(a: any, b: any, msg?: string): void;
+        not(a: any, b: any, msg?: string): void;
+        doesNotEqual(a: any, b: any, msg?: string): void;
+        isInequal(a: any, b: any, msg?: string): void;
 
-			/**
-			 * Assert that a and b do not have the same structure and nested values using node's deepEqual() algorithm with strict comparisons (===) on leaf nodes and an optional description msg.
-			 */
-			notDeepEqual(a: any, b: any, msg?: string): void;
-			notEquivalent(a: any, b: any, msg?: string): void;
-			notDeeply(a: any, b: any, msg?: string): void;
-			notSame(a: any, b: any, msg?: string): void;
-			isNotDeepEqual(a: any, b: any, msg?: string): void;
-			isNotDeeply(a: any, b: any, msg?: string): void;
-			isNotEquivalent(a: any, b: any, msg?: string): void;
-			isInequivalent(a: any, b: any, msg?: string): void;
+        /**
+         * Assert that a and b have the same structure and nested values using node's deepEqual() algorithm with strict comparisons (===) on leaf nodes and an optional description msg.
+         */
+        deepEqual(a: any, b: any, msg?: string): void;
+        deepEquals(a: any, b: any, msg?: string): void;
+        isEquivalent(a: any, b: any, msg?: string): void;
+        same(a: any, b: any, msg?: string): void;
 
-			/**
-			 * Assert that a and b have the same structure and nested values using node's deepEqual() algorithm with loose comparisons (==) on leaf nodes and an optional description msg.
-			 */
-			deepLooseEqual(a: any, b: any, msg?: string): void;
-			looseEqual(a: any, b: any, msg?: string): void;
-			looseEquals(a: any, b: any, msg?: string): void;
+        /**
+         * Assert that a and b do not have the same structure and nested values using node's deepEqual() algorithm with strict comparisons (===) on leaf nodes and an optional description msg.
+         */
+        notDeepEqual(a: any, b: any, msg?: string): void;
+        notEquivalent(a: any, b: any, msg?: string): void;
+        notDeeply(a: any, b: any, msg?: string): void;
+        notSame(a: any, b: any, msg?: string): void;
+        isNotDeepEqual(a: any, b: any, msg?: string): void;
+        isNotDeeply(a: any, b: any, msg?: string): void;
+        isNotEquivalent(a: any, b: any, msg?: string): void;
+        isInequivalent(a: any, b: any, msg?: string): void;
 
-			/**
-			 * Assert that a and b do not have the same structure and nested values using node's deepEqual() algorithm with loose comparisons (==) on leaf nodes and an optional description msg.
-			 */
-			notDeepLooseEqual(a: any, b: any, msg?: string): void;
-			notLooseEqual(a: any, b: any, msg?: string): void;
-			notLooseEquals(a: any, b: any, msg?: string): void;
+        /**
+         * Assert that a and b have the same structure and nested values using node's deepEqual() algorithm with loose comparisons (==) on leaf nodes and an optional description msg.
+         */
+        deepLooseEqual(a: any, b: any, msg?: string): void;
+        looseEqual(a: any, b: any, msg?: string): void;
+        looseEquals(a: any, b: any, msg?: string): void;
 
-			/**
-			 * Assert that the function call fn() throws an exception.
-			 * expected, if present, must be a RegExp or Function, which is used to test the exception object.
-			 */
-			throws(fn: () => void, msg?: string): void;
-			throws(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+        /**
+         * Assert that a and b do not have the same structure and nested values using node's deepEqual() algorithm with loose comparisons (==) on leaf nodes and an optional description msg.
+         */
+        notDeepLooseEqual(a: any, b: any, msg?: string): void;
+        notLooseEqual(a: any, b: any, msg?: string): void;
+        notLooseEquals(a: any, b: any, msg?: string): void;
 
-			/**
-			 * Assert that the function call fn() does not throw an exception.
-			 */
-			doesNotThrow(fn: () => void, msg?: string): void;
-			doesNotThrow(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+        /**
+         * Assert that the function call fn() throws an exception.
+         * expected, if present, must be a RegExp or Function, which is used to test the exception object.
+         */
+        throws(fn: () => void, msg?: string): void;
+        throws(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
 
-			/**
-			 * Print a message without breaking the tap output.
-			 * (Useful when using e.g. tap-colorize where output is buffered & console.log will print in incorrect order vis-a-vis tap output.)
-			 */
-			comment(msg: string): void;
-		}
-	}
+        /**
+         * Assert that the function call fn() does not throw an exception.
+         */
+        doesNotThrow(fn: () => void, msg?: string): void;
+        doesNotThrow(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+
+        /**
+         * Print a message without breaking the tap output.
+         * (Useful when using e.g. tap-colorize where output is buffered & console.log will print in incorrect order vis-a-vis tap output.)
+         */
+        comment(msg: string): void;
+    }
 }
diff --git a/tar/tar.d.ts b/tar/tar.d.ts
index 8f84d95d12..b4bd72d472 100644
--- a/tar/tar.d.ts
+++ b/tar/tar.d.ts
@@ -6,225 +6,222 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "tar" {
-    import stream = require("stream");
 
-    // #region Interfaces
+import stream = require("stream");
 
-    export interface HeaderProperties {
-        path?: string;
-        mode?: number;
-        uid?: number;
-        gid?: number;
-        size?: number;
-        mtime?: number;
-        uname?: string;
-        gname?: string;
-        devmaj?: number;
-        devmin?: number;
-    }
+// #region Interfaces
 
-    export interface ExtractOptions {
-        type?: string;
-        Directory?: boolean;
-        path?: string;
-        strip?: number;
-    }
+export interface HeaderProperties {
+    path?: string;
+    mode?: number;
+    uid?: number;
+    gid?: number;
+    size?: number;
+    mtime?: number;
+    uname?: string;
+    gname?: string;
+    devmaj?: number;
+    devmin?: number;
+}
 
-    export interface ParseStream extends NodeJS.ReadWriteStream {
-        position: number;
+export interface ExtractOptions {
+    type?: string;
+    Directory?: boolean;
+    path?: string;
+    strip?: number;
+}
 
-        _stream: stream.Stream;
-        _ended: boolean;
+export interface ParseStream extends NodeJS.ReadWriteStream {
+    position: number;
 
-        _streamEnd(): void;
-        _process(c: Buffer): void;
-        _startEntry(c: Buffer): void;
-    }
+    _stream: stream.Stream;
+    _ended: boolean;
 
-    export interface PackStream extends NodeJS.ReadWriteStream {
-        writable: boolean;
-        readable: boolean;
+    _streamEnd(): void;
+    _process(c: Buffer): void;
+    _startEntry(c: Buffer): void;
+}
 
-        _noProprietary: boolean;
-        _global: HeaderProperties;
-        _buffer: stream.Stream[];
-        _currentEntry: any;
-        _processing: boolean;
-        _pipeRoot: stream.Stream;
-        _needDrain: boolean;
-        _paused: boolean;
+export interface PackStream extends NodeJS.ReadWriteStream {
+    writable: boolean;
+    readable: boolean;
 
-        addGlobal(props: HeaderProperties): void;
-        add(stream: stream.Stream): boolean;
-        destroy(): void;
+    _noProprietary: boolean;
+    _global: HeaderProperties;
+    _buffer: stream.Stream[];
+    _currentEntry: any;
+    _processing: boolean;
+    _pipeRoot: stream.Stream;
+    _needDrain: boolean;
+    _paused: boolean;
 
-        _process(): void;
-    }
+    addGlobal(props: HeaderProperties): void;
+    add(stream: stream.Stream): boolean;
+    destroy(): void;
 
-    export interface ExtractStream extends ParseStream {
-    }
+    _process(): void;
+}
 
-    // #endregion
+export interface ExtractStream extends ParseStream {
+}
 
-    // #region Enums
+// #endregion
 
-    export var fields: {
-        path: number;
-        mode: number;
-        uid: number;
-        gid: number;
-        size: number;
-        mtime: number;
-        cksum: number;
-        type: number;
-        linkpath: number;
-        ustar: number;
-        ustarvar: number;
-        uname: number;
-        gname: number;
-        devmaj: number;
-        devmin: number;
-        prefix: number;
-        fill: number;
-    };
+// #region Enums
 
-    export var fieldSize: number[];
-    export var fieldOffs: number[];
-    export var fieldEnds: number[];
+declare export var fields: {
+    path: number;
+    mode: number;
+    uid: number;
+    gid: number;
+    size: number;
+    mtime: number;
+    cksum: number;
+    type: number;
+    linkpath: number;
+    ustar: number;
+    ustarvar: number;
+    uname: number;
+    gname: number;
+    devmaj: number;
+    devmin: number;
+    prefix: number;
+    fill: number;
+};
 
-    /**
-     * Different values of the 'type' field
-     * paths match the values of Stats.isX() functions, where appropriate
-     */
-    export var types: {
-        0: string;
-        "\0": string;
-        "": string;
-        1: string;
-        2: string;
-        3: string;
-        4: string;
-        5: string;
-        6: string;
-        7: string;
-        g: string;
-        x: string;
-        A: string;
-        D: string;
-        I: string;
-        K: string;
-        L: string;
-        M: string;
-        N: string;
-        S: string;
-        V: string;
-        X: string;
-        File: string;
-        OldFile: string;
-        Link: string;
-        SymbolicLick: string;
-        CharacterDevice: string;
-        BlockDevice: string;
-        Directory: string;
-        FIFO: string;
-        ContiguousFile: string;
-        GlobalExtendedHeader: string;
-        ExtendedHeader: string;
-        SolarisACL: string;
-        GNUDumpDir: string;
-        INode: string;
-        NextFileHasLonLinkPath: string;
-        NextFileHasLongPath: string;
-        ContinuationFile: string;
-        TapeVolumeHeader: string;
-        OldExtendedHeader: string;
-    };
+declare export var fieldSize: number[];
+declare export var fieldOffs: number[];
+declare export var fieldEnds: number[];
 
-    /**
-     * Values for the mode field
-     */
-    export var modes: {
-        suid: number;
-        sgid: number;
-        svtx: number;
-        uread: number;
-        uwrite: number;
-        uexec: number;
-        gread: number;
-        gwrite: number;
-        gexec: number;
-        oread: number;
-        owrite: number;
-        oexec: number;
-    };
+/**
+ * Different values of the 'type' field
+ * paths match the values of Stats.isX() functions, where appropriate
+ */
+declare export var types: {
+    0: string;
+    "\0": string;
+    "": string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+    5: string;
+    6: string;
+    7: string;
+    g: string;
+    x: string;
+    A: string;
+    D: string;
+    I: string;
+    K: string;
+    L: string;
+    M: string;
+    N: string;
+    S: string;
+    V: string;
+    X: string;
+    File: string;
+    OldFile: string;
+    Link: string;
+    SymbolicLick: string;
+    CharacterDevice: string;
+    BlockDevice: string;
+    Directory: string;
+    FIFO: string;
+    ContiguousFile: string;
+    GlobalExtendedHeader: string;
+    ExtendedHeader: string;
+    SolarisACL: string;
+    GNUDumpDir: string;
+    INode: string;
+    NextFileHasLonLinkPath: string;
+    NextFileHasLongPath: string;
+    ContinuationFile: string;
+    TapeVolumeHeader: string;
+    OldExtendedHeader: string;
+};
 
-    export var numeric: {
-        mode: boolean;
-        uid: boolean;
-        gid: boolean;
-        size: boolean;
-        mtime: boolean;
-        devmaj: boolean;
-        devmin: boolean;
-        cksum: boolean;
-        atime: boolean;
-        ctime: boolean;
-        dev: boolean;
-        ino: boolean;
-        nlink: boolean;
-    };
+/**
+ * Values for the mode field
+ */
+declare export var modes: {
+    suid: number;
+    sgid: number;
+    svtx: number;
+    uread: number;
+    uwrite: number;
+    uexec: number;
+    gread: number;
+    gwrite: number;
+    gexec: number;
+    oread: number;
+    owrite: number;
+    oexec: number;
+};
 
-    export var knownExtended: {
-        atime: boolean;
-        charset: boolean;
-        comment: boolean;
-        ctime: boolean;
-        gid: boolean;
-        gname: boolean;
-        linkpat: boolean;
-        mtime: boolean;
-        path: boolean;
-        realtime: boolean;
-        security: boolean;
-        size: boolean;
-        uid: boolean;
-        uname: boolean;
-    };
+declare export var numeric: {
+    mode: boolean;
+    uid: boolean;
+    gid: boolean;
+    size: boolean;
+    mtime: boolean;
+    devmaj: boolean;
+    devmin: boolean;
+    cksum: boolean;
+    atime: boolean;
+    ctime: boolean;
+    dev: boolean;
+    ino: boolean;
+    nlink: boolean;
+};
 
-    export var headerSize: number;
-    export var blockSize: number;
+declare export var knownExtended: {
+    atime: boolean;
+    charset: boolean;
+    comment: boolean;
+    ctime: boolean;
+    gid: boolean;
+    gname: boolean;
+    linkpat: boolean;
+    mtime: boolean;
+    path: boolean;
+    realtime: boolean;
+    security: boolean;
+    size: boolean;
+    uid: boolean;
+    uname: boolean;
+};
 
-    //#endregion
+declare export var headerSize: number;
+declare export var blockSize: number;
 
-    //#region Global Methods
+//#endregion
 
-    /**
-     * Returns a writable stream. Write tar data to it and it will emit entry events for each entry parsed from the tarball. This is used by tar.Extract.
-     */
-    export function Parse(): ParseStream;
-    /**
-     * Returns a through stream. Use fstream to write files into the pack stream and you will receive tar archive data from the pack stream.
-     * This only works with directories, it does not work with individual files.
-     * The optional properties object are used to set properties in the tar 'Global Extended Header'.
-     */
-    export function Pack(props?: HeaderProperties): PackStream;
-    /**
-     * Returns a through stream. Write tar data to the stream and the files in the tarball will be extracted onto the filesystem.
-     */
-    export function Extract(path: string): ExtractStream;
-    /**
-     * Returns a through stream. Write tar data to the stream and the files in the tarball will be extracted onto the filesystem.
-     * options can be:
-     * ```
-     * {
-     *   path: '/path/to/extract/tar/into',
-     *   strip: 0, // how many path segments to strip from the root when extracting
-     * }
-     * ```
-     * options also get passed to the fstream.Writer instance that tar uses internally.
-     */
-    export function Extract(opts: ExtractOptions): ExtractStream;
+//#region Global Methods
 
-    //#endregion
-}
\ No newline at end of file
+/**
+ * Returns a writable stream. Write tar data to it and it will emit entry events for each entry parsed from the tarball. This is used by tar.Extract.
+ */
+declare export function Parse(): ParseStream;
+/**
+ * Returns a through stream. Use fstream to write files into the pack stream and you will receive tar archive data from the pack stream.
+ * This only works with directories, it does not work with individual files.
+ * The optional properties object are used to set properties in the tar 'Global Extended Header'.
+ */
+declare export function Pack(props?: HeaderProperties): PackStream;
+/**
+ * Returns a through stream. Write tar data to the stream and the files in the tarball will be extracted onto the filesystem.
+ */
+declare export function Extract(path: string): ExtractStream;
+/**
+ * Returns a through stream. Write tar data to the stream and the files in the tarball will be extracted onto the filesystem.
+ * options can be:
+ * ```
+ * {
+ *   path: '/path/to/extract/tar/into',
+ *   strip: 0, // how many path segments to strip from the root when extracting
+ * }
+ * ```
+ * options also get passed to the fstream.Writer instance that tar uses internally.
+ */
+declare export function Extract(opts: ExtractOptions): ExtractStream;
diff --git a/tea-merge/tea-merge.d.ts b/tea-merge/tea-merge.d.ts
index cd9fc13def..7aec947806 100644
--- a/tea-merge/tea-merge.d.ts
+++ b/tea-merge/tea-merge.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Mihhail Lapushkin <https://github.com/mihhail-lapushkin/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "tea-merge" {
-    function e(destination: Object, ...sources: Object[]): Object;
-    export = e;
-}
\ No newline at end of file
+
+declare function e(destination: Object, ...sources: Object[]): Object;
+export = e;
diff --git a/tedious-connection-pool/tedious-connection-pool.d.ts b/tedious-connection-pool/tedious-connection-pool.d.ts
index d4391f2dee..d8c6a28469 100644
--- a/tedious-connection-pool/tedious-connection-pool.d.ts
+++ b/tedious-connection-pool/tedious-connection-pool.d.ts
@@ -5,105 +5,104 @@
 
 /// <reference path="../tedious/tedious.d.ts" />
 
-declare module "tedious-connection-pool" {
-    import tedious = require('tedious');
 
-    namespace tcp {
+import tedious = require('tedious');
 
+declare namespace tcp {
+
+    /**
+     * Extends Tedious Connection with release function
+     */
+    export class PooledConnection extends tedious.Connection {
         /**
-         * Extends Tedious Connection with release function
+         * If the connection is issued from a connection pool returns the connection to the pool.
          */
-        export class PooledConnection extends tedious.Connection {
-            /**
-             * If the connection is issued from a connection pool returns the connection to the pool.
-             */
-            release():void;
-        }
-
-        /**
-         * Acquire function callback signature
-         */
-        export interface ConnectionCallback {
-            /**
-             * Provides a connection or an error
-             * @param err error if any
-             * @param connection issued from the pool
-             */
-            (err:Error, connection:PooledConnection): void;
-        }
-
-        /**
-         *  Pool Configuration interface
-         */
-        export interface PoolConfig {
-
-            /**
-             * Minimum concurrent connections
-             */
-            min?: number;
-
-            /**
-             * Maximum concurrent connections
-             */
-            max?: number;
-
-            /**
-             * Defines if logging is activated
-             */
-            log?: boolean;
-
-            /**
-             * Idle timeout
-             */
-            idleTimeout?: number;
-
-            /**
-             * Retry delay
-             */
-            retryDelay?: number;
-
-            /**
-             * Acquire timeout
-             */
-            acquireTimeout?: number;
-        }
-
-
+        release(): void;
     }
 
     /**
-     * Tedious Connection Pool Class
+     * Acquire function callback signature
      */
-    class tcp {
+    export interface ConnectionCallback {
+        /**
+         * Provides a connection or an error
+         * @param err error if any
+         * @param connection issued from the pool
+         */
+        (err: Error, connection: PooledConnection): void;
+    }
+
+    /**
+     *  Pool Configuration interface
+     */
+    export interface PoolConfig {
 
         /**
-         * Connection Pool constructor
-         * @param poolConfig the pool configuration
-         * @param connectionConfig the connection configuration
+         * Minimum concurrent connections
          */
-        constructor(poolConfig:tcp.PoolConfig, connectionConfig:tedious.ConnectionConfig);
+        min?: number;
 
         /**
-         * acquires a connection from the pool
-         * @param callback invoked when the connection is retrieved and ready
+         * Maximum concurrent connections
          */
-        acquire(callback:tcp.ConnectionCallback):void;
+        max?: number;
 
         /**
-         * listens for a specific connection pool event
-         * @param event the event name
-         * @param callback invoked when the event is raised
+         * Defines if logging is activated
          */
-        on(event:string, callback:Function):void;
+        log?: boolean;
 
         /**
-         * closes opened connections
+         * Idle timeout
          */
-        drain():void;
+        idleTimeout?: number;
+
+        /**
+         * Retry delay
+         */
+        retryDelay?: number;
+
+        /**
+         * Acquire timeout
+         */
+        acquireTimeout?: number;
     }
 
 
-
-
-    export = tcp;
 }
+
+/**
+ * Tedious Connection Pool Class
+ */
+declare class tcp {
+
+    /**
+     * Connection Pool constructor
+     * @param poolConfig the pool configuration
+     * @param connectionConfig the connection configuration
+     */
+    constructor(poolConfig: tcp.PoolConfig, connectionConfig: tedious.ConnectionConfig);
+
+    /**
+     * acquires a connection from the pool
+     * @param callback invoked when the connection is retrieved and ready
+     */
+    acquire(callback: tcp.ConnectionCallback): void;
+
+    /**
+     * listens for a specific connection pool event
+     * @param event the event name
+     * @param callback invoked when the event is raised
+     */
+    on(event: string, callback: Function): void;
+
+    /**
+     * closes opened connections
+     */
+    drain(): void;
+}
+
+
+
+
+export = tcp;
diff --git a/tedious/tedious.d.ts b/tedious/tedious.d.ts
index 0be051c91f..9eae6ae4d4 100644
--- a/tedious/tedious.d.ts
+++ b/tedious/tedious.d.ts
@@ -5,527 +5,526 @@
 
 ///<reference path='../node/node.d.ts' />
 
-declare module 'tedious' {
 
-	import events = require("events");
 
-	export interface ColumnType {
-		/**
-		 * The column's type, such as VarChar, Int or Binary.
-		 */
-		name: string;
-	}
+import events = require("events");
+
+export interface ColumnType {
+    /**
+     * The column's type, such as VarChar, Int or Binary.
+     */
+    name: string;
+}
+
+export interface ColumnMetaData {
+    /**
+     * The column's name
+     */
+    colName: string;
+
+    /**
+     * The column type.
+     */
+    type: ColumnType;
+
+    /**
+     * The precision. Only applicable to numeric and decimal.
+     */
+    precision?: number;
+
+    /**
+     * The scale. Only applicable to numeric, decimal, time, datetime2 and datetimeoffset.
+     */
+    scale?: number;
+
+    /**
+     * The length, for char, varchar, nvarchar and varbinary.
+     */
+    dataLength?: number;
+}
+
+export interface DebugOptions {
+    /**
+     * A boolean, controlling whether debug events will be emitted with text describing packet details (default: false).
+     */
+    packet?: boolean;
+
+    /**
+     * A boolean, controlling whether debug events will be emitted with text describing packet data details (default: false).
+     */
+    data?: boolean;
+
+    /**
+     * A boolean, controlling whether debug events will be emitted with text describing packet payload details (default: false).
+     */
+    payload?: boolean;
+
+    /**
+     * A boolean, controlling whether debug events will be emitted with text describing token stream tokens (default: false).
+     */
+    token?: boolean;
+}
+
+declare export enum ISOLATION_LEVEL {
+    NO_CHANGE = 0x00,
+    READ_UNCOMMITTED = 0x01,
+    READ_COMMITTED = 0x02,
+    REPEATABLE_READ = 0x03,
+    SERIALIZABLE = 0x04,
+    SNAPSHOT = 0x05
+}
+
+/**
+ * Unfortunately these aren't valid JavaScript identifiers
+ * so I cannot list the values here as enum values
+      7_1 = 0x71000001,
+    7_2 = 0x72090002,
+    7_3_A = 0x730A0003,
+    7_3_B = 0x730B0003,
+    7_4 = 0x74000004
+ */
+declare export var TDS_VERSION: { [index: string]: number };
+
+export interface TediousType {
+    type: string;
+    name: string;
+}
+
+export interface TediousTypes {
+    BigInt: TediousType;
+    Binary: TediousType;
+    Bit: TediousType;
+    BitN: TediousType;
+    Char: TediousType;
+    Date: TediousType;
+    DateN: TediousType;
+    DateTime2: TediousType;
+    DateTime2N: TediousType;
+    DateTime: TediousType;
+    DateTimeN: TediousType;
+    DateTimeOffset: TediousType;
+    DateTimeOffsetN: TediousType;
+    Decimal: TediousType;
+    DecimalN: TediousType;
+    Float: TediousType;
+    FloatN: TediousType;
+    Image: TediousType;
+    Int: TediousType;
+    IntN: TediousType;
+    Money: TediousType;
+    MoneyN: TediousType;
+    NChar: TediousType;
+    NText: TediousType;
+    NVarChar: TediousType;
+    Null: TediousType;
+    Numeric: TediousType;
+    NumericN: TediousType;
+    Real: TediousType;
+    SmallDateTime: TediousType;
+    SmallInt: TediousType;
+    SmallMoney: TediousType;
+    TVP: TediousType;
+    Text: TediousType;
+    Time: TediousType;
+    TimeN: TediousType;
+    TinyInt: TediousType;
+    UDT: TediousType;
+    UniqueIdentifier: TediousType;
+    UniqueIdentifierN: TediousType;
+    VarBinary: TediousType;
+    VarChar: TediousType;
+    Xml: TediousType;
+}
+
+declare export var TYPES: TediousTypes;
+
+export interface ConnectionOptions {
+
+    /**
+     * Port to connect to (default: 1433). Mutually exclusive with options.instanceName.
+     */
+    port?: number;
+
+    /**
+     * The instance name to connect to. The SQL Server Browser service must be running on the database server,
+     * and UDP port 1444 on the database server must be reachable. (no default) Mutually exclusive with options.port.
+     */
+    instanceName?: string;
+
+    /**
+     * Database to connect to (default: dependent on server configuration).
+     */
+    database?: string;
+
+    /**
+     * By default, if the database requestion by options.database cannot be accessed,
+     * the connection will fail with an error. However, if options.fallbackToDefaultDb is set to true,
+     * then the user's default database will be  * used instead (Default: false).
+     */
+    fallbackToDefaultDb?: boolean;
+
+    /**
+     * The number of milliseconds before the attempt to connect is considered failed (default: 15000).
+     */
+    connectTimeout?: number;
+
+    /**
+     * The number of milliseconds before a request is considered failed, or 0 for no timeout (default: 15000).
+     */
+    requestTimeout?: number;
+
+    /**
+     * The number of milliseconds before the cancel (abort) of a request is considered failed (default: 5000).
+     */
+    cancelTimeout?: number;
+
+    /**
+     * The size of TDS packets (subject to negotiation with the server). Should be a power of 2. (default: 4096).
+     */
+    packetSize?: number;
+
+    /**
+     * A boolean determining whether to pass time values in UTC or local time. (default: true).
+     */
+    useUTC?: boolean;
+
+    /**
+     * A boolean determining whether to rollback a transaction automatically if any error is encountered
+     * during the given transaction's execution. This sets the value for SET XACT_ABORT during the initial
+     * SQL phase of a connection (documentation).
+     */
+    abortTransactionOnError?: boolean;
+
+    /**
+     * A string indicating which network interface (ip addres) to use when connecting to SQL Server.
+     */
+    localAddress?: string;
+
+    /**
+     * A boolean determining whether to return rows as arrays or key-value collections. (default: false).
+     */
+    useColumnNames?: boolean;
+
+    /**
+     * A boolean, controlling whether the column names returned will have the first letter converted
+     * to lower case (true) or not. This value is ignored if you provide a columnNameReplacer. (default: false).
+     */
+    camelCaseColumns?: boolean;
+
+    /**
+     * A function with parameters (columnName, index, columnMetaData) and returning a string. If provided,
+     * this will be called once per column per result-set. The returned value will be used instead of the
+     * SQL-provided column name on row and meta data objects. This allows you to dynamically convert between
+     * naming conventions. (default: null).
+     */
+    columnNameReplacer?: (columnName: string, index: number, columnMetaData: ColumnMetaData) => string;
+
+    /**
+     * Debug options
+     */
+    debug?: DebugOptions;
+
+    /**
+     * The default isolation level that transactions will be run with. (default: READ_COMMITED).
+     */
+    isolationLevel?: ISOLATION_LEVEL;
+
+    /**
+     * The default isolation level for new connections. All out-of-transaction queries are executed with this setting. (default: READ_COMMITED)
+     */
+    connectionIsolationLevel?: ISOLATION_LEVEL;
+
+    /**
+     * A boolean, determining whether the connection will request read only access from a SQL Server Availability Group. For more information, see here. (default: false).
+     */
+    readOnlyIntent?: boolean;
+
+    /**
+     * A boolean determining whether or not the connection will be encrypted. Set to true if you're on Windows Azure. (default: false).
+     */
+    encrypt?: boolean;
+
+    /**
+     * When encryption is used, an object may be supplied that will be used for the first argument when calling tls.createSecurePair (default: {}).
+     */
+    cryptoCredentialsDetails?: Object;
+
+    /**
+     * A boolean, that when true will expose received rows in Requests' done* events. See done, doneInProc and doneProc. (default: false)
+     * Caution: If many row are received, enabling this option could result in excessive memory usage.
+     */
+    rowCollectionOnDone?: boolean;
+
+    /**
+     * A boolean, that when true will expose received rows in Requests' completion callback. See new Request. (default: false)
+     * Caution: If many row are received, enabling this option could result in excessive memory usage.
+     */
+    rowCollectionOnRequestCompletion?: boolean;
+
+    /**
+     * The version of TDS to use. If server doesn't support specified version, negotiated version is used instead. (default: 7_4).
+     * Take this from tedious.TDS_VERSION.7_4 .
+     */
+    tdsVersion?: number;
+}
+
+export interface ConnectionConfig {
+    /**
+     * User name to use for authentication.
+     */
+    userName?: string;
+
+    /**
+     * Password to use for authentication.
+     */
+    password?: string;
+
+    /**
+     * Hostname to connect to.
+     */
+    server?: string;
+
+    /**
+     * Once you set domain, driver will connect to SQL Server using domain login.
+     */
+    domain?: string;
+
+    /**
+     * Further options
+     */
+    options?: ConnectionOptions;
+}
+
+export interface ParameterOptions {
+    //  for VarChar, NVarChar, VarBinary
+    length?: number;
+    // precision for Numeric, Decimal
+    precision?: number;
+    // scale for Numeric, Decimal, Time, DateTime2, DateTimeOffset
+    scale?: number;
+}
+
+/**
+ * Type of each column in the Request#row event
+ */
+export interface ColumnValue {
+    metadata: ColumnMetaData;
+    value: any;
+}
+
+/**
+ * A Request instance represents a request that can be executed on a connection
+ * @event  'columnMetadata' This event, describing result set columns, will be emitted before row events are emitted. This event may be emited multiple times when more than one recordset is produced by the statement.
+ * @event  'row' A row resulting from execution of the SQL statement
+ * @event  'done' All rows from a result set have been provided (through row events). This token is used to indicate the completion of a SQL statement. As multiple SQL statements can be sent to the server in a single SQL batch, multiple done events can be generated. An done event is emited for each SQL statement in the SQL batch except variable declarations. For execution of SQL statements within stored procedures, doneProc and doneInProc events are used in place of done events.
+ * @event  'doneInProc' Indicates the completion status of a SQL statement within a stored procedure. All rows from a statement in a stored procedure have been provided (through row events).
+ * @event  'doneProc' Indicates the completion status of a stored procedure. This is also generated for stored procedures executed through SQL statements.
+ * @event  'returnValue' A value for an output parameter (that was added to the request with addOutputParameter(...)). See also Using Parameters.
+ */
+declare export class Request extends events.EventEmitter {
+
+    /**
+     * Constructor
+     * @param sql The SQL statement to be executed (or a procedure name, if the request is to be used with connection.callProcedure).
+     * @param callback	The callback is called when the request has completed, either successfully or with an error. If an error occurs during execution of the statement(s), then err will describe the error.
+     * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+     * 					rowCount: The number of rows emitted as result of executing the SQL statement.
+     * 					rows: Rows as a result of executing the SQL statement. Will only be avaiable if Connection's config.options.rowCollectionOnRequestCompletion is true.
+     */
+    constructor(sql: string, callback: (error: Error, rowCount: number, rows: any[]) => void);
+
+    /**
+     * Add an input parameter to the request.
+     * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects. The name should not start '@'.
+     * @param type One of the supported data types.
+     * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types.
+     * @param options Additional type options. Optional.
+     */
+    addParameter(name: string, type: TediousType, value: any, options?: ParameterOptions): void;
+
+    /**
+     * Add an output parameter to the request. The parameter's value will be provide by an emitted returnValue event.
+     * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects.
+     * @param type One of the supported data types.
+     * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types. Optional.
+     * @param options Additional type options. Optional.
+     */
+    addOutputParameter(name: string, type: TediousType, value?: any, options?: ParameterOptions): void;
+}
+
+export interface BulkLoadColumnOpts extends ParameterOptions {
+    //  indicates whether the column accepts NULL values.
+    nullable: boolean;
+    //  If the name of the column is different from the name of the property found on rowObj arguments passed to , then you can use this option to specify the property name.
+    objName?: string;
+}
+
+export interface BulkLoad {
+
+    /**
+     * Adds a column to the bulk load. The column definitions should match the table you are trying to insert into. Attempting to call addColumn after the first row has been added will throw an exception.
+     * @param name	The name of the column.
+     * @param type	One of the supported data types.
+     * @param options	Additional column type information. At a minimum, nullable must be set to true or false.
+     */
+    addColumn(name: string, type: TediousType, options: BulkLoadColumnOpts): void;
+
+    /**
+     * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+     * @param rowObj An object of key/value pairs representing column name (or objName) and value.
+     */
+    addRow(row: Object): void;
+    /**
+     * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+     * @param columnArray	An array representing the values of each column in the same order which they were added to the bulkLoad object.
+     */
+    addRow(columnArray: any[]): void;
+    /**
+     * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+     * @param args If there are at least two columns, values can be passed as multiple arguments instead of an array. They must be in the same order the columns were added in.
+     */
+    addRow(...args: any[]): void;
+
+    /**
+     * This is simply a helper utility function which returns a CREATE TABLE SQL statement based on the columns added to the bulkLoad object. This may be particularly handy when you want to insert into a temporary table (a table which starts with #). A side note on bulk inserting into temporary tables: if you want to access a local temporary table after executing the bulk load, you'll need to use the same connection and execute your requests using connection.execSqlBatch instead of .execSql.
+     */
+    getTableCreationSql(): string;
+}
+
+/**
+ * message interface used by the infoMessage and errorMessage events of Connection
+ */
+export interface InfoObject {
+    /**
+     * Error number
+     */
+    number: number;
+    /**
+     * The error state, used as a modifier to the error number.
+     */
+    state: any;
+    /**
+     * The class (severity) of the error. A class of less than 10 indicates an informational message.
+     */
+    class: number;
+    /**
+     * The message text.
+     */
+    message: string;
+    /**
+     * The stored procedure name (if a stored procedure generated the message).
+     */
+    procName: string;
+    /**
+     * The line number in the SQL batch or stored procedure that caused the error. Line numbers begin at 1; therefore, if the line number is not applicable to the message, the value of LineNumber will be 0.
+     */
+    lineNumber: number;
+}
+
+/**
+ * Connection
+ * @event  'connect' The attempt to connect and validate has completed.
+ * @event  'end' The connection has ended. This may be as a result of the client calling close(), the server closing the connection, or a network error.
+ * @event  'error' Internal error occurs.
+ * @event  'debug' A debug message is available. It may be logged or ignored.
+ * @event  'infoMessage' The server has issued an information message.
+ * @event  'errorMessage' The server has issued an error message.
+ * @event  'databaseChange' The server has reported that the active database has changed. This may be as a result of a sucessful login, or a use statement.
+ * @event  'languageChange' The server has reported that the language has changed.
+ * @event  'charsetChange' The server has reported that the charset has changed.
+ * @event  'secure' A secure connection has been established.
+ */
+declare export class Connection extends events.EventEmitter {
+
+    constructor(config: ConnectionConfig);
+
+    /**
+     * Start a transaction. As only one request at a time may be executed on
+     * a connection, another request should not be initiated until this callback is called.
+     * @param callback The callback is called when the request to start the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+     * @param name A string representing a name to associate with the transaction. Optional, and defaults to an empty string. Required when isolationLevel is present.
+     * @param isolationLevel	The isolation level that the transaction is to be run with.
+     */
+    beginTransaction(callback: (error?: Error) => void, name?: string, isolationLevel?: ISOLATION_LEVEL): void;
+
+    /**
+     * Commit a transaction.
+     * There should be an active transaction. That is, beginTransaction should have been previously called.
+     * @param callback The callback is called when the request to commit the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+     * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+     */
+    commitTransaction(callback: (error: Error) => void): void;
+
+    /**
+     * Rollback a transaction.	There should be an active transaction. That is, beginTransaction should have been previously called.
+     * @param callback	The callback is called when the request to rollback the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+     * 						As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+     */
+    rollbackTransaction(callback: (error: Error) => void): void;
+
+    /**
+     * Prepare the SQL represented by the request. The request can then be used in subsequent calls to execute and unprepare
+     * @param request A Request object representing the request. Parameters only require a name and type. Parameter values are ignored.
+     */
+    prepare(request: Request): void;
+
+    /**
+     * Release the SQL Server resources associated with a previously prepared request.
+     */
+    unprepare(request: Request): void;
+
+    /**
+     * Call a stored procedure represented by request.
+     */
+    callProcedure(request: Request): void;
+
+    /**
+     * Execute the SQL represented by request.
+     * As sp_executesql is used to execute the SQL, if the same SQL is executed multiples times using this function, the SQL Server query optimizer is likely to reuse the execution plan it generates for the first execution.
+     * Beware of the way that scoping rules apply, and how they may affect local temp tables. If you're running in to scoping issues, then execSqlBatch may be a better choice. See also issue #24.
+     */
+    execSql(request: Request): void;
+
+    /**
+     * Execute the SQL batch represented by request. There is no param support, and unlike execSql, it is not likely that SQL Server will reuse the execution plan it generates for the SQL.
+     * In almost all cases, execSql will be a better choice.
+     */
+    execSqlBatch(request: Request): void;
+
+    /**
+     * Execute previously prepared SQL, using the supplied parameters.
+     * @param request A previously prepared Request.
+     * @param parameters An object whose names correspond to the names of parameters that were added to the request before it was prepared. The object's values are passed as the parameters' values when the request is executed.
+     */
+    execute(request: Request, parameters: {}): void;
+
+    /**
+     * Creates a new BulkLoad instance.
+     * @param tableName The name of the table to bulk-insert into.
+     * @param callback A function which will be called after the BulkLoad finishes executing. rowCount will equal the number of rows inserted.
+     */
+    newBulkLoad(tableName: string, callback: (error: Error, rowCount: number) => void): BulkLoad;
+
+    /**
+     * Executes a BulkLoad.
+     */
+    execBulkLoad(bulkLoad: BulkLoad): void;
+
+    /**
+     * Reset the connection to its initial state. Can be useful for connection pool implementations.
+     * @param callback The callback is called when the connection reset has completed, either successfully or with an error. If an error occured then err will describe the error.
+     * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+     */
+    reset(callback: (error: Error) => void): void;
+
+    /**
+     * Cancel currently executed request.
+     */
+    cancel(): void;
+
+    /**
+     * Closes the connection to the database. The end will be emmited once the connection has been closed.
+     */
+    close(): void;
 
-	export interface ColumnMetaData {
-		/**
-		 * The column's name
-		 */
-		colName: string;
-
-		/**
-		 * The column type.
-		 */
-		type: ColumnType;
-
-		/**
-		 * The precision. Only applicable to numeric and decimal.
-		 */
-		precision?: number;
-
-		/**
-		 * The scale. Only applicable to numeric, decimal, time, datetime2 and datetimeoffset.
-		 */
-		scale?: number;
-
-		/**
-		 * The length, for char, varchar, nvarchar and varbinary.
-		 */
-		dataLength?: number;
-	}
-
-	export interface DebugOptions {
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet details (default: false).
-		 */
-		packet?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet data details (default: false).
-		 */
-		data?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet payload details (default: false).
-		 */
-		payload?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing token stream tokens (default: false).
-		 */
-		token?: boolean;
-	}
-
-	export enum ISOLATION_LEVEL {
-		NO_CHANGE = 0x00,
-		READ_UNCOMMITTED = 0x01,
-		READ_COMMITTED = 0x02,
-		REPEATABLE_READ = 0x03,
-		SERIALIZABLE = 0x04,
-		SNAPSHOT = 0x05
-	}
-
-	/**
-	 * Unfortunately these aren't valid JavaScript identifiers
-	 * so I cannot list the values here as enum values
-	 	7_1 = 0x71000001,
-		7_2 = 0x72090002,
-		7_3_A = 0x730A0003,
-		7_3_B = 0x730B0003,
-		7_4 = 0x74000004
-	 */
-	export var TDS_VERSION: { [index: string]: number };
-
-	export interface TediousType {
-		type: string;
-		name: string;
-	}
-
-	export interface TediousTypes {
-		BigInt: TediousType;
-		Binary: TediousType;
-		Bit: TediousType;
-		BitN: TediousType;
-		Char: TediousType;
-		Date: TediousType;
-		DateN: TediousType;
-		DateTime2: TediousType;
-		DateTime2N: TediousType;
-		DateTime: TediousType;
-		DateTimeN: TediousType;
-		DateTimeOffset: TediousType;
-		DateTimeOffsetN: TediousType;
-		Decimal: TediousType;
-		DecimalN: TediousType;
-		Float: TediousType;
-		FloatN: TediousType;
-		Image: TediousType;
-		Int: TediousType;
-		IntN: TediousType;
-		Money: TediousType;
-		MoneyN: TediousType;
-		NChar: TediousType;
-		NText: TediousType;
-		NVarChar: TediousType;
-		Null: TediousType;
-		Numeric: TediousType;
-		NumericN: TediousType;
-		Real: TediousType;
-		SmallDateTime: TediousType;
-		SmallInt		: TediousType;
-		SmallMoney: TediousType;
-		TVP: TediousType;
-		Text: TediousType;
-		Time: TediousType;
-		TimeN: TediousType;
-		TinyInt: TediousType;
-		UDT: TediousType;
-		UniqueIdentifier: TediousType;
-		UniqueIdentifierN: TediousType;
-		VarBinary: TediousType;
-		VarChar: TediousType;
-		Xml: TediousType;
-	}
-
-	export var TYPES: TediousTypes;
-
-	export interface ConnectionOptions {
-
-		/**
-		 * Port to connect to (default: 1433). Mutually exclusive with options.instanceName.
-		 */
-		port?: number;
-
-		/**
-		 * The instance name to connect to. The SQL Server Browser service must be running on the database server,
-		 * and UDP port 1444 on the database server must be reachable. (no default) Mutually exclusive with options.port.
-		 */
-		instanceName?: string;
-
-		/**
-		 * Database to connect to (default: dependent on server configuration).
-		 */
-		database?: string;
-
-		/**
-		 * By default, if the database requestion by options.database cannot be accessed,
-		 * the connection will fail with an error. However, if options.fallbackToDefaultDb is set to true,
-		 * then the user's default database will be  * used instead (Default: false).
-		 */
-		fallbackToDefaultDb?: boolean;
-
-		/**
-		 * The number of milliseconds before the attempt to connect is considered failed (default: 15000).
-		 */
-		connectTimeout?: number;
-
-		/**
-		 * The number of milliseconds before a request is considered failed, or 0 for no timeout (default: 15000).
-		 */
-		requestTimeout?: number;
-
-		/**
-		 * The number of milliseconds before the cancel (abort) of a request is considered failed (default: 5000).
-		 */
-		cancelTimeout?: number;
-
-		/**
-		 * The size of TDS packets (subject to negotiation with the server). Should be a power of 2. (default: 4096).
-		 */
-		packetSize?: number;
-
-		/**
-		 * A boolean determining whether to pass time values in UTC or local time. (default: true).
-		 */
-		useUTC?: boolean;
-
-		/**
-		 * A boolean determining whether to rollback a transaction automatically if any error is encountered
-		 * during the given transaction's execution. This sets the value for SET XACT_ABORT during the initial
-		 * SQL phase of a connection (documentation).
-		 */
-		abortTransactionOnError?: boolean;
-
-		/**
-		 * A string indicating which network interface (ip addres) to use when connecting to SQL Server.
-		 */
-		localAddress?: string;
-
-		/**
-		 * A boolean determining whether to return rows as arrays or key-value collections. (default: false).
-		 */
-		useColumnNames?: boolean;
-
-		/**
-		 * A boolean, controlling whether the column names returned will have the first letter converted
-		 * to lower case (true) or not. This value is ignored if you provide a columnNameReplacer. (default: false).
-		 */
-		camelCaseColumns?: boolean;
-
-		/**
-		 * A function with parameters (columnName, index, columnMetaData) and returning a string. If provided,
-		 * this will be called once per column per result-set. The returned value will be used instead of the
-		 * SQL-provided column name on row and meta data objects. This allows you to dynamically convert between
-		 * naming conventions. (default: null).
-		 */
-		columnNameReplacer?: (columnName: string, index: number, columnMetaData: ColumnMetaData) => string;
-
-		/**
-		 * Debug options
-		 */
-		debug?: DebugOptions;
-
-		/**
-		 * The default isolation level that transactions will be run with. (default: READ_COMMITED).
-		 */
-		isolationLevel?: ISOLATION_LEVEL;
-
-		/**
-		 * The default isolation level for new connections. All out-of-transaction queries are executed with this setting. (default: READ_COMMITED)
-		 */
-		connectionIsolationLevel?: ISOLATION_LEVEL;
-
-		/**
-		 * A boolean, determining whether the connection will request read only access from a SQL Server Availability Group. For more information, see here. (default: false).
-		 */
-		readOnlyIntent?: boolean;
-
-		/**
-		 * A boolean determining whether or not the connection will be encrypted. Set to true if you're on Windows Azure. (default: false).
-		 */
-		encrypt?: boolean;
-
-		/**
-		 * When encryption is used, an object may be supplied that will be used for the first argument when calling tls.createSecurePair (default: {}).
-		 */
-		cryptoCredentialsDetails?: Object;
-
-		/**
-		 * A boolean, that when true will expose received rows in Requests' done* events. See done, doneInProc and doneProc. (default: false)
-		 * Caution: If many row are received, enabling this option could result in excessive memory usage.
-		 */
-		rowCollectionOnDone?: boolean;
-
-		/**
-		 * A boolean, that when true will expose received rows in Requests' completion callback. See new Request. (default: false)
-		 * Caution: If many row are received, enabling this option could result in excessive memory usage.
-		 */
-		rowCollectionOnRequestCompletion?: boolean;
-
-		/**
-		 * The version of TDS to use. If server doesn't support specified version, negotiated version is used instead. (default: 7_4).
-		 * Take this from tedious.TDS_VERSION.7_4 .
-		 */
-		tdsVersion?: number;
-	}
-
-	export interface ConnectionConfig {
-		/**
-		 * User name to use for authentication.
-		 */
-		userName?: string;
-
-		/**
-		 * Password to use for authentication.
-		 */
-		password?: string;
-
-		/**
-		 * Hostname to connect to.
-		 */
-		server?: string;
-
-		/**
-		 * Once you set domain, driver will connect to SQL Server using domain login.
-		 */
-		domain?: string;
-
-		/**
-		 * Further options
-		 */
-		options?: ConnectionOptions;
-	}
-
-	export interface ParameterOptions {
-		//  for VarChar, NVarChar, VarBinary
-		length?: number;
-		// precision for Numeric, Decimal
-		precision?: number;
-		// scale for Numeric, Decimal, Time, DateTime2, DateTimeOffset
-		scale?: number;
-	}
-
-	/**
-	 * Type of each column in the Request#row event
-	 */
-	export interface ColumnValue {
-		metadata: ColumnMetaData;
-		value: any;
-	}
-
-	/**
-	 * A Request instance represents a request that can be executed on a connection
-	 * @event  'columnMetadata' This event, describing result set columns, will be emitted before row events are emitted. This event may be emited multiple times when more than one recordset is produced by the statement.
-	 * @event  'row' A row resulting from execution of the SQL statement
-	 * @event  'done' All rows from a result set have been provided (through row events). This token is used to indicate the completion of a SQL statement. As multiple SQL statements can be sent to the server in a single SQL batch, multiple done events can be generated. An done event is emited for each SQL statement in the SQL batch except variable declarations. For execution of SQL statements within stored procedures, doneProc and doneInProc events are used in place of done events.
-	 * @event  'doneInProc' Indicates the completion status of a SQL statement within a stored procedure. All rows from a statement in a stored procedure have been provided (through row events).
-	 * @event  'doneProc' Indicates the completion status of a stored procedure. This is also generated for stored procedures executed through SQL statements.
-	 * @event  'returnValue' A value for an output parameter (that was added to the request with addOutputParameter(...)). See also Using Parameters.
-	 */
-	export class Request extends events.EventEmitter {
-
-		/**
-		 * Constructor
-		 * @param sql The SQL statement to be executed (or a procedure name, if the request is to be used with connection.callProcedure).
-		 * @param callback	The callback is called when the request has completed, either successfully or with an error. If an error occurs during execution of the statement(s), then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 * 					rowCount: The number of rows emitted as result of executing the SQL statement.
-		 * 					rows: Rows as a result of executing the SQL statement. Will only be avaiable if Connection's config.options.rowCollectionOnRequestCompletion is true.
-		 */
-		constructor(sql: string, callback: (error: Error, rowCount: number, rows: any[]) => void);
-
-		/**
-		 * Add an input parameter to the request.
-		 * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects. The name should not start '@'.
-		 * @param type One of the supported data types.
-		 * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types.
-		 * @param options Additional type options. Optional.
-		 */
-		addParameter(name: string, type: TediousType, value: any, options?: ParameterOptions): void;
-
-		/**
-		 * Add an output parameter to the request. The parameter's value will be provide by an emitted returnValue event.
-		 * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects.
-		 * @param type One of the supported data types.
-		 * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types. Optional.
-		 * @param options Additional type options. Optional.
-		 */
-		addOutputParameter(name: string, type: TediousType, value?: any, options?: ParameterOptions): void;
-	}
-
-	export interface BulkLoadColumnOpts extends ParameterOptions {
-		//  indicates whether the column accepts NULL values.
-		nullable: boolean;
-		//  If the name of the column is different from the name of the property found on rowObj arguments passed to , then you can use this option to specify the property name.
-		objName?: string;
-	}
-
-	export interface BulkLoad {
-
-		/**
-		 * Adds a column to the bulk load. The column definitions should match the table you are trying to insert into. Attempting to call addColumn after the first row has been added will throw an exception.
-		 * @param name	The name of the column.
-		 * @param type	One of the supported data types.
-		 * @param options	Additional column type information. At a minimum, nullable must be set to true or false.
-		 */
-		addColumn(name: string, type: TediousType, options: BulkLoadColumnOpts): void;
-
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param rowObj An object of key/value pairs representing column name (or objName) and value.
-		 */
-		addRow(row: Object): void;
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param columnArray	An array representing the values of each column in the same order which they were added to the bulkLoad object.
-		 */
-		addRow(columnArray: any[]): void;
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param args If there are at least two columns, values can be passed as multiple arguments instead of an array. They must be in the same order the columns were added in.
-		 */
-		addRow(...args: any[]): void;
-
-		/**
-		 * This is simply a helper utility function which returns a CREATE TABLE SQL statement based on the columns added to the bulkLoad object. This may be particularly handy when you want to insert into a temporary table (a table which starts with #). A side note on bulk inserting into temporary tables: if you want to access a local temporary table after executing the bulk load, you'll need to use the same connection and execute your requests using connection.execSqlBatch instead of .execSql.
-		 */
-		getTableCreationSql(): string;
-	}
-
-	/**
-	 * message interface used by the infoMessage and errorMessage events of Connection
-	 */
-	export interface InfoObject {
-		/**
-		 * Error number
-		 */
-		number: number;
-		/**
-		 * The error state, used as a modifier to the error number.
-		 */
-		state: any;
-		/**
-		 * The class (severity) of the error. A class of less than 10 indicates an informational message.
-		 */
-		class: number;
-		/**
-		 * The message text.
-		 */
-		message: string;
-		/**
-		 * The stored procedure name (if a stored procedure generated the message).
-		 */
-		procName: string;
-		/**
-		 * The line number in the SQL batch or stored procedure that caused the error. Line numbers begin at 1; therefore, if the line number is not applicable to the message, the value of LineNumber will be 0.
-		 */
-		lineNumber: number;
-	}
-
-	/**
-	 * Connection
-	 * @event  'connect' The attempt to connect and validate has completed.
-	 * @event  'end' The connection has ended. This may be as a result of the client calling close(), the server closing the connection, or a network error.
-	 * @event  'error' Internal error occurs.
-	 * @event  'debug' A debug message is available. It may be logged or ignored.
-	 * @event  'infoMessage' The server has issued an information message.
-	 * @event  'errorMessage' The server has issued an error message.
-	 * @event  'databaseChange' The server has reported that the active database has changed. This may be as a result of a sucessful login, or a use statement.
-	 * @event  'languageChange' The server has reported that the language has changed.
-	 * @event  'charsetChange' The server has reported that the charset has changed.
-	 * @event  'secure' A secure connection has been established.
-	 */
-	export class Connection extends events.EventEmitter {
-
-		constructor(config: ConnectionConfig);
-
-		/**
-		 * Start a transaction. As only one request at a time may be executed on
-		 * a connection, another request should not be initiated until this callback is called.
-		 * @param callback The callback is called when the request to start the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * @param name A string representing a name to associate with the transaction. Optional, and defaults to an empty string. Required when isolationLevel is present.
-		 * @param isolationLevel	The isolation level that the transaction is to be run with.
-		 */
-		beginTransaction(callback: (error?: Error) => void, name?: string, isolationLevel?: ISOLATION_LEVEL): void;
-
-		/**
-		 * Commit a transaction.
-		 * There should be an active transaction. That is, beginTransaction should have been previously called.
-		 * @param callback The callback is called when the request to commit the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		commitTransaction(callback: (error: Error) => void): void;
-
-		/**
-		 * Rollback a transaction.	There should be an active transaction. That is, beginTransaction should have been previously called.
-		 * @param callback	The callback is called when the request to rollback the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 						As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		rollbackTransaction(callback: (error: Error) => void): void;
-
-		/**
-		 * Prepare the SQL represented by the request. The request can then be used in subsequent calls to execute and unprepare
-		 * @param request A Request object representing the request. Parameters only require a name and type. Parameter values are ignored.
-		 */
-		prepare(request: Request): void;
-
-		/**
-		 * Release the SQL Server resources associated with a previously prepared request.
-		 */
-		unprepare(request: Request): void;
-
-		/**
-		 * Call a stored procedure represented by request.
-		 */
-		callProcedure(request: Request): void;
-
-		/**
-		 * Execute the SQL represented by request.
-		 * As sp_executesql is used to execute the SQL, if the same SQL is executed multiples times using this function, the SQL Server query optimizer is likely to reuse the execution plan it generates for the first execution.
-		 * Beware of the way that scoping rules apply, and how they may affect local temp tables. If you're running in to scoping issues, then execSqlBatch may be a better choice. See also issue #24.
-		 */
-		execSql(request: Request): void;
-
-		/**
-		 * Execute the SQL batch represented by request. There is no param support, and unlike execSql, it is not likely that SQL Server will reuse the execution plan it generates for the SQL.
-		 * In almost all cases, execSql will be a better choice.
-		 */
-		execSqlBatch(request: Request): void;
-
-		/**
-		 * Execute previously prepared SQL, using the supplied parameters.
-		 * @param request A previously prepared Request.
-		 * @param parameters An object whose names correspond to the names of parameters that were added to the request before it was prepared. The object's values are passed as the parameters' values when the request is executed.
-		 */
-		execute(request: Request, parameters: {}): void;
-
-		/**
-		 * Creates a new BulkLoad instance.
-		 * @param tableName The name of the table to bulk-insert into.
-		 * @param callback A function which will be called after the BulkLoad finishes executing. rowCount will equal the number of rows inserted.
-		 */
-		newBulkLoad(tableName: string, callback: (error: Error, rowCount: number) => void): BulkLoad;
-
-		/**
-		 * Executes a BulkLoad.
-		 */
-		execBulkLoad(bulkLoad: BulkLoad): void;
-
-		/**
-		 * Reset the connection to its initial state. Can be useful for connection pool implementations.
-		 * @param callback The callback is called when the connection reset has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		reset(callback: (error: Error) => void): void;
-
-		/**
-		 * Cancel currently executed request.
-		 */
-		cancel(): void;
-
-		/**
-		 * Closes the connection to the database. The end will be emmited once the connection has been closed.
-		 */
-		close(): void;
-
-	}
 }
diff --git a/temp/temp.d.ts b/temp/temp.d.ts
index c8caab7467..679a3ec076 100644
--- a/temp/temp.d.ts
+++ b/temp/temp.d.ts
@@ -5,39 +5,38 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "temp" {
-    import * as temp from "temp";
-    import * as fs from "fs";
 
-    export interface AffixOptions {
-        prefix?: string;
-        suffix?: string;
-        dir?: string;
-    }
+import * as temp from "temp";
+import * as fs from "fs";
 
-    export var dir: string;
+export interface AffixOptions {
+    prefix?: string;
+    suffix?: string;
+    dir?: string;
+}
 
-    export function track(value?: boolean): typeof temp;
+declare export var dir: string;
 
-    export function mkdir(affixes: string, callback?: (err: any, dirPath: string) => void): void;
-    export function mkdir(affixes: AffixOptions, callback?: (err: any, dirPath: string) => void): void;
+declare export function track(value?: boolean): typeof temp;
 
-    export function mkdirSync(affixes: string): string;
-    export function mkdirSync(affixes: AffixOptions): string;
+declare export function mkdir(affixes: string, callback?: (err: any, dirPath: string) => void): void;
+declare export function mkdir(affixes: AffixOptions, callback?: (err: any, dirPath: string) => void): void;
 
-    export function open(affixes: string, callback?: (err: any, result: {path: string, fd: number}) => void): void;
-    export function open(affixes: AffixOptions, callback?: (err: any, result: {path: string, fd: number}) => void): void;
+declare export function mkdirSync(affixes: string): string;
+declare export function mkdirSync(affixes: AffixOptions): string;
 
-    export function openSync(affixes: string): { path: string, fd: number };
-    export function openSync(affixes: AffixOptions): { path: string, fd: number };
+declare export function open(affixes: string, callback?: (err: any, result: { path: string, fd: number }) => void): void;
+declare export function open(affixes: AffixOptions, callback?: (err: any, result: { path: string, fd: number }) => void): void;
 
-    export function path(affixes: string, defaultPrefix?: string): string;
-    export function path(affixes: AffixOptions, defaultPrefix?: string): string;
+declare export function openSync(affixes: string): { path: string, fd: number };
+declare export function openSync(affixes: AffixOptions): { path: string, fd: number };
 
-    export function cleanup(callback?: (result: boolean | {files: number, dirs?: number}) => void): void;
+declare export function path(affixes: string, defaultPrefix?: string): string;
+declare export function path(affixes: AffixOptions, defaultPrefix?: string): string;
 
-    export function cleanupSync(): boolean | {files: number, dirs: number};
+declare export function cleanup(callback?: (result: boolean | { files: number, dirs?: number }) => void): void;
 
-    export function createWriteStream(affixes: string): fs.WriteStream;
-    export function createWriteStream(affixes: AffixOptions): fs.WriteStream;
-}
\ No newline at end of file
+declare export function cleanupSync(): boolean | { files: number, dirs: number };
+
+declare export function createWriteStream(affixes: string): fs.WriteStream;
+declare export function createWriteStream(affixes: AffixOptions): fs.WriteStream;
diff --git a/thrift/thrift.d.ts b/thrift/thrift.d.ts
index 766173c1e6..ffd4fe558e 100644
--- a/thrift/thrift.d.ts
+++ b/thrift/thrift.d.ts
@@ -21,261 +21,260 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare module "thrift" {
-    export module Thrift {
-        /**
-         * Thrift IDL type string to Id mapping.
-         * @property {number}    STOP     - End of a set of fields.
-         * @property {number}    VOID     - No value (only legal for return types).
-         * @property {number}    BOOL     - True/False integer.
-         * @property {number}    BYTE     - Signed 8 bit integer.
-         * @property {number}    I08        - Signed 8 bit integer.
-         * @property {number}    DOUBLE - 64 bit IEEE 854 floating point.
-         * @property {number}    I16        - Signed 16 bit integer.
-         * @property {number}    I32        - Signed 32 bit integer.
-         * @property {number}    I64        - Signed 64 bit integer.
-         * @property {number}    STRING - Array of bytes representing a string of characters.
-         * @property {number}    UTF7     - Array of bytes representing a string of UTF7 encoded characters.
-         * @property {number}    STRUCT - A multifield type.
-         * @property {number}    MAP        - A collection type (map/associative-array/dictionary).
-         * @property {number}    SET        - A collection type (unordered and without repeated values).
-         * @property {number}    LIST     - A collection type (unordered).
-         * @property {number}    UTF8     - Array of bytes representing a string of UTF8 encoded characters.
-         * @property {number}    UTF16    - Array of bytes representing a string of UTF16 encoded characters.
-         */
-        interface Type {
-            'STOP': number;
-            'VOID': number;
-            'BOOL': number;
-            'BYTE': number;
-            'I08': number;
-            'DOUBLE': number;
-            'I16': number;
-            'I32': number;
-            'I64': number;
-            'STRING': number;
-            'UTF7': number;
-            'STRUCT': number;
-            'MAP': number;
-            'SET': number;
-            'LIST': number;
-            'UTF8': number;
-            'UTF16': number;
-        }
-        var Type: Type;
+
+declare export module Thrift {
+    /**
+     * Thrift IDL type string to Id mapping.
+     * @property {number}    STOP     - End of a set of fields.
+     * @property {number}    VOID     - No value (only legal for return types).
+     * @property {number}    BOOL     - True/False integer.
+     * @property {number}    BYTE     - Signed 8 bit integer.
+     * @property {number}    I08        - Signed 8 bit integer.
+     * @property {number}    DOUBLE - 64 bit IEEE 854 floating point.
+     * @property {number}    I16        - Signed 16 bit integer.
+     * @property {number}    I32        - Signed 32 bit integer.
+     * @property {number}    I64        - Signed 64 bit integer.
+     * @property {number}    STRING - Array of bytes representing a string of characters.
+     * @property {number}    UTF7     - Array of bytes representing a string of UTF7 encoded characters.
+     * @property {number}    STRUCT - A multifield type.
+     * @property {number}    MAP        - A collection type (map/associative-array/dictionary).
+     * @property {number}    SET        - A collection type (unordered and without repeated values).
+     * @property {number}    LIST     - A collection type (unordered).
+     * @property {number}    UTF8     - Array of bytes representing a string of UTF8 encoded characters.
+     * @property {number}    UTF16    - Array of bytes representing a string of UTF16 encoded characters.
+     */
+    interface Type {
+        'STOP': number;
+        'VOID': number;
+        'BOOL': number;
+        'BYTE': number;
+        'I08': number;
+        'DOUBLE': number;
+        'I16': number;
+        'I32': number;
+        'I64': number;
+        'STRING': number;
+        'UTF7': number;
+        'STRUCT': number;
+        'MAP': number;
+        'SET': number;
+        'LIST': number;
+        'UTF8': number;
+        'UTF16': number;
+    }
+    var Type: Type;
+
+    /**
+     * Thrift RPC message type string to Id mapping.
+     * @property {number}    CALL            - RPC call sent from client to server.
+     * @property {number}    REPLY         - RPC call normal response from server to client.
+     * @property {number}    EXCEPTION - RPC call exception response from server to client.
+     * @property {number}    ONEWAY        - Oneway RPC call from client to server with no response.
+     */
+    interface MessageType {
+        'CALL': number;
+        'REPLY': number;
+        'EXCEPTION': number;
+        'ONEWAY': number;
+    }
+    var MessageType: MessageType;
+
+    /**
+     * Utility function returning the count of an object's own properties.
+     * @param {object} obj - Object to test.
+     * @returns {number} number of object's own properties
+     */
+    function objectLength(obj: Object): number;
+
+    /**
+     * Utility function to establish prototype inheritance.
+     * @param {function} constructor - Contstructor function to set as derived.
+     * @param {function} superConstructor - Contstructor function to set as base.
+     * @param {string} [name] - Type name to set as name property in derived prototype.
+     */
+    function inherits(constructor: Function, superConstructor: Function, name?: string): void;
+
+    /**
+     * TException is the base class for all Thrift exceptions types.
+     */
+    class TException implements Error {
+        name: string;
+        message: string;
 
         /**
-         * Thrift RPC message type string to Id mapping.
-         * @property {number}    CALL            - RPC call sent from client to server.
-         * @property {number}    REPLY         - RPC call normal response from server to client.
-         * @property {number}    EXCEPTION - RPC call exception response from server to client.
-         * @property {number}    ONEWAY        - Oneway RPC call from client to server with no response.
+         * Initializes a Thrift TException instance.
+         * @param {string} message - The TException message (distinct from the Error message).
          */
-        interface MessageType {
-            'CALL': number;
-            'REPLY': number;
-            'EXCEPTION': number;
-            'ONEWAY': number;
-        }
-        var MessageType: MessageType;
+        constructor(message: string);
 
         /**
-         * Utility function returning the count of an object's own properties.
-         * @param {object} obj - Object to test.
-         * @returns {number} number of object's own properties
+         * Returns the message set on the exception.
+         * @returns {string} exception message
          */
-        function objectLength(obj: Object): number;
+        getMessage(): string;
+    }
+
+    /**
+     * Thrift Application Exception type string to Id mapping.
+     * @property {number}    UNKNOWN                                 - Unknown/undefined.
+     * @property {number}    UNKNOWN_METHOD                    - Client attempted to call a method unknown to the server.
+     * @property {number}    INVALID_MESSAGE_TYPE        - Client passed an unknown/unsupported MessageType.
+     * @property {number}    WRONG_METHOD_NAME             - Unused.
+     * @property {number}    BAD_SEQUENCE_ID                 - Unused in Thrift RPC, used to flag proprietary sequence number errors.
+     * @property {number}    MISSING_RESULT                    - Raised by a server processor if a handler fails to supply the required return result.
+     * @property {number}    INTERNAL_ERROR                    - Something bad happened.
+     * @property {number}    PROTOCOL_ERROR                    - The protocol layer failed to serialize or deserialize data.
+     * @property {number}    INVALID_TRANSFORM             - Unused.
+     * @property {number}    INVALID_PROTOCOL                - The protocol (or version) is not supported.
+     * @property {number}    UNSUPPORTED_CLIENT_TYPE - Unused.
+     */
+    interface TApplicationExceptionType {
+        'UNKNOWN': number;
+        'UNKNOWN_METHOD': number;
+        'INVALID_MESSAGE_TYPE': number;
+        'WRONG_METHOD_NAME': number;
+        'BAD_SEQUENCE_ID': number;
+        'MISSING_RESULT': number;
+        'INTERNAL_ERROR': number;
+        'PROTOCOL_ERROR': number;
+        'INVALID_TRANSFORM': number;
+        'INVALID_PROTOCOL': number;
+        'UNSUPPORTED_CLIENT_TYPE': number;
+    }
+    var TApplicationExceptionType: TApplicationExceptionType;
+
+    /**
+     * TApplicationException is the exception class used to propagate exceptions from an RPC server back to a calling client.
+     */
+    class TApplicationException extends TException {
+        message: string;
+        code: number;
 
         /**
-         * Utility function to establish prototype inheritance.
-         * @param {function} constructor - Contstructor function to set as derived.
-         * @param {function} superConstructor - Contstructor function to set as base.
-         * @param {string} [name] - Type name to set as name property in derived prototype.
+         * Initializes a Thrift TApplicationException instance.
+         * @param {string} message - The TApplicationException message (distinct from the Error message).
+         * @param {Thrift.TApplicationExceptionType} [code] - The TApplicationExceptionType code.
          */
-        function inherits(constructor: Function, superConstructor: Function, name?: string): void;
+        constructor(message: string, code?: number);
 
         /**
-         * TException is the base class for all Thrift exceptions types.
+         * Read a TApplicationException from the supplied protocol.
+         * @param {object} input - The input protocol to read from.
          */
-        class TException implements Error {
-            name: string;
-            message: string;
-
-            /**
-             * Initializes a Thrift TException instance.
-             * @param {string} message - The TException message (distinct from the Error message).
-             */
-            constructor(message: string);
-
-            /**
-             * Returns the message set on the exception.
-             * @returns {string} exception message
-             */
-            getMessage(): string;
-        }
+        read(input: Object): void;
 
         /**
-         * Thrift Application Exception type string to Id mapping.
-         * @property {number}    UNKNOWN                                 - Unknown/undefined.
-         * @property {number}    UNKNOWN_METHOD                    - Client attempted to call a method unknown to the server.
-         * @property {number}    INVALID_MESSAGE_TYPE        - Client passed an unknown/unsupported MessageType.
-         * @property {number}    WRONG_METHOD_NAME             - Unused.
-         * @property {number}    BAD_SEQUENCE_ID                 - Unused in Thrift RPC, used to flag proprietary sequence number errors.
-         * @property {number}    MISSING_RESULT                    - Raised by a server processor if a handler fails to supply the required return result.
-         * @property {number}    INTERNAL_ERROR                    - Something bad happened.
-         * @property {number}    PROTOCOL_ERROR                    - The protocol layer failed to serialize or deserialize data.
-         * @property {number}    INVALID_TRANSFORM             - Unused.
-         * @property {number}    INVALID_PROTOCOL                - The protocol (or version) is not supported.
-         * @property {number}    UNSUPPORTED_CLIENT_TYPE - Unused.
+         * Write a TApplicationException to the supplied protocol.
+         * @param {object} output - The output protocol to write to.
          */
-        interface TApplicationExceptionType {
-            'UNKNOWN': number;
-            'UNKNOWN_METHOD': number;
-            'INVALID_MESSAGE_TYPE': number;
-            'WRONG_METHOD_NAME': number;
-            'BAD_SEQUENCE_ID': number;
-            'MISSING_RESULT': number;
-            'INTERNAL_ERROR': number;
-            'PROTOCOL_ERROR': number;
-            'INVALID_TRANSFORM': number;
-            'INVALID_PROTOCOL': number;
-            'UNSUPPORTED_CLIENT_TYPE': number;
-        }
-        var TApplicationExceptionType: TApplicationExceptionType;
+        write(output: Object): void;
 
         /**
-         * TApplicationException is the exception class used to propagate exceptions from an RPC server back to a calling client.
+         * Returns the application exception code set on the exception.
+         * @returns {Thrift.TApplicationExceptionType} exception code
          */
-        class TApplicationException extends TException {
-            message: string;
-            code: number;
+        getCode(): number;
+    }
 
-            /**
-             * Initializes a Thrift TApplicationException instance.
-             * @param {string} message - The TApplicationException message (distinct from the Error message).
-             * @param {Thrift.TApplicationExceptionType} [code] - The TApplicationExceptionType code.
-             */
-            constructor(message: string, code?: number);
-
-            /**
-             * Read a TApplicationException from the supplied protocol.
-             * @param {object} input - The input protocol to read from.
-             */
-            read(input: Object): void;
-
-            /**
-             * Write a TApplicationException to the supplied protocol.
-             * @param {object} output - The output protocol to write to.
-             */
-            write(output: Object): void;
-
-            /**
-             * Returns the application exception code set on the exception.
-             * @returns {Thrift.TApplicationExceptionType} exception code
-             */
-            getCode(): number;
-        }
+    /**
+     * The Apache Thrift Transport layer performs byte level I/O between RPC
+     * clients and servers. The JavaScript Transport object type uses Http[s]/XHR and is
+     * the sole browser based Thrift transport. Target servers must implement the http[s]
+     * transport (see: node.js example server).
+     */
+    class TXHRTransport {
+        url: string;
+        wpos: number;
+        rpos: number;
+        useCORS: any;
+        send_buf: string;
+        recv_buf: string;
 
         /**
-         * The Apache Thrift Transport layer performs byte level I/O between RPC
-         * clients and servers. The JavaScript Transport object type uses Http[s]/XHR and is
-         * the sole browser based Thrift transport. Target servers must implement the http[s]
-         * transport (see: node.js example server).
+         * If you do not specify a url then you must handle XHR operations on
+         * your own. This type can also be constructed using the Transport alias
+         * for backward compatibility.
+         * @param {string} [url] - The URL to connect to.
+         * @param {object} [options] - Options.
          */
-        class TXHRTransport {
-            url: string;
-            wpos: number;
-            rpos: number;
-            useCORS: any;
-            send_buf: string;
-            recv_buf: string;
+        constructor(url?: string, options?: Object);
 
-            /**
-             * If you do not specify a url then you must handle XHR operations on
-             * your own. This type can also be constructed using the Transport alias
-             * for backward compatibility.
-             * @param {string} [url] - The URL to connect to.
-             * @param {object} [options] - Options.
-             */
-            constructor(url?: string, options?: Object);
+        /**
+         * Gets the browser specific XmlHttpRequest Object.
+         * @returns {object} the browser XHR interface object
+         */
+        getXmlHttpRequestObject(): Object;
 
-            /**
-             * Gets the browser specific XmlHttpRequest Object.
-             * @returns {object} the browser XHR interface object
-             */
-            getXmlHttpRequestObject(): Object;
+        /**
+         * Sends the current XRH request if the transport was created with a URL and
+         * the async parameter if false. If the transport was not created with a URL
+         * or the async parameter is True or the URL is an empty string, the current
+         * send buffer is returned.
+         * @param {object} async - If true the current send buffer is returned.
+         * @param {function} callback - Optional async completion callback.
+         * @returns {undefined|string} Nothing or the current send buffer.
+         */
+        flush(async: any, callback?: Function): string;
 
-            /**
-             * Sends the current XRH request if the transport was created with a URL and
-             * the async parameter if false. If the transport was not created with a URL
-             * or the async parameter is True or the URL is an empty string, the current
-             * send buffer is returned.
-             * @param {object} async - If true the current send buffer is returned.
-             * @param {function} callback - Optional async completion callback.
-             * @returns {undefined|string} Nothing or the current send buffer.
-             */
-            flush(async: any, callback?: Function): string;
+        /**
+         * Creates a jQuery XHR object to be used for a Thrift server call.
+         * @param {object} client - The Thrift Service client object generated by the IDL compiler.
+         * @param {object} postData - The message to send to the server.
+         * @param {function} args - The function to call if the request succeeds.
+         * @param {function} recv_method - The Thrift Service Client receive method for the call.
+         * @returns {object} A new jQuery XHR object.
+         */
+        jqRequest(client: Object, postData: any, args: Function, recv_method: Function): Object;
 
-            /**
-             * Creates a jQuery XHR object to be used for a Thrift server call.
-             * @param {object} client - The Thrift Service client object generated by the IDL compiler.
-             * @param {object} postData - The message to send to the server.
-             * @param {function} args - The function to call if the request succeeds.
-             * @param {function} recv_method - The Thrift Service Client receive method for the call.
-             * @returns {object} A new jQuery XHR object.
-             */
-            jqRequest(client: Object, postData: any, args: Function, recv_method: Function): Object;
+        /**
+         * Sets the buffer to use when receiving server responses.
+         * @param {string} buf - The buffer to receive server responses.
+         */
+        setRecvBuffer(buf: string): void;
 
-            /**
-             * Sets the buffer to use when receiving server responses.
-             * @param {string} buf - The buffer to receive server responses.
-             */
-            setRecvBuffer(buf: string): void;
+        /**
+         * Returns true if the transport is open, in browser based JavaScript
+         * this function always returns true.
+         * @returns {boolean} Always True.
+         */
+        isOpen(): boolean;
 
-            /**
-             * Returns true if the transport is open, in browser based JavaScript
-             * this function always returns true.
-             * @returns {boolean} Always True.
-             */
-            isOpen(): boolean;
+        /**
+         * Opens the transport connection, in browser based JavaScript
+         * this function is a nop.
+         */
+        open(): void;
 
-            /**
-             * Opens the transport connection, in browser based JavaScript
-             * this function is a nop.
-             */
-            open(): void;
+        /**
+         * Closes the transport connection, in browser based JavaScript
+         * this function is a nop.
+         */
+        close(): void;
 
-            /**
-             * Closes the transport connection, in browser based JavaScript
-             * this function is a nop.
-             */
-            close(): void;
+        /**
+         * Returns the specified number of characters from the response
+         * buffer.
+         * @param {number} len - The number of characters to return.
+         * @returns {string} Characters sent by the server.
+         */
+        read(len: number): string;
 
-            /**
-             * Returns the specified number of characters from the response
-             * buffer.
-             * @param {number} len - The number of characters to return.
-             * @returns {string} Characters sent by the server.
-             */
-            read(len: number): string;
+        /**
+         * Returns the entire response buffer.
+         * @returns {string} Characters sent by the server.
+         */
+        readAll(): string;
 
-            /**
-             * Returns the entire response buffer.
-             * @returns {string} Characters sent by the server.
-             */
-            readAll(): string;
+        /**
+         * Sets the send buffer to buf.
+         * @param {string} buf - The buffer to send.
+         */
+        write(buf: string): void;
 
-            /**
-             * Sets the send buffer to buf.
-             * @param {string} buf - The buffer to send.
-             */
-            write(buf: string): void;
-
-            /**
-             * Returns the send buffer.
-             * @returns {string} The send buffer.
-             */
-            getSendBuffer(): string;
-        }
+        /**
+         * Returns the send buffer.
+         * @returns {string} The send buffer.
+         */
+        getSendBuffer(): string;
     }
 }
diff --git a/through/through.d.ts b/through/through.d.ts
index b0d49fc533..ebcfdfb833 100644
--- a/through/through.d.ts
+++ b/through/through.d.ts
@@ -5,20 +5,19 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "through" {
-    import stream = require("stream");
 
-    function through(write?: (data: any) => void,
-        end?: () => void,
-        opts?: {
-            autoDestroy: boolean;
-        }): through.ThroughStream;
+import stream = require("stream");
 
-    namespace through {
-        export interface ThroughStream extends stream.Transform {
-            autoDestroy: boolean;
-        }
+declare function through(write?: (data: any) => void,
+    end?: () => void,
+    opts?: {
+        autoDestroy: boolean;
+    }): through.ThroughStream;
+
+declare namespace through {
+    export interface ThroughStream extends stream.Transform {
+        autoDestroy: boolean;
     }
-
-    export = through;
 }
+
+export = through;
diff --git a/through2/through2-0.4.2.d.ts b/through2/through2-0.4.2.d.ts
index b2eddf0e9c..591c4cdad4 100644
--- a/through2/through2-0.4.2.d.ts
+++ b/through2/through2-0.4.2.d.ts
@@ -5,22 +5,20 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'through2' {
 
-	import stream = require('stream');
 
-	function through2(transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
+import stream = require('stream');
 
-	function through2(opts?: stream.DuplexOptions, transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
+declare function through2(transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
 
-	namespace through2 {
+declare function through2(opts?: stream.DuplexOptions, transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
 
-		export function obj(transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
+declare namespace through2 {
 
-		export function push(data: any): void;
+    export function obj(transform?: (chunk: any, enc: string, callback: () => void) => void, flush?: () => void): NodeJS.ReadWriteStream;
 
-	}
-
-	export = through2;
+    export function push(data: any): void;
 
 }
+
+export = through2;
diff --git a/through2/through2.d.ts b/through2/through2.d.ts
index 77cc817caa..a7a0679347 100644
--- a/through2/through2.d.ts
+++ b/through2/through2.d.ts
@@ -5,26 +5,24 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'through2' {
 
-	import stream = require('stream');
 
-	type TransfofmCallback = (err?: any, data?: any) => void;
-	type TransformFunction = (chunk: any, enc: string, callback: TransfofmCallback) => void;
-	type FlashCallback = (flushCallback: () => void) => void;
+import stream = require('stream');
 
-	function through2(transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
+type TransfofmCallback = (err?: any, data?: any) => void;
+type TransformFunction = (chunk: any, enc: string, callback: TransfofmCallback) => void;
+type FlashCallback = (flushCallback: () => void) => void;
 
-	function through2(opts?: stream.DuplexOptions, transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
+declare function through2(transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
 
-	namespace through2 {
+declare function through2(opts?: stream.DuplexOptions, transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
 
-		export function obj(transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
+declare namespace through2 {
 
-		export function push(data: any): void;
+    export function obj(transform?: TransformFunction, flush?: FlashCallback): NodeJS.ReadWriteStream;
 
-	}
-
-	export = through2;
+    export function push(data: any): void;
 
 }
+
+export = through2;
diff --git a/timezone-js/timezone-js.d.ts b/timezone-js/timezone-js.d.ts
index 4af5c69762..2777fcee93 100644
--- a/timezone-js/timezone-js.d.ts
+++ b/timezone-js/timezone-js.d.ts
@@ -5,89 +5,88 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/timezone-js.d.ts
 
-declare module "timezone-js" {
-	export var timezone: TimezoneJs;
 
-	export class Date {
-		constructor(timezone?: string);
-		// Note due to naming conflict I have not found a way to introduce the constructor
-		// that takes a regular Date object. Instead, I defined it to take an Object.
-		constructor(date: Object, timezone?: string);
-		constructor(utcMillis: number, timezone?: string);
-		constructor(time: string, timezone?: string);
-		constructor(year?: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, millisecond?: number, timezone?: string);
-		setTimezone: (timezone: string) => void;
+declare export var timezone: TimezoneJs;
 
-		// regular Date members
-		toString(): string;
-		toDateString(): string;
-		toTimeString(): string;
-		toLocaleString(): string;
-		toLocaleDateString(): string;
-		toLocaleTimeString(): string;
-		valueOf(): number;
-		getTime(): number;
-		getFullYear(): number;
-		getUTCFullYear(): number;
-		getMonth(): number;
-		getUTCMonth(): number;
-		getDate(): number;
-		getUTCDate(): number;
-		getDay(): number;
-		getUTCDay(): number;
-		getHours(): number;
-		getUTCHours(): number;
-		getMinutes(): number;
-		getUTCMinutes(): number;
-		getSeconds(): number;
-		getUTCSeconds(): number;
-		getMilliseconds(): number;
-		getUTCMilliseconds(): number;
-		getTimezoneOffset(): number;
-		setTime(time: number): number;
+declare export class Date {
+    constructor(timezone?: string);
+    // Note due to naming conflict I have not found a way to introduce the constructor
+    // that takes a regular Date object. Instead, I defined it to take an Object.
+    constructor(date: Object, timezone?: string);
+    constructor(utcMillis: number, timezone?: string);
+    constructor(time: string, timezone?: string);
+    constructor(year?: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, millisecond?: number, timezone?: string);
+    setTimezone: (timezone: string) => void;
 
-		// Note the setters have a non-void return type. Date has them as well, according to TypeScript 
-		setMilliseconds(ms: number): number;
-		setUTCMilliseconds(ms: number): number;
-		setSeconds(sec: number, ms?: number): number;
-		setUTCSeconds(sec: number, ms?: number): number;
-		setMinutes(min: number, sec?: number, ms?: number): number;
-		setUTCMinutes(min: number, sec?: number, ms?: number): number;
-		setHours(hours: number, min?: number, sec?: number, ms?: number): number;
-		setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number;
-		setDate(date: number): number;
-		setUTCDate(date: number): number;
-		setMonth(month: number, date?: number): number;
-		setUTCMonth(month: number, date?: number): number;
-		setFullYear(year: number, month?: number, date?: number): number;
-		setUTCFullYear(year: number, month?: number, date?: number): number;
-		toUTCString(): string;
-		toISOString(): string;
-		toJSON(key?: any): string;
-	}
+    // regular Date members
+    toString(): string;
+    toDateString(): string;
+    toTimeString(): string;
+    toLocaleString(): string;
+    toLocaleDateString(): string;
+    toLocaleTimeString(): string;
+    valueOf(): number;
+    getTime(): number;
+    getFullYear(): number;
+    getUTCFullYear(): number;
+    getMonth(): number;
+    getUTCMonth(): number;
+    getDate(): number;
+    getUTCDate(): number;
+    getDay(): number;
+    getUTCDay(): number;
+    getHours(): number;
+    getUTCHours(): number;
+    getMinutes(): number;
+    getUTCMinutes(): number;
+    getSeconds(): number;
+    getUTCSeconds(): number;
+    getMilliseconds(): number;
+    getUTCMilliseconds(): number;
+    getTimezoneOffset(): number;
+    setTime(time: number): number;
+
+    // Note the setters have a non-void return type. Date has them as well, according to TypeScript 
+    setMilliseconds(ms: number): number;
+    setUTCMilliseconds(ms: number): number;
+    setSeconds(sec: number, ms?: number): number;
+    setUTCSeconds(sec: number, ms?: number): number;
+    setMinutes(min: number, sec?: number, ms?: number): number;
+    setUTCMinutes(min: number, sec?: number, ms?: number): number;
+    setHours(hours: number, min?: number, sec?: number, ms?: number): number;
+    setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number;
+    setDate(date: number): number;
+    setUTCDate(date: number): number;
+    setMonth(month: number, date?: number): number;
+    setUTCMonth(month: number, date?: number): number;
+    setFullYear(year: number, month?: number, date?: number): number;
+    setUTCFullYear(year: number, month?: number, date?: number): number;
+    toUTCString(): string;
+    toISOString(): string;
+    toJSON(key?: any): string;
+}
 
 
-	export interface TimezoneJs {
-		zoneFileBasePath: string;
-		loadingScheme: number;
-		loadingSchemes: TimezoneJsLoadingSchemes;
+export interface TimezoneJs {
+    zoneFileBasePath: string;
+    loadingScheme: number;
+    loadingSchemes: TimezoneJsLoadingSchemes;
 
-		transport(opts: TimezoneJsOptions): any;
-		init(opts?: TimezoneJsOptions): any;
-		getAllZones(): string[];
-		loadZoneDataFromObject(obj: Object): void;
-	}
+    transport(opts: TimezoneJsOptions): any;
+    init(opts?: TimezoneJsOptions): any;
+    getAllZones(): string[];
+    loadZoneDataFromObject(obj: Object): void;
+}
 
-	export interface TimezoneJsOptions {
-		async?: boolean;
-		success?: (data: string) => void;
-		error?: (err: Error) => void;
-		url?: string;
-	}
+export interface TimezoneJsOptions {
+    async?: boolean;
+    success?: (data: string) => void;
+    error?: (err: Error) => void;
+    url?: string;
+}
 
-	export class TimezoneJsLoadingSchemes {
-		PRELOAD_ALL: number;
-		LAZY_LOAD: number;
-		MANUAL_LOAD: number;
-	}
- }
+declare export class TimezoneJsLoadingSchemes {
+    PRELOAD_ALL: number;
+    LAZY_LOAD: number;
+    MANUAL_LOAD: number;
+}
diff --git a/title-case/title-case.d.ts b/title-case/title-case.d.ts
index 914b7f75c9..cec8a49c43 100644
--- a/title-case/title-case.d.ts
+++ b/title-case/title-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "title-case" {
-	function titleCase(string1: string, string2?: string): string;
-	export = titleCase;
-}
\ No newline at end of file
+
+declare function titleCase(string1: string, string2?: string): string;
+export = titleCase;
diff --git a/tmp/tmp.d.ts b/tmp/tmp.d.ts
index eb8e24ca1a..d4597d0e37 100644
--- a/tmp/tmp.d.ts
+++ b/tmp/tmp.d.ts
@@ -3,46 +3,45 @@
 // Definitions by: Jared Klopper <https://github.com/optical>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "tmp" {
 
-	namespace tmp {
-		interface Options extends SimpleOptions {
-			mode?: number;
-		}
 
-		interface SimpleOptions {
-			prefix?: string;
-			postfix?: string;
-			template?: string;
-			dir?: string;
-			tries?: number;
-			keep?: boolean;
-			unsafeCleanup?: boolean;
-		}
+declare namespace tmp {
+    interface Options extends SimpleOptions {
+        mode?: number;
+    }
 
-		interface SynchrounousResult {
-			name: string;
-			fd: number;
-			removeCallback: () => void;
-		}
+    interface SimpleOptions {
+        prefix?: string;
+        postfix?: string;
+        template?: string;
+        dir?: string;
+        tries?: number;
+        keep?: boolean;
+        unsafeCleanup?: boolean;
+    }
 
-		function file(callback: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
-		function file(config: Options, callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
+    interface SynchrounousResult {
+        name: string;
+        fd: number;
+        removeCallback: () => void;
+    }
 
-		function fileSync(config?: Options): SynchrounousResult;
+    function file(callback: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
+    function file(config: Options, callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
 
-		function dir(callback: (err: any, path: string, cleanupCallback: () => void) => void): void;
-		function dir(config: Options, callback?: (err: any, path: string, cleanupCallback: () => void) => void): void;
+    function fileSync(config?: Options): SynchrounousResult;
 
-		function dirSync(config?: Options): SynchrounousResult;
+    function dir(callback: (err: any, path: string, cleanupCallback: () => void) => void): void;
+    function dir(config: Options, callback?: (err: any, path: string, cleanupCallback: () => void) => void): void;
 
-		function tmpName(callback: (err: any, path: string) => void): void;
-		function tmpName(config: SimpleOptions, callback?: (err: any, path: string) => void): void;
+    function dirSync(config?: Options): SynchrounousResult;
 
-		function tmpNameSync(config?: SimpleOptions): string;
+    function tmpName(callback: (err: any, path: string) => void): void;
+    function tmpName(config: SimpleOptions, callback?: (err: any, path: string) => void): void;
 
-		function setGracefulCleanup(): void;
-	}
+    function tmpNameSync(config?: SimpleOptions): string;
 
-	export = tmp;
+    function setGracefulCleanup(): void;
 }
+
+export = tmp;
diff --git a/traverse/traverse.d.ts b/traverse/traverse.d.ts
index c45c3db03b..87933c76f2 100644
--- a/traverse/traverse.d.ts
+++ b/traverse/traverse.d.ts
@@ -3,20 +3,19 @@
 // Definitions by: newclear <https://github.com/newclear>
 // Definitions: https://github.com/newclear/DefinitelyTyped
 
-declare module "traverse" {
-    interface Traverse {
-        get(paths: string[]): any;
-        has(paths: string[]): boolean;
-        set(paths: string[], value: any): any;
-        map(cb: (v: any) => void): any;
-        forEach(cb: (v: any) => void): any;
-        reduce(cb: (acc: any, v: any) => void, init?: any): any;
-        paths(): string[];
-        nodes(): any[];
-        clone(): any;
-    }
 
-    function traverse(obj: any): Traverse;
-
-    export = traverse;
+interface Traverse {
+    get(paths: string[]): any;
+    has(paths: string[]): boolean;
+    set(paths: string[], value: any): any;
+    map(cb: (v: any) => void): any;
+    forEach(cb: (v: any) => void): any;
+    reduce(cb: (acc: any, v: any) => void, init?: any): any;
+    paths(): string[];
+    nodes(): any[];
+    clone(): any;
 }
+
+declare function traverse(obj: any): Traverse;
+
+export = traverse;
diff --git a/twig/twig.d.ts b/twig/twig.d.ts
index d011eddd44..fa3ba0536b 100644
--- a/twig/twig.d.ts
+++ b/twig/twig.d.ts
@@ -5,33 +5,32 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/twig.d.ts
 
-declare module "twig" {
-	export interface Parameters {
-		id?: any;
-		ref?: any;
-		href?: any;
-		path?: any;
-		debug?: boolean;
-		trace?: boolean;
-		strict_variables?: boolean;
-		data: any;
-	}
 
-	export interface Template {
-	}
-
-	export interface CompileOptions {
-		filename: string;
-		settings: any;
-	}
-
-	export function twig(params: Parameters): Template;
-	export function extendFilter(name: string, definition: (left: any, ...params: any[]) => string): void;
-	export function extendFunction(name: string, definition: (...params: any[]) => string): void;
-	export function extendTest(name: string, definition: (value: any) => boolean): void;
-	export function extendTag(definition: any): void;
-	export function compile(markup: string, options: CompileOptions): (context: any) => any;
-	export function renderFile(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
-	export function __express(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
-	export function cache(value: boolean): void;
+export interface Parameters {
+    id?: any;
+    ref?: any;
+    href?: any;
+    path?: any;
+    debug?: boolean;
+    trace?: boolean;
+    strict_variables?: boolean;
+    data: any;
 }
+
+export interface Template {
+}
+
+export interface CompileOptions {
+    filename: string;
+    settings: any;
+}
+
+declare export function twig(params: Parameters): Template;
+declare export function extendFilter(name: string, definition: (left: any, ...params: any[]) => string): void;
+declare export function extendFunction(name: string, definition: (...params: any[]) => string): void;
+declare export function extendTest(name: string, definition: (value: any) => boolean): void;
+declare export function extendTag(definition: any): void;
+declare export function compile(markup: string, options: CompileOptions): (context: any) => any;
+declare export function renderFile(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
+declare export function __express(path: string, options: CompileOptions, fn: (err: Error, result: any) => void): void;
+declare export function cache(value: boolean): void;
diff --git a/twitter-text/twitter-text.d.ts b/twitter-text/twitter-text.d.ts
index e880c0d796..5ab17c01b5 100644
--- a/twitter-text/twitter-text.d.ts
+++ b/twitter-text/twitter-text.d.ts
@@ -3,101 +3,100 @@
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "twitter-text" {
-	export interface HashtagWithIndices {
-		hashtag: string;
-		indices: [number, number];
-	}
-	export interface UrlWithIndices {
-		url: string;
-		indices: [number, number];
-	}
-	export interface MentionWithIndices {
-		screenName: string;
-		indices: [number, number];
-	}
-	export interface MentionOrListWithIndices {
-		screenName: string;
-		listSlug: string;
-		indices: [number, number];
-	}
-	export interface CashtagWithIndices {
-		cashtag: string;
-		indices: [number, number];
-	}
-	export type EntityWithIndices =
-			HashtagWithIndices |
-			UrlWithIndices |
-			MentionWithIndices |
-			MentionOrListWithIndices |
-			CashtagWithIndices;
 
-	interface Indices {
-		indices: [number, number];
-	}
-
-	export function htmlEscape(text: string): string;
-	export function splitTags(text: string): string[];
-
-	export function extractHashtags(text: string): string[];
-	export function extractHashtagsWithIndices(text: string): HashtagWithIndices[];
-	export function extractUrls(text: string): string[];
-	export function extractUrlsWithIndices(text: string): UrlWithIndices[];
-	export function extractMentions(text: string): string[];
-	export function extractMentionsWithIndices(text: string): MentionWithIndices[];
-	export function extractMentionsOrListsWithIndices(text: string): MentionOrListWithIndices[];
-	export function extractReplies(text: string): string[];
-	export function extractCashtags(text: string): string[];
-	export function extractCashtagsWithIndices(text: string): CashtagWithIndices[];
-	export function extractEntitiesWithIndices(text: string): EntityWithIndices[];
-
-	export function modifyIndicesFromUnicodeToUTF16<I>(i: I): I;
-	export function modifyIndicesFromUTF16ToUnicode<I>(i: I): I;
-
-	export interface UrlEntity {
-		url: string;
-		display_url: string;
-		expanded_url: string;
-		indices: [number, number];
-	}
-	export interface AutoLinkOptions {
-		hashtagClass?: string;
-		hashtagUrlBase?: string;
-		cashtagClass?: string;
-		cashtagUrlBase?: string;
-		listClass?: string;
-		usernameClass?: string;
-		usernameUrlBase?: string;
-		listUrlBase?: string;
-		htmlAttrs?: string;
-		invisibleTagAttrs?: string;
-		htmlEscapeNonEntities?: boolean;
-		urlEntities?: UrlEntity[];
-	}
-
-	export function autoLink(text: string, options?: AutoLinkOptions): string;
-	export function autoLinkUsernamesOrLists(text: string, options?: AutoLinkOptions): string;
-	export function autoLinkHashtags(text: string, options?: AutoLinkOptions): string;
-	export function autoLinkCashtags(text: string, options?: AutoLinkOptions): string;
-	export function autoLinkUrlsCustom(text: string, options?: AutoLinkOptions): string;
-	export function autoLinkEntities(text: string, entities: EntityWithIndices[], options?: AutoLinkOptions): string;
-
-	interface TweetLengthOptions {
-		short_url_length: number;
-		short_url_length_https: number;
-	}
-	export function getTweetLength(text: string, options?: TweetLengthOptions): number;
-
-	export function isValidUsername(username: string): boolean;
-	export function isValidList(usernameList: string): boolean;
-	export function isValidHashtag(hashtag: string): boolean;
-	// Note: unicodeDomainsa and requireProtocol can be null
-	export function isValidUrl(url: string, unicodeDomains: boolean, requireProtocol: boolean): boolean;
-	export function isInvalidTweet(text: string): string;
-
-	export function getUnicodeTextLength(text: string): number;
-	// Note: This function directly modify entities" indices
-	export function convertUnicodeIndices(text: string, entities: EntityWithIndices[], indicesInUTF16?: boolean): void;
-
-	export function hitHighlight(text: string, hits?: number[][], options?: {tag: string}): string;
+export interface HashtagWithIndices {
+    hashtag: string;
+    indices: [number, number];
 }
+export interface UrlWithIndices {
+    url: string;
+    indices: [number, number];
+}
+export interface MentionWithIndices {
+    screenName: string;
+    indices: [number, number];
+}
+export interface MentionOrListWithIndices {
+    screenName: string;
+    listSlug: string;
+    indices: [number, number];
+}
+export interface CashtagWithIndices {
+    cashtag: string;
+    indices: [number, number];
+}
+export type EntityWithIndices =
+    HashtagWithIndices |
+    UrlWithIndices |
+    MentionWithIndices |
+    MentionOrListWithIndices |
+    CashtagWithIndices;
+
+interface Indices {
+    indices: [number, number];
+}
+
+declare export function htmlEscape(text: string): string;
+declare export function splitTags(text: string): string[];
+
+declare export function extractHashtags(text: string): string[];
+declare export function extractHashtagsWithIndices(text: string): HashtagWithIndices[];
+declare export function extractUrls(text: string): string[];
+declare export function extractUrlsWithIndices(text: string): UrlWithIndices[];
+declare export function extractMentions(text: string): string[];
+declare export function extractMentionsWithIndices(text: string): MentionWithIndices[];
+declare export function extractMentionsOrListsWithIndices(text: string): MentionOrListWithIndices[];
+declare export function extractReplies(text: string): string[];
+declare export function extractCashtags(text: string): string[];
+declare export function extractCashtagsWithIndices(text: string): CashtagWithIndices[];
+declare export function extractEntitiesWithIndices(text: string): EntityWithIndices[];
+
+declare export function modifyIndicesFromUnicodeToUTF16<I>(i: I): I;
+declare export function modifyIndicesFromUTF16ToUnicode<I>(i: I): I;
+
+export interface UrlEntity {
+    url: string;
+    display_url: string;
+    expanded_url: string;
+    indices: [number, number];
+}
+export interface AutoLinkOptions {
+    hashtagClass?: string;
+    hashtagUrlBase?: string;
+    cashtagClass?: string;
+    cashtagUrlBase?: string;
+    listClass?: string;
+    usernameClass?: string;
+    usernameUrlBase?: string;
+    listUrlBase?: string;
+    htmlAttrs?: string;
+    invisibleTagAttrs?: string;
+    htmlEscapeNonEntities?: boolean;
+    urlEntities?: UrlEntity[];
+}
+
+declare export function autoLink(text: string, options?: AutoLinkOptions): string;
+declare export function autoLinkUsernamesOrLists(text: string, options?: AutoLinkOptions): string;
+declare export function autoLinkHashtags(text: string, options?: AutoLinkOptions): string;
+declare export function autoLinkCashtags(text: string, options?: AutoLinkOptions): string;
+declare export function autoLinkUrlsCustom(text: string, options?: AutoLinkOptions): string;
+declare export function autoLinkEntities(text: string, entities: EntityWithIndices[], options?: AutoLinkOptions): string;
+
+interface TweetLengthOptions {
+    short_url_length: number;
+    short_url_length_https: number;
+}
+declare export function getTweetLength(text: string, options?: TweetLengthOptions): number;
+
+declare export function isValidUsername(username: string): boolean;
+declare export function isValidList(usernameList: string): boolean;
+declare export function isValidHashtag(hashtag: string): boolean;
+// Note: unicodeDomainsa and requireProtocol can be null
+declare export function isValidUrl(url: string, unicodeDomains: boolean, requireProtocol: boolean): boolean;
+declare export function isInvalidTweet(text: string): string;
+
+declare export function getUnicodeTextLength(text: string): number;
+// Note: This function directly modify entities" indices
+declare export function convertUnicodeIndices(text: string, entities: EntityWithIndices[], indicesInUTF16?: boolean): void;
+
+declare export function hitHighlight(text: string, hits?: number[][], options?: { tag: string }): string;
diff --git a/type-detect/type-detect.d.ts b/type-detect/type-detect.d.ts
index 58956f3b71..8dbf9018aa 100644
--- a/type-detect/type-detect.d.ts
+++ b/type-detect/type-detect.d.ts
@@ -3,16 +3,15 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'type-detect' {
-	function type(val: any): string;
 
-	namespace type {
-		export class Library {
-			of(val: any): string;
-			define (type: string, test: RegExp): void;
-			define (type: string, test: (val: any) => boolean): void;
-			test (val: any, type: string): boolean;
-		}
-	}
-	export = type;
+declare function type(val: any): string;
+
+declare namespace type {
+    export class Library {
+        of(val: any): string;
+        define(type: string, test: RegExp): void;
+        define(type: string, test: (val: any) => boolean): void;
+        test(val: any, type: string): boolean;
+    }
 }
+export = type;
diff --git a/typescript-deferred/typescript-deferred.d.ts b/typescript-deferred/typescript-deferred.d.ts
index 6d9820e187..b5c738a9f9 100644
--- a/typescript-deferred/typescript-deferred.d.ts
+++ b/typescript-deferred/typescript-deferred.d.ts
@@ -3,45 +3,42 @@
 // Definitions by: Christian Speckner <https://github.com/DirtyHairy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "typescript-deferred" {
-
-    export interface ImmediateSuccessCB<T, TP> {
-        (value: T): TP;
-    }
-    export interface ImmediateErrorCB<TP> {
-        (err: any): TP;
-    }
-    export interface DeferredSuccessCB<T, TP> {
-        (value: T): ThenableInterface<TP>;
-    }
-    export interface DeferredErrorCB<TP> {
-        (error: any): ThenableInterface<TP>;
-    }
-    export interface ThenableInterface<T> {
-        then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): ThenableInterface<TP>;
-        then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): ThenableInterface<TP>;
-        then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): ThenableInterface<TP>;
-        then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): ThenableInterface<TP>;
-    }
-    export interface PromiseInterface<T> extends ThenableInterface<T> {
-        then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
-        then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
-        then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
-        then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
-        otherwise(errorCB?: DeferredErrorCB<T>): PromiseInterface<T>;
-        otherwise(errorCB?: ImmediateErrorCB<T>): PromiseInterface<T>;
-        always<TP>(errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
-        always<TP>(errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
-    }
-    export interface DeferredInterface<T> {
-        resolve(value?: ThenableInterface<T>): DeferredInterface<T>;
-        resolve(value?: T): DeferredInterface<T>;
-        reject(error?: any): DeferredInterface<T>;
-        promise: PromiseInterface<T>;
-    }
-    export function create<T>(): DeferredInterface<T>;
-    export function when<T>(value?: ThenableInterface<T>): PromiseInterface<T>;
-    export function when<T>(value?: T): PromiseInterface<T>;
 
 
+export interface ImmediateSuccessCB<T, TP> {
+    (value: T): TP;
 }
+export interface ImmediateErrorCB<TP> {
+    (err: any): TP;
+}
+export interface DeferredSuccessCB<T, TP> {
+    (value: T): ThenableInterface<TP>;
+}
+export interface DeferredErrorCB<TP> {
+    (error: any): ThenableInterface<TP>;
+}
+export interface ThenableInterface<T> {
+    then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): ThenableInterface<TP>;
+    then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): ThenableInterface<TP>;
+    then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): ThenableInterface<TP>;
+    then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): ThenableInterface<TP>;
+}
+export interface PromiseInterface<T> extends ThenableInterface<T> {
+    then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
+    then<TP>(successCB?: DeferredSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
+    then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
+    then<TP>(successCB?: ImmediateSuccessCB<T, TP>, errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
+    otherwise(errorCB?: DeferredErrorCB<T>): PromiseInterface<T>;
+    otherwise(errorCB?: ImmediateErrorCB<T>): PromiseInterface<T>;
+    always<TP>(errorCB?: DeferredErrorCB<TP>): PromiseInterface<TP>;
+    always<TP>(errorCB?: ImmediateErrorCB<TP>): PromiseInterface<TP>;
+}
+export interface DeferredInterface<T> {
+    resolve(value?: ThenableInterface<T>): DeferredInterface<T>;
+    resolve(value?: T): DeferredInterface<T>;
+    reject(error?: any): DeferredInterface<T>;
+    promise: PromiseInterface<T>;
+}
+declare export function create<T>(): DeferredInterface<T>;
+declare export function when<T>(value?: ThenableInterface<T>): PromiseInterface<T>;
+declare export function when<T>(value?: T): PromiseInterface<T>;
diff --git a/uglify-js/uglify-js.d.ts b/uglify-js/uglify-js.d.ts
index debb017c14..11b2664517 100644
--- a/uglify-js/uglify-js.d.ts
+++ b/uglify-js/uglify-js.d.ts
@@ -5,112 +5,112 @@
 
 /// <reference path="../source-map/source-map.d.ts" />
 
-declare module 'uglify-js' {
-  import * as MOZ_SourceMap from 'source-map';
 
-  namespace UglifyJS {
+import * as MOZ_SourceMap from 'source-map';
+
+declare namespace UglifyJS {
     interface Tokenizer {
-      /**
-       * The type of this token.
-       * Can be "num", "string", "regexp", "operator", "punc", "atom", "name", "keyword", "comment1" or "comment2".
-       * "comment1" and "comment2" are for single-line, respectively multi-line comments.
-       */
-      type: string;
+        /**
+         * The type of this token.
+         * Can be "num", "string", "regexp", "operator", "punc", "atom", "name", "keyword", "comment1" or "comment2".
+         * "comment1" and "comment2" are for single-line, respectively multi-line comments.
+         */
+        type: string;
 
-      /**
-       * The name of the file where this token originated from. Useful when compressing multiple files at once to generate the proper source map.
-       */
-      file: string;
+        /**
+         * The name of the file where this token originated from. Useful when compressing multiple files at once to generate the proper source map.
+         */
+        file: string;
 
-      /**
-       * The "value" of the token.
-       * That's additional information and depends on the token type: "num", "string" and "regexp" tokens you get their literal value.
-       * - For "operator" you get the operator.
-       * - For "punc" it's the punctuation sign (parens, comma, semicolon etc).
-       * - For "atom", "name" and "keyword" it's the name of the identifier
-       * - For comments it's the body of the comment (excluding the initial "//" and "/*".
-       */
-      value: string;
+        /**
+         * The "value" of the token.
+         * That's additional information and depends on the token type: "num", "string" and "regexp" tokens you get their literal value.
+         * - For "operator" you get the operator.
+         * - For "punc" it's the punctuation sign (parens, comma, semicolon etc).
+         * - For "atom", "name" and "keyword" it's the name of the identifier
+         * - For comments it's the body of the comment (excluding the initial "//" and "/*".
+         */
+        value: string;
 
-      /**
-       * The line number of this token in the original code.
-       * 1-based index.
-       */
-      line: number;
+        /**
+         * The line number of this token in the original code.
+         * 1-based index.
+         */
+        line: number;
 
-      /**
-       * The column number of this token in the original code.
-       * 0-based index.
-       */
-      col: number;
+        /**
+         * The column number of this token in the original code.
+         * 0-based index.
+         */
+        col: number;
 
-      /**
-       * Short for "newline before", it's a boolean that tells us whether there was a newline before this node in the original source. It helps for automatic semicolon insertion.
-       * For multi-line comments in particular this will be set to true if there either was a newline before this comment, or * * if this comment contains a newline.
-       */
-      nlb: boolean;
+        /**
+         * Short for "newline before", it's a boolean that tells us whether there was a newline before this node in the original source. It helps for automatic semicolon insertion.
+         * For multi-line comments in particular this will be set to true if there either was a newline before this comment, or * * if this comment contains a newline.
+         */
+        nlb: boolean;
 
-      /**
-       * This doesn't apply for comment tokens, but for all other token types it will be an array of comment tokens that were found before.
-       */
-      comments_before: string[];
+        /**
+         * This doesn't apply for comment tokens, but for all other token types it will be an array of comment tokens that were found before.
+         */
+        comments_before: string[];
     }
 
     interface AST_Node {
-      // The first token of this node
-      start: AST_Node;
+        // The first token of this node
+        start: AST_Node;
 
-      // The last token of this node
-      end: AST_Node;
+        // The last token of this node
+        end: AST_Node;
 
-      transform(tt: TreeTransformer): AST_Toplevel;
+        transform(tt: TreeTransformer): AST_Toplevel;
     }
 
     interface AST_Toplevel extends AST_Node {
-      // UglifyJS contains a scope analyzer which figures out variable/function definitions, references etc.
-      // You need to call it manually before compression or mangling.
-      // The figure_out_scope method is defined only on the AST_Toplevel node.
-      figure_out_scope(): void;
+        // UglifyJS contains a scope analyzer which figures out variable/function definitions, references etc.
+        // You need to call it manually before compression or mangling.
+        // The figure_out_scope method is defined only on the AST_Toplevel node.
+        figure_out_scope(): void;
 
-      // Get names that are optimized for GZip compression (names will be generated using the most frequent characters first)
-      compute_char_frequency(): void;
+        // Get names that are optimized for GZip compression (names will be generated using the most frequent characters first)
+        compute_char_frequency(): void;
 
-      mangle_names(): void;
+        mangle_names(): void;
 
-      print(stream: OutputStream): void;
+        print(stream: OutputStream): void;
 
-      print_to_string(options?: BeautifierOptions): string;
+        print_to_string(options?: BeautifierOptions): string;
     }
 
     interface MinifyOptions {
-      spidermonkey?: boolean;
-      outSourceMap?: string;
-      sourceRoot?: string;
-      inSourceMap?: string;
-      fromString?: boolean;
-      warnings?: boolean;
-      mangle?: Object;
-      output?: MinifyOutput,
-      compress?: Object;
+        spidermonkey?: boolean;
+        outSourceMap?: string;
+        sourceRoot?: string;
+        inSourceMap?: string;
+        fromString?: boolean;
+        warnings?: boolean;
+        mangle?: Object;
+        output?: MinifyOutput,
+        compress?: Object;
     }
 
     interface MinifyOutput {
-      code: string;
-      map: string;
+        code: string;
+        map: string;
     }
 
     function minify(files: string | Array<string>, options?: MinifyOptions): MinifyOutput;
 
 
     interface ParseOptions {
-      // Default is false
-      strict?: boolean;
+        // Default is false
+        strict?: boolean;
 
-      // Input file name, default is null
-      filename?: string;
+        // Input file name, default is null
+        filename?: string;
 
-      // Default is null
-      toplevel?: AST_Toplevel;
+        // Default is null
+        toplevel?: AST_Toplevel;
     }
 
     /**
@@ -121,177 +121,177 @@ declare module 'uglify-js' {
 
 
     interface BeautifierOptions {
-      /**
-       * Start indentation on every line (only when `beautify`)
-       */
-      indent_start?: number;
+        /**
+         * Start indentation on every line (only when `beautify`)
+         */
+        indent_start?: number;
 
-      /**
-       * Indentation level (only when `beautify`)
-       */
-      indent_level?: number;
+        /**
+         * Indentation level (only when `beautify`)
+         */
+        indent_level?: number;
 
-      /**
-       * Quote all keys in object literals?
-       */
-      quote_keys?: boolean;
+        /**
+         * Quote all keys in object literals?
+         */
+        quote_keys?: boolean;
 
-      /**
-       * Add a space after colon signs?
-       */
-      space_colon?: boolean;
+        /**
+         * Add a space after colon signs?
+         */
+        space_colon?: boolean;
 
-      /**
-       * Output ASCII-safe? (encodes Unicode characters as ASCII)
-       */
-      ascii_only?: boolean;
+        /**
+         * Output ASCII-safe? (encodes Unicode characters as ASCII)
+         */
+        ascii_only?: boolean;
 
-      /**
-       * Escape "</script"?
-       */
-      inline_script?: boolean;
+        /**
+         * Escape "</script"?
+         */
+        inline_script?: boolean;
 
-      /**
-       * Informative maximum line width (for beautified output)
-       */
-      width?: number;
+        /**
+         * Informative maximum line width (for beautified output)
+         */
+        width?: number;
 
-      /**
-       * Maximum line length (for non-beautified output)
-       */
-      max_line_len?: number;
+        /**
+         * Maximum line length (for non-beautified output)
+         */
+        max_line_len?: number;
 
-      /**
-       * Output IE-safe code?
-       */
-      ie_proof?: boolean;
+        /**
+         * Output IE-safe code?
+         */
+        ie_proof?: boolean;
 
-      /**
-       * Beautify output?
-       */
-      beautify?: boolean;
+        /**
+         * Beautify output?
+         */
+        beautify?: boolean;
 
-      /**
-       * Output a source map
-       */
-      source_map?: SourceMapOptions;
+        /**
+         * Output a source map
+         */
+        source_map?: SourceMapOptions;
 
-      /**
-       * Use brackets every time?
-       */
-      bracketize?: boolean;
+        /**
+         * Use brackets every time?
+         */
+        bracketize?: boolean;
 
-      /**
-       * Output comments?
-       */
-      comments?: boolean;
+        /**
+         * Output comments?
+         */
+        comments?: boolean;
 
-      /**
-       * Use semicolons to separate statements? (otherwise, newlines)
-       */
-      semicolons?: boolean;
+        /**
+         * Use semicolons to separate statements? (otherwise, newlines)
+         */
+        semicolons?: boolean;
     }
 
     interface OutputStream {
-      // Return the output so far as a string
-      get(): string;
-      toString(): string;
+        // Return the output so far as a string
+        get(): string;
+        toString(): string;
 
-      // Insert one indentation string (usually 4 characters).
-      // Optionally pass true to indent half the width (I'm using that for case and default lines in switch blocks.
-      // If beautify is off, this function does nothing.
-      indent(half?: boolean): void;
+        // Insert one indentation string (usually 4 characters).
+        // Optionally pass true to indent half the width (I'm using that for case and default lines in switch blocks.
+        // If beautify is off, this function does nothing.
+        indent(half?: boolean): void;
 
-      // Return the current indentation width (not level; for example if we're in level 2 and indent_level is 4, this method would return 8.
-      indentation(): number;
+        // Return the current indentation width (not level; for example if we're in level 2 and indent_level is 4, this method would return 8.
+        indentation(): number;
 
-      // return the width of the current line text minus indentation.
-      current_width(): number
+        // return the width of the current line text minus indentation.
+        current_width(): number
 
-      // Return true if current_width() is bigger than options.width (assuming options.width is non-null, non-zero).
-      should_break(): boolean;
+        // Return true if current_width() is bigger than options.width (assuming options.width is non-null, non-zero).
+        should_break(): boolean;
 
-      // If beautification is on, this inserts a newline. Otherwise it does nothing.
-      newline(): void;
+        // If beautification is on, this inserts a newline. Otherwise it does nothing.
+        newline(): void;
 
-      // Include the given string into the output, adjusting current_line, current_col and current_pos accordingly.
-      print(str: string): void;
+        // Include the given string into the output, adjusting current_line, current_col and current_pos accordingly.
+        print(str: string): void;
 
-      // If beautification is on this always includes a space character.
-      // Otherwise it saves a hint somewhere that a space might be needed at current point.
-      // The space will go in at the next output but only when absolutely required, for example it will insert the space in return 10 but not in return"stuff".
-      space(): void;
+        // If beautification is on this always includes a space character.
+        // Otherwise it saves a hint somewhere that a space might be needed at current point.
+        // The space will go in at the next output but only when absolutely required, for example it will insert the space in return 10 but not in return"stuff".
+        space(): void;
 
-      // Inserts a comma, and calls space() — that is, if beautification is on you'll get a space after the comma.
-      comma(): void;
+        // Inserts a comma, and calls space() — that is, if beautification is on you'll get a space after the comma.
+        comma(): void;
 
-      // Inserts a colon, and calls space() if options.space_colon is set.
-      colon(): void;
+        // Inserts a colon, and calls space() if options.space_colon is set.
+        colon(): void;
 
-      // Returns the last printed chunk.
-      last(): string;
+        // Returns the last printed chunk.
+        last(): string;
 
-      // If beautification is on it always inserts a semicolon.
-      // Otherwise it saves a hint that a semicolon might be needed at current point.
-      // The semicolon is inserted when the next output comes in, only if required to not break the JS syntax.
-      semicolon(): void;
+        // If beautification is on it always inserts a semicolon.
+        // Otherwise it saves a hint that a semicolon might be needed at current point.
+        // The semicolon is inserted when the next output comes in, only if required to not break the JS syntax.
+        semicolon(): void;
 
-      // Always inserts a semicolon and clears the hint that a semicolon might be needed.
-      force_semicolon(): void;
+        // Always inserts a semicolon and clears the hint that a semicolon might be needed.
+        force_semicolon(): void;
 
-      // Encodes any non-ASCII characters in string with JavaScript's conventions (using \uCODE).
-      to_ascii(str: string): void;
+        // Encodes any non-ASCII characters in string with JavaScript's conventions (using \uCODE).
+        to_ascii(str: string): void;
 
-      // Prints an identifier. If options.ascii_only is set, non-ASCII chars will be encoded with JavaScript conventions.
-      print_name(name: string): void;
+        // Prints an identifier. If options.ascii_only is set, non-ASCII chars will be encoded with JavaScript conventions.
+        print_name(name: string): void;
 
-      // Prints a string. It adds quotes automatically.
-      // It prefers double-quotes, but will actually count any quotes in the string and will use single-quotes if the output proves to be shorter (depending on how many backslashes it has to insert).
-      // It encodes to ASCII if options.ascii_only is set.
-      print_string(str: string): void;
+        // Prints a string. It adds quotes automatically.
+        // It prefers double-quotes, but will actually count any quotes in the string and will use single-quotes if the output proves to be shorter (depending on how many backslashes it has to insert).
+        // It encodes to ASCII if options.ascii_only is set.
+        print_string(str: string): void;
 
-      // Returns the width of the next indentation level. For example if current level is 2 and options.indent_level is 4, it'll return 12.
-      next_indent(): number;
+        // Returns the width of the next indentation level. For example if current level is 2 and options.indent_level is 4, it'll return 12.
+        next_indent(): number;
 
-      // Sets the current indentation to col (column), calls the function and thereafter restores the previous indentation level.
-      // If beautification is off it simply calls func.
-      with_indent(col: number, func: Function): void;
+        // Sets the current indentation to col (column), calls the function and thereafter restores the previous indentation level.
+        // If beautification is off it simply calls func.
+        with_indent(col: number, func: Function): void;
 
-      // This is used to output blocks in curly brackets.
-      // It'll print an open bracket at current point, then call newline() and with the next indentation level it calls your func.
-      // Lastly, it'll print an indented closing bracket. As usual, if beautification is off you'll just get {x} where x is whatever func outputs.
-      with_block(func: Function): void;
+        // This is used to output blocks in curly brackets.
+        // It'll print an open bracket at current point, then call newline() and with the next indentation level it calls your func.
+        // Lastly, it'll print an indented closing bracket. As usual, if beautification is off you'll just get {x} where x is whatever func outputs.
+        with_block(func: Function): void;
 
-      // Adds parens around the output that your function prints.
-      with_parens(func: Function): void;
+        // Adds parens around the output that your function prints.
+        with_parens(func: Function): void;
 
-      // Adds square brackets around the output that your function prints.
-      with_square(func: Function): void;
+        // Adds square brackets around the output that your function prints.
+        with_square(func: Function): void;
 
-      // If options.source_map is set, this will generate a source mapping between the given token (which should be an AST_Token-like object) and the current line/col.
-      // The name is optional; in most cases it will be inferred from the token.
-      add_mapping(token: AST_Node, name?: string): void;
+        // If options.source_map is set, this will generate a source mapping between the given token (which should be an AST_Token-like object) and the current line/col.
+        // The name is optional; in most cases it will be inferred from the token.
+        add_mapping(token: AST_Node, name?: string): void;
 
-      // Returns the option with the given name.
-      option(name: string): any;
+        // Returns the option with the given name.
+        option(name: string): any;
 
-      // Returns the current line in the output (1-based).
-      line(): number;
+        // Returns the current line in the output (1-based).
+        line(): number;
 
-      // Returns the current column in the output (zero-based).
-      col(): number;
+        // Returns the current column in the output (zero-based).
+        col(): number;
 
-      // Push the given node into an internal stack. This is used to keep track of current node's parent(s).
-      push_node(node: AST_Node): void;
+        // Push the given node into an internal stack. This is used to keep track of current node's parent(s).
+        push_node(node: AST_Node): void;
 
-      // Pops the top of the stack and returns it.
-      pop_node(): AST_Node;
+        // Pops the top of the stack and returns it.
+        pop_node(): AST_Node;
 
-      // Returns that internal stack.
-      stack(): any;
+        // Returns that internal stack.
+        stack(): any;
 
-      // Returns the n-th parent node (where zero means the direct parent).
-      parent(n: number): AST_Node;
+        // Returns the n-th parent node (where zero means the direct parent).
+        parent(n: number): AST_Node;
     }
 
     /**
@@ -304,29 +304,29 @@ declare module 'uglify-js' {
 
 
     interface SourceMapOptions {
-      /**
-       * The compressed file name
-       */
-      file?: string;
+        /**
+         * The compressed file name
+         */
+        file?: string;
 
-      /**
-       * The root URL to the original sources
-       */
-      root?: string;
+        /**
+         * The root URL to the original sources
+         */
+        root?: string;
 
-      /**
-       * The input source map.
-       * Useful when you compress code that was generated from some other source (possibly other programming language).
-       * If you have an input source map, pass it in this argument and UglifyJS will generate a mapping that maps back
-       * to the original source (as opposed to the compiled code that you are compressing).
-       */
-      orig?: Object | JSON;
+        /**
+         * The input source map.
+         * Useful when you compress code that was generated from some other source (possibly other programming language).
+         * If you have an input source map, pass it in this argument and UglifyJS will generate a mapping that maps back
+         * to the original source (as opposed to the compiled code that you are compressing).
+         */
+        orig?: Object | JSON;
     }
 
     interface SourceMap {
-      add(source: string, gen_line: number, gen_col: number, orig_line: number, orig_col: number, name?: string): void;
-      get(): MOZ_SourceMap.SourceMapGenerator;
-      toString(): string;
+        add(source: string, gen_line: number, gen_col: number, orig_line: number, orig_col: number, name?: string): void;
+        get(): MOZ_SourceMap.SourceMapGenerator;
+        toString(): string;
     }
 
     /**
@@ -338,62 +338,62 @@ declare module 'uglify-js' {
 
 
     interface CompressorOptions {
-      // Join consecutive statemets with the “comma operator�
-      sequences?: boolean;
+        // Join consecutive statemets with the “comma operator�
+        sequences?: boolean;
 
-      // Optimize property access: a["foo"] → a.foo
-      properties?: boolean;
+        // Optimize property access: a["foo"] → a.foo
+        properties?: boolean;
 
-      // Discard unreachable code
-      dead_code?: boolean;
+        // Discard unreachable code
+        dead_code?: boolean;
 
-      // Discard “debugger� statements
-      drop_debugger?: boolean;
+        // Discard “debugger� statements
+        drop_debugger?: boolean;
 
-      // Some unsafe optimizations (see below)
-      unsafe?: boolean;
+        // Some unsafe optimizations (see below)
+        unsafe?: boolean;
 
-      // Optimize if-s and conditional expressions
-      conditionals?: boolean;
+        // Optimize if-s and conditional expressions
+        conditionals?: boolean;
 
-      // Optimize comparisons
-      comparisons?: boolean;
+        // Optimize comparisons
+        comparisons?: boolean;
 
-      // Evaluate constant expressions
-      evaluate?: boolean;
+        // Evaluate constant expressions
+        evaluate?: boolean;
 
-      // Optimize boolean expressions
-      booleans?: boolean;
+        // Optimize boolean expressions
+        booleans?: boolean;
 
-      // Optimize loops
-      loops?: boolean;
+        // Optimize loops
+        loops?: boolean;
 
-      // Drop unused variables/functions
-      unused?: boolean;
+        // Drop unused variables/functions
+        unused?: boolean;
 
-      // Hoist function declarations
-      hoist_funs?: boolean;
+        // Hoist function declarations
+        hoist_funs?: boolean;
 
-      // Hoist variable declarations
-      hoist_vars?: boolean;
+        // Hoist variable declarations
+        hoist_vars?: boolean;
 
-      // Optimize if-s followed by return/continue
-      if_return?: boolean;
+        // Optimize if-s followed by return/continue
+        if_return?: boolean;
 
-      // Join var declarations
-      join_vars?: boolean;
+        // Join var declarations
+        join_vars?: boolean;
 
-      // Try to cascade `right` into `left` in sequences
-      cascade?: boolean;
+        // Try to cascade `right` into `left` in sequences
+        cascade?: boolean;
 
-      // Drop side-effect-free statements
-      side_effects?: boolean;
+        // Drop side-effect-free statements
+        side_effects?: boolean;
 
-      // Warn about potentially dangerous optimizations/code
-      warnings?: boolean;
+        // Warn about potentially dangerous optimizations/code
+        warnings?: boolean;
 
-      // Global definitions
-      global_defs?: Object;
+        // Global definitions
+        global_defs?: Object;
     }
 
     /**
@@ -424,7 +424,6 @@ declare module 'uglify-js' {
      * In fact it even inherits from TreeWalker and you can use the same methods, but initialization and visitor protocol are a bit different.
      */
     function TreeTransformer(before: visitor, after: visitor): TreeTransformer;
-  }
-
-  export = UglifyJS;
 }
+
+export = UglifyJS;
diff --git a/umzug/umzug.d.ts b/umzug/umzug.d.ts
index c15b165b4a..b7a675e8d7 100644
--- a/umzug/umzug.d.ts
+++ b/umzug/umzug.d.ts
@@ -6,189 +6,188 @@
 /// <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path="../sequelize/sequelize.d.ts" />
 
-declare module "umzug" {
-    import Sequelize = require("sequelize");
 
-    namespace umzug {
+import Sequelize = require("sequelize");
 
-        interface MigrationOptions {
+declare namespace umzug {
 
-            /*
-             * The params that gets passed to the migrations.
-             * Might be an array or a synchronous function which returns an array.
-             */
-            params?: Array<any>;
+    interface MigrationOptions {
 
-            /** The path to the migrations directory. */
-            path?: string;
+        /*
+         * The params that gets passed to the migrations.
+         * Might be an array or a synchronous function which returns an array.
+         */
+        params?: Array<any>;
 
-            /** The pattern that determines whether or not a file is a migration. */
-            pattern?: RegExp;
+        /** The path to the migrations directory. */
+        path?: string;
 
-            /**
-             * A function that receives and returns the to be executed function.
-             * This can be used to modify the function.
-             */
-            wrap?: <T>( fn : T ) => T;
+        /** The pattern that determines whether or not a file is a migration. */
+        pattern?: RegExp;
 
-        }
+        /**
+         * A function that receives and returns the to be executed function.
+         * This can be used to modify the function.
+         */
+        wrap?: <T>(fn: T) => T;
 
-        interface JSONStorageOptions {
-
-            /**
-             * The path to the json storage.
-             * Defaults to process.cwd() + '/umzug.json';
-             */
-            path?: string;
-
-        }
-
-        interface SequelizeStorageOptions {
-
-            /**
-             * The configured instance of Sequelize.
-             * Optional if `model` is passed.
-             */
-            sequelize?: Sequelize.Sequelize;
-
-            /**
-             * The to be used Sequelize model.
-             * Must have column name matching `columnName` option
-             * Optional of `sequelize` is passed.
-             */
-            model?: Sequelize.Model<any, any>;
-
-            /**
-             * The name of the to be used model.
-             * Defaults to 'SequelizeMeta'
-             */
-            modelName?: string;
-
-            /**
-             * The name of table to create if `model` option is not supplied
-             * Defaults to `modelName`
-             */
-            tableName?: string;
-
-            /**
-             * The name of table column holding migration name.
-             * Defaults to 'name'.
-             */
-            columnName: string;
-
-            /**
-             * The type of the column holding migration name.
-             * Defaults to `Sequelize.STRING`
-             */
-            columnType: Sequelize.DataTypeAbstract;
-
-        }
-
-        interface ExecuteOptions {
-            migrations?: Array<string>;
-            method?: string;
-        }
-
-        interface UmzugOptions {
-
-            /**
-             * The storage.
-             * Possible values: 'json', 'sequelize', an object
-             */
-            storage?: string;
-
-            /**
-             * The options for the storage.
-             */
-            storageOptions?: JSONStorageOptions | SequelizeStorageOptions | Object;
-
-            /**
-             * The logging function.
-             * A function that gets executed everytime migrations start and have ended.
-             */
-            logging? : boolean | Function;
-
-            /**
-             * The name of the positive method in migrations.
-             */
-            upName? : string;
-
-            /**
-             * The name of the negative method in migrations.
-             */
-            downName? : string;
-
-            /**
-             * Options for defined migration
-             */
-            migrations? : MigrationOptions;
-
-        }
-
-        interface UpDownToOptions {
-
-            /**
-             * It is also possible to pass the name of a migration in order to
-             * just run the migrations from the current state to the passed
-             * migration name.
-             */
-            to: string;
-
-        }
-
-        interface UpDownMigrationsOptions {
-
-            /**
-             * Running specific migrations while ignoring the right order, can be
-             * done like this:
-             */
-            migrations: Array<string>;
-
-        }
-
-        interface Migration {
-            path: string;
-            file: string;
-        }
-
-        interface Umzug {
-            /**
-             * The execute method is a general purpose function that runs for
-             * every specified migrations the respective function.
-             */
-            execute(options? : ExecuteOptions) : Promise<Migration[]>;
-
-            /**
-             * You can get a list of pending/not yet executed migrations like this:
-             */
-            pending() : Promise<Migration[]>;
-
-            /**
-             * You can get a list of already executed migrations like this:
-             */
-            executed() : Promise<Migration[]>;
-
-            /**
-             * The up method can be used to execute all pending migrations.
-             */
-            up(migration?: string) : Promise<Migration[]>;
-            up(migrations?: string[]) : Promise<Migration[]>;
-            up(options?: UpDownToOptions | UpDownMigrationsOptions ) : Promise<Migration[]>;
-
-            /**
-             * The down method can be used to revert the last executed migration.
-             */
-            down(migration?: string) : Promise<Migration[]>;
-            down(migrations?: string[]) : Promise<Migration[]>;
-            down(options?: UpDownToOptions | UpDownMigrationsOptions ) : Promise<Migration[]>;
-
-        }
-
-        interface UmzugStatic {
-            new (options?: UmzugOptions) : Umzug;
-        }
     }
 
-    var umzug : umzug.UmzugStatic;
-    export = umzug;
+    interface JSONStorageOptions {
+
+        /**
+         * The path to the json storage.
+         * Defaults to process.cwd() + '/umzug.json';
+         */
+        path?: string;
+
+    }
+
+    interface SequelizeStorageOptions {
+
+        /**
+         * The configured instance of Sequelize.
+         * Optional if `model` is passed.
+         */
+        sequelize?: Sequelize.Sequelize;
+
+        /**
+         * The to be used Sequelize model.
+         * Must have column name matching `columnName` option
+         * Optional of `sequelize` is passed.
+         */
+        model?: Sequelize.Model<any, any>;
+
+        /**
+         * The name of the to be used model.
+         * Defaults to 'SequelizeMeta'
+         */
+        modelName?: string;
+
+        /**
+         * The name of table to create if `model` option is not supplied
+         * Defaults to `modelName`
+         */
+        tableName?: string;
+
+        /**
+         * The name of table column holding migration name.
+         * Defaults to 'name'.
+         */
+        columnName: string;
+
+        /**
+         * The type of the column holding migration name.
+         * Defaults to `Sequelize.STRING`
+         */
+        columnType: Sequelize.DataTypeAbstract;
+
+    }
+
+    interface ExecuteOptions {
+        migrations?: Array<string>;
+        method?: string;
+    }
+
+    interface UmzugOptions {
+
+        /**
+         * The storage.
+         * Possible values: 'json', 'sequelize', an object
+         */
+        storage?: string;
+
+        /**
+         * The options for the storage.
+         */
+        storageOptions?: JSONStorageOptions | SequelizeStorageOptions | Object;
+
+        /**
+         * The logging function.
+         * A function that gets executed everytime migrations start and have ended.
+         */
+        logging?: boolean | Function;
+
+        /**
+         * The name of the positive method in migrations.
+         */
+        upName?: string;
+
+        /**
+         * The name of the negative method in migrations.
+         */
+        downName?: string;
+
+        /**
+         * Options for defined migration
+         */
+        migrations?: MigrationOptions;
+
+    }
+
+    interface UpDownToOptions {
+
+        /**
+         * It is also possible to pass the name of a migration in order to
+         * just run the migrations from the current state to the passed
+         * migration name.
+         */
+        to: string;
+
+    }
+
+    interface UpDownMigrationsOptions {
+
+        /**
+         * Running specific migrations while ignoring the right order, can be
+         * done like this:
+         */
+        migrations: Array<string>;
+
+    }
+
+    interface Migration {
+        path: string;
+        file: string;
+    }
+
+    interface Umzug {
+        /**
+         * The execute method is a general purpose function that runs for
+         * every specified migrations the respective function.
+         */
+        execute(options?: ExecuteOptions): Promise<Migration[]>;
+
+        /**
+         * You can get a list of pending/not yet executed migrations like this:
+         */
+        pending(): Promise<Migration[]>;
+
+        /**
+         * You can get a list of already executed migrations like this:
+         */
+        executed(): Promise<Migration[]>;
+
+        /**
+         * The up method can be used to execute all pending migrations.
+         */
+        up(migration?: string): Promise<Migration[]>;
+        up(migrations?: string[]): Promise<Migration[]>;
+        up(options?: UpDownToOptions | UpDownMigrationsOptions): Promise<Migration[]>;
+
+        /**
+         * The down method can be used to revert the last executed migration.
+         */
+        down(migration?: string): Promise<Migration[]>;
+        down(migrations?: string[]): Promise<Migration[]>;
+        down(options?: UpDownToOptions | UpDownMigrationsOptions): Promise<Migration[]>;
+
+    }
+
+    interface UmzugStatic {
+        new (options?: UmzugOptions): Umzug;
+    }
 }
+
+declare var umzug: umzug.UmzugStatic;
+export = umzug;
diff --git a/undertaker/undertaker.d.ts b/undertaker/undertaker.d.ts
index 7bffe57823..3c5da5dd99 100644
--- a/undertaker/undertaker.d.ts
+++ b/undertaker/undertaker.d.ts
@@ -3,115 +3,113 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "undertaker" {
 
-    export interface UndertakerStatic {
-        new(registry?: Registry): Undertaker;
-    }
 
-    export interface Undertaker {
-        task: TaskMethod;
-        /**
-         * Takes a variable amount of strings (taskName) and/or functions (fn)
-         * and returns a function of the composed tasks or functions.
-         * Any taskNames are retrieved from the registry using the get method.
-         *
-         * When the returned function is executed, the tasks or functions will be executed in series,
-         * each waiting for the prior to finish. If an error occurs, execution will stop.
-         * @param task
-         */
-        series(...tasks: (string|Task)[]): Task;
-        /**
-         * Takes a variable amount of strings (taskName) and/or functions (fn)
-         * and returns a function of the composed tasks or functions.
-         * Any taskNames are retrieved from the registry using the get method.
-         *
-         * When the returned function is executed, the tasks or functions will be executed in parallel,
-         * all being executed at the same time. If an error occurs, all execution will complete.
-         * @param tasks
-         */
-        parallel(...tasks: (string|Task)[]): Task;
-        /**
-         * Returns the current registry object.
-         */
-        registry(): Registry;
-        /**
-         * The tasks from the current registry will be transferred to it
-         * and the current registry will be replaced with the new registry.
-         * @param registry
-         */
-        registry(registry: Registry): void;
-        /**
-         * Optionally takes an object (options) and returns an object representing the tree of registered tasks.
-         * @param options
-         */
-        tree(options?: { deep?: boolean }): Node[]|string[];
-        /**
-         * Takes a string or function (task) and returns a timestamp of the last time the task was run successfully.
-         * The time will be the time the task started.  Returns undefined if the task has not been run.
-         * @param task
-         * @param timeResolution
-         */
-        lastRun(task: string, timeResolution?: number): number;
-    }
-
-    export interface Task {
-        (cb?: Function): any;
-    }
-
-    export interface TaskMethod {
-        /**
-         * Returns the registered function.
-         * @param taskName
-         */
-        (taskName: string): Task;
-        /**
-         * Register the task by the taskName.
-         * @param taskName
-         * @param fn
-         */
-        (taskName: string, fn: Task): void;
-        /**
-         * Register the task by the name property of the function.
-         * @param fn
-         */
-        (fn: Task): void;
-        /**
-         * Register the task by the displayName property of the function.
-         * @param fn
-         */
-        (fn: Task & { displayName: string }): void;
-    }
-
-    export interface Registry {
-        /**
-         * receives the undertaker instance to set pre-defined tasks using the task(taskName, fn) method.
-         * @param taker
-         */
-        init(taker: Undertaker): void;
-        /**
-         * returns the task with that name or undefined if no task is registered with that name.
-         * @param taskName
-         */
-        get(taskName: string): Task;
-        /**
-         * add task to the registry. If set modifies a task, it should return the new task.
-         * @param taskName
-         * @param fn
-         */
-        set(taskName: string, fn: Task): void;
-        /**
-         * returns an object listing all tasks in the registry.
-         */
-        tasks(): { [taskName: string]: Task };
-    }
-
-    export interface Node {
-        label: string;
-        type: string;
-        nodes: Node[];
-    }
-
-    export default UndertakerStatic;
+export interface UndertakerStatic {
+    new (registry?: Registry): Undertaker;
 }
 
+export interface Undertaker {
+    task: TaskMethod;
+    /**
+     * Takes a variable amount of strings (taskName) and/or functions (fn)
+     * and returns a function of the composed tasks or functions.
+     * Any taskNames are retrieved from the registry using the get method.
+     *
+     * When the returned function is executed, the tasks or functions will be executed in series,
+     * each waiting for the prior to finish. If an error occurs, execution will stop.
+     * @param task
+     */
+    series(...tasks: (string | Task)[]): Task;
+    /**
+     * Takes a variable amount of strings (taskName) and/or functions (fn)
+     * and returns a function of the composed tasks or functions.
+     * Any taskNames are retrieved from the registry using the get method.
+     *
+     * When the returned function is executed, the tasks or functions will be executed in parallel,
+     * all being executed at the same time. If an error occurs, all execution will complete.
+     * @param tasks
+     */
+    parallel(...tasks: (string | Task)[]): Task;
+    /**
+     * Returns the current registry object.
+     */
+    registry(): Registry;
+    /**
+     * The tasks from the current registry will be transferred to it
+     * and the current registry will be replaced with the new registry.
+     * @param registry
+     */
+    registry(registry: Registry): void;
+    /**
+     * Optionally takes an object (options) and returns an object representing the tree of registered tasks.
+     * @param options
+     */
+    tree(options?: { deep?: boolean }): Node[] | string[];
+    /**
+     * Takes a string or function (task) and returns a timestamp of the last time the task was run successfully.
+     * The time will be the time the task started.  Returns undefined if the task has not been run.
+     * @param task
+     * @param timeResolution
+     */
+    lastRun(task: string, timeResolution?: number): number;
+}
+
+export interface Task {
+    (cb?: Function): any;
+}
+
+export interface TaskMethod {
+    /**
+     * Returns the registered function.
+     * @param taskName
+     */
+    (taskName: string): Task;
+    /**
+     * Register the task by the taskName.
+     * @param taskName
+     * @param fn
+     */
+    (taskName: string, fn: Task): void;
+    /**
+     * Register the task by the name property of the function.
+     * @param fn
+     */
+    (fn: Task): void;
+    /**
+     * Register the task by the displayName property of the function.
+     * @param fn
+     */
+    (fn: Task & { displayName: string }): void;
+}
+
+export interface Registry {
+    /**
+     * receives the undertaker instance to set pre-defined tasks using the task(taskName, fn) method.
+     * @param taker
+     */
+    init(taker: Undertaker): void;
+    /**
+     * returns the task with that name or undefined if no task is registered with that name.
+     * @param taskName
+     */
+    get(taskName: string): Task;
+    /**
+     * add task to the registry. If set modifies a task, it should return the new task.
+     * @param taskName
+     * @param fn
+     */
+    set(taskName: string, fn: Task): void;
+    /**
+     * returns an object listing all tasks in the registry.
+     */
+    tasks(): { [taskName: string]: Task };
+}
+
+export interface Node {
+    label: string;
+    type: string;
+    nodes: Node[];
+}
+
+export default UndertakerStatic;
diff --git a/unique-random/unique-random.d.ts b/unique-random/unique-random.d.ts
index 8daab03b2b..eb07d386b0 100644
--- a/unique-random/unique-random.d.ts
+++ b/unique-random/unique-random.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Yuki Kokubun <https://github.com/Kuniwak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "unique-random" {
-  function uniqueRandom(min: number, max: number): () => number;
 
-  export = uniqueRandom;
-}
+declare function uniqueRandom(min: number, max: number): () => number;
+
+export = uniqueRandom;
diff --git a/update-notifier/update-notifier.d.ts b/update-notifier/update-notifier.d.ts
index bc3d296a06..9818b3aeab 100644
--- a/update-notifier/update-notifier.d.ts
+++ b/update-notifier/update-notifier.d.ts
@@ -3,34 +3,33 @@
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "update-notifier" {
-	function t(settings?:t.ISettings):t.IResult;
 
-	namespace t {
+declare function t(settings?: t.ISettings): t.IResult;
 
-		export interface IResult {
-			update: IUpdateInfo;
-			notify(message?:string):void;
-		}
+declare namespace t {
 
-		export interface ISettings {
-			callback?:(error:any, update?:IUpdateInfo)=>any; // default null
-			packagePath?:string; // default 'package.json'
-			packageName?:string; // default Inferred from packageFile
-			packageVersion?:string; // default Inferred from packageFile
-			updateCheckInterval?:number; // default 1000 * 60 * 60 * 24 (1 day)
-			updateCheckTimeout?:number; // default 20000 (20 secs)
-			registryUrl?:string; // default 'http://registry.npmjs.org/%s'
-		}
+    export interface IResult {
+        update: IUpdateInfo;
+        notify(message?: string): void;
+    }
 
-		export interface IUpdateInfo {
-			latest:string;
-			current:string;
-			type:string;
-			date:string;
-			name:string;
-		}
-	}
+    export interface ISettings {
+        callback?: (error: any, update?: IUpdateInfo) => any; // default null
+        packagePath?: string; // default 'package.json'
+        packageName?: string; // default Inferred from packageFile
+        packageVersion?: string; // default Inferred from packageFile
+        updateCheckInterval?: number; // default 1000 * 60 * 60 * 24 (1 day)
+        updateCheckTimeout?: number; // default 20000 (20 secs)
+        registryUrl?: string; // default 'http://registry.npmjs.org/%s'
+    }
 
-	export = t;
+    export interface IUpdateInfo {
+        latest: string;
+        current: string;
+        type: string;
+        date: string;
+        name: string;
+    }
 }
+
+export = t;
diff --git a/upper-case-first/upper-case-first.d.ts b/upper-case-first/upper-case-first.d.ts
index 9d8e9358b7..7d714974ef 100644
--- a/upper-case-first/upper-case-first.d.ts
+++ b/upper-case-first/upper-case-first.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "upper-case-first" {
-	function upperCaseFirst(string: string): string;
-	export = upperCaseFirst;
-}
+
+declare function upperCaseFirst(string: string): string;
+export = upperCaseFirst;
diff --git a/upper-case/upper-case.d.ts b/upper-case/upper-case.d.ts
index 33ca4038c4..4568ae2b27 100644
--- a/upper-case/upper-case.d.ts
+++ b/upper-case/upper-case.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "upper-case" {
-	function upperCase(string: any, locale?: string): string;
-	export = upperCase;
-}
+
+declare function upperCase(string: any, locale?: string): string;
+export = upperCase;
diff --git a/uri-templates/uri-templates.d.ts b/uri-templates/uri-templates.d.ts
index b338d18bbb..ad8cead946 100644
--- a/uri-templates/uri-templates.d.ts
+++ b/uri-templates/uri-templates.d.ts
@@ -3,16 +3,15 @@
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'uri-templates' {
-	function utpl(template: string): utpl.URITemplate;
 
-	namespace utpl {
-		export interface URITemplate {
-			fillFromObject(vars: Object): string;
-			fill(callback: (varName: string) => string): string;
-			fromUri(uri: string): Object;
-		}
-	}
+declare function utpl(template: string): utpl.URITemplate;
 
-	export = utpl;
+declare namespace utpl {
+    export interface URITemplate {
+        fillFromObject(vars: Object): string;
+        fill(callback: (varName: string) => string): string;
+        fromUri(uri: string): Object;
+    }
 }
+
+export = utpl;
diff --git a/urlrouter/urlrouter.d.ts b/urlrouter/urlrouter.d.ts
index c7a741ac90..d7601a85a0 100644
--- a/urlrouter/urlrouter.d.ts
+++ b/urlrouter/urlrouter.d.ts
@@ -5,65 +5,64 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "urlrouter" {
-	import http = require("http");
 
-	function UrlRouterInternal(handler:(app:UrlRouterInternal.App) => void):UrlRouterInternal.HttpHandler;
+import http = require("http");
 
-	namespace UrlRouterInternal {
+declare function UrlRouterInternal(handler: (app: UrlRouterInternal.App) => void): UrlRouterInternal.HttpHandler;
+
+declare namespace UrlRouterInternal {
 
 
-		interface ServerRequest extends http.ServerRequest {
-			params: any;
-		}
+    interface ServerRequest extends http.ServerRequest {
+        params: any;
+    }
 
-		interface ServerResponse extends http.ServerResponse {
+    interface ServerResponse extends http.ServerResponse {
 
-		}
+    }
 
-		interface App {
-			// https://github.com/visionmedia/node-methods/blob/master/index.js
-			get(urlpattern:string, handler:HttpHandler): void;
-			post(urlpattern:string, handler:HttpHandler): void;
-			put(urlpattern:string, handler:HttpHandler): void;
-			head(urlpattern:string, handler:HttpHandler): void;
-			delete(urlpattern:string, handler:HttpHandler): void;
-			options(urlpattern:string, handler:HttpHandler): void;
-			trace(urlpattern:string, handler:HttpHandler): void;
-			copy(urlpattern:string, handler:HttpHandler): void;
-			lock(urlpattern:string, handler:HttpHandler): void;
-			mkcol(urlpattern:string, handler:HttpHandler): void;
-			move(urlpattern:string, handler:HttpHandler): void;
-			propfind(urlpattern:string, handler:HttpHandler): void;
-			proppatch(urlpattern:string, handler:HttpHandler): void;
-			unlock(urlpattern:string, handler:HttpHandler): void;
-			report(urlpattern:string, handler:HttpHandler): void;
-			mkactivity(urlpattern:string, handler:HttpHandler): void;
-			checkout(urlpattern:string, handler:HttpHandler): void;
-			merge(urlpattern:string, handler:HttpHandler): void;
-			"m-search"(urlpattern:string, handler:HttpHandler): void;
-			notify(urlpattern:string, handler:HttpHandler): void;
-			subscribe(urlpattern:string, handler:HttpHandler): void;
-			unsubscribe(urlpattern:string, handler:HttpHandler): void;
-			patch(urlpattern:string, handler:HttpHandler): void;
-			search(urlpattern:string, handler:HttpHandler): void;
+    interface App {
+        // https://github.com/visionmedia/node-methods/blob/master/index.js
+        get(urlpattern: string, handler: HttpHandler): void;
+        post(urlpattern: string, handler: HttpHandler): void;
+        put(urlpattern: string, handler: HttpHandler): void;
+        head(urlpattern: string, handler: HttpHandler): void;
+        delete(urlpattern: string, handler: HttpHandler): void;
+        options(urlpattern: string, handler: HttpHandler): void;
+        trace(urlpattern: string, handler: HttpHandler): void;
+        copy(urlpattern: string, handler: HttpHandler): void;
+        lock(urlpattern: string, handler: HttpHandler): void;
+        mkcol(urlpattern: string, handler: HttpHandler): void;
+        move(urlpattern: string, handler: HttpHandler): void;
+        propfind(urlpattern: string, handler: HttpHandler): void;
+        proppatch(urlpattern: string, handler: HttpHandler): void;
+        unlock(urlpattern: string, handler: HttpHandler): void;
+        report(urlpattern: string, handler: HttpHandler): void;
+        mkactivity(urlpattern: string, handler: HttpHandler): void;
+        checkout(urlpattern: string, handler: HttpHandler): void;
+        merge(urlpattern: string, handler: HttpHandler): void;
+        "m-search"(urlpattern: string, handler: HttpHandler): void;
+        notify(urlpattern: string, handler: HttpHandler): void;
+        subscribe(urlpattern: string, handler: HttpHandler): void;
+        unsubscribe(urlpattern: string, handler: HttpHandler): void;
+        patch(urlpattern: string, handler: HttpHandler): void;
+        search(urlpattern: string, handler: HttpHandler): void;
 
-			all(urlpattern:string, handler:HttpHandler): void;
-			redirect(urlpattern:string, to:string): void;
-		}
+        all(urlpattern: string, handler: HttpHandler): void;
+        redirect(urlpattern: string, to: string): void;
+    }
 
-		interface Options {
-			paramsName?: string;
-			pageNotFound?: (req:ServerRequest, res:ServerResponse) => void;
-			errorHandler?: (err:Error, req:ServerRequest, res:ServerResponse) => void;
-		}
+    interface Options {
+        paramsName?: string;
+        pageNotFound?: (req: ServerRequest, res: ServerResponse) => void;
+        errorHandler?: (err: Error, req: ServerRequest, res: ServerResponse) => void;
+    }
 
-		function _UrlRouterfunc(handler:(app:App) => void, options?:any):void;
+    function _UrlRouterfunc(handler: (app: App) => void, options?: any): void;
 
-		interface HttpHandler {
-			(req:ServerRequest, res:ServerResponse, next?:() => void): void;
-		}
-	}
-
-	export = UrlRouterInternal;
+    interface HttpHandler {
+        (req: ServerRequest, res: ServerResponse, next?: () => void): void;
+    }
 }
+
+export = UrlRouterInternal;
diff --git a/urlsafe-base64/urlsafe-base64.d.ts b/urlsafe-base64/urlsafe-base64.d.ts
index cb7f5842fc..cd696c7eb7 100644
--- a/urlsafe-base64/urlsafe-base64.d.ts
+++ b/urlsafe-base64/urlsafe-base64.d.ts
@@ -5,46 +5,45 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module 'urlsafe-base64' {
-    /**
-     * Library version.
-     */
-    export var version: string;
 
-    /**
-     * .encode
-     *
-     * return an encoded Buffer as URL Safe Base64
-     *
-     * Note: This function encodes to the RFC 4648 Spec where '+' is encoded
-     *       as '-' and '/' is encoded as '_'. The padding character '=' is
-     *       removed.
-     *
-     * @param {Buffer} buffer
-     * @return {String}
-     * @api public
-     */
-    export function encode(buffer: Buffer): string;
+/**
+ * Library version.
+ */
+declare export var version: string;
 
-    /**
-     * .decode
-     *
-     * return an decoded URL Safe Base64 as Buffer
-     *
-     * @param {String}
-     * @return {Buffer}
-     * @api public
-     */
-    export function decode(base64: string): Buffer;
+/**
+ * .encode
+ *
+ * return an encoded Buffer as URL Safe Base64
+ *
+ * Note: This function encodes to the RFC 4648 Spec where '+' is encoded
+ *       as '-' and '/' is encoded as '_'. The padding character '=' is
+ *       removed.
+ *
+ * @param {Buffer} buffer
+ * @return {String}
+ * @api public
+ */
+declare export function encode(buffer: Buffer): string;
 
-    /**
-     * .validate
-     *
-     * Validates a string if it is URL Safe Base64 encoded.
-     *
-     * @param {String}
-     * @return {Boolean}
-     * @api public
-     */
-    export function validate(base64: string): boolean;
-}
+/**
+ * .decode
+ *
+ * return an decoded URL Safe Base64 as Buffer
+ *
+ * @param {String}
+ * @return {Buffer}
+ * @api public
+ */
+declare export function decode(base64: string): Buffer;
+
+/**
+ * .validate
+ *
+ * Validates a string if it is URL Safe Base64 encoded.
+ *
+ * @param {String}
+ * @return {Boolean}
+ * @api public
+ */
+declare export function validate(base64: string): boolean;
diff --git a/usage/usage.d.ts b/usage/usage.d.ts
index bfe0fcb1ea..407c55788c 100644
--- a/usage/usage.d.ts
+++ b/usage/usage.d.ts
@@ -3,26 +3,23 @@
 // Definitions by: Pascal Vomhoff <https://github.com/pvomhoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "usage" {
 
-  export interface ResultObject {
-    memory:number;
+
+export interface ResultObject {
+    memory: number;
     memoryInfo: {
-      rss:number;
-      vsize:number;
+        rss: number;
+        vsize: number;
     }
-    cpu:number;
-  }
+    cpu: number;
+}
 
-  export interface Options {
-    keepHistory:boolean;
-  }
+export interface Options {
+    keepHistory: boolean;
+}
 
-  export function lookup(pid:number, callback:(err:Error, result:ResultObject) => void):void;
-  export function lookup(pid:number, options:Options, callback:(err:Error, result:ResultObject) => void):void;
+declare export function lookup(pid: number, callback: (err: Error, result: ResultObject) => void): void;
+declare export function lookup(pid: number, options: Options, callback: (err: Error, result: ResultObject) => void): void;
 
-  //Only availible on linux
-  export function clearHistory(pid?:number):void;
-
-
-}
\ No newline at end of file
+//Only availible on linux
+declare export function clearHistory(pid?: number): void;
diff --git a/username/username.d.ts b/username/username.d.ts
index bb329295de..e0bceed481 100644
--- a/username/username.d.ts
+++ b/username/username.d.ts
@@ -3,25 +3,24 @@
 // Definitions by: Klaus Reimer <https://github.com/kayahr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "username" {
+
+/**
+ * Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables.
+ * Falls back to `id -un` on OS X / Linux and `whoami` on Windows in the rare case none of the environment
+ * variables are set. The result is cached.
+ *
+ * @param callback The callback function to call asynchronously with the result.
+ */
+declare function username(callback: (err: Error, result: string) => void): void;
+
+declare namespace username {
     /**
-     * Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables.
-     * Falls back to `id -un` on OS X / Linux and `whoami` on Windows in the rare case none of the environment
-     * variables are set. The result is cached.
+     * Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables. Falls back
+     * to returning an empty string in the reare case none of the environment variables are set.
      *
-     * @param callback The callback function to call asynchronously with the result.
+     * @return The username or empty string if not found.
      */
-    function username(callback: (err: Error, result: string) => void): void;
-
-    namespace username {
-        /**
-         * Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables. Falls back
-         * to returning an empty string in the reare case none of the environment variables are set.
-         *
-         * @return The username or empty string if not found.
-         */
-        function sync(): string;
-    }
-
-    export = username;
+    function sync(): string;
 }
+
+export = username;
diff --git a/utils-merge/utils-merge.d.ts b/utils-merge/utils-merge.d.ts
index 381821dfe1..5868d7ddf4 100644
--- a/utils-merge/utils-merge.d.ts
+++ b/utils-merge/utils-merge.d.ts
@@ -3,8 +3,7 @@
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "utils-merge" {
-	function merge<TA, TB, TResult>(a: TA, b: TB): TResult;
 
-	export default merge;
-}
+declare function merge<TA, TB, TResult>(a: TA, b: TB): TResult;
+
+export default merge;
diff --git a/uuid-1345/uuid-1345.d.ts b/uuid-1345/uuid-1345.d.ts
index 92a5d1026d..bc577d3c75 100644
--- a/uuid-1345/uuid-1345.d.ts
+++ b/uuid-1345/uuid-1345.d.ts
@@ -3,82 +3,81 @@
 // Definitions by: TANAKA Koichi <https://github.com/mugeso/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 ///<reference path="../node/node" />
-declare module "uuid-1345" {
-    export interface UUID {
-        version: string;
-        variant: string;
-        toString(): string;
-        toBuffer(): Buffer;
-    }
 
-    type UuidTypes = string|Buffer|UUID;
-    interface ASCIICallback {
-        (error: string, result: string):void;
-    }
-
-    interface BinaryCallback {
-        (error: string, result: Buffer):void;
-    }
-
-    interface ObjectCallback {
-        (error: string, result: UUID):void;
-    }
-
-    export var namespace: {
-        dns: UUID
-        url: UUID,
-        oid: UUID,
-        x500: UUID
-    };
-
-    export function check(uuid:string|Buffer): {version?:number, variant: string, format: string};
-    export function parse(uuid:string): Buffer;
-    export function stringify(uuid:Buffer): string;
-
-    export function v1():string;
-    export function v1(options:{mac?:boolean}):string;
-    export function v1(options:{encoding:'ascii', mac?:boolean}):string;
-    export function v1(options:{encoding:'binary', mac?:boolean}):Buffer;
-    export function v1(options:{encoding:'object', mac?:boolean}):UUID;
-    export function v1(options:{mac?:boolean}, callback:ASCIICallback):void;
-    export function v1(options:{encoding:'ascii', mac?:boolean}, callback:ASCIICallback):void;
-    export function v1(options:{encoding:'binary', mac?:boolean}, callback:BinaryCallback):void;
-    export function v1(options:{encoding:'object', mac?:boolean}, callback:ObjectCallback):void;
-    export function v1(callback:ASCIICallback):void;
-
-    export function v3(options:{namespace:UuidTypes, name: string}):string;
-    export function v3(options:{encoding:'ascii', namespace:UuidTypes, name: string}):string;
-    export function v3(options:{encoding:'binary', namespace:UuidTypes, name: string}):Buffer;
-    export function v3(options:{encoding:'object', namespace:UuidTypes, name: string}):UUID;
-    export function v3(options:{namespace:UuidTypes, name: string}, callback:ASCIICallback):void;
-    export function v3(options:{encoding:'ascii', namespace:UuidTypes, name: string}, callback:ASCIICallback):void;
-    export function v3(options:{encoding:'binary', namespace:UuidTypes, name: string}, callback:BinaryCallback):void;
-    export function v3(options:{encoding:'object', namespace:UuidTypes, name: string}, callback:ObjectCallback):void;
-
-    export function v4():string;
-    export function v4(options:{encoding:'ascii'}):string;
-    export function v4(options:{encoding:'binary'}):Buffer;
-    export function v4(options:{encoding:'object'}):UUID;
-    export function v4(options:{encoding:'ascii'}, callback:ASCIICallback):void;
-    export function v4(options:{encoding:'binary'}, callback:BinaryCallback):void;
-    export function v4(options:{encoding:'object'}, callback:ObjectCallback):void;
-    export function v4(callback:ASCIICallback):void;
-
-    export function v4fast():string;
-    export function v4fast(options:{encoding:'ascii'}):string;
-    export function v4fast(options:{encoding:'binary'}):Buffer;
-    export function v4fast(options:{encoding:'object'}):UUID;
-    export function v4fast(options:{encoding:'ascii'}, callback:ASCIICallback):void;
-    export function v4fast(options:{encoding:'binary'}, callback:BinaryCallback):void;
-    export function v4fast(options:{encoding:'object'}, callback:ObjectCallback):void;
-    export function v4fast(callback:ASCIICallback):void;
-
-    export function v5(options:{namespace:UuidTypes, name: string}):string;
-    export function v5(options:{encoding:'ascii', namespace:UuidTypes, name: string}):string;
-    export function v5(options:{encoding:'binary', namespace:UuidTypes, name: string}):Buffer;
-    export function v5(options:{encoding:'object', namespace:UuidTypes, name: string}):UUID;
-    export function v5(options:{namespace:UuidTypes, name: string}, callback:ASCIICallback):void;
-    export function v5(options:{encoding:'ascii', namespace:UuidTypes, name: string}, callback:ASCIICallback):void;
-    export function v5(options:{encoding:'binary', namespace:UuidTypes, name: string}, callback:BinaryCallback):void;
-    export function v5(options:{encoding:'object', namespace:UuidTypes, name: string}, callback:ObjectCallback):void;
+export interface UUID {
+    version: string;
+    variant: string;
+    toString(): string;
+    toBuffer(): Buffer;
 }
+
+type UuidTypes = string | Buffer | UUID;
+interface ASCIICallback {
+    (error: string, result: string): void;
+}
+
+interface BinaryCallback {
+    (error: string, result: Buffer): void;
+}
+
+interface ObjectCallback {
+    (error: string, result: UUID): void;
+}
+
+declare export var namespace: {
+    dns: UUID
+    url: UUID,
+    oid: UUID,
+    x500: UUID
+};
+
+declare export function check(uuid: string | Buffer): { version?: number, variant: string, format: string };
+declare export function parse(uuid: string): Buffer;
+declare export function stringify(uuid: Buffer): string;
+
+declare export function v1(): string;
+declare export function v1(options: { mac?: boolean }): string;
+declare export function v1(options: { encoding: 'ascii', mac?: boolean }): string;
+declare export function v1(options: { encoding: 'binary', mac?: boolean }): Buffer;
+declare export function v1(options: { encoding: 'object', mac?: boolean }): UUID;
+declare export function v1(options: { mac?: boolean }, callback: ASCIICallback): void;
+declare export function v1(options: { encoding: 'ascii', mac?: boolean }, callback: ASCIICallback): void;
+declare export function v1(options: { encoding: 'binary', mac?: boolean }, callback: BinaryCallback): void;
+declare export function v1(options: { encoding: 'object', mac?: boolean }, callback: ObjectCallback): void;
+declare export function v1(callback: ASCIICallback): void;
+
+declare export function v3(options: { namespace: UuidTypes, name: string }): string;
+declare export function v3(options: { encoding: 'ascii', namespace: UuidTypes, name: string }): string;
+declare export function v3(options: { encoding: 'binary', namespace: UuidTypes, name: string }): Buffer;
+declare export function v3(options: { encoding: 'object', namespace: UuidTypes, name: string }): UUID;
+declare export function v3(options: { namespace: UuidTypes, name: string }, callback: ASCIICallback): void;
+declare export function v3(options: { encoding: 'ascii', namespace: UuidTypes, name: string }, callback: ASCIICallback): void;
+declare export function v3(options: { encoding: 'binary', namespace: UuidTypes, name: string }, callback: BinaryCallback): void;
+declare export function v3(options: { encoding: 'object', namespace: UuidTypes, name: string }, callback: ObjectCallback): void;
+
+declare export function v4(): string;
+declare export function v4(options: { encoding: 'ascii' }): string;
+declare export function v4(options: { encoding: 'binary' }): Buffer;
+declare export function v4(options: { encoding: 'object' }): UUID;
+declare export function v4(options: { encoding: 'ascii' }, callback: ASCIICallback): void;
+declare export function v4(options: { encoding: 'binary' }, callback: BinaryCallback): void;
+declare export function v4(options: { encoding: 'object' }, callback: ObjectCallback): void;
+declare export function v4(callback: ASCIICallback): void;
+
+declare export function v4fast(): string;
+declare export function v4fast(options: { encoding: 'ascii' }): string;
+declare export function v4fast(options: { encoding: 'binary' }): Buffer;
+declare export function v4fast(options: { encoding: 'object' }): UUID;
+declare export function v4fast(options: { encoding: 'ascii' }, callback: ASCIICallback): void;
+declare export function v4fast(options: { encoding: 'binary' }, callback: BinaryCallback): void;
+declare export function v4fast(options: { encoding: 'object' }, callback: ObjectCallback): void;
+declare export function v4fast(callback: ASCIICallback): void;
+
+declare export function v5(options: { namespace: UuidTypes, name: string }): string;
+declare export function v5(options: { encoding: 'ascii', namespace: UuidTypes, name: string }): string;
+declare export function v5(options: { encoding: 'binary', namespace: UuidTypes, name: string }): Buffer;
+declare export function v5(options: { encoding: 'object', namespace: UuidTypes, name: string }): UUID;
+declare export function v5(options: { namespace: UuidTypes, name: string }, callback: ASCIICallback): void;
+declare export function v5(options: { encoding: 'ascii', namespace: UuidTypes, name: string }, callback: ASCIICallback): void;
+declare export function v5(options: { encoding: 'binary', namespace: UuidTypes, name: string }, callback: BinaryCallback): void;
+declare export function v5(options: { encoding: 'object', namespace: UuidTypes, name: string }, callback: ObjectCallback): void;
diff --git a/uuid/UUID.d.ts b/uuid/UUID.d.ts
index 164cf503c8..b23a9ddc67 100644
--- a/uuid/UUID.d.ts
+++ b/uuid/UUID.d.ts
@@ -3,81 +3,80 @@
 // Definitions by: Jason Jarrett <https://github.com/staxmanade/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "UUID" {
-
-    interface UUID {
-        intFields: UUIDArray<number>;
-        bitFields: UUIDArray<string>;
-        hexFields: UUIDArray<string>;
-        version: number;
-        bitString: string;
-        hexString: string;
-        urn: string;
 
 
-        /**
-         * Tests if two {@link UUID} objects are equal.
-         * @param {UUID} uuid
-         * @returns {bool} True if two {@link UUID} objects are equal.
-         */
-        equals(uuid:UUID): boolean;
-
-        /**
-         * Returns UUID string representation.
-         * @returns {string} {@link UUID#hexString}.
-         */
-        toString(): string;
-    }
-
-    interface UUIDArray<T> extends Array<T> {
-        timeLow: string;
-        timeMid: string;
-        timeHiAndVersion: string;
-        clockSeqHiAndReserved: string;
-        clockSeqLow: string;
-        node: string;
-    }
-
-    /**
-     * The simplest function to get an UUID string.
-     * @returns {string} A version 4 UUID string.
-     */
-    export function generate(): string;
-
-    /**
-     * Generates a version 4 {@link UUID}.
-     * @returns {UUID} A version 4 {@link UUID} object.
-     * @since 3.0
-     */
-    export function genV4(): UUID;
+interface UUID {
+    intFields: UUIDArray<number>;
+    bitFields: UUIDArray<string>;
+    hexFields: UUIDArray<string>;
+    version: number;
+    bitString: string;
+    hexString: string;
+    urn: string;
 
 
     /**
-     * Generates a version 1 {@link UUID}.
-     * @returns {UUID} A version 1 {@link UUID} object.
-     * @since 3.0
+     * Tests if two {@link UUID} objects are equal.
+     * @param {UUID} uuid
+     * @returns {bool} True if two {@link UUID} objects are equal.
      */
-    export function genV1(): UUID;
+    equals(uuid: UUID): boolean;
 
     /**
-     * Converts hexadecimal UUID string to an {@link UUID} object.
-     * @param {string} uuid UUID hexadecimal string representation ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
-     * @returns {UUID} {@link UUID} object or null.
-     * @since 3.0
+     * Returns UUID string representation.
+     * @returns {string} {@link UUID#hexString}.
      */
-    export function parse(uuid:string): UUID;
-
-
-    /**
-     * Re-initializes version 1 UUID state.
-     * @since 3.0
-     */
-    export function resetState(): void;
-
-    /**
-     * Reinstalls {@link UUID.generate} method to emulate the interface of UUID.js version 2.x.
-     * @since 3.1
-     * @deprecated Version 2.x. compatible interface is not recommended.
-     */
-    export function makeBackwardCompatible(): void;
+    toString(): string;
 }
+
+interface UUIDArray<T> extends Array<T> {
+    timeLow: string;
+    timeMid: string;
+    timeHiAndVersion: string;
+    clockSeqHiAndReserved: string;
+    clockSeqLow: string;
+    node: string;
+}
+
+/**
+ * The simplest function to get an UUID string.
+ * @returns {string} A version 4 UUID string.
+ */
+declare export function generate(): string;
+
+/**
+ * Generates a version 4 {@link UUID}.
+ * @returns {UUID} A version 4 {@link UUID} object.
+ * @since 3.0
+ */
+declare export function genV4(): UUID;
+
+
+/**
+ * Generates a version 1 {@link UUID}.
+ * @returns {UUID} A version 1 {@link UUID} object.
+ * @since 3.0
+ */
+declare export function genV1(): UUID;
+
+/**
+ * Converts hexadecimal UUID string to an {@link UUID} object.
+ * @param {string} uuid UUID hexadecimal string representation ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
+ * @returns {UUID} {@link UUID} object or null.
+ * @since 3.0
+ */
+declare export function parse(uuid: string): UUID;
+
+
+/**
+ * Re-initializes version 1 UUID state.
+ * @since 3.0
+ */
+declare export function resetState(): void;
+
+/**
+ * Reinstalls {@link UUID.generate} method to emulate the interface of UUID.js version 2.x.
+ * @since 3.1
+ * @deprecated Version 2.x. compatible interface is not recommended.
+ */
+declare export function makeBackwardCompatible(): void;
diff --git a/vec3/vec3.d.ts b/vec3/vec3.d.ts
index 5f94ec1795..10b201f609 100644
--- a/vec3/vec3.d.ts
+++ b/vec3/vec3.d.ts
@@ -3,32 +3,31 @@
 // Definitions by: Xavier Stouder <https://github.com/xstoudi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "vec3" {
-    class Vec3 {
-        constructor(x: number, y: number, z: number);
-        constructor(location: number[]);
-        constructor(location: {x: number; y: number; z: number});
-        constructor(locationStr: string);
 
-        set(x: number, y: number, z: number): Vec3;
-        update(other: Vec3): Vec3;
-        floored(): Vec3;
-        floor(): Vec3;
-        offset(dx: number, dy: number, dz: number): Vec3;
-        translate(dx: number, dy: number, dz: number): Vec3;
-        add(other: Vec3): Vec3;
-        substract(other: Vec3): Vec3;
-        plus(other: Vec3): Vec3;
-        minus(other: Vec3): Vec3;
-        scaled(scalar: number): Vec3;
-        abs(): Vec3
-        volume(): number;
-        modulus(): Vec3;
-        distanceTo(other: Vec3): number;
-        equals(other: Vec3): boolean;
-        toString(): string;
-        clone(): Vec3;
-        min(other: Vec3): Vec3;
-        max(other: Vec3): Vec3;
-    }
+declare class Vec3 {
+    constructor(x: number, y: number, z: number);
+    constructor(location: number[]);
+    constructor(location: { x: number; y: number; z: number });
+    constructor(locationStr: string);
+
+    set(x: number, y: number, z: number): Vec3;
+    update(other: Vec3): Vec3;
+    floored(): Vec3;
+    floor(): Vec3;
+    offset(dx: number, dy: number, dz: number): Vec3;
+    translate(dx: number, dy: number, dz: number): Vec3;
+    add(other: Vec3): Vec3;
+    substract(other: Vec3): Vec3;
+    plus(other: Vec3): Vec3;
+    minus(other: Vec3): Vec3;
+    scaled(scalar: number): Vec3;
+    abs(): Vec3
+    volume(): number;
+    modulus(): Vec3;
+    distanceTo(other: Vec3): number;
+    equals(other: Vec3): boolean;
+    toString(): string;
+    clone(): Vec3;
+    min(other: Vec3): Vec3;
+    max(other: Vec3): Vec3;
 }
diff --git a/verror/verror.d.ts b/verror/verror.d.ts
index 65b73ef174..2c88ddb8e8 100644
--- a/verror/verror.d.ts
+++ b/verror/verror.d.ts
@@ -3,61 +3,60 @@
 // Definitions by: Sven Reglitzki <https://github.com/svi3c/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "verror" {
 
-    /*
-     * VError([cause], fmt[, arg...]): Like JavaScript's built-in Error class, but
-     * supports a "cause" argument (another error) and a printf-style message.  The
-     * cause argument can be null or omitted entirely.
-     *
-     * Examples:
-     *
-     * CODE                                    MESSAGE
-     * new VError('something bad happened')    "something bad happened"
-     * new VError('missing file: "%s"', file)  "missing file: "/etc/passwd"
-     *   with file = '/etc/passwd'
-     * new VError(err, 'open failed')          "open failed: file not found"
-     *   with err.message = 'file not found'
-     */
-    class VError extends Error {
-        static VError: typeof VError;
-        static SError: typeof SError;
-        static MultiError: typeof MultiError;
-        static WError: typeof WError;
-        cause():Error;
-        constructor(cause: Error, message: string, ...params: any[]);
-        constructor(message: string, ...params: any[]);
-    }
 
-    /*
-     * SError is like VError, but stricter about types.  You cannot pass "null" or
-     * "undefined" as string arguments to the formatter.  Since SError is only a
-     * different function, not really a different class, we don't set
-     * SError.prototype.name.
-     */
-    class SError extends VError {
-    }
-
-    /*
-     * Represents a collection of errors for the purpose of consumers that generally
-     * only deal with one error.  Callers can extract the individual errors
-     * contained in this object, but may also just treat it as a normal single
-     * error, in which case a summary message will be printed.
-     */
-    class MultiError extends VError {
-        constructor(errors: Error[]);
-    }
-
-    /*
-     * Like JavaScript's built-in Error class, but supports a "cause" argument which
-     * is wrapped, not "folded in" as with VError.	Accepts a printf-style message.
-     * The cause argument can be null.
-     */
-    class WError extends Error {
-        cause():Error;
-        constructor(cause: Error, message: string, ...params: any[]);
-        constructor(message: string, ...params: any[]);
-    }
-
-    export = VError;
+/*
+ * VError([cause], fmt[, arg...]): Like JavaScript's built-in Error class, but
+ * supports a "cause" argument (another error) and a printf-style message.  The
+ * cause argument can be null or omitted entirely.
+ *
+ * Examples:
+ *
+ * CODE                                    MESSAGE
+ * new VError('something bad happened')    "something bad happened"
+ * new VError('missing file: "%s"', file)  "missing file: "/etc/passwd"
+ *   with file = '/etc/passwd'
+ * new VError(err, 'open failed')          "open failed: file not found"
+ *   with err.message = 'file not found'
+ */
+declare class VError extends Error {
+    static VError: typeof VError;
+    static SError: typeof SError;
+    static MultiError: typeof MultiError;
+    static WError: typeof WError;
+    cause(): Error;
+    constructor(cause: Error, message: string, ...params: any[]);
+    constructor(message: string, ...params: any[]);
 }
+
+/*
+ * SError is like VError, but stricter about types.  You cannot pass "null" or
+ * "undefined" as string arguments to the formatter.  Since SError is only a
+ * different function, not really a different class, we don't set
+ * SError.prototype.name.
+ */
+declare class SError extends VError {
+}
+
+/*
+ * Represents a collection of errors for the purpose of consumers that generally
+ * only deal with one error.  Callers can extract the individual errors
+ * contained in this object, but may also just treat it as a normal single
+ * error, in which case a summary message will be printed.
+ */
+declare class MultiError extends VError {
+    constructor(errors: Error[]);
+}
+
+/*
+ * Like JavaScript's built-in Error class, but supports a "cause" argument which
+ * is wrapped, not "folded in" as with VError.	Accepts a printf-style message.
+ * The cause argument can be null.
+ */
+declare class WError extends Error {
+    cause(): Error;
+    constructor(cause: Error, message: string, ...params: any[]);
+    constructor(message: string, ...params: any[]);
+}
+
+export = VError;
diff --git a/vinyl-buffer/vinyl-buffer.d.ts b/vinyl-buffer/vinyl-buffer.d.ts
index 40fbb6f1f0..624c70e367 100644
--- a/vinyl-buffer/vinyl-buffer.d.ts
+++ b/vinyl-buffer/vinyl-buffer.d.ts
@@ -5,15 +5,13 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "vinyl-buffer" {
-    namespace buffer {
-        interface Buffer {
-            (): NodeJS.ReadWriteStream;
-        }
+
+declare namespace buffer {
+    interface Buffer {
+        (): NodeJS.ReadWriteStream;
     }
-
-    var buffer: buffer.Buffer;
-
-    export = buffer;
 }
 
+declare var buffer: buffer.Buffer;
+
+export = buffer;
diff --git a/vinyl-paths/vinyl-paths.d.ts b/vinyl-paths/vinyl-paths.d.ts
index 15730cbd33..d8594089be 100644
--- a/vinyl-paths/vinyl-paths.d.ts
+++ b/vinyl-paths/vinyl-paths.d.ts
@@ -5,30 +5,28 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "vinyl-paths" {
 
-    namespace paths {
-        interface Paths extends NodeJS.ReadWriteStream {
-            paths: string[];
-        }
 
-        interface PathsStatic {
-            /**
-             * Use the file paths from a gulp pipeline in vanilla node module
-             * @param callback The optionally supplied callback will get a file path for every file and is expected
-             * to call the callback when done. An array of the file paths so far is available as a paths property
-             * on the stream.
-             */
-            (callback?: Callback): Paths;
-        }
-
-        interface Callback {
-            //TODO: Function is gulp.ITaskCallback, which is currently invisible
-            (path: string, callback: Function): any;
-        }
+declare namespace paths {
+    interface Paths extends NodeJS.ReadWriteStream {
+        paths: string[];
     }
 
-    var paths: paths.PathsStatic;
-    export = paths;
+    interface PathsStatic {
+        /**
+         * Use the file paths from a gulp pipeline in vanilla node module
+         * @param callback The optionally supplied callback will get a file path for every file and is expected
+         * to call the callback when done. An array of the file paths so far is available as a paths property
+         * on the stream.
+         */
+        (callback?: Callback): Paths;
+    }
+
+    interface Callback {
+        //TODO: Function is gulp.ITaskCallback, which is currently invisible
+        (path: string, callback: Function): any;
+    }
 }
 
+declare var paths: paths.PathsStatic;
+export = paths;
diff --git a/vinyl-source-stream/vinyl-source-stream.d.ts b/vinyl-source-stream/vinyl-source-stream.d.ts
index e8fadee5f5..e8da3be94d 100644
--- a/vinyl-source-stream/vinyl-source-stream.d.ts
+++ b/vinyl-source-stream/vinyl-source-stream.d.ts
@@ -5,8 +5,7 @@
 
 /// <reference path="../node/node.d.ts"/>
 
-declare module "vinyl-source-stream" {
-    function vinylSourceStream(filename: string): NodeJS.ReadWriteStream;
-    namespace vinylSourceStream {}
-    export = vinylSourceStream;
-}
+
+declare function vinylSourceStream(filename: string): NodeJS.ReadWriteStream;
+declare namespace vinylSourceStream { }
+export = vinylSourceStream;
diff --git a/vinyl/vinyl-0.4.3.d.ts b/vinyl/vinyl-0.4.3.d.ts
index 507d265a70..0acb50567d 100644
--- a/vinyl/vinyl-0.4.3.d.ts
+++ b/vinyl/vinyl-0.4.3.d.ts
@@ -5,104 +5,102 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "vinyl" {
 
-	import fs = require("fs");
 
-	/**
-	 * A virtual file format.
-	 */
-	class File {
-		constructor(options?: {
-			/**
-			* Default: process.cwd()
-			*/
-			cwd?: string;
-			/**
-			 * Used for relative pathing. Typically where a glob starts.
-			 */
-			base?: string;
-			/**
-			 * Full path to the file.
-			 */
-			path?: string;
-			/**
-			 * Path history. Has no effect if options.path is passed.
-			 */
-			history?: string[];
-			/**
-			 * The result of an fs.stat call. See fs.Stats for more information.
-			 */
-			stat?: fs.Stats;
-			/**
-			 * File contents.
-			 * Type: Buffer, Stream, or null
-			 */
-			contents?: Buffer | NodeJS.ReadWriteStream;
-		});
+import fs = require("fs");
 
-		/**
-		 * Default: process.cwd()
-		 */
-		public cwd: string;
-		/**
-		 * Used for relative pathing. Typically where a glob starts.
-		 */
-		public base: string;
-		/**
-		 * Full path to the file.
-		 */
-		public path: string;
-		public stat: fs.Stats;
-		/**
-		 * Type: Buffer|Stream|null (Default: null)
-		 */
-		public contents: Buffer | NodeJS.ReadableStream;
-		/**
-		 * Returns path.relative for the file base and file path.
-		 * Example:
-		 *  var file = new File({
-		 *    cwd: "/",
-		 *    base: "/test/",
-		 *    path: "/test/file.js"
-		 *  });
-		 *  console.log(file.relative); // file.js
-		 */
-		public relative: string;
+/**
+ * A virtual file format.
+ */
+declare class File {
+    constructor(options?: {
+        /**
+        * Default: process.cwd()
+        */
+        cwd?: string;
+        /**
+         * Used for relative pathing. Typically where a glob starts.
+         */
+        base?: string;
+        /**
+         * Full path to the file.
+         */
+        path?: string;
+        /**
+         * Path history. Has no effect if options.path is passed.
+         */
+        history?: string[];
+        /**
+         * The result of an fs.stat call. See fs.Stats for more information.
+         */
+        stat?: fs.Stats;
+        /**
+         * File contents.
+         * Type: Buffer, Stream, or null
+         */
+        contents?: Buffer | NodeJS.ReadWriteStream;
+    });
 
-		public isBuffer(): boolean;
+    /**
+     * Default: process.cwd()
+     */
+    public cwd: string;
+    /**
+     * Used for relative pathing. Typically where a glob starts.
+     */
+    public base: string;
+    /**
+     * Full path to the file.
+     */
+    public path: string;
+    public stat: fs.Stats;
+    /**
+     * Type: Buffer|Stream|null (Default: null)
+     */
+    public contents: Buffer | NodeJS.ReadableStream;
+    /**
+     * Returns path.relative for the file base and file path.
+     * Example:
+     *  var file = new File({
+     *    cwd: "/",
+     *    base: "/test/",
+     *    path: "/test/file.js"
+     *  });
+     *  console.log(file.relative); // file.js
+     */
+    public relative: string;
 
-		public isStream(): boolean;
+    public isBuffer(): boolean;
 
-		public isNull(): boolean;
+    public isStream(): boolean;
 
-		public isDirectory(): boolean;
+    public isNull(): boolean;
 
-		/**
-		 * Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
-		 */
-		public clone(opts?: { contents?: boolean }): File;
+    public isDirectory(): boolean;
 
-		/**
-		 * If file.contents is a Buffer, it will write it to the stream.
-		 * If file.contents is a Stream, it will pipe it to the stream.
-		 * If file.contents is null, it will do nothing.
-		 */
-		public pipe<T extends NodeJS.ReadWriteStream>(
-			stream: T,
-			opts?: {
-				/**
-				 * If false, the destination stream will not be ended (same as node core).
-				 */
-				end?: boolean;
-			}): T;
+    /**
+     * Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
+     */
+    public clone(opts?: { contents?: boolean }): File;
 
-		/**
-		 * Returns a pretty String interpretation of the File. Useful for console.log.
-		 */
-		public inspect(): string;
-	}
+    /**
+     * If file.contents is a Buffer, it will write it to the stream.
+     * If file.contents is a Stream, it will pipe it to the stream.
+     * If file.contents is null, it will do nothing.
+     */
+    public pipe<T extends NodeJS.ReadWriteStream>(
+        stream: T,
+        opts?: {
+            /**
+             * If false, the destination stream will not be ended (same as node core).
+             */
+            end?: boolean;
+        }): T;
 
-	export = File;
+    /**
+     * Returns a pretty String interpretation of the File. Useful for console.log.
+     */
+    public inspect(): string;
+}
 
-}
\ No newline at end of file
+export = File;
diff --git a/vinyl/vinyl.d.ts b/vinyl/vinyl.d.ts
index bcee5c6614..212a5b6828 100644
--- a/vinyl/vinyl.d.ts
+++ b/vinyl/vinyl.d.ts
@@ -5,143 +5,141 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "vinyl" {
 
-	import fs = require("fs");
 
-	/**
-	 * A virtual file format.
-	 */
-	class File {
-		constructor(options?: {
+import fs = require("fs");
 
-			/**
-			* Default: process.cwd()
-			*/
-			cwd?: string;
+/**
+ * A virtual file format.
+ */
+declare class File {
+    constructor(options?: {
 
-			/**
-			 * Used for relative pathing. Typically where a glob starts.
-			 */
-			base?: string;
+        /**
+        * Default: process.cwd()
+        */
+        cwd?: string;
 
-			/**
-			 * Full path to the file.
-			 */
-			path?: string;
+        /**
+         * Used for relative pathing. Typically where a glob starts.
+         */
+        base?: string;
 
-			/**
-			 * Path history. Has no effect if options.path is passed.
-			 */
-			history?: string[];
+        /**
+         * Full path to the file.
+         */
+        path?: string;
 
-			/**
-			 * The result of an fs.stat call. See fs.Stats for more information.
-			 */
-			stat?: fs.Stats;
+        /**
+         * Path history. Has no effect if options.path is passed.
+         */
+        history?: string[];
 
-			/**
-			 * File contents.
-			 * Type: Buffer, Stream, or null
-			 */
-			contents?: Buffer | NodeJS.ReadWriteStream;
-		});
+        /**
+         * The result of an fs.stat call. See fs.Stats for more information.
+         */
+        stat?: fs.Stats;
 
-		/**
-		 * Default: process.cwd()
-		 */
-		public cwd: string;
+        /**
+         * File contents.
+         * Type: Buffer, Stream, or null
+         */
+        contents?: Buffer | NodeJS.ReadWriteStream;
+    });
 
-		/**
-		 * Used for relative pathing. Typically where a glob starts.
-		 */
-		public dirname: string;
-		public basename: string;
-		public base: string;
+    /**
+     * Default: process.cwd()
+     */
+    public cwd: string;
 
-		/**
-		 * Full path to the file.
-		 */
-		public path: string;
-		public stat: fs.Stats;
+    /**
+     * Used for relative pathing. Typically where a glob starts.
+     */
+    public dirname: string;
+    public basename: string;
+    public base: string;
 
-		/**
-		 * Gets and sets stem (filename without suffix) for the file path.
-		 */
-		public stem: string;
+    /**
+     * Full path to the file.
+     */
+    public path: string;
+    public stat: fs.Stats;
 
-		/**
-		 * Gets and sets path.extname for the file path
-		 */
-		public extname: string;
+    /**
+     * Gets and sets stem (filename without suffix) for the file path.
+     */
+    public stem: string;
 
-		/**
-		 * Array of path values the file object has had
-		 */
-		public history: string[];
+    /**
+     * Gets and sets path.extname for the file path
+     */
+    public extname: string;
 
-		/**
-		 * Type: Buffer|Stream|null (Default: null)
-		 */
-		public contents: Buffer | NodeJS.ReadableStream;
+    /**
+     * Array of path values the file object has had
+     */
+    public history: string[];
 
-		/**
-		 * Returns path.relative for the file base and file path.
-		 * Example:
-		 *  var file = new File({
-		 *    cwd: "/",
-		 *    base: "/test/",
-		 *    path: "/test/file.js"
-		 *  });
-		 *  console.log(file.relative); // file.js
-		 */
-		public relative: string;
+    /**
+     * Type: Buffer|Stream|null (Default: null)
+     */
+    public contents: Buffer | NodeJS.ReadableStream;
 
-		/**
-		 * Returns true if file.contents is a Buffer.
-		 */
-		public isBuffer(): boolean;
+    /**
+     * Returns path.relative for the file base and file path.
+     * Example:
+     *  var file = new File({
+     *    cwd: "/",
+     *    base: "/test/",
+     *    path: "/test/file.js"
+     *  });
+     *  console.log(file.relative); // file.js
+     */
+    public relative: string;
 
-		/**
-		 * Returns true if file.contents is a Stream.
-		 */
-		public isStream(): boolean;
+    /**
+     * Returns true if file.contents is a Buffer.
+     */
+    public isBuffer(): boolean;
 
-		/**
-		 * Returns true if file.contents is null.
-		 */
-		public isNull(): boolean;
+    /**
+     * Returns true if file.contents is a Stream.
+     */
+    public isStream(): boolean;
 
-		/**
-		 * Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
-		 */
-		public clone(opts?: { contents?: boolean, deep?:boolean }): File;
+    /**
+     * Returns true if file.contents is null.
+     */
+    public isNull(): boolean;
 
-		/**
-		 * If file.contents is a Buffer, it will write it to the stream.
-		 * If file.contents is a Stream, it will pipe it to the stream.
-		 * If file.contents is null, it will do nothing.
-		 */
-		public pipe<T extends NodeJS.ReadWriteStream>(
-			stream: T,
-			opts?: {
-				/**
-				 * If false, the destination stream will not be ended (same as node core).
-				 */
-				end?: boolean;
-			}): T;
+    /**
+     * Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
+     */
+    public clone(opts?: { contents?: boolean, deep?: boolean }): File;
 
-		/**
-		 * Returns a pretty String interpretation of the File. Useful for console.log.
-		 */
-		public inspect(): string;
+    /**
+     * If file.contents is a Buffer, it will write it to the stream.
+     * If file.contents is a Stream, it will pipe it to the stream.
+     * If file.contents is null, it will do nothing.
+     */
+    public pipe<T extends NodeJS.ReadWriteStream>(
+        stream: T,
+        opts?: {
+            /**
+             * If false, the destination stream will not be ended (same as node core).
+             */
+            end?: boolean;
+        }): T;
 
-		/**
-		 * Checks if a given object is a vinyl file.
-		 */
-		public static isVinyl(obj: any): boolean;
-	}
-
-	export = File;
+    /**
+     * Returns a pretty String interpretation of the File. Useful for console.log.
+     */
+    public inspect(): string;
 
+    /**
+     * Checks if a given object is a vinyl file.
+     */
+    public static isVinyl(obj: any): boolean;
 }
+
+export = File;
diff --git a/wampy/wampy.d.ts b/wampy/wampy.d.ts
index 650a8a91a5..658b82368e 100644
--- a/wampy/wampy.d.ts
+++ b/wampy/wampy.d.ts
@@ -3,91 +3,90 @@
 // Definitions by: Konstantin Burkalev <https://github.com/KSDaemon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "wampy" {
 
-    interface WampyOptions {
-        autoReconnect?: boolean;
-        reconnectInterval?: number;
-        maxRetries?: number;
-        transportEncoding?: string;
-        realm?: string;
-        helloCustomDetails?: any;
-        onConnect?: () => void;
-        onClose?: () => void;
-        onError?: () => void;
-        onReconnect?: () => void;
-        ws?: any;
-        msgpackCoder?: any;
-    }
 
-    interface WampyOpStatus {
-        code: number;
-        description: string;
-        reqId?: number;
-    }
-
-    interface SuccessErrorCallbacksHash {
-        onSuccess?: (data: any) => void;
-        onError?: (err: string) => void;
-    }
-
-    interface SubscribeCallbacksHash extends SuccessErrorCallbacksHash {
-        onEvent: (data: any) => void;
-    }
-
-    interface RegisterCallbacksHash extends SuccessErrorCallbacksHash {
-        rpc: (data: any) => any;
-    }
-
-    interface CallSuccessErrorCallbacksHash {
-        onSuccess: (data: any) => any;
-        onError?: (err: string) => void;
-    }
-
-    interface AdvancedOptions {
-        exclude?: number | number[];
-        eligible?: number | number[];
-        exclude_me?: boolean;
-        disclose_me?: boolean;
-    }
-
-    interface CallAdvancedOptions extends AdvancedOptions {
-        receive_progress?: boolean;
-    }
-
-    interface CancelAdvancedOptions {
-        mode?: "skip" | "kill" | "killnowait";
-    }
-
-    interface Wampy {
-        options(opts?: WampyOptions): WampyOptions | Wampy;
-        getOpStatus(): WampyOpStatus;
-        getSessionId(): number;
-        connect(url?: string): Wampy;
-        disconnect(): Wampy;
-        abort(): Wampy;
-        subscribe(topicURI: string, callbacks: (((data: any) => void) | SubscribeCallbacksHash)): Wampy;
-        unsubscribe(topicURI: string, callbacks?: (((data: any) => void) | SubscribeCallbacksHash)): Wampy;
-        publish(topicURI: string,
-                payload?: any,
-                callbacks?: SuccessErrorCallbacksHash,
-                advancedOptions?: AdvancedOptions): Wampy;
-        call(topicURI: string,
-             payload?: any,
-             callbacks?: (((data: any) => void) | CallSuccessErrorCallbacksHash),
-             advancedOptions?: CallAdvancedOptions): Wampy;
-        cancel(reqId: number,
-               callbacks?: ((() => void) | SuccessErrorCallbacksHash),
-               advancedOptions?: CancelAdvancedOptions): Wampy;
-        register(topicURI: string, callbacks: (((data: any) => any) | RegisterCallbacksHash)): Wampy;
-        unregister(topicURI: string, callbacks?: ((() => void) | SuccessErrorCallbacksHash)): Wampy;
-    }
-
-    interface WampyInstance {
-        new(url?: string, options?: WampyOptions): Wampy;
-    }
-
-    var wampy: WampyInstance;
-
-    export default wampy;
+interface WampyOptions {
+    autoReconnect?: boolean;
+    reconnectInterval?: number;
+    maxRetries?: number;
+    transportEncoding?: string;
+    realm?: string;
+    helloCustomDetails?: any;
+    onConnect?: () => void;
+    onClose?: () => void;
+    onError?: () => void;
+    onReconnect?: () => void;
+    ws?: any;
+    msgpackCoder?: any;
 }
+
+interface WampyOpStatus {
+    code: number;
+    description: string;
+    reqId?: number;
+}
+
+interface SuccessErrorCallbacksHash {
+    onSuccess?: (data: any) => void;
+    onError?: (err: string) => void;
+}
+
+interface SubscribeCallbacksHash extends SuccessErrorCallbacksHash {
+    onEvent: (data: any) => void;
+}
+
+interface RegisterCallbacksHash extends SuccessErrorCallbacksHash {
+    rpc: (data: any) => any;
+}
+
+interface CallSuccessErrorCallbacksHash {
+    onSuccess: (data: any) => any;
+    onError?: (err: string) => void;
+}
+
+interface AdvancedOptions {
+    exclude?: number | number[];
+    eligible?: number | number[];
+    exclude_me?: boolean;
+    disclose_me?: boolean;
+}
+
+interface CallAdvancedOptions extends AdvancedOptions {
+    receive_progress?: boolean;
+}
+
+interface CancelAdvancedOptions {
+    mode?: "skip" | "kill" | "killnowait";
+}
+
+interface Wampy {
+    options(opts?: WampyOptions): WampyOptions | Wampy;
+    getOpStatus(): WampyOpStatus;
+    getSessionId(): number;
+    connect(url?: string): Wampy;
+    disconnect(): Wampy;
+    abort(): Wampy;
+    subscribe(topicURI: string, callbacks: (((data: any) => void) | SubscribeCallbacksHash)): Wampy;
+    unsubscribe(topicURI: string, callbacks?: (((data: any) => void) | SubscribeCallbacksHash)): Wampy;
+    publish(topicURI: string,
+        payload?: any,
+        callbacks?: SuccessErrorCallbacksHash,
+        advancedOptions?: AdvancedOptions): Wampy;
+    call(topicURI: string,
+        payload?: any,
+        callbacks?: (((data: any) => void) | CallSuccessErrorCallbacksHash),
+        advancedOptions?: CallAdvancedOptions): Wampy;
+    cancel(reqId: number,
+        callbacks?: ((() => void) | SuccessErrorCallbacksHash),
+        advancedOptions?: CancelAdvancedOptions): Wampy;
+    register(topicURI: string, callbacks: (((data: any) => any) | RegisterCallbacksHash)): Wampy;
+    unregister(topicURI: string, callbacks?: ((() => void) | SuccessErrorCallbacksHash)): Wampy;
+}
+
+interface WampyInstance {
+    new (url?: string, options?: WampyOptions): Wampy;
+}
+
+declare var wampy: WampyInstance;
+
+export default wampy;
diff --git a/watch/watch.d.ts b/watch/watch.d.ts
index 77e1c0d66a..63b5db3c3e 100644
--- a/watch/watch.d.ts
+++ b/watch/watch.d.ts
@@ -7,30 +7,29 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "watch" {
-	import fs = require("fs");
-	import events = require("events");
 
-	export interface Monitor extends events.EventEmitter {
-		// event: created
-		// event: removed
-		// event: changed
+import fs = require("fs");
+import events = require("events");
 
-		// export function onCreated(callback, function(f, stat: fs.Stats) { });
-		// export function onChanged(callback, function(f, curr: fs.Stats, prev: fs.Stats) { });
-		// export function onRemoved(callback, function(f, stat: fs.Stats) { });
-	}
+export interface Monitor extends events.EventEmitter {
+    // event: created
+    // event: removed
+    // event: changed
 
-	export interface Options {
-		persistent?: boolean;
-		ignoreDotFiles?: boolean;
-		filter?: any;
-		interval?: number;
-	}
-
-	export function watchTree(root: string, callback: (f: any, curr: fs.Stats, prev: fs.Stats) => void): void;
-	export function watchTree(root: string, options: Options, callback: (f: any, curr: fs.Stats, prev: fs.Stats) => void): void;
-	export function unwatchTree(root: string): void;
-	export function createMonitor(root: string, callback: (monitor: Monitor) => void): void;
-	export function createMonitor(root: string, options: Options, callback: (monitor: Monitor) => void): void;
+    // export function onCreated(callback, function(f, stat: fs.Stats) { });
+    // export function onChanged(callback, function(f, curr: fs.Stats, prev: fs.Stats) { });
+    // export function onRemoved(callback, function(f, stat: fs.Stats) { });
 }
+
+export interface Options {
+    persistent?: boolean;
+    ignoreDotFiles?: boolean;
+    filter?: any;
+    interval?: number;
+}
+
+declare export function watchTree(root: string, callback: (f: any, curr: fs.Stats, prev: fs.Stats) => void): void;
+declare export function watchTree(root: string, options: Options, callback: (f: any, curr: fs.Stats, prev: fs.Stats) => void): void;
+declare export function unwatchTree(root: string): void;
+declare export function createMonitor(root: string, callback: (monitor: Monitor) => void): void;
+declare export function createMonitor(root: string, options: Options, callback: (monitor: Monitor) => void): void;
diff --git a/webpack/webpack.d.ts b/webpack/webpack.d.ts
index 035b49b014..7c36e785fa 100644
--- a/webpack/webpack.d.ts
+++ b/webpack/webpack.d.ts
@@ -5,534 +5,533 @@
 
 /// <reference path="../uglify-js/uglify-js.d.ts"/>
 
-declare module "webpack" {
-    import * as UglifyJS from 'uglify-js';
 
-    namespace webpack {
-        interface Configuration {
-            context?: string;
-            entry?: string|string[]|Entry;
-            /** Choose a developer tool to enhance debugging. */
-            devtool?: string;
-            /** Options affecting the output. */
-            output?: Output;
-            /** Options affecting the normal modules (NormalModuleFactory) */
-            module?: Module;
-            /** Options affecting the resolving of modules. */
-            resolve?: Resolve;
-            /** Like resolve but for loaders. */
-            resolveLoader?: ResolveLoader;
-            /**
-             *  Specify dependencies that shouldn’t be resolved by webpack, but should become dependencies of the resulting bundle.
-             *  The kind of the dependency depends on output.libraryTarget.
-             */
-            externals?: ExternalsElement|ExternalsElement[];
-            /**
-             * <ul>
-             *   <li>"web" Compile for usage in a browser-like environment (default)</li>
-             *   <li>"webworker" Compile as WebWorker</li>
-             *   <li>"node" Compile for usage in a node.js-like environment (use require to load chunks)</li>
-             *   <li>"async-node" Compile for usage in a node.js-like environment (use fs and vm to load chunks async)</li>
-             *   <li>"node-webkit" Compile for usage in webkit, uses jsonp chunk loading but also supports builtin node.js modules plus require(“nw.gui�) (experimental)</li>
-             *   <li>"atom" Compile for usage in electron (formerly known as atom-shell), supports require for modules necessary to run Electron.</li>
-             * <ul>
-             */
-            target?: string;
-            /** Report the first error as a hard error instead of tolerating it. */
-            bail?: boolean;
-            /** Capture timing information for each module. */
-            profile?: boolean;
-            /** Cache generated modules and chunks to improve performance for multiple incremental builds. */
-            cache?: boolean|any;
-            /** Enter watch mode, which rebuilds on file change. */
-            watch?: boolean;
-            watchOptions?: WatchOptions;
-            /** Switch loaders to debug mode. */
-            debug?: boolean;
-            /** Can be used to configure the behaviour of webpack-dev-server when the webpack config is passed to webpack-dev-server CLI. */
-            devServer?: any; // TODO: Type this
-            /** Include polyfills or mocks for various node stuff */
-            node?: Node;
-            /** Set the value of require.amd and define.amd. */
-            amd?: { [moduleName: string]: boolean };
-            /** Used for recordsInputPath and recordsOutputPath */
-            recordsPath?: string;
-            /** Load compiler state from a json file. */
-            recordsInputPath?: string;
-            /** Store compiler state to a json file. */
-            recordsOutputPath?: string;
-            /** Add additional plugins to the compiler. */
-            plugins?: (Plugin|Function)[];
-        }
+import * as UglifyJS from 'uglify-js';
 
-        interface Entry {
-            [name: string]: string|string[];
-        }
+declare namespace webpack {
+    interface Configuration {
+        context?: string;
+        entry?: string | string[] | Entry;
+        /** Choose a developer tool to enhance debugging. */
+        devtool?: string;
+        /** Options affecting the output. */
+        output?: Output;
+        /** Options affecting the normal modules (NormalModuleFactory) */
+        module?: Module;
+        /** Options affecting the resolving of modules. */
+        resolve?: Resolve;
+        /** Like resolve but for loaders. */
+        resolveLoader?: ResolveLoader;
+        /**
+         *  Specify dependencies that shouldn’t be resolved by webpack, but should become dependencies of the resulting bundle.
+         *  The kind of the dependency depends on output.libraryTarget.
+         */
+        externals?: ExternalsElement | ExternalsElement[];
+        /**
+         * <ul>
+         *   <li>"web" Compile for usage in a browser-like environment (default)</li>
+         *   <li>"webworker" Compile as WebWorker</li>
+         *   <li>"node" Compile for usage in a node.js-like environment (use require to load chunks)</li>
+         *   <li>"async-node" Compile for usage in a node.js-like environment (use fs and vm to load chunks async)</li>
+         *   <li>"node-webkit" Compile for usage in webkit, uses jsonp chunk loading but also supports builtin node.js modules plus require(“nw.gui�) (experimental)</li>
+         *   <li>"atom" Compile for usage in electron (formerly known as atom-shell), supports require for modules necessary to run Electron.</li>
+         * <ul>
+         */
+        target?: string;
+        /** Report the first error as a hard error instead of tolerating it. */
+        bail?: boolean;
+        /** Capture timing information for each module. */
+        profile?: boolean;
+        /** Cache generated modules and chunks to improve performance for multiple incremental builds. */
+        cache?: boolean | any;
+        /** Enter watch mode, which rebuilds on file change. */
+        watch?: boolean;
+        watchOptions?: WatchOptions;
+        /** Switch loaders to debug mode. */
+        debug?: boolean;
+        /** Can be used to configure the behaviour of webpack-dev-server when the webpack config is passed to webpack-dev-server CLI. */
+        devServer?: any; // TODO: Type this
+        /** Include polyfills or mocks for various node stuff */
+        node?: Node;
+        /** Set the value of require.amd and define.amd. */
+        amd?: { [moduleName: string]: boolean };
+        /** Used for recordsInputPath and recordsOutputPath */
+        recordsPath?: string;
+        /** Load compiler state from a json file. */
+        recordsInputPath?: string;
+        /** Store compiler state to a json file. */
+        recordsOutputPath?: string;
+        /** Add additional plugins to the compiler. */
+        plugins?: (Plugin | Function)[];
+    }
 
-        interface Output {
-            /** The output directory as absolute path (required). */
-            path?: string;
-            /** The filename of the entry chunk as relative path inside the output.path directory. */
-            filename?: string;
-            /** The filename of non-entry chunks as relative path inside the output.path directory. */
-            chunkFilename?: string;
-            /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */
-            sourceMapFilename?: string;
-            /** Filename template string of function for the sources array in a generated SourceMap. */
-            devtoolModuleFilenameTemplate?: string;
-            /** Similar to output.devtoolModuleFilenameTemplate, but used in the case of duplicate module identifiers. */
-            devtoolFallbackModuleFilenameTemplate?: string;
-            /**
-             * Enable line to line mapped mode for all/specified modules.
-             * Line to line mapped mode uses a simple SourceMap where each line of the generated source is mapped to the same line of the original source.
-             * It’s a performance optimization. Only use it if your performance need to be better and you are sure that input lines match which generated lines.
-             * true enables it for all modules (not recommended)
-             */
-            devtoolLineToLine?: boolean;
-            /** The filename of the Hot Update Chunks. They are inside the output.path directory. */
-            hotUpdateChunkFilename?: string;
-            /** The filename of the Hot Update Main File. It is inside the output.path directory. */
-            hotUpdateMainFilename?: string;
-            /** The output.path from the view of the Javascript / HTML page. */
-            publicPath?: string;
-            /** The JSONP function used by webpack for asnyc loading of chunks. */
-            jsonpFunction?: string;
-            /** The JSONP function used by webpack for async loading of hot update chunks. */
-            hotUpdateFunction?: string;
-            /** Include comments with information about the modules. */
-            pathinfo?: boolean;
-            /** If set, export the bundle as library. output.library is the name. */
-            library?: boolean;
-            /**
-             * Which format to export the library:
-             * <ul>
-             *   <li>"var" - Export by setting a variable: var Library = xxx (default)</li>
-             *   <li>"this" - Export by setting a property of this: this["Library"] = xxx</li>
-             *   <li>"commonjs" - Export by setting a property of exports: exports["Library"] = xxx</li>
-             *   <li>"commonjs2" - Export by setting module.exports: module.exports = xxx</li>
-             *   <li>"amd" - Export to AMD (optionally named)</li>
-             *   <li>"umd" - Export to AMD, CommonJS2 or as property in root</li>
-             * </ul>
-             */
-            libraryTarget?: string;
-            /** If output.libraryTarget is set to umd and output.library is set, setting this to true will name the AMD module. */
-            umdNamedDefine?: boolean;
-            /** Prefixes every line of the source in the bundle with this string. */
-            sourcePrefix?: string;
-            /** This option enables cross-origin loading of chunks. */
-            crossOriginLoading?: string|boolean;
-        }
+    interface Entry {
+        [name: string]: string | string[];
+    }
 
-        interface Module {
-            /** A array of automatically applied loaders. */
-            loaders?: Loader[];
-            /** A array of applied pre loaders. */
-            preLoaders?: Loader[];
-            /** A array of applied post loaders. */
-            postLoaders?: Loader[];
-            /** A RegExp or an array of RegExps. Don’t parse files matching. */
-            noParse?: RegExp|RegExp[];
-            unknownContextRequest?: string;
-            unknownContextRecursive?: boolean;
-            unknownContextRegExp?: RegExp;
-            unknownContextCritical?: boolean;
-            exprContextRequest?: string;
-            exprContextRegExp?: RegExp;
-            exprContextRecursive?: boolean;
-            exprContextCritical?: boolean;
-            wrappedContextRegExp?: RegExp;
-            wrappedContextRecursive?: boolean;
-            wrappedContextCritical?: boolean;
-        }
+    interface Output {
+        /** The output directory as absolute path (required). */
+        path?: string;
+        /** The filename of the entry chunk as relative path inside the output.path directory. */
+        filename?: string;
+        /** The filename of non-entry chunks as relative path inside the output.path directory. */
+        chunkFilename?: string;
+        /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */
+        sourceMapFilename?: string;
+        /** Filename template string of function for the sources array in a generated SourceMap. */
+        devtoolModuleFilenameTemplate?: string;
+        /** Similar to output.devtoolModuleFilenameTemplate, but used in the case of duplicate module identifiers. */
+        devtoolFallbackModuleFilenameTemplate?: string;
+        /**
+         * Enable line to line mapped mode for all/specified modules.
+         * Line to line mapped mode uses a simple SourceMap where each line of the generated source is mapped to the same line of the original source.
+         * It’s a performance optimization. Only use it if your performance need to be better and you are sure that input lines match which generated lines.
+         * true enables it for all modules (not recommended)
+         */
+        devtoolLineToLine?: boolean;
+        /** The filename of the Hot Update Chunks. They are inside the output.path directory. */
+        hotUpdateChunkFilename?: string;
+        /** The filename of the Hot Update Main File. It is inside the output.path directory. */
+        hotUpdateMainFilename?: string;
+        /** The output.path from the view of the Javascript / HTML page. */
+        publicPath?: string;
+        /** The JSONP function used by webpack for asnyc loading of chunks. */
+        jsonpFunction?: string;
+        /** The JSONP function used by webpack for async loading of hot update chunks. */
+        hotUpdateFunction?: string;
+        /** Include comments with information about the modules. */
+        pathinfo?: boolean;
+        /** If set, export the bundle as library. output.library is the name. */
+        library?: boolean;
+        /**
+         * Which format to export the library:
+         * <ul>
+         *   <li>"var" - Export by setting a variable: var Library = xxx (default)</li>
+         *   <li>"this" - Export by setting a property of this: this["Library"] = xxx</li>
+         *   <li>"commonjs" - Export by setting a property of exports: exports["Library"] = xxx</li>
+         *   <li>"commonjs2" - Export by setting module.exports: module.exports = xxx</li>
+         *   <li>"amd" - Export to AMD (optionally named)</li>
+         *   <li>"umd" - Export to AMD, CommonJS2 or as property in root</li>
+         * </ul>
+         */
+        libraryTarget?: string;
+        /** If output.libraryTarget is set to umd and output.library is set, setting this to true will name the AMD module. */
+        umdNamedDefine?: boolean;
+        /** Prefixes every line of the source in the bundle with this string. */
+        sourcePrefix?: string;
+        /** This option enables cross-origin loading of chunks. */
+        crossOriginLoading?: string | boolean;
+    }
 
-        interface Resolve {
-            /** Replace modules by other modules or paths. */
-            alias?: { [key: string]: string; };
-            /**
-             * The directory (absolute path) that contains your modules.
-             * May also be an array of directories.
-             * This setting should be used to add individual directories to the search path. */
-            root?: string|string[];
-            /**
-             * An array of directory names to be resolved to the current directory as well as its ancestors, and searched for modules.
-             * This functions similarly to how node finds “node_modules� directories.
-             * For example, if the value is ["mydir"], webpack will look in “./mydir�, “../mydir�, “../../mydir�, etc.
-             */
-            modulesDirectories?: string[];
-            /**
-             * A directory (or array of directories absolute paths),
-             * in which webpack should look for modules that weren’t found in resolve.root or resolve.modulesDirectories.
-             */
-            fallback?: string|string[];
-            /**
-             * An array of extensions that should be used to resolve modules.
-             * For example, in order to discover CoffeeScript files, your array should contain the string ".coffee".
-             */
-            extensions?: string[];
-            /** Check these fields in the package.json for suitable files. */
-            packageMains?: (string|string[])[];
-            /** Check this field in the package.json for an object. Key-value-pairs are threaded as aliasing according to this spec */
-            packageAlias?: (string|string[])[];
-            /**
-             * Enable aggressive but unsafe caching for the resolving of a part of your files.
-             * Changes to cached paths may cause failure (in rare cases). An array of RegExps, only a RegExp or true (all files) is expected.
-             * If the resolved path matches, it’ll be cached.
-             */
-            unsafeCache?: RegExp|RegExp[]|boolean;
-        }
+    interface Module {
+        /** A array of automatically applied loaders. */
+        loaders?: Loader[];
+        /** A array of applied pre loaders. */
+        preLoaders?: Loader[];
+        /** A array of applied post loaders. */
+        postLoaders?: Loader[];
+        /** A RegExp or an array of RegExps. Don’t parse files matching. */
+        noParse?: RegExp | RegExp[];
+        unknownContextRequest?: string;
+        unknownContextRecursive?: boolean;
+        unknownContextRegExp?: RegExp;
+        unknownContextCritical?: boolean;
+        exprContextRequest?: string;
+        exprContextRegExp?: RegExp;
+        exprContextRecursive?: boolean;
+        exprContextCritical?: boolean;
+        wrappedContextRegExp?: RegExp;
+        wrappedContextRecursive?: boolean;
+        wrappedContextCritical?: boolean;
+    }
 
-        interface ResolveLoader extends Resolve {
-            /** It describes alternatives for the module name that are tried. */
-            moduleTemplates?: string[];
-        }
+    interface Resolve {
+        /** Replace modules by other modules or paths. */
+        alias?: { [key: string]: string; };
+        /**
+         * The directory (absolute path) that contains your modules.
+         * May also be an array of directories.
+         * This setting should be used to add individual directories to the search path. */
+        root?: string | string[];
+        /**
+         * An array of directory names to be resolved to the current directory as well as its ancestors, and searched for modules.
+         * This functions similarly to how node finds “node_modules� directories.
+         * For example, if the value is ["mydir"], webpack will look in “./mydir�, “../mydir�, “../../mydir�, etc.
+         */
+        modulesDirectories?: string[];
+        /**
+         * A directory (or array of directories absolute paths),
+         * in which webpack should look for modules that weren’t found in resolve.root or resolve.modulesDirectories.
+         */
+        fallback?: string | string[];
+        /**
+         * An array of extensions that should be used to resolve modules.
+         * For example, in order to discover CoffeeScript files, your array should contain the string ".coffee".
+         */
+        extensions?: string[];
+        /** Check these fields in the package.json for suitable files. */
+        packageMains?: (string | string[])[];
+        /** Check this field in the package.json for an object. Key-value-pairs are threaded as aliasing according to this spec */
+        packageAlias?: (string | string[])[];
+        /**
+         * Enable aggressive but unsafe caching for the resolving of a part of your files.
+         * Changes to cached paths may cause failure (in rare cases). An array of RegExps, only a RegExp or true (all files) is expected.
+         * If the resolved path matches, it’ll be cached.
+         */
+        unsafeCache?: RegExp | RegExp[] | boolean;
+    }
 
-        type ExternalsElement = string|RegExp|ExternalsObjectElement|ExternalsFunctionElement;
+    interface ResolveLoader extends Resolve {
+        /** It describes alternatives for the module name that are tried. */
+        moduleTemplates?: string[];
+    }
 
-        interface ExternalsObjectElement {
-            [key: string]: boolean|string;
-        }
+    type ExternalsElement = string | RegExp | ExternalsObjectElement | ExternalsFunctionElement;
 
-        interface ExternalsFunctionElement {
-            (context: any, request: any, callback: (error: any, result: any) => void): any;
-        }
+    interface ExternalsObjectElement {
+        [key: string]: boolean | string;
+    }
 
-        interface WatchOptions {
-            /** Delay the rebuilt after the first change. Value is a time in ms. */
-            aggregateTimeout?: number;
-            /** true: use polling, number: use polling with specified interval */
-            poll?: boolean|number;
-        }
+    interface ExternalsFunctionElement {
+        (context: any, request: any, callback: (error: any, result: any) => void): any;
+    }
 
-        interface Node {
-            console?: boolean;
-            global?: boolean;
-            process?: boolean;
-            Buffer?: boolean;
-            __filename?: boolean|string;
-            __dirname?: boolean|string;
-            [nodeBuiltin: string]: boolean|string;
-        }
+    interface WatchOptions {
+        /** Delay the rebuilt after the first change. Value is a time in ms. */
+        aggregateTimeout?: number;
+        /** true: use polling, number: use polling with specified interval */
+        poll?: boolean | number;
+    }
 
-        type LoaderCondition = string|RegExp|((absPath: string) => boolean);
+    interface Node {
+        console?: boolean;
+        global?: boolean;
+        process?: boolean;
+        Buffer?: boolean;
+        __filename?: boolean | string;
+        __dirname?: boolean | string;
+        [nodeBuiltin: string]: boolean | string;
+    }
 
-        interface Loader {
-            /** A condition that must not be met */
-            exclude?: LoaderCondition|LoaderCondition[];
-            /** A condition that must be met */
-            include?: LoaderCondition|LoaderCondition[];
-            /** A condition that must be met */
-            test: LoaderCondition|LoaderCondition[];
-            /** A string of “!� separated loaders */
-            loader?: string;
-            /** A array of loaders as string */
-            loaders?: string[];
-            query?: {
-                [name: string]: any;
-            }
-        }
+    type LoaderCondition = string | RegExp | ((absPath: string) => boolean);
 
-        interface Plugin { }
-
-        interface Webpack {
-            (config: Configuration, callback?: compiler.CompilerCallback): compiler.Compiler;
-            /**
-             * optimize namespace
-             */
-            optimize: Optimize;
-            /**
-             * dependencies namespace
-             */
-            dependencies: Dependencies;
-            /**
-             * Replace resources that matches resourceRegExp with newResource.
-             * If newResource is relative, it is resolve relative to the previous resource.
-             * If newResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
-             */
-            NormalModuleReplacementPlugin: NormalModuleReplacementPluginStatic;
-            /**
-             * Replaces the default resource, recursive flag or regExp generated by parsing with newContentResource,
-             * newContentRecursive resp. newContextRegExp if the resource (directory) matches resourceRegExp.
-             * If newContentResource is relative, it is resolve relative to the previous resource.
-             * If newContentResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
-             */
-            ContextReplacementPlugin: ContextReplacementPluginStatic;
-            /**
-             * Don’t generate modules for requests matching the provided RegExp.
-             */
-            IgnorePlugin: IgnorePluginStatic;
-            /**
-             * A request for a normal module, which is resolved and built even before a require to it occurs.
-             * This can boost performance. Try to profile the build first to determine clever prefetching points.
-             */
-            PrefetchPlugin: PrefetchPluginStatic;
-            /**
-             * Apply a plugin (or array of plugins) to one or more resolvers (as specified in types).
-             */
-            ResolverPlugin: ResolverPluginStatic;
-            /**
-             * Adds a banner to the top of each generated chunk.
-             */
-            BannerPlugin: BannerPluginStatic;
-            /**
-             * Define free variables. Useful for having development builds with debug logging or adding global constants.
-             */
-            DefinePlugin: DefinePluginStatic;
-            /**
-             * Automatically loaded modules.
-             * Module (value) is loaded when the identifier (key) is used as free variable in a module.
-             * The identifier is filled with the exports of the loaded module.
-             */
-            ProvidePlugin: ProvidePluginStatic;
-            /**
-             * Adds SourceMaps for assets.
-             */
-            SourceMapDevToolPlugin: SourceMapDevToolPluginStatic;
-            /**
-             * Enables Hot Module Replacement. (This requires records data if not in dev-server mode, recordsPath)
-             * Generates Hot Update Chunks of each chunk in the records.
-             * It also enables the API and makes __webpack_hash__ available in the bundle.
-             */
-            HotModuleReplacementPlugin: HotModuleReplacementPluginStatic;
-            /**
-             * Adds useful free vars to the bundle.
-             */
-            ExtendedAPIPlugin: ExtendedAPIPluginStatic;
-            /**
-             * When there are errors while compiling this plugin skips the emitting phase (and recording phase),
-             * so there are no assets emitted that include errors. The emitted flag in the stats is false for all assets.
-             */
-            NoErrorsPlugin: NoErrorsPluginStatic;
-            /**
-             * Does not watch specified files matching provided paths or RegExps.
-             */
-            WatchIgnorePlugin: WatchIgnorePluginStatic;
-        }
-
-        interface Optimize {
-            /**
-             * Search for equal or similar files and deduplicate them in the output.
-             * This comes with some overhead for the entry chunk, but can reduce file size effectively.
-             * This is experimental and may crash, because of some missing implementations. (Report an issue)
-             */
-            DedupePlugin: optimize.DedupePluginStatic;
-            /**
-             * Limit the chunk count to a defined value. Chunks are merged until it fits.
-             */
-            LimitChunkCountPlugin: optimize.LimitChunkCountPluginStatic;
-            /**
-             * Merge small chunks that are lower than this min size (in chars). Size is approximated.
-             */
-            MinChunkSizePlugin: optimize.MinChunkSizePluginStatic;
-            /**
-             * Assign the module and chunk ids by occurrence count. Ids that are used often get lower (shorter) ids.
-             * This make ids predictable, reduces to total file size and is recommended.
-             */
-            OccurenceOrderPlugin: optimize.OccurenceOrderPluginStatic;
-            /**
-             * Minimize all JavaScript output of chunks. Loaders are switched into minimizing mode.
-             * You can pass an object containing UglifyJs options.
-             */
-            UglifyJsPlugin: optimize.UglifyJsPluginStatic;
-            CommonsChunkPlugin: optimize.CommonsChunkPluginStatic;
-            /**
-             * A plugin for a more aggressive chunk merging strategy.
-             * Even similar chunks are merged if the total size is reduced enough.
-             * As an option modules that are not common in these chunks can be moved up the chunk tree to the parents.
-             */
-            AggressiveMergingPlugin: optimize.AggressiveMergingPluginStatic;
-        }
-
-        interface Dependencies {
-            /**
-             * Support Labeled Modules.
-             */
-            LabeledModulesPlugin: dependencies.LabeledModulesPluginStatic;
-        }
-
-        interface DirectoryDescriptionFilePluginStatic {
-            new(file: string, files: string[]): Plugin;
-        }
-
-        interface NormalModuleReplacementPluginStatic {
-            new(resourceRegExp: any, newResource: any): Plugin;
-        }
-
-        interface ContextReplacementPluginStatic {
-            new(resourceRegExp: any, newContentResource?: any, newContentRecursive?: any, newContentRegExp?: any): Plugin
-        }
-
-        interface IgnorePluginStatic {
-            new(requestRegExp: any, contextRegExp?: any): Plugin;
-        }
-
-        interface PrefetchPluginStatic {
-            new(context: any, request: any): Plugin;
-            new(request: any): Plugin;
-        }
-
-        interface ResolverPluginStatic {
-            new(plugins: Plugin[], files?: string[]): Plugin;
-            DirectoryDescriptionFilePlugin: DirectoryDescriptionFilePluginStatic;
-            /**
-             * This plugin will append a path to the module directory to find a match,
-             * which can be useful if you have a module which has an incorrect “main� entry in its package.json/bower.json etc (e.g. "main": "Gruntfile.js").
-             * You can use this plugin as a special case to load the correct file for this module. Example:
-             */
-            FileAppendPlugin: FileAppendPluginStatic;
-        }
-
-        interface FileAppendPluginStatic {
-            new(files: string[]): Plugin;
-        }
-
-        interface BannerPluginStatic {
-            new(banner: any, options: any): Plugin;
-        }
-
-        interface DefinePluginStatic {
-            new(definitions: any): Plugin;
-        }
-
-        interface ProvidePluginStatic {
-            new(definitions: any): Plugin;
-        }
-
-        interface SourceMapDevToolPluginStatic {
-            new(options: any): Plugin;
-        }
-
-        interface HotModuleReplacementPluginStatic {
-            new(): Plugin;
-        }
-
-        interface ExtendedAPIPluginStatic {
-            new(): Plugin;
-        }
-
-        interface NoErrorsPluginStatic {
-            new(): Plugin;
-        }
-
-        interface WatchIgnorePluginStatic {
-            new(paths: RegExp[]): Plugin;
-        }
-
-        namespace optimize {
-            interface DedupePluginStatic {
-                new(): Plugin;
-            }
-            interface LimitChunkCountPluginStatic {
-                new(options: any): Plugin
-            }
-            interface MinChunkSizePluginStatic {
-                new(options: any): Plugin;
-            }
-            interface OccurenceOrderPluginStatic {
-                new(preferEntry: boolean): Plugin;
-            }
-            interface UglifyJsPluginStatic {
-                new(options?: UglifyJS.MinifyOptions): Plugin;
-            }
-            interface CommonsChunkPluginStatic {
-                new(chunkName: string, filenames?: string|string[]): Plugin;
-                new(options?: any): Plugin;
-            }
-            interface AggressiveMergingPluginStatic {
-                new(options: any): Plugin;
-            }
-        }
-
-        namespace dependencies {
-            interface LabeledModulesPluginStatic {
-                new(): Plugin;
-            }
-        }
-
-        namespace compiler {
-            interface Compiler {
-                /** Builds the bundle(s). */
-                run(callback: CompilerCallback): void;
-                /**
-                 * Builds the bundle(s) then starts the watcher, which rebuilds bundles whenever their source files change.
-                 * Returns a Watching instance. Note: since this will automatically run an initial build, so you only need to run watch (and not run).
-                 */
-                watch(watchOptions: WatchOptions, handler: CompilerCallback): Watching;
-                //TODO: below are some of the undocumented properties. needs typings
-                outputFileSystem: any;
-                name: string;
-                options: Configuration;
-            }
-
-            interface Watching {
-                close(callback: () => void): void;
-            }
-
-            interface WatchOptions {
-                /** After a change the watcher waits that time (in milliseconds) for more changes. Default: 300. */
-                aggregateTimeout?: number;
-                /** The watcher uses polling instead of native watchers. true uses the default interval, a number specifies a interval in milliseconds. Default: undefined (automatic). */
-                poll?: number|boolean;
-            }
-
-            interface Stats {
-                /** Returns true if there were errors while compiling */
-                hasErrors(): boolean;
-                /** Returns true if there were warnings while compiling. */
-                hasWarnings(): boolean;
-                /** Return information as json object */
-                toJson(options?: StatsToJsonOptions): any; //TODO: type this
-                /** Returns a formatted string of the result. */
-                toString(options?: StatsToStringOptions): string;
-            }
-
-            interface StatsToJsonOptions {
-                /** context directory for request shortening */
-                context?: boolean;
-                /** add the hash of the compilation */
-                hash?: boolean;
-                /** add webpack version information */
-                version?: boolean;
-                /** add timing information */
-                timings?: boolean;
-                /** add assets information */
-                assets?: boolean;
-                /** add chunk information */
-                chunks?: boolean;
-                /** add built modules information to chunk information */
-                chunkModules?: boolean;
-                /** add built modules information */
-                modules?: boolean;
-                /** add children information */
-                children?: boolean;
-                /** add also information about cached (not built) modules */
-                cached?: boolean;
-                /** add information about the reasons why modules are included */
-                reasons?: boolean;
-                /** add the source code of modules */
-                source?: boolean;
-                /** add details to errors (like resolving log) */
-                errorDetails?: boolean;
-                /** add the origins of chunks and chunk merging info */
-                chunkOrigins?: boolean;
-                /** sort the modules by that field */
-                modulesSort?: string;
-                /** sort the chunks by that field */
-                chunksSort?: string;
-                /** sort the assets by that field */
-                assetsSort?: string;
-            }
-
-            interface StatsToStringOptions extends StatsToJsonOptions {
-                /** With console colors */
-                colors?: boolean;
-            }
-
-            type CompilerCallback = (err: Error, stats: Stats) => void
+    interface Loader {
+        /** A condition that must not be met */
+        exclude?: LoaderCondition | LoaderCondition[];
+        /** A condition that must be met */
+        include?: LoaderCondition | LoaderCondition[];
+        /** A condition that must be met */
+        test: LoaderCondition | LoaderCondition[];
+        /** A string of “!� separated loaders */
+        loader?: string;
+        /** A array of loaders as string */
+        loaders?: string[];
+        query?: {
+            [name: string]: any;
         }
     }
 
-    var webpack: webpack.Webpack;
+    interface Plugin { }
 
-    //export default webpack;
-    export = webpack;
+    interface Webpack {
+        (config: Configuration, callback?: compiler.CompilerCallback): compiler.Compiler;
+        /**
+         * optimize namespace
+         */
+        optimize: Optimize;
+        /**
+         * dependencies namespace
+         */
+        dependencies: Dependencies;
+        /**
+         * Replace resources that matches resourceRegExp with newResource.
+         * If newResource is relative, it is resolve relative to the previous resource.
+         * If newResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
+         */
+        NormalModuleReplacementPlugin: NormalModuleReplacementPluginStatic;
+        /**
+         * Replaces the default resource, recursive flag or regExp generated by parsing with newContentResource,
+         * newContentRecursive resp. newContextRegExp if the resource (directory) matches resourceRegExp.
+         * If newContentResource is relative, it is resolve relative to the previous resource.
+         * If newContentResource is a function, it is expected to overwrite the ‘request’ attribute of the supplied object.
+         */
+        ContextReplacementPlugin: ContextReplacementPluginStatic;
+        /**
+         * Don’t generate modules for requests matching the provided RegExp.
+         */
+        IgnorePlugin: IgnorePluginStatic;
+        /**
+         * A request for a normal module, which is resolved and built even before a require to it occurs.
+         * This can boost performance. Try to profile the build first to determine clever prefetching points.
+         */
+        PrefetchPlugin: PrefetchPluginStatic;
+        /**
+         * Apply a plugin (or array of plugins) to one or more resolvers (as specified in types).
+         */
+        ResolverPlugin: ResolverPluginStatic;
+        /**
+         * Adds a banner to the top of each generated chunk.
+         */
+        BannerPlugin: BannerPluginStatic;
+        /**
+         * Define free variables. Useful for having development builds with debug logging or adding global constants.
+         */
+        DefinePlugin: DefinePluginStatic;
+        /**
+         * Automatically loaded modules.
+         * Module (value) is loaded when the identifier (key) is used as free variable in a module.
+         * The identifier is filled with the exports of the loaded module.
+         */
+        ProvidePlugin: ProvidePluginStatic;
+        /**
+         * Adds SourceMaps for assets.
+         */
+        SourceMapDevToolPlugin: SourceMapDevToolPluginStatic;
+        /**
+         * Enables Hot Module Replacement. (This requires records data if not in dev-server mode, recordsPath)
+         * Generates Hot Update Chunks of each chunk in the records.
+         * It also enables the API and makes __webpack_hash__ available in the bundle.
+         */
+        HotModuleReplacementPlugin: HotModuleReplacementPluginStatic;
+        /**
+         * Adds useful free vars to the bundle.
+         */
+        ExtendedAPIPlugin: ExtendedAPIPluginStatic;
+        /**
+         * When there are errors while compiling this plugin skips the emitting phase (and recording phase),
+         * so there are no assets emitted that include errors. The emitted flag in the stats is false for all assets.
+         */
+        NoErrorsPlugin: NoErrorsPluginStatic;
+        /**
+         * Does not watch specified files matching provided paths or RegExps.
+         */
+        WatchIgnorePlugin: WatchIgnorePluginStatic;
+    }
+
+    interface Optimize {
+        /**
+         * Search for equal or similar files and deduplicate them in the output.
+         * This comes with some overhead for the entry chunk, but can reduce file size effectively.
+         * This is experimental and may crash, because of some missing implementations. (Report an issue)
+         */
+        DedupePlugin: optimize.DedupePluginStatic;
+        /**
+         * Limit the chunk count to a defined value. Chunks are merged until it fits.
+         */
+        LimitChunkCountPlugin: optimize.LimitChunkCountPluginStatic;
+        /**
+         * Merge small chunks that are lower than this min size (in chars). Size is approximated.
+         */
+        MinChunkSizePlugin: optimize.MinChunkSizePluginStatic;
+        /**
+         * Assign the module and chunk ids by occurrence count. Ids that are used often get lower (shorter) ids.
+         * This make ids predictable, reduces to total file size and is recommended.
+         */
+        OccurenceOrderPlugin: optimize.OccurenceOrderPluginStatic;
+        /**
+         * Minimize all JavaScript output of chunks. Loaders are switched into minimizing mode.
+         * You can pass an object containing UglifyJs options.
+         */
+        UglifyJsPlugin: optimize.UglifyJsPluginStatic;
+        CommonsChunkPlugin: optimize.CommonsChunkPluginStatic;
+        /**
+         * A plugin for a more aggressive chunk merging strategy.
+         * Even similar chunks are merged if the total size is reduced enough.
+         * As an option modules that are not common in these chunks can be moved up the chunk tree to the parents.
+         */
+        AggressiveMergingPlugin: optimize.AggressiveMergingPluginStatic;
+    }
+
+    interface Dependencies {
+        /**
+         * Support Labeled Modules.
+         */
+        LabeledModulesPlugin: dependencies.LabeledModulesPluginStatic;
+    }
+
+    interface DirectoryDescriptionFilePluginStatic {
+        new (file: string, files: string[]): Plugin;
+    }
+
+    interface NormalModuleReplacementPluginStatic {
+        new (resourceRegExp: any, newResource: any): Plugin;
+    }
+
+    interface ContextReplacementPluginStatic {
+        new (resourceRegExp: any, newContentResource?: any, newContentRecursive?: any, newContentRegExp?: any): Plugin
+    }
+
+    interface IgnorePluginStatic {
+        new (requestRegExp: any, contextRegExp?: any): Plugin;
+    }
+
+    interface PrefetchPluginStatic {
+        new (context: any, request: any): Plugin;
+        new (request: any): Plugin;
+    }
+
+    interface ResolverPluginStatic {
+        new (plugins: Plugin[], files?: string[]): Plugin;
+        DirectoryDescriptionFilePlugin: DirectoryDescriptionFilePluginStatic;
+        /**
+         * This plugin will append a path to the module directory to find a match,
+         * which can be useful if you have a module which has an incorrect “main� entry in its package.json/bower.json etc (e.g. "main": "Gruntfile.js").
+         * You can use this plugin as a special case to load the correct file for this module. Example:
+         */
+        FileAppendPlugin: FileAppendPluginStatic;
+    }
+
+    interface FileAppendPluginStatic {
+        new (files: string[]): Plugin;
+    }
+
+    interface BannerPluginStatic {
+        new (banner: any, options: any): Plugin;
+    }
+
+    interface DefinePluginStatic {
+        new (definitions: any): Plugin;
+    }
+
+    interface ProvidePluginStatic {
+        new (definitions: any): Plugin;
+    }
+
+    interface SourceMapDevToolPluginStatic {
+        new (options: any): Plugin;
+    }
+
+    interface HotModuleReplacementPluginStatic {
+        new (): Plugin;
+    }
+
+    interface ExtendedAPIPluginStatic {
+        new (): Plugin;
+    }
+
+    interface NoErrorsPluginStatic {
+        new (): Plugin;
+    }
+
+    interface WatchIgnorePluginStatic {
+        new (paths: RegExp[]): Plugin;
+    }
+
+    namespace optimize {
+        interface DedupePluginStatic {
+            new (): Plugin;
+        }
+        interface LimitChunkCountPluginStatic {
+            new (options: any): Plugin
+        }
+        interface MinChunkSizePluginStatic {
+            new (options: any): Plugin;
+        }
+        interface OccurenceOrderPluginStatic {
+            new (preferEntry: boolean): Plugin;
+        }
+        interface UglifyJsPluginStatic {
+            new (options?: UglifyJS.MinifyOptions): Plugin;
+        }
+        interface CommonsChunkPluginStatic {
+            new (chunkName: string, filenames?: string | string[]): Plugin;
+            new (options?: any): Plugin;
+        }
+        interface AggressiveMergingPluginStatic {
+            new (options: any): Plugin;
+        }
+    }
+
+    namespace dependencies {
+        interface LabeledModulesPluginStatic {
+            new (): Plugin;
+        }
+    }
+
+    namespace compiler {
+        interface Compiler {
+            /** Builds the bundle(s). */
+            run(callback: CompilerCallback): void;
+            /**
+             * Builds the bundle(s) then starts the watcher, which rebuilds bundles whenever their source files change.
+             * Returns a Watching instance. Note: since this will automatically run an initial build, so you only need to run watch (and not run).
+             */
+            watch(watchOptions: WatchOptions, handler: CompilerCallback): Watching;
+            //TODO: below are some of the undocumented properties. needs typings
+            outputFileSystem: any;
+            name: string;
+            options: Configuration;
+        }
+
+        interface Watching {
+            close(callback: () => void): void;
+        }
+
+        interface WatchOptions {
+            /** After a change the watcher waits that time (in milliseconds) for more changes. Default: 300. */
+            aggregateTimeout?: number;
+            /** The watcher uses polling instead of native watchers. true uses the default interval, a number specifies a interval in milliseconds. Default: undefined (automatic). */
+            poll?: number | boolean;
+        }
+
+        interface Stats {
+            /** Returns true if there were errors while compiling */
+            hasErrors(): boolean;
+            /** Returns true if there were warnings while compiling. */
+            hasWarnings(): boolean;
+            /** Return information as json object */
+            toJson(options?: StatsToJsonOptions): any; //TODO: type this
+            /** Returns a formatted string of the result. */
+            toString(options?: StatsToStringOptions): string;
+        }
+
+        interface StatsToJsonOptions {
+            /** context directory for request shortening */
+            context?: boolean;
+            /** add the hash of the compilation */
+            hash?: boolean;
+            /** add webpack version information */
+            version?: boolean;
+            /** add timing information */
+            timings?: boolean;
+            /** add assets information */
+            assets?: boolean;
+            /** add chunk information */
+            chunks?: boolean;
+            /** add built modules information to chunk information */
+            chunkModules?: boolean;
+            /** add built modules information */
+            modules?: boolean;
+            /** add children information */
+            children?: boolean;
+            /** add also information about cached (not built) modules */
+            cached?: boolean;
+            /** add information about the reasons why modules are included */
+            reasons?: boolean;
+            /** add the source code of modules */
+            source?: boolean;
+            /** add details to errors (like resolving log) */
+            errorDetails?: boolean;
+            /** add the origins of chunks and chunk merging info */
+            chunkOrigins?: boolean;
+            /** sort the modules by that field */
+            modulesSort?: string;
+            /** sort the chunks by that field */
+            chunksSort?: string;
+            /** sort the assets by that field */
+            assetsSort?: string;
+        }
+
+        interface StatsToStringOptions extends StatsToJsonOptions {
+            /** With console colors */
+            colors?: boolean;
+        }
+
+        type CompilerCallback = (err: Error, stats: Stats) => void
+    }
 }
+
+declare var webpack: webpack.Webpack;
+
+//export default webpack;
+export = webpack;
diff --git a/websocket/websocket.d.ts b/websocket/websocket.d.ts
index bbcd7e04d8..fa8f05e6f6 100644
--- a/websocket/websocket.d.ts
+++ b/websocket/websocket.d.ts
@@ -5,654 +5,653 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "websocket" {
-    import events = require('events');
-    import http   = require('http');
-    import net    = require('net');
-    import url    = require('url');
 
-    export interface IStringified {
-        toString: (...args: any[]) => string;
-    }
+import events = require('events');
+import http = require('http');
+import net = require('net');
+import url = require('url');
 
-    export interface IConfig {
-        /**
-         * The maximum allowed received frame size in bytes.
-         * Single frame messages will also be limited to this maximum.
-         */
-        maxReceivedFrameSize?: number;
-
-        /** The maximum allowed aggregate message size (for fragmented messages) in bytes */
-        maxReceivedMessageSize?: number;
-
-        /**
-         * Whether or not to fragment outgoing messages. If true, messages will be
-         * automatically fragmented into chunks of up to `fragmentationThreshold` bytes.
-         * @default true
-         */
-        fragmentOutgoingMessages?: boolean;
-
-        /**
-         * The maximum size of a frame in bytes before it is automatically fragmented.
-         * @default 16KiB
-         */
-        fragmentationThreshold?: number;
-
-        /**
-         * If true, fragmented messages will be automatically assembled and the full
-         * message will be emitted via a `message` event. If false, each frame will be
-         * emitted on the `connection` object via a `frame` event and the application
-         * will be responsible for aggregating multiple fragmented frames. Single-frame
-         * messages will emit a `message` event in addition to the `frame` event.
-         * @default true
-         */
-        assembleFragments?: boolean;
-
-        /**
-         * The number of milliseconds to wait after sending a close frame for an
-         * `acknowledgement` to come back before giving up and just closing the socket.
-         * @default 5000
-         */
-        closeTimeout?: number;
-    }
-
-    export interface IServerConfig extends IConfig {
-        /** The http server instance to attach to */
-        httpServer: http.Server;
-
-        /**
-         * The maximum allowed received frame size in bytes.
-         * Single frame messages will also be limited to this maximum.
-         * @default 64KiB
-         */
-        maxReceivedFrameSize?: number;
-
-        /**
-         * The maximum allowed aggregate message size (for fragmented messages) in bytes.
-         * @default 1MiB
-         */
-        maxReceivedMessageSize?: number;
-
-        /**
-         * If true, the server will automatically send a ping to all clients every
-         * `keepaliveInterval` milliseconds. Each client has an independent `keepalive`
-         * timer, which is reset when any data is received from that client.
-         * @default true
-         */
-        keepalive?: boolean;
-
-        /**
-         * The interval in milliseconds to send `keepalive` pings to connected clients.
-         * @default 20000
-         */
-        keepaliveInterval?: number;
-
-        /**
-         * If true, the server will consider any connection that has not received any
-         * data within the amount of time specified by `keepaliveGracePeriod` after a
-         * `keepalive` ping has been sent. Ignored if `keepalive` is false.
-         * @default true
-         */
-        dropConnectionOnKeepaliveTimeout?: boolean;
-
-        /**
-         * The amount of time to wait after sending a `keepalive` ping before closing
-         * the connection if the connected peer does not respond. Ignored if `keepalive`
-         * or `dropConnectionOnKeepaliveTimeout` are false. The grace period timer is
-         * reset when any data is received from the client.
-         * @default 10000
-         */
-        keepaliveGracePeriod?: number;
-
-        /**
-         * If this is true, websocket connections will be accepted regardless of the path
-         * and protocol specified by the client. The protocol accepted will be the first
-         * that was requested by the client.
-         * @default false
-         */
-        autoAcceptConnections?: boolean;
-
-        /**
-         * The Nagle Algorithm makes more efficient use of network resources by introducing a
-         * small delay before sending small packets so that multiple messages can be batched
-         * together before going onto the wire. This however comes at the cost of latency.
-         * @default true
-         */
-        disableNagleAlgorithm?: boolean;
-    }
-
-    export class server extends events.EventEmitter {
-        config: IServerConfig;
-        connections: connection[];
-
-        constructor(serverConfig?: IServerConfig);
-
-        /** Send binary message for each connection */
-        broadcast(data: Buffer): void;
-        /** Send UTF-8 message for each connection */
-        broadcast(data: IStringified): void;
-        /** Send binary message for each connection */
-        broadcastBytes(data: Buffer): void;
-        /** Send UTF-8 message for each connection */
-        broadcastUTF(data: IStringified): void;
-        /** Attach the `server` instance to a Node http.Server instance */
-        mount(serverConfig: IServerConfig): void;
-
-        /**
-         * Detach the `server` instance from the Node http.Server instance.
-         * All existing connections are left alone and will not be affected,
-         * but no new WebSocket connections will be accepted.
-         */
-        unmount(): void;
-
-        /** Close all open WebSocket connections */
-        closeAllConnections(): void;
-        /** Close all open WebSocket connections and unmount the server */
-        shutDown(): void;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'request', cb: (request: request) => void): this;
-        on(event: 'connect', cb: (connection: connection) => void): this;
-        on(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'request', cb: (request: request) => void): this;
-        addListener(event: 'connect', cb: (connection: connection) => void): this;
-        addListener(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
-    }
-
-    export interface ICookie {
-        name: string;
-        value: string;
-        path?: string;
-        domain?: string;
-        expires?: Date;
-        maxage?: number;
-        secure?: boolean;
-        httponly?: boolean;
-    }
-
-    export interface IExtension {
-        name: string;
-        value: string;
-    }
-
-    export class request extends events.EventEmitter {
-        /** A reference to the original Node HTTP request object */
-        httpRequest: http.ClientRequest;
-        /** This will include the port number if a non-standard port is used */
-        host: string;
-        /** A string containing the path that was requested by the client */
-        resource: string;
-        /** `Sec-WebSocket-Key` */
-        key: string;
-        /** Parsed resource, including the query string parameters */
-        resourceURL: url.Url;
-
-        /**
-         * Client's IP. If an `X-Forwarded-For` header is present, the value will be taken
-         * from that header to facilitate WebSocket servers that live behind a reverse-proxy
-         */
-        remoteAddress: string;
-
-        /**
-         * If the client is a web browser, origin will be a string containing the URL
-         * of the page containing the script that opened the connection.
-         * If the client is not a web browser, origin may be `null` or "*".
-         */
-        origin: string;
-
-        /** The version of the WebSocket protocol requested by the client */
-        webSocketVersion: number;
-        /** An array containing a list of extensions requested by the client */
-        requestedExtensions: any[];
-
-        cookies: ICookie[];
-        socket: net.Socket;
-
-        /**
-         * List of strings that indicate the subprotocols the client would like to speak.
-         * The server should select the best one that it can support from the list and
-         * pass it to the `accept` function when accepting the connection.
-         * Note that all the strings in the `requestedProtocols` array will have been
-         * converted to lower case.
-         */
-        requestedProtocols: string[];
-        protocolFullCaseMap: {[key: string]: string};
-
-        constructor(socket: net.Socket, httpRequest: http.ClientRequest, config: IServerConfig);
-
-        /**
-         * After inspecting the `request` properties, call this function on the
-         * request object to accept the connection. If you don't have a particular subprotocol
-         * you wish to speak, you may pass `null` for the `acceptedProtocol` parameter.
-         *
-         * @param [acceptedProtocol] case-insensitive value that was requested by the client
-         */
-        accept(acceptedProtocol?: string, allowedOrigin?: string, cookies?: ICookie[]): connection;
-
-        /**
-         * Reject connection.
-         * You may optionally pass in an HTTP Status code (such as 404) and a textual
-         * description that will be sent to the client in the form of an
-         * `X-WebSocket-Reject-Reason` header.
-         */
-        reject(httpStatus?: number, reason?: string): void;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'requestAccepted', cb: (connection: connection) => void): this;
-        on(event: 'requestRejected', cb: () => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
-        addListener(event: 'requestRejected', cb: () => void): this;
-    }
-
-    export interface IMessage {
-        type: string;
-        utf8Data?: string;
-        binaryData?: Buffer;
-    }
-
-    export interface IBufferList extends events.EventEmitter {
-        encoding: string;
-        length: number;
-        write(buf: Buffer): boolean;
-        end(buf: Buffer): void;
-
-        /**
-         * For each buffer, perform some action.
-         * If fn's result is a true value, cut out early.
-         */
-        forEach(fn: (buf: Buffer) => boolean): void;
-
-        /** Create a single buffer out of all the chunks */
-        join(start: number, end: number): Buffer;
-
-        /** Join all the chunks to existing buffer */
-        joinInto(buf: Buffer, offset: number, start: number, end: number): Buffer;
-
-        /**
-         * Advance the buffer stream by `n` bytes.
-         * If `n` the aggregate advance offset passes the end of the buffer list,
-         * operations such as `take` will return empty strings until enough data is pushed.
-         */
-        advance(n: number): IBufferList;
-
-        /**
-         * Take `n` bytes from the start of the buffers.
-         * If there are less than `n` bytes in all the buffers or `n` is undefined,
-         * returns the entire concatenated buffer string.
-         */
-        take(n: number, encoding?: string): any;
-        take(encoding?: string): any;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'advance', cb: (n: number) => void): this;
-        on(event: 'write', cb: (buf: Buffer) => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'advance', cb: (n: number) => void): this;
-        addListener(event: 'write', cb: (buf: Buffer) => void): this;
-    }
-
-    class connection extends events.EventEmitter {
-        static CLOSE_REASON_NORMAL: number;
-        static CLOSE_REASON_GOING_AWAY: number;
-        static CLOSE_REASON_PROTOCOL_ERROR: number;
-        static CLOSE_REASON_UNPROCESSABLE_INPUT: number;
-        static CLOSE_REASON_RESERVED: number;
-        static CLOSE_REASON_NOT_PROVIDED: number;
-        static CLOSE_REASON_ABNORMAL: number;
-        static CLOSE_REASON_INVALID_DATA: number;
-        static CLOSE_REASON_POLICY_VIOLATION: number;
-        static CLOSE_REASON_MESSAGE_TOO_BIG: number;
-        static CLOSE_REASON_EXTENSION_REQUIRED: number;
-
-        /**
-         * After the connection is closed, contains a textual description of the reason for
-         * the connection closure, or `null` if the connection is still open.
-         */
-        closeDescription: string;
-
-        /**
-         * After the connection is closed, contains the numeric close reason status code,
-         * or `-1` if the connection is still open.
-         */
-        closeReasonCode: number;
-
-        /**
-         * The subprotocol that was chosen to be spoken on this connection. This field
-         * will have been converted to lower case.
-         */
-        protocol: string;
-
-        config: IConfig;
-        socket: net.Socket;
-        maskOutgoingPackets: boolean;
-        maskBytes: Buffer;
-        frameHeader: Buffer;
-        bufferList: IBufferList;
-        currentFrame: frame;
-        fragmentationSize: number;
-        frameQueue: frame[];
-        state: string;
-        waitingForCloseResponse: boolean;
-        closeTimeout: number;
-        assembleFragments: number;
-        maxReceivedMessageSize: number;
-        outputPaused: boolean;
-        bytesWaitingToFlush: number;
-        socketHadError: boolean;
-
-        /** An array of extensions that were negotiated for this connection */
-        extensions: IExtension[];
-
-        /**
-         * The IP address of the remote peer as a string. In the case of a server,
-         * the `X-Forwarded-For` header will be respected and preferred for the purposes
-         * of populating this field. If you need to get to the actual remote IP address,
-         * `socket.remoteAddress` will provide it.
-         */
-        remoteAddress: string;
-
-        /** The version of the WebSocket protocol requested by the client */
-        webSocketVersion: number;
-        /** Whether or not the connection is still connected. Read-only */
-        connected: boolean;
-
-        constructor(socket: net.Socket, extensions: IExtension[], protocol: string,
-                    maskOutgoingPackets: boolean, config: IConfig);
-
-        /**
-         * Close the connection. A close frame will be sent to the remote peer indicating
-         * that we wish to close the connection, and we will then wait for up to
-         * `config.closeTimeout` milliseconds for an acknowledgment from the remote peer
-         * before terminating the underlying socket connection.
-         */
-        close(): void;
-
-        /**
-         * Send a close frame to the remote peer and immediately close the socket without
-         * waiting for a response. This should generally be used only in error conditions.
-         */
-        drop(reasonCode?: number, description?: string): void;
-
-        /**
-         * Immediately sends the specified string as a UTF-8 WebSocket message to the remote
-         * peer. If `config.fragmentOutgoingMessages` is true the message may be sent as
-         * multiple fragments if it exceeds `config.fragmentationThreshold` bytes.
-         */
-        sendUTF(data: IStringified): void;
-
-        /**
-         * Immediately sends the specified Node Buffer object as a Binary WebSocket message
-         * to the remote peer. If config.fragmentOutgoingMessages is true the message may be
-         * sent as multiple fragments if it exceeds config.fragmentationThreshold bytes.
-         */
-        sendBytes(buffer: Buffer): void;
-
-        /** Auto-detect the data type and send UTF-8 or Binary message */
-        send(data: Buffer): void;
-        send(data: IStringified): void;
-
-        /** Sends a ping frame. Ping frames must not exceed 125 bytes in length. */
-        ping(data: Buffer): void;
-        ping(data: IStringified): void;
-
-        /**
-         * Sends a pong frame. Pong frames may be sent unsolicited and such pong frames will
-         * trigger no action on the receiving peer. Pong frames sent in response to a ping
-         * frame must mirror the payload data of the ping frame exactly.
-         * The `connection` object handles this internally for you, so there should
-         * be no need to use this method to respond to pings.
-         * Pong frames must not exceed 125 bytes in length.
-         */
-        pong(buffer: Buffer): void;
-
-        /**
-         * Serializes a `frame` object into binary data and immediately sends it to
-         * the remote peer. This is an advanced function, requiring you to manually compose
-         * your own `frame`. You should probably use sendUTF or sendBytes instead.
-         */
-        sendFrame(frame: frame): void;
-
-        /** Set or reset the `keepalive` timer when data is received */
-        setKeepaliveTimer(): void;
-        setGracePeriodTimer(): void;
-        setCloseTimer(): void;
-        clearCloseTimer(): void;
-        processFrame(frame: frame): void;
-        fragmentAndSend(frame: frame, cb?: (err: Error) => void): void;
-        sendCloseFrame(reasonCode: number, reasonText: string, force: boolean): void;
-        sendCloseFrame(): void;
-        sendFrame(frame: frame, force: boolean, cb?: (msg: string) => void): void;
-        sendFrame(frame: frame, cb?: (msg: string) => void): void;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'message', cb: (data: IMessage) => void): this;
-        on(event: 'frame', cb: (frame: frame) => void): this;
-        on(event: 'close', cb: (code: number, desc: string) => void): this;
-        on(event: 'error', cb: (err: Error) => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'message', cb: (data: IMessage) => void): this;
-        addListener(event: 'frame', cb: (frame: frame) => void): this;
-        addListener(event: 'close', cb: (code: number, desc: string) => void): this;
-        addListener(event: 'error', cb: (err: Error) => void): this;
-    }
-
-    class frame {
-        /** Whether or not this is last frame in a fragmentation sequence */
-        fin: boolean;
-
-        /**
-         * Represents the RSV1 field in the framing. Setting this to true will result in
-         * a Protocol Error on the receiving peer.
-         */
-        rsv1: boolean;
-
-        /**
-         * Represents the RSV1 field in the framing. Setting this to true will result in
-         * a Protocol Error on the receiving peer.
-         */
-        rsv2: boolean;
-
-        /**
-         * Represents the RSV1 field in the framing. Setting this to true will result in
-         * a Protocol Error on the receiving peer.
-         */
-        rsv3: boolean;
-
-        /**
-         * Whether or not this frame is (or should be) masked. For outgoing frames, when
-         * connected as a client, this flag is automatically forced to true by `connection`.
-         * Outgoing frames sent from the server-side of a connection are not masked.
-         */
-        mask: number;
-
-        /**
-         * Identifies which kind of frame this is.
-         *
-         * Hex  - Dec - Description
-         * 0x00 -   0 - Continuation
-         * 0x01 -   1 - Text Frame
-         * 0x02 -   2 - Binary Frame
-         * 0x08 -   8 - Close Frame
-         * 0x09 -   9 - Ping Frame
-         * 0x0A -  10 - Pong Frame
-         */
-        opcode: number;
-
-        /**
-         * Identifies the length of the payload data on a received frame.
-         * When sending a frame, will be automatically calculated from `binaryPayload` object.
-         */
-        length: number;
-
-        /**
-         * The binary payload data.
-         * Even text frames are sent with a Buffer providing the binary payload data.
-         */
-        binaryPayload: Buffer;
-
-        maskBytes: Buffer;
-        frameHeader: Buffer;
-        config: IConfig;
-        maxReceivedFrameSize: number;
-        protocolError: boolean;
-        frameTooLarge: boolean;
-        invalidCloseFrameLength: boolean;
-        closeStatus: number;
-
-        addData(bufferList: IBufferList): boolean;
-        throwAwayPayload(bufferList: IBufferList): boolean;
-        toBuffer(nullMask: boolean): Buffer;
-    }
-
-    export interface IClientConfig extends IConfig {
-        /**
-         * Which version of the WebSocket protocol to use when making the connection.
-         * Currently supported values are 8 and 13. This option will be removed once the
-         * protocol is finalized by the IETF It is only available to ease the transition
-         * through the intermediate draft protocol versions. The only thing this affects
-         * the name of the Origin header.
-         * @default 13
-         */
-        webSocketVersion?: number;
-
-        /**
-         * The maximum allowed received frame size in bytes.
-         * Single frame messages will also be limited to this maximum.
-         * @default 1MiB
-         */
-        maxReceivedFrameSize?: number;
-
-        /**
-         * The maximum allowed aggregate message size (for fragmented messages) in bytes.
-         * @default 8MiB
-         */
-        maxReceivedMessageSize?: number;
-    }
-
-    class client extends events.EventEmitter {
-        protocols: string[];
-        origin: string;
-        url: url.Url;
-        secure: boolean;
-        socket: net.Socket;
-        response: http.ClientResponse;
-
-        constructor(clientConfig?: IClientConfig);
-
-        /**
-         * Establish a connection. The remote server will select the best subprotocol that
-         * it supports and send that back when establishing the connection.
-         *
-         * @param [origin] can be used in user-agent scenarios to identify the page containing
-         *                 any scripting content that caused the connection to be requested.
-         * @param requestUrl should be a standard websocket url
-         */
-        connect(requestUrl: url.Url, protocols?: string[], origin?: string, headers?: any[]): void;
-        connect(requestUrl: string,  protocols?: string[], origin?: string, headers?: any[]): void;
-        connect(requestUrl: url.Url, protocols?: string,   origin?: string, headers?: any[]): void;
-        connect(requestUrl: string,  protocols?: string,   origin?: string, headers?: any[]): void;
-
-        // Events
-        on(event: string, listener: () => void): this;
-        on(event: 'connect', cb: (connection: connection) => void): this;
-        on(event: 'connectFailed', cb: (err: Error) => void): this;
-        addListener(event: string, listener: () => void): this;
-        addListener(event: 'connect', cb: (connection: connection) => void): this;
-        addListener(event: 'connectFailed', cb: (err: Error) => void): this;
-    }
-
-    class routerRequest extends events.EventEmitter {
-
-      /** A reference to the original Node HTTP request object */
-      httpRequest: http.ClientRequest;
-      /** A string containing the path that was requested by the client */
-      resource: string;
-      /** Parsed resource, including the query string parameters */
-      resourceURL: url.Url;
-
-      /**
-       * Client's IP. If an `X-Forwarded-For` header is present, the value will be taken
-       * from that header to facilitate WebSocket servers that live behind a reverse-proxy
-       */
-      remoteAddress: string;
-
-      /**
-       * If the client is a web browser, origin will be a string containing the URL
-       * of the page containing the script that opened the connection.
-       * If the client is not a web browser, origin may be `null` or "*".
-       */
-      origin: string;
-
-      /** The version of the WebSocket protocol requested by the client */
-      webSocketVersion: number;
-      /** An array containing a list of extensions requested by the client */
-      requestedExtensions: any[];
-
-      cookies: ICookie[];
-
-      constructor(webSocketRequest: request, resolvedProtocol: string);
-
-      /**
-       * After inspecting the `request` properties, call this function on the
-       * request object to accept the connection. If you don't have a particular subprotocol
-       * you wish to speak, you may pass `null` for the `acceptedProtocol` parameter.
-       *
-       * @param [acceptedProtocol] case-insensitive value that was requested by the client
-       */
-      accept(acceptedProtocol?: string, allowedOrigin?: string, cookies?: ICookie[]): connection;
-
-      /**
-       * Reject connection.
-       * You may optionally pass in an HTTP Status code (such as 404) and a textual
-       * description that will be sent to the client in the form of an
-       * `X-WebSocket-Reject-Reason` header.
-       */
-      reject(httpStatus?: number, reason?: string): void;
-
-      // Events
-      on(event: string, listener: () => void): this;
-      on(event: 'requestAccepted', cb: (connection: connection) => void): this;
-      on(event: 'requestRejected', cb: () => void): this;
-      addListener(event: string, listener: () => void): this;
-      addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
-      addListener(event: 'requestRejected', cb: () => void): this;
-    }
-
-    interface IRouterConfig {
-      /*
-       * The WebSocketServer instance to attach to.
-       */
-      server: server
-    }
-
-    class router extends events.EventEmitter {
-
-      constructor(config?: IRouterConfig);
-
-      /** Attach to WebSocket server */
-      attachServer(server: server): void;
-
-      /** Detach from WebSocket server */
-      detachServer(): void;
-
-      mount(path: string, cb: (request: routerRequest) => void): void;
-      mount(path: string, protocol: string, cb: (request: routerRequest) => void): void;
-      mount(path: RegExp, cb: (request: routerRequest) => void): void;
-      mount(path: RegExp, protocol: string, cb: (request: routerRequest) => void): void;
-
-      unmount(path: string, protocol?: string): void;
-      unmount(path: RegExp, protocol?: string): void;
-
-    }
-
-    export var version: string;
-    export var constants: {
-        DEBUG: boolean;
-    };
+export interface IStringified {
+    toString: (...args: any[]) => string;
 }
+
+export interface IConfig {
+    /**
+     * The maximum allowed received frame size in bytes.
+     * Single frame messages will also be limited to this maximum.
+     */
+    maxReceivedFrameSize?: number;
+
+    /** The maximum allowed aggregate message size (for fragmented messages) in bytes */
+    maxReceivedMessageSize?: number;
+
+    /**
+     * Whether or not to fragment outgoing messages. If true, messages will be
+     * automatically fragmented into chunks of up to `fragmentationThreshold` bytes.
+     * @default true
+     */
+    fragmentOutgoingMessages?: boolean;
+
+    /**
+     * The maximum size of a frame in bytes before it is automatically fragmented.
+     * @default 16KiB
+     */
+    fragmentationThreshold?: number;
+
+    /**
+     * If true, fragmented messages will be automatically assembled and the full
+     * message will be emitted via a `message` event. If false, each frame will be
+     * emitted on the `connection` object via a `frame` event and the application
+     * will be responsible for aggregating multiple fragmented frames. Single-frame
+     * messages will emit a `message` event in addition to the `frame` event.
+     * @default true
+     */
+    assembleFragments?: boolean;
+
+    /**
+     * The number of milliseconds to wait after sending a close frame for an
+     * `acknowledgement` to come back before giving up and just closing the socket.
+     * @default 5000
+     */
+    closeTimeout?: number;
+}
+
+export interface IServerConfig extends IConfig {
+    /** The http server instance to attach to */
+    httpServer: http.Server;
+
+    /**
+     * The maximum allowed received frame size in bytes.
+     * Single frame messages will also be limited to this maximum.
+     * @default 64KiB
+     */
+    maxReceivedFrameSize?: number;
+
+    /**
+     * The maximum allowed aggregate message size (for fragmented messages) in bytes.
+     * @default 1MiB
+     */
+    maxReceivedMessageSize?: number;
+
+    /**
+     * If true, the server will automatically send a ping to all clients every
+     * `keepaliveInterval` milliseconds. Each client has an independent `keepalive`
+     * timer, which is reset when any data is received from that client.
+     * @default true
+     */
+    keepalive?: boolean;
+
+    /**
+     * The interval in milliseconds to send `keepalive` pings to connected clients.
+     * @default 20000
+     */
+    keepaliveInterval?: number;
+
+    /**
+     * If true, the server will consider any connection that has not received any
+     * data within the amount of time specified by `keepaliveGracePeriod` after a
+     * `keepalive` ping has been sent. Ignored if `keepalive` is false.
+     * @default true
+     */
+    dropConnectionOnKeepaliveTimeout?: boolean;
+
+    /**
+     * The amount of time to wait after sending a `keepalive` ping before closing
+     * the connection if the connected peer does not respond. Ignored if `keepalive`
+     * or `dropConnectionOnKeepaliveTimeout` are false. The grace period timer is
+     * reset when any data is received from the client.
+     * @default 10000
+     */
+    keepaliveGracePeriod?: number;
+
+    /**
+     * If this is true, websocket connections will be accepted regardless of the path
+     * and protocol specified by the client. The protocol accepted will be the first
+     * that was requested by the client.
+     * @default false
+     */
+    autoAcceptConnections?: boolean;
+
+    /**
+     * The Nagle Algorithm makes more efficient use of network resources by introducing a
+     * small delay before sending small packets so that multiple messages can be batched
+     * together before going onto the wire. This however comes at the cost of latency.
+     * @default true
+     */
+    disableNagleAlgorithm?: boolean;
+}
+
+declare export class server extends events.EventEmitter {
+    config: IServerConfig;
+    connections: connection[];
+
+    constructor(serverConfig?: IServerConfig);
+
+    /** Send binary message for each connection */
+    broadcast(data: Buffer): void;
+    /** Send UTF-8 message for each connection */
+    broadcast(data: IStringified): void;
+    /** Send binary message for each connection */
+    broadcastBytes(data: Buffer): void;
+    /** Send UTF-8 message for each connection */
+    broadcastUTF(data: IStringified): void;
+    /** Attach the `server` instance to a Node http.Server instance */
+    mount(serverConfig: IServerConfig): void;
+
+    /**
+     * Detach the `server` instance from the Node http.Server instance.
+     * All existing connections are left alone and will not be affected,
+     * but no new WebSocket connections will be accepted.
+     */
+    unmount(): void;
+
+    /** Close all open WebSocket connections */
+    closeAllConnections(): void;
+    /** Close all open WebSocket connections and unmount the server */
+    shutDown(): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'request', cb: (request: request) => void): this;
+    on(event: 'connect', cb: (connection: connection) => void): this;
+    on(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'request', cb: (request: request) => void): this;
+    addListener(event: 'connect', cb: (connection: connection) => void): this;
+    addListener(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
+}
+
+export interface ICookie {
+    name: string;
+    value: string;
+    path?: string;
+    domain?: string;
+    expires?: Date;
+    maxage?: number;
+    secure?: boolean;
+    httponly?: boolean;
+}
+
+export interface IExtension {
+    name: string;
+    value: string;
+}
+
+declare export class request extends events.EventEmitter {
+    /** A reference to the original Node HTTP request object */
+    httpRequest: http.ClientRequest;
+    /** This will include the port number if a non-standard port is used */
+    host: string;
+    /** A string containing the path that was requested by the client */
+    resource: string;
+    /** `Sec-WebSocket-Key` */
+    key: string;
+    /** Parsed resource, including the query string parameters */
+    resourceURL: url.Url;
+
+    /**
+     * Client's IP. If an `X-Forwarded-For` header is present, the value will be taken
+     * from that header to facilitate WebSocket servers that live behind a reverse-proxy
+     */
+    remoteAddress: string;
+
+    /**
+     * If the client is a web browser, origin will be a string containing the URL
+     * of the page containing the script that opened the connection.
+     * If the client is not a web browser, origin may be `null` or "*".
+     */
+    origin: string;
+
+    /** The version of the WebSocket protocol requested by the client */
+    webSocketVersion: number;
+    /** An array containing a list of extensions requested by the client */
+    requestedExtensions: any[];
+
+    cookies: ICookie[];
+    socket: net.Socket;
+
+    /**
+     * List of strings that indicate the subprotocols the client would like to speak.
+     * The server should select the best one that it can support from the list and
+     * pass it to the `accept` function when accepting the connection.
+     * Note that all the strings in the `requestedProtocols` array will have been
+     * converted to lower case.
+     */
+    requestedProtocols: string[];
+    protocolFullCaseMap: { [key: string]: string };
+
+    constructor(socket: net.Socket, httpRequest: http.ClientRequest, config: IServerConfig);
+
+    /**
+     * After inspecting the `request` properties, call this function on the
+     * request object to accept the connection. If you don't have a particular subprotocol
+     * you wish to speak, you may pass `null` for the `acceptedProtocol` parameter.
+     *
+     * @param [acceptedProtocol] case-insensitive value that was requested by the client
+     */
+    accept(acceptedProtocol?: string, allowedOrigin?: string, cookies?: ICookie[]): connection;
+
+    /**
+     * Reject connection.
+     * You may optionally pass in an HTTP Status code (such as 404) and a textual
+     * description that will be sent to the client in the form of an
+     * `X-WebSocket-Reject-Reason` header.
+     */
+    reject(httpStatus?: number, reason?: string): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'requestAccepted', cb: (connection: connection) => void): this;
+    on(event: 'requestRejected', cb: () => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
+    addListener(event: 'requestRejected', cb: () => void): this;
+}
+
+export interface IMessage {
+    type: string;
+    utf8Data?: string;
+    binaryData?: Buffer;
+}
+
+export interface IBufferList extends events.EventEmitter {
+    encoding: string;
+    length: number;
+    write(buf: Buffer): boolean;
+    end(buf: Buffer): void;
+
+    /**
+     * For each buffer, perform some action.
+     * If fn's result is a true value, cut out early.
+     */
+    forEach(fn: (buf: Buffer) => boolean): void;
+
+    /** Create a single buffer out of all the chunks */
+    join(start: number, end: number): Buffer;
+
+    /** Join all the chunks to existing buffer */
+    joinInto(buf: Buffer, offset: number, start: number, end: number): Buffer;
+
+    /**
+     * Advance the buffer stream by `n` bytes.
+     * If `n` the aggregate advance offset passes the end of the buffer list,
+     * operations such as `take` will return empty strings until enough data is pushed.
+     */
+    advance(n: number): IBufferList;
+
+    /**
+     * Take `n` bytes from the start of the buffers.
+     * If there are less than `n` bytes in all the buffers or `n` is undefined,
+     * returns the entire concatenated buffer string.
+     */
+    take(n: number, encoding?: string): any;
+    take(encoding?: string): any;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'advance', cb: (n: number) => void): this;
+    on(event: 'write', cb: (buf: Buffer) => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'advance', cb: (n: number) => void): this;
+    addListener(event: 'write', cb: (buf: Buffer) => void): this;
+}
+
+declare class connection extends events.EventEmitter {
+    static CLOSE_REASON_NORMAL: number;
+    static CLOSE_REASON_GOING_AWAY: number;
+    static CLOSE_REASON_PROTOCOL_ERROR: number;
+    static CLOSE_REASON_UNPROCESSABLE_INPUT: number;
+    static CLOSE_REASON_RESERVED: number;
+    static CLOSE_REASON_NOT_PROVIDED: number;
+    static CLOSE_REASON_ABNORMAL: number;
+    static CLOSE_REASON_INVALID_DATA: number;
+    static CLOSE_REASON_POLICY_VIOLATION: number;
+    static CLOSE_REASON_MESSAGE_TOO_BIG: number;
+    static CLOSE_REASON_EXTENSION_REQUIRED: number;
+
+    /**
+     * After the connection is closed, contains a textual description of the reason for
+     * the connection closure, or `null` if the connection is still open.
+     */
+    closeDescription: string;
+
+    /**
+     * After the connection is closed, contains the numeric close reason status code,
+     * or `-1` if the connection is still open.
+     */
+    closeReasonCode: number;
+
+    /**
+     * The subprotocol that was chosen to be spoken on this connection. This field
+     * will have been converted to lower case.
+     */
+    protocol: string;
+
+    config: IConfig;
+    socket: net.Socket;
+    maskOutgoingPackets: boolean;
+    maskBytes: Buffer;
+    frameHeader: Buffer;
+    bufferList: IBufferList;
+    currentFrame: frame;
+    fragmentationSize: number;
+    frameQueue: frame[];
+    state: string;
+    waitingForCloseResponse: boolean;
+    closeTimeout: number;
+    assembleFragments: number;
+    maxReceivedMessageSize: number;
+    outputPaused: boolean;
+    bytesWaitingToFlush: number;
+    socketHadError: boolean;
+
+    /** An array of extensions that were negotiated for this connection */
+    extensions: IExtension[];
+
+    /**
+     * The IP address of the remote peer as a string. In the case of a server,
+     * the `X-Forwarded-For` header will be respected and preferred for the purposes
+     * of populating this field. If you need to get to the actual remote IP address,
+     * `socket.remoteAddress` will provide it.
+     */
+    remoteAddress: string;
+
+    /** The version of the WebSocket protocol requested by the client */
+    webSocketVersion: number;
+    /** Whether or not the connection is still connected. Read-only */
+    connected: boolean;
+
+    constructor(socket: net.Socket, extensions: IExtension[], protocol: string,
+        maskOutgoingPackets: boolean, config: IConfig);
+
+    /**
+     * Close the connection. A close frame will be sent to the remote peer indicating
+     * that we wish to close the connection, and we will then wait for up to
+     * `config.closeTimeout` milliseconds for an acknowledgment from the remote peer
+     * before terminating the underlying socket connection.
+     */
+    close(): void;
+
+    /**
+     * Send a close frame to the remote peer and immediately close the socket without
+     * waiting for a response. This should generally be used only in error conditions.
+     */
+    drop(reasonCode?: number, description?: string): void;
+
+    /**
+     * Immediately sends the specified string as a UTF-8 WebSocket message to the remote
+     * peer. If `config.fragmentOutgoingMessages` is true the message may be sent as
+     * multiple fragments if it exceeds `config.fragmentationThreshold` bytes.
+     */
+    sendUTF(data: IStringified): void;
+
+    /**
+     * Immediately sends the specified Node Buffer object as a Binary WebSocket message
+     * to the remote peer. If config.fragmentOutgoingMessages is true the message may be
+     * sent as multiple fragments if it exceeds config.fragmentationThreshold bytes.
+     */
+    sendBytes(buffer: Buffer): void;
+
+    /** Auto-detect the data type and send UTF-8 or Binary message */
+    send(data: Buffer): void;
+    send(data: IStringified): void;
+
+    /** Sends a ping frame. Ping frames must not exceed 125 bytes in length. */
+    ping(data: Buffer): void;
+    ping(data: IStringified): void;
+
+    /**
+     * Sends a pong frame. Pong frames may be sent unsolicited and such pong frames will
+     * trigger no action on the receiving peer. Pong frames sent in response to a ping
+     * frame must mirror the payload data of the ping frame exactly.
+     * The `connection` object handles this internally for you, so there should
+     * be no need to use this method to respond to pings.
+     * Pong frames must not exceed 125 bytes in length.
+     */
+    pong(buffer: Buffer): void;
+
+    /**
+     * Serializes a `frame` object into binary data and immediately sends it to
+     * the remote peer. This is an advanced function, requiring you to manually compose
+     * your own `frame`. You should probably use sendUTF or sendBytes instead.
+     */
+    sendFrame(frame: frame): void;
+
+    /** Set or reset the `keepalive` timer when data is received */
+    setKeepaliveTimer(): void;
+    setGracePeriodTimer(): void;
+    setCloseTimer(): void;
+    clearCloseTimer(): void;
+    processFrame(frame: frame): void;
+    fragmentAndSend(frame: frame, cb?: (err: Error) => void): void;
+    sendCloseFrame(reasonCode: number, reasonText: string, force: boolean): void;
+    sendCloseFrame(): void;
+    sendFrame(frame: frame, force: boolean, cb?: (msg: string) => void): void;
+    sendFrame(frame: frame, cb?: (msg: string) => void): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'message', cb: (data: IMessage) => void): this;
+    on(event: 'frame', cb: (frame: frame) => void): this;
+    on(event: 'close', cb: (code: number, desc: string) => void): this;
+    on(event: 'error', cb: (err: Error) => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'message', cb: (data: IMessage) => void): this;
+    addListener(event: 'frame', cb: (frame: frame) => void): this;
+    addListener(event: 'close', cb: (code: number, desc: string) => void): this;
+    addListener(event: 'error', cb: (err: Error) => void): this;
+}
+
+declare class frame {
+    /** Whether or not this is last frame in a fragmentation sequence */
+    fin: boolean;
+
+    /**
+     * Represents the RSV1 field in the framing. Setting this to true will result in
+     * a Protocol Error on the receiving peer.
+     */
+    rsv1: boolean;
+
+    /**
+     * Represents the RSV1 field in the framing. Setting this to true will result in
+     * a Protocol Error on the receiving peer.
+     */
+    rsv2: boolean;
+
+    /**
+     * Represents the RSV1 field in the framing. Setting this to true will result in
+     * a Protocol Error on the receiving peer.
+     */
+    rsv3: boolean;
+
+    /**
+     * Whether or not this frame is (or should be) masked. For outgoing frames, when
+     * connected as a client, this flag is automatically forced to true by `connection`.
+     * Outgoing frames sent from the server-side of a connection are not masked.
+     */
+    mask: number;
+
+    /**
+     * Identifies which kind of frame this is.
+     *
+     * Hex  - Dec - Description
+     * 0x00 -   0 - Continuation
+     * 0x01 -   1 - Text Frame
+     * 0x02 -   2 - Binary Frame
+     * 0x08 -   8 - Close Frame
+     * 0x09 -   9 - Ping Frame
+     * 0x0A -  10 - Pong Frame
+     */
+    opcode: number;
+
+    /**
+     * Identifies the length of the payload data on a received frame.
+     * When sending a frame, will be automatically calculated from `binaryPayload` object.
+     */
+    length: number;
+
+    /**
+     * The binary payload data.
+     * Even text frames are sent with a Buffer providing the binary payload data.
+     */
+    binaryPayload: Buffer;
+
+    maskBytes: Buffer;
+    frameHeader: Buffer;
+    config: IConfig;
+    maxReceivedFrameSize: number;
+    protocolError: boolean;
+    frameTooLarge: boolean;
+    invalidCloseFrameLength: boolean;
+    closeStatus: number;
+
+    addData(bufferList: IBufferList): boolean;
+    throwAwayPayload(bufferList: IBufferList): boolean;
+    toBuffer(nullMask: boolean): Buffer;
+}
+
+export interface IClientConfig extends IConfig {
+    /**
+     * Which version of the WebSocket protocol to use when making the connection.
+     * Currently supported values are 8 and 13. This option will be removed once the
+     * protocol is finalized by the IETF It is only available to ease the transition
+     * through the intermediate draft protocol versions. The only thing this affects
+     * the name of the Origin header.
+     * @default 13
+     */
+    webSocketVersion?: number;
+
+    /**
+     * The maximum allowed received frame size in bytes.
+     * Single frame messages will also be limited to this maximum.
+     * @default 1MiB
+     */
+    maxReceivedFrameSize?: number;
+
+    /**
+     * The maximum allowed aggregate message size (for fragmented messages) in bytes.
+     * @default 8MiB
+     */
+    maxReceivedMessageSize?: number;
+}
+
+declare class client extends events.EventEmitter {
+    protocols: string[];
+    origin: string;
+    url: url.Url;
+    secure: boolean;
+    socket: net.Socket;
+    response: http.ClientResponse;
+
+    constructor(clientConfig?: IClientConfig);
+
+    /**
+     * Establish a connection. The remote server will select the best subprotocol that
+     * it supports and send that back when establishing the connection.
+     *
+     * @param [origin] can be used in user-agent scenarios to identify the page containing
+     *                 any scripting content that caused the connection to be requested.
+     * @param requestUrl should be a standard websocket url
+     */
+    connect(requestUrl: url.Url, protocols?: string[], origin?: string, headers?: any[]): void;
+    connect(requestUrl: string, protocols?: string[], origin?: string, headers?: any[]): void;
+    connect(requestUrl: url.Url, protocols?: string, origin?: string, headers?: any[]): void;
+    connect(requestUrl: string, protocols?: string, origin?: string, headers?: any[]): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'connect', cb: (connection: connection) => void): this;
+    on(event: 'connectFailed', cb: (err: Error) => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'connect', cb: (connection: connection) => void): this;
+    addListener(event: 'connectFailed', cb: (err: Error) => void): this;
+}
+
+declare class routerRequest extends events.EventEmitter {
+
+    /** A reference to the original Node HTTP request object */
+    httpRequest: http.ClientRequest;
+    /** A string containing the path that was requested by the client */
+    resource: string;
+    /** Parsed resource, including the query string parameters */
+    resourceURL: url.Url;
+
+    /**
+     * Client's IP. If an `X-Forwarded-For` header is present, the value will be taken
+     * from that header to facilitate WebSocket servers that live behind a reverse-proxy
+     */
+    remoteAddress: string;
+
+    /**
+     * If the client is a web browser, origin will be a string containing the URL
+     * of the page containing the script that opened the connection.
+     * If the client is not a web browser, origin may be `null` or "*".
+     */
+    origin: string;
+
+    /** The version of the WebSocket protocol requested by the client */
+    webSocketVersion: number;
+    /** An array containing a list of extensions requested by the client */
+    requestedExtensions: any[];
+
+    cookies: ICookie[];
+
+    constructor(webSocketRequest: request, resolvedProtocol: string);
+
+    /**
+     * After inspecting the `request` properties, call this function on the
+     * request object to accept the connection. If you don't have a particular subprotocol
+     * you wish to speak, you may pass `null` for the `acceptedProtocol` parameter.
+     *
+     * @param [acceptedProtocol] case-insensitive value that was requested by the client
+     */
+    accept(acceptedProtocol?: string, allowedOrigin?: string, cookies?: ICookie[]): connection;
+
+    /**
+     * Reject connection.
+     * You may optionally pass in an HTTP Status code (such as 404) and a textual
+     * description that will be sent to the client in the form of an
+     * `X-WebSocket-Reject-Reason` header.
+     */
+    reject(httpStatus?: number, reason?: string): void;
+
+    // Events
+    on(event: string, listener: () => void): this;
+    on(event: 'requestAccepted', cb: (connection: connection) => void): this;
+    on(event: 'requestRejected', cb: () => void): this;
+    addListener(event: string, listener: () => void): this;
+    addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
+    addListener(event: 'requestRejected', cb: () => void): this;
+}
+
+interface IRouterConfig {
+    /*
+     * The WebSocketServer instance to attach to.
+     */
+    server: server
+}
+
+declare class router extends events.EventEmitter {
+
+    constructor(config?: IRouterConfig);
+
+    /** Attach to WebSocket server */
+    attachServer(server: server): void;
+
+    /** Detach from WebSocket server */
+    detachServer(): void;
+
+    mount(path: string, cb: (request: routerRequest) => void): void;
+    mount(path: string, protocol: string, cb: (request: routerRequest) => void): void;
+    mount(path: RegExp, cb: (request: routerRequest) => void): void;
+    mount(path: RegExp, protocol: string, cb: (request: routerRequest) => void): void;
+
+    unmount(path: string, protocol?: string): void;
+    unmount(path: RegExp, protocol?: string): void;
+
+}
+
+declare export var version: string;
+declare export var constants: {
+    DEBUG: boolean;
+};
diff --git a/which/which.d.ts b/which/which.d.ts
index 56d235d251..1fcfbc60e3 100644
--- a/which/which.d.ts
+++ b/which/which.d.ts
@@ -3,11 +3,10 @@
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "which" {
-  function when (cmd: string, cb: (err: Error, path: string) => void): void;
-  namespace when {
-    function sync(cmd: string): string;
-  }
 
-  export = when;
+declare function when(cmd: string, cb: (err: Error, path: string) => void): void;
+declare namespace when {
+    function sync(cmd: string): string;
 }
+
+export = when;
diff --git a/windows-service/windows-service.d.ts b/windows-service/windows-service.d.ts
index 3d670f585d..509982c702 100644
--- a/windows-service/windows-service.d.ts
+++ b/windows-service/windows-service.d.ts
@@ -4,71 +4,70 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-declare module "windows-service" {
-	import stream = require("stream");
 
-	/**
-	 * Options for the add() function.
-	 */
-	export interface AddOptions {
-		/**
-		 * The services display name, defaults to the name parameter
-		 */
-		displayName?: string;
-		/**
-		 * The fully qualified path to the node binary used to run the service (i.e. c:\Program Files\nodejs\node.exe, defaults to the value of process.execPath
-		 */
-		nodePath?: string;
-		/**
-		 * An array of strings specifying parameters to pass to nodePath, defaults to []
-		 */
-		nodeArgs?: string[];
-		/**
-		 * The program to run using nodePath, defaults to the value of process.argv[1]
-		 */
-		programPath?: string;
-		/**
-		 * An array of strings specifying parameters to pass to programPath, defaults to []
-		 */
-		programArgs?: string[];
-	}
+import stream = require("stream");
 
-	/**
-	 * The add() function adds a Windows service. The service will be set to automatically start at boot time, but not started.
-	 * The service can be started using the net start "My Service" command. An exception will be thrown if the service could
-	 * not be added. The error will be an instance of the Error class.
-	 *
-	 * @param name The name parameter specifies the name of the created service.
-	 * @param opts Options
-	 */
-	export function add(name: string, opts?: AddOptions): void;
-
-
-	/**
-	 * The remove() function removes a Windows service.
-	 * The name parameter specifies the name of the service to remove. This will be the same name parameter specified when adding the service.
-	 * The service must be in a stopped state for it to be removed. The net stop "My Service" command can be used to stop the service before
-	 * it is to be removed.
-	 * An exception will be thrown if the service could not be removed. The error will be an instance of the Error class.
-	 */
-	export function remove(name: string): void;
-
-	/**
-	 * The run() function will connect the calling program to the Windows Service Control Manager, allowing the program to run as a Windows service.
-	 * The programs process.stdout stream will be replaced with the stdoutLogStream parameter, and the programs process.stderr stream replaced with
-	 * the stdoutLogStream parameter (this allows the redirection of all console.log() type calls to a service specific log file). If the stderrLogStream
-	 * parameter is not specified the programs process.stderr stream will be replaced with the stdoutLogStream parameter. The callback function will be
-	 * called when the service receives a stop request, e.g. because the Windows Service Controller was used to send a stop request to the service.
-	 * The program should perform cleanup tasks and then call the service.stop() function.
-	 */
-	export function run(stdoutLogStream: stream.Writable, callback: () => void): void;
-	export function run(stdoutLogStream: stream.Writable, stderrLogStream: stream.Writable, callback: () => void): void;
-
-	/**
-	 * The stop() function will cause the service to stop, and the calling program to exit.
-	 * Once the service has been stopped this function will terminate the program by calling the process.exit() function, passing to it the rcode
-	 * parameter which defaults to 0. Before calling this function ensure the program has finished performing cleanup tasks.
-	 * BE AWARE, THIS FUNCTION WILL NOT RETURN.
-	 */
-	export function stop(rcode?: number): void;
+/**
+ * Options for the add() function.
+ */
+export interface AddOptions {
+    /**
+     * The services display name, defaults to the name parameter
+     */
+    displayName?: string;
+    /**
+     * The fully qualified path to the node binary used to run the service (i.e. c:\Program Files\nodejs\node.exe, defaults to the value of process.execPath
+     */
+    nodePath?: string;
+    /**
+     * An array of strings specifying parameters to pass to nodePath, defaults to []
+     */
+    nodeArgs?: string[];
+    /**
+     * The program to run using nodePath, defaults to the value of process.argv[1]
+     */
+    programPath?: string;
+    /**
+     * An array of strings specifying parameters to pass to programPath, defaults to []
+     */
+    programArgs?: string[];
 }
+
+/**
+ * The add() function adds a Windows service. The service will be set to automatically start at boot time, but not started.
+ * The service can be started using the net start "My Service" command. An exception will be thrown if the service could
+ * not be added. The error will be an instance of the Error class.
+ *
+ * @param name The name parameter specifies the name of the created service.
+ * @param opts Options
+ */
+declare export function add(name: string, opts?: AddOptions): void;
+
+
+/**
+ * The remove() function removes a Windows service.
+ * The name parameter specifies the name of the service to remove. This will be the same name parameter specified when adding the service.
+ * The service must be in a stopped state for it to be removed. The net stop "My Service" command can be used to stop the service before
+ * it is to be removed.
+ * An exception will be thrown if the service could not be removed. The error will be an instance of the Error class.
+ */
+declare export function remove(name: string): void;
+
+/**
+ * The run() function will connect the calling program to the Windows Service Control Manager, allowing the program to run as a Windows service.
+ * The programs process.stdout stream will be replaced with the stdoutLogStream parameter, and the programs process.stderr stream replaced with
+ * the stdoutLogStream parameter (this allows the redirection of all console.log() type calls to a service specific log file). If the stderrLogStream
+ * parameter is not specified the programs process.stderr stream will be replaced with the stdoutLogStream parameter. The callback function will be
+ * called when the service receives a stop request, e.g. because the Windows Service Controller was used to send a stop request to the service.
+ * The program should perform cleanup tasks and then call the service.stop() function.
+ */
+declare export function run(stdoutLogStream: stream.Writable, callback: () => void): void;
+declare export function run(stdoutLogStream: stream.Writable, stderrLogStream: stream.Writable, callback: () => void): void;
+
+/**
+ * The stop() function will cause the service to stop, and the calling program to exit.
+ * Once the service has been stopped this function will terminate the program by calling the process.exit() function, passing to it the rcode
+ * parameter which defaults to 0. Before calling this function ensure the program has finished performing cleanup tasks.
+ * BE AWARE, THIS FUNCTION WILL NOT RETURN.
+ */
+declare export function stop(rcode?: number): void;
diff --git a/winston/winston.d.ts b/winston/winston.d.ts
index 3b021bf097..0854208544 100644
--- a/winston/winston.d.ts
+++ b/winston/winston.d.ts
@@ -11,43 +11,43 @@
 ///  Winston v2.2.x
 ///******************
 
-declare module "winston" {
-  export var transports: Transports;
-  export var Transport: TransportStatic;
-  export var Logger: LoggerStatic;
-  export var Container: ContainerStatic;
-  export var loggers: ContainerInstance;
-  export var defaultLogger: LoggerInstance;
 
-  export var exception: Exception;
+declare export var transports: Transports;
+declare export var Transport: TransportStatic;
+declare export var Logger: LoggerStatic;
+declare export var Container: ContainerStatic;
+declare export var loggers: ContainerInstance;
+declare export var defaultLogger: LoggerInstance;
 
-  export var exitOnError: boolean;
-  export var level: string;
+declare export var exception: Exception;
 
-  export var log: LogMethod;
+declare export var exitOnError: boolean;
+declare export var level: string;
 
-  export var debug: LeveledLogMethod;
-  export var info: LeveledLogMethod;
-  export var warn: LeveledLogMethod;
-  export var error: LeveledLogMethod;
+declare export var log: LogMethod;
 
-  export function query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
-  export function query(callback: (err: Error, results: any) => void): any;
-  export function stream(options?: any): NodeJS.ReadableStream;
-  export function handleExceptions(...transports: TransportInstance[]): void;
-  export function unhandleExceptions(...transports: TransportInstance[]): void;
-  export function add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
-  export function clear(): void;
-  export function remove(transport: string): LoggerInstance;
-  export function remove(transport: TransportInstance): LoggerInstance;
-  export function startTimer(): ProfileHandler;
-  export function profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
-  export function addColors(target: any): any;
-  export function setLevels(target: any): any;
-  export function cli(): LoggerInstance;
-  export function close(): void;
+declare export var debug: LeveledLogMethod;
+declare export var info: LeveledLogMethod;
+declare export var warn: LeveledLogMethod;
+declare export var error: LeveledLogMethod;
 
-  export interface ExceptionProcessInfo {
+declare export function query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
+declare export function query(callback: (err: Error, results: any) => void): any;
+declare export function stream(options?: any): NodeJS.ReadableStream;
+declare export function handleExceptions(...transports: TransportInstance[]): void;
+declare export function unhandleExceptions(...transports: TransportInstance[]): void;
+declare export function add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
+declare export function clear(): void;
+declare export function remove(transport: string): LoggerInstance;
+declare export function remove(transport: TransportInstance): LoggerInstance;
+declare export function startTimer(): ProfileHandler;
+declare export function profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
+declare export function addColors(target: any): any;
+declare export function setLevels(target: any): any;
+declare export function cli(): LoggerInstance;
+declare export function close(): void;
+
+export interface ExceptionProcessInfo {
     pid: number;
     uid?: number;
     gid?: number;
@@ -56,50 +56,50 @@ declare module "winston" {
     version: string;
     argv: string;
     memoryUsage: NodeJS.MemoryUsage;
-  }
+}
 
-  export interface ExceptionOsInfo {
+export interface ExceptionOsInfo {
     loadavg: [number, number, number];
     uptime: number;
-  }
+}
 
-  export interface ExceptionTrace {
+export interface ExceptionTrace {
     column: number;
     file: string;
     "function": string;
     line: number;
     method: string;
     native: boolean;
-  }
+}
 
-  export interface ExceptionAllInfo {
+export interface ExceptionAllInfo {
     date: Date;
     process: ExceptionProcessInfo;
     os: ExceptionOsInfo;
     trace: Array<ExceptionTrace>;
     stack: Array<string>;
-  }
+}
 
-  export interface Exception {
+export interface Exception {
     getAllInfo(err: Error): ExceptionAllInfo;
     getProcessInfo(): ExceptionProcessInfo;
     getOsInfo(): ExceptionOsInfo;
     getTrace(err: Error): Array<ExceptionTrace>;
-  }
+}
 
-  export interface MetadataRewriter {
+export interface MetadataRewriter {
     (level: string, msg: string, meta: any): any;
-  }
+}
 
-  export interface MetadataFilter {
-    (level: string, msg: string, meta: any): string | {msg: any; meta: any;};
-  }
+export interface MetadataFilter {
+    (level: string, msg: string, meta: any): string | { msg: any; meta: any; };
+}
 
-  export interface LoggerStatic {
+export interface LoggerStatic {
     new (options?: LoggerOptions): LoggerInstance;
-  }
+}
 
-  export interface LoggerInstance extends NodeJS.EventEmitter {
+export interface LoggerInstance extends NodeJS.EventEmitter {
     rewriters: Array<MetadataRewriter>;
     filters: Array<MetadataFilter>;
     transports: Array<TransportInstance>;
@@ -127,11 +127,11 @@ declare module "winston" {
 
     setLevels(target: any): any;
     cli(): LoggerInstance;
-    
-    level: string;
-  }
 
-  export interface LoggerOptions {
+    level: string;
+}
+
+export interface LoggerOptions {
     transports?: TransportInstance[];
     rewriters?: TransportInstance[];
     exceptionHandlers?: TransportInstance[];
@@ -146,53 +146,53 @@ declare module "winston" {
     //       and need to get options for each instance.
     //       Unfortunately, the documentation is unhelpful.
     [optionName: string]: any;
-  }
+}
 
-  export interface TransportStatic {
+export interface TransportStatic {
     new (options?: TransportOptions): TransportInstance;
-  }
+}
 
-  export interface TransportInstance extends TransportStatic, NodeJS.EventEmitter {
-    formatQuery(query: (string|Object)): (string|Object);
+export interface TransportInstance extends TransportStatic, NodeJS.EventEmitter {
+    formatQuery(query: (string | Object)): (string | Object);
     normalizeQuery(options: QueryOptions): QueryOptions;
-    formatResults(results: (Object|Array<any>), options?: Object): (Object|Array<any>);
+    formatResults(results: (Object | Array<any>), options?: Object): (Object | Array<any>);
     logException(msg: string, meta: Object, callback: () => void): void;
-  }
+}
 
-  export interface ConsoleTransportInstance extends TransportInstance {
+export interface ConsoleTransportInstance extends TransportInstance {
     new (options?: ConsoleTransportOptions): ConsoleTransportInstance;
-  }
+}
 
-  export interface DailyRotateFileTransportInstance extends TransportInstance {
+export interface DailyRotateFileTransportInstance extends TransportInstance {
     new (options?: DailyRotateFileTransportOptions): DailyRotateFileTransportInstance;
-  }
+}
 
-  export interface FileTransportInstance extends TransportInstance {
+export interface FileTransportInstance extends TransportInstance {
     new (options?: FileTransportOptions): FileTransportInstance;
     close(): void;
-  }
+}
 
-  export interface HttpTransportInstance extends TransportInstance {
+export interface HttpTransportInstance extends TransportInstance {
     new (options?: HttpTransportOptions): HttpTransportInstance;
-  }
+}
 
-  export interface MemoryTransportInstance extends TransportInstance {
+export interface MemoryTransportInstance extends TransportInstance {
     new (options?: MemoryTransportOptions): MemoryTransportInstance;
-  }
+}
 
-  export interface WebhookTransportInstance extends TransportInstance {
+export interface WebhookTransportInstance extends TransportInstance {
     new (options?: WebhookTransportOptions): WebhookTransportInstance;
-  }
+}
 
-  export interface WinstonModuleTrasportInstance extends TransportInstance {
+export interface WinstonModuleTrasportInstance extends TransportInstance {
     new (options?: WinstonModuleTransportOptions): WinstonModuleTrasportInstance;
-  }
+}
 
-  export interface ContainerStatic {
+export interface ContainerStatic {
     new (options: LoggerOptions): ContainerInstance;
-  }
+}
 
-  export interface ContainerInstance extends ContainerStatic {
+export interface ContainerInstance extends ContainerStatic {
     get(id: string, options?: LoggerOptions): LoggerInstance;
     add(id: string, options: LoggerOptions): LoggerInstance;
     has(id: string): boolean;
@@ -200,9 +200,9 @@ declare module "winston" {
     options: LoggerOptions;
     loggers: any;
     default: LoggerOptions;
-  }
+}
 
-  export interface Transports {
+export interface Transports {
     File: FileTransportInstance;
     Console: ConsoleTransportInstance;
     Loggly: WinstonModuleTrasportInstance;
@@ -210,11 +210,11 @@ declare module "winston" {
     Http: HttpTransportInstance;
     Memory: MemoryTransportInstance;
     Webhook: WebhookTransportInstance;
-  }
+}
 
-  export type TransportOptions = ConsoleTransportOptions|DailyRotateFileTransportOptions|FileTransportOptions|HttpTransportOptions|MemoryTransportOptions|WebhookTransportOptions|WinstonModuleTransportOptions;
+export type TransportOptions = ConsoleTransportOptions | DailyRotateFileTransportOptions | FileTransportOptions | HttpTransportOptions | MemoryTransportOptions | WebhookTransportOptions | WinstonModuleTransportOptions;
 
-  export interface GenericTransportOptions {
+export interface GenericTransportOptions {
     level?: string;
     silent?: boolean;
     raw?: boolean;
@@ -223,36 +223,36 @@ declare module "winston" {
     handleExceptions?: boolean;
     exceptionsLevel?: string;
     humanReadableUnhandledException?: boolean;
-  }
+}
 
-  export interface GenericTextTransportOptions {
+export interface GenericTextTransportOptions {
     json?: boolean;
     colorize?: boolean;
     colors?: any;
     prettyPrint?: boolean;
-    timestamp?: (Function|boolean);
+    timestamp?: (Function | boolean);
     showLevel?: boolean;
     label?: string;
     depth?: number;
     stringify?: Function;
-  }
+}
 
-  export interface GenericNetworkTransportOptions {
+export interface GenericNetworkTransportOptions {
     host?: string;
     port?: number;
     auth?: {
-      username: string;
-      password: string;
+        username: string;
+        password: string;
     };
     path?: string;
-  }
+}
 
-  export interface ConsoleTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
+export interface ConsoleTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
     logstash?: boolean;
     debugStdout?: boolean;
-  }
+}
 
-  export interface DailyRotateFileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
+export interface DailyRotateFileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
     logstash?: boolean;
     maxsize?: number;
     maxFiles?: number;
@@ -262,13 +262,13 @@ declare module "winston" {
     filename?: string;
     dirname?: string;
     options?: {
-      flags?: string;
-      highWaterMark?: number;
+        flags?: string;
+        highWaterMark?: number;
     };
     stream?: NodeJS.WritableStream;
-  }
+}
 
-  export interface FileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
+export interface FileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
     logstash?: boolean;
     maxsize?: number;
     rotationFormat?: boolean;
@@ -280,33 +280,33 @@ declare module "winston" {
     filename?: string;
     dirname?: string;
     options?: {
-      flags?: string;
-      highWaterMark?: number;
+        flags?: string;
+        highWaterMark?: number;
     };
     stream?: NodeJS.WritableStream;
-  }
+}
 
-  export interface HttpTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
+export interface HttpTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
     ssl?: boolean;
-  }
+}
 
-  export interface MemoryTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-  }
+export interface MemoryTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
+}
 
-  export interface WebhookTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
+export interface WebhookTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
     method?: string;
     ssl?: {
-      key?: any;
-      cert?: any;
-      ca: any;
+        key?: any;
+        cert?: any;
+        ca: any;
     };
-  }
+}
 
-  export interface WinstonModuleTransportOptions extends GenericTransportOptions {
+export interface WinstonModuleTransportOptions extends GenericTransportOptions {
     [optionName: string]: any;
-  }
+}
 
-  export interface QueryOptions {
+export interface QueryOptions {
     rows?: number;
     limit?: number;
     start?: number;
@@ -314,27 +314,26 @@ declare module "winston" {
     until?: Date;
     order?: "asc" | "desc";
     fields: any;
-  }
+}
 
-  export interface ProfileHandler {
+export interface ProfileHandler {
     logger: LoggerInstance;
     start: Date;
     done: (msg: string) => LoggerInstance;
-  }
+}
 
-  interface LogMethod {
+interface LogMethod {
     (level: string, msg: string, callback: LogCallback): LoggerInstance;
     (level: string, msg: string, meta: any, callback: LogCallback): LoggerInstance;
-    (level: string, msg: string, ... meta: any[]): LoggerInstance;
-  }
+    (level: string, msg: string, ...meta: any[]): LoggerInstance;
+}
 
-  interface LeveledLogMethod {
+interface LeveledLogMethod {
     (msg: string, callback: LogCallback): LoggerInstance;
     (msg: string, meta: any, callback: LogCallback): LoggerInstance;
-    (msg: string, ... meta: any[]): LoggerInstance;
-  }
-
-  interface LogCallback {
-    (error?: any, level?: string, msg?: string, meta?:any): void;
-  }
+    (msg: string, ...meta: any[]): LoggerInstance;
+}
+
+interface LogCallback {
+    (error?: any, level?: string, msg?: string, meta?: any): void;
 }
diff --git a/wiredep/wiredep.d.ts b/wiredep/wiredep.d.ts
index 456f47b67e..6d0da5b23d 100644
--- a/wiredep/wiredep.d.ts
+++ b/wiredep/wiredep.d.ts
@@ -5,34 +5,34 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module 'wiredep' {
 
-  interface PathFiles{
+
+interface PathFiles {
     [type: string]: string[];
-  }
+}
 
-  /**
-   * @return {PathFiles} paths to your files by extension
-   * @example:
-   *  {
-   *     js: [
-   *       'paths/to/your/js/files.js',
-   *       'in/their/order/of/dependency.js'
-   *     ],
-   *     css: [
-   *       'paths/to/your/css/files.css'
-   *     ],
-   *     // etc.
-   *   }
-   */
-  function Wiredep(config: WiredepParams): PathFiles;
+/**
+ * @return {PathFiles} paths to your files by extension
+ * @example:
+ *  {
+ *     js: [
+ *       'paths/to/your/js/files.js',
+ *       'in/their/order/of/dependency.js'
+ *     ],
+ *     css: [
+ *       'paths/to/your/css/files.css'
+ *     ],
+ *     // etc.
+ *   }
+ */
+declare function Wiredep(config: WiredepParams): PathFiles;
 
-  namespace Wiredep {
+declare namespace Wiredep {
     export function stream(config: WiredepParams): NodeJS.ReadWriteStream;
-  }
+}
 
 
-  interface WiredepParams {
+interface WiredepParams {
     src?: string | string[];
     /**
      * the directory of your Bower packages.
@@ -113,10 +113,10 @@ declare module 'wiredep' {
      */
     onMainNotFound?: (pkg: string) => void;
 
-    fileTypes?  : FileTypes;
-  }
+    fileTypes?: FileTypes;
+}
 
-  interface FileObject {
+interface FileObject {
     /**
      * type of wiredep block ('js', 'css', etc)
      */
@@ -129,244 +129,243 @@ declare module 'wiredep' {
      * path to file that was injected
      */
     path: string
-  }
+}
 
-  interface FileTypes {
+interface FileTypes {
     fileExtension: {
-      /**
-       *  match the beginning-to-end of a bower block in this type of file
-       */
-      block: RegExp;
-      detect: {
         /**
-         * match the way this type of file is included
+         *  match the beginning-to-end of a bower block in this type of file
          */
-        typeOfBowerFile: RegExp;
-      };
-      replace: {
-        /**
-         * <format for this {{filePath}} to be injected>
-         */
-        typeOfBowerFile: string;
-        /**
-         * @exemple:
-         *   return '<script class="random-' + Math.random() + '" src="' + filePath + '"></script>'
-         */
-        anotherTypeOfBowerFile: (filePath: string) => string;
-      }
+        block: RegExp;
+        detect: {
+            /**
+             * match the way this type of file is included
+             */
+            typeOfBowerFile: RegExp;
+        };
+        replace: {
+            /**
+             * <format for this {{filePath}} to be injected>
+             */
+            typeOfBowerFile: string;
+            /**
+             * @exemple:
+             *   return '<script class="random-' + Math.random() + '" src="' + filePath + '"></script>'
+             */
+            anotherTypeOfBowerFile: (filePath: string) => string;
+        }
     };
 
     // defaults:
     html: {
-      /**
-       * @example:
-       *  /(([ \t]*)<!--\s*bower:*(\S*)\s*-->)(\n|\r|.)*?(<!--\s*endbower\s*-->)/gi
-       */
-      block: RegExp;
+        /**
+         * @example:
+         *  /(([ \t]*)<!--\s*bower:*(\S*)\s*-->)(\n|\r|.)*?(<!--\s*endbower\s*-->)/gi
+         */
+        block: RegExp;
 
-      detect: {
-        /**
-         * @example:
-         *  /<script.*src=['"]([^'"]+)/gi
-         */
-        js: RegExp;
-        /**
-         * @example:
-         *  /<link.*href=['"]([^'"]+)/gi
-         */
-        css: RegExp;
-      };
+        detect: {
+            /**
+             * @example:
+             *  /<script.*src=['"]([^'"]+)/gi
+             */
+            js: RegExp;
+            /**
+             * @example:
+             *  /<link.*href=['"]([^'"]+)/gi
+             */
+            css: RegExp;
+        };
 
-      replace: {
-        /**
-         * @example:
-         *  '<script src="{{filePath}}"></script>'
-         */
-        js: string;
-        /**
-         * @example:
-         *  '<link rel="stylesheet" href="{{filePath}}" />'
-         */
-        css: string;
-      };
+        replace: {
+            /**
+             * @example:
+             *  '<script src="{{filePath}}"></script>'
+             */
+            js: string;
+            /**
+             * @example:
+             *  '<link rel="stylesheet" href="{{filePath}}" />'
+             */
+            css: string;
+        };
     };
 
     jade: {
-      /**
-       * @example:
-       *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
-       */
-      block: RegExp;
-      detect: {
         /**
          * @example:
-         *  /script\(.*src=['"]([^'"]+)/gi
+         *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
          */
-        js: RegExp;
-        /**
-         * @example:
-         *  /link\(.*href=['"]([^'"]+)/gi
-         */
-        css: RegExp;
-      };
+        block: RegExp;
+        detect: {
+            /**
+             * @example:
+             *  /script\(.*src=['"]([^'"]+)/gi
+             */
+            js: RegExp;
+            /**
+             * @example:
+             *  /link\(.*href=['"]([^'"]+)/gi
+             */
+            css: RegExp;
+        };
 
-      replace: {
-        /**
-         * @example:
-         *  'script(src=\'{{filePath}}\')'
-         */
-        js: string;
-        /**
-         * @example:
-         *  'link(rel=\'stylesheet\', href=\'{{filePath}}\')'
-         */
-        css: string;
-      }
+        replace: {
+            /**
+             * @example:
+             *  'script(src=\'{{filePath}}\')'
+             */
+            js: string;
+            /**
+             * @example:
+             *  'link(rel=\'stylesheet\', href=\'{{filePath}}\')'
+             */
+            css: string;
+        }
     };
 
     less: {
-      /**
-       * @example:
-       *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
-       */
-      block: RegExp;
-      detect: {
         /**
          * @example:
-         *  /@import\s['"](.+css)['"]/gi
+         *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
          */
-        css: RegExp;
-        /**
-         * @example:
-         *  /@import\s['"](.+less)['"]/gi
-         */
-        less: RegExp
-      };
+        block: RegExp;
+        detect: {
+            /**
+             * @example:
+             *  /@import\s['"](.+css)['"]/gi
+             */
+            css: RegExp;
+            /**
+             * @example:
+             *  /@import\s['"](.+less)['"]/gi
+             */
+            less: RegExp
+        };
 
-      replace: {
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        css: string;
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        less: string;
-      };
+        replace: {
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            css: string;
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            less: string;
+        };
     };
 
     scss: {
-      /**
-       * @example:
-       *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
-       */
-      block: RegExp;
-      detect: {
         /**
          * @example:
-         *  /@import\s['"](.+css)['"]/gi
+         *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
          */
-        css: RegExp;
-        /**
-         * @example:
-         *  /@import\s['"](.+sass)['"]/gi
-         */
-        sass: RegExp;
-        /**
-         * @example:
-         *  /@import\s['"](.+scss)['"]/gi
-         */
-        scss: RegExp;
-      },
-      replace: {
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        css: string;
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        sass: string;
-        /**
-         * @example:
-         *  '@import "{{filePath}}";'
-         */
-        scss: string;
-      }
+        block: RegExp;
+        detect: {
+            /**
+             * @example:
+             *  /@import\s['"](.+css)['"]/gi
+             */
+            css: RegExp;
+            /**
+             * @example:
+             *  /@import\s['"](.+sass)['"]/gi
+             */
+            sass: RegExp;
+            /**
+             * @example:
+             *  /@import\s['"](.+scss)['"]/gi
+             */
+            scss: RegExp;
+        },
+        replace: {
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            css: string;
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            sass: string;
+            /**
+             * @example:
+             *  '@import "{{filePath}}";'
+             */
+            scss: string;
+        }
     };
 
     styl: {
-      /**
-       * @example:
-       *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
-       */
-      block: RegExp;
+        /**
+         * @example:
+         *  /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi
+         */
+        block: RegExp;
 
-      detect: {
-        /**
-         * @example:
-         *  /@import\s['"](.+css)['"]/gi
-         */
-        css: RegExp;
-        /**
-         * @example:
-         *   /@import\s['"](.+styl)['"]/gi
-         */
-        styl: RegExp;
-      };
-      replace: {
-        /**
-         * @example:
-         *  '@import "{{filePath}}"'
-         */
-        css: string;
-        /**
-         * @example:
-         *  '@import "{{filePath}}"'
-         */
-        styl: string;
-      };
+        detect: {
+            /**
+             * @example:
+             *  /@import\s['"](.+css)['"]/gi
+             */
+            css: RegExp;
+            /**
+             * @example:
+             *   /@import\s['"](.+styl)['"]/gi
+             */
+            styl: RegExp;
+        };
+        replace: {
+            /**
+             * @example:
+             *  '@import "{{filePath}}"'
+             */
+            css: string;
+            /**
+             * @example:
+             *  '@import "{{filePath}}"'
+             */
+            styl: string;
+        };
     };
 
     yaml: {
-      /**
-       * @example:
-       *  /(([ \t]*)#\s*bower:*(\S*))(\n|\r|.)*?(#\s*endbower)/gi
-       */
-      block: RegExp;
+        /**
+         * @example:
+         *  /(([ \t]*)#\s*bower:*(\S*))(\n|\r|.)*?(#\s*endbower)/gi
+         */
+        block: RegExp;
 
-      detect: {
-        /**
-         * @example:
-         *  /-\s(.+js)/gi
-         */
-        js: RegExp;
-        /**
-         * @example:
-         *  /-\s(.+css)/gi
-         */
-        css: RegExp;
-      };
+        detect: {
+            /**
+             * @example:
+             *  /-\s(.+js)/gi
+             */
+            js: RegExp;
+            /**
+             * @example:
+             *  /-\s(.+css)/gi
+             */
+            css: RegExp;
+        };
 
-      replace: {
-        /**
-         * @example:
-         *  '- {{filePath}}'
-         */
-        js: string;
-        /**
-         * @example:
-         *  '- {{filePath}}'
-         */
-        css: string;
-      };
+        replace: {
+            /**
+             * @example:
+             *  '- {{filePath}}'
+             */
+            js: string;
+            /**
+             * @example:
+             *  '- {{filePath}}'
+             */
+            css: string;
+        };
     };
-  }
+}
 
 
 export = Wiredep;
-}
diff --git a/wreck/wreck.d.ts b/wreck/wreck.d.ts
index e548f72a0f..7545b7d06f 100644
--- a/wreck/wreck.d.ts
+++ b/wreck/wreck.d.ts
@@ -5,37 +5,34 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "wreck"
-{
-    import http = require('http');
-    import stream = require('stream');
+
+import http = require('http');
+import stream = require('stream');
 
 
-    interface WreckObject
-    {
-        defaults: (options: any) => WreckObject;
+interface WreckObject {
+    defaults: (options: any) => WreckObject;
 
-        request: (method: string, uri: string, options: any, callback?: (err: any, response: http.IncomingMessage) => void) => http.ClientRequest;
+    request: (method: string, uri: string, options: any, callback?: (err: any, response: http.IncomingMessage) => void) => http.ClientRequest;
 
-        read: (response: http.IncomingMessage, options: any, callback: (err: any, payload: any) => void) => void;
+    read: (response: http.IncomingMessage, options: any, callback: (err: any, payload: any) => void) => void;
 
-        get: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-        post: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-        patch: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-        put: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-        delete: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    get: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    post: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    patch: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    put: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    delete: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
 
-        toReadableStream: (payload: any, encoding?: string) => stream.Readable;
+    toReadableStream: (payload: any, encoding?: string) => stream.Readable;
 
-        parseCacheControl: (field: string) => any;
+    parseCacheControl: (field: string) => any;
 
-        agents: {
-            http: http.Agent,
-            https: http.Agent
-        };
-    }
-
-    var wreck: WreckObject;
-
-    export = wreck;
+    agents: {
+        http: http.Agent,
+        https: http.Agent
+    };
 }
+
+declare var wreck: WreckObject;
+
+export = wreck;
diff --git a/wrench/wrench.d.ts b/wrench/wrench.d.ts
index ced55ea9d4..5660c90813 100644
--- a/wrench/wrench.d.ts
+++ b/wrench/wrench.d.ts
@@ -5,23 +5,22 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/wrench.d.ts
 
-declare module "wrench" {
-	export function readdirSyncRecursive(baseDir: string): string[];
-	export function rmdirSyncRecursive(path: string, failSilent?: boolean): void;
-	export function copyDirSyncRecursive(sourceDir: string, newDirLocation: string, opts?: { preserve?: boolean; }): void;
-	export function chmodSyncRecursive(sourceDir: string, filemode: number): void;
-	export function chownSyncRecursive(sourceDir: string, uid: number, gid: number): void;
-	export function mkdirSyncRecursive(path: string, mode: number): void;
 
-	export function readdirRecursive(baseDir: string, fn: (err: Error, files: string[]) => void): void;
-	export function rmdirRecursive(path: string, fn: (err: Error) => void): void;
-	export function copyDirRecursive(srcDir: string, newDir: string, fn: (err: Error) => void): void;
+declare export function readdirSyncRecursive(baseDir: string): string[];
+declare export function rmdirSyncRecursive(path: string, failSilent?: boolean): void;
+declare export function copyDirSyncRecursive(sourceDir: string, newDirLocation: string, opts?: { preserve?: boolean; }): void;
+declare export function chmodSyncRecursive(sourceDir: string, filemode: number): void;
+declare export function chownSyncRecursive(sourceDir: string, uid: number, gid: number): void;
+declare export function mkdirSyncRecursive(path: string, mode: number): void;
 
-	export class LineReader {
-		constructor (filename: string, bufferSize?: number);
+declare export function readdirRecursive(baseDir: string, fn: (err: Error, files: string[]) => void): void;
+declare export function rmdirRecursive(path: string, fn: (err: Error) => void): void;
+declare export function copyDirRecursive(srcDir: string, newDir: string, fn: (err: Error) => void): void;
 
-		getBufferAndSetCurrentPosition(position: number): number;
-		hasNextLine(): boolean;
-		getNextLine(): string;
-	}
+declare export class LineReader {
+    constructor(filename: string, bufferSize?: number);
+
+    getBufferAndSetCurrentPosition(position: number): number;
+    hasNextLine(): boolean;
+    getNextLine(): string;
 }
diff --git a/ws/ws.d.ts b/ws/ws.d.ts
index 83ba9dec92..ce4f904512 100644
--- a/ws/ws.d.ts
+++ b/ws/ws.d.ts
@@ -5,132 +5,133 @@
 
 /// <reference path="../node/node.d.ts" />
 
-declare module "ws" {
-    import * as events from 'events';
-    import * as http from 'http';
-    import * as net from 'net';
 
-    class WebSocket extends events.EventEmitter {
-        static CONNECTING: number;
-        static OPEN: number;
-        static CLOSING: number;
-        static CLOSED: number;
+import * as events from 'events';
+import * as http from 'http';
+import * as net from 'net';
 
-        bytesReceived: number;
-        readyState: number;
-        protocolVersion: string;
-        url: string;
-        supports: any;
-        upgradeReq: http.ServerRequest;
+declare class WebSocket extends events.EventEmitter {
+    static CONNECTING: number;
+    static OPEN: number;
+    static CLOSING: number;
+    static CLOSED: number;
 
-        CONNECTING: number;
-        OPEN: number;
-        CLOSING: number;
-        CLOSED: number;
+    bytesReceived: number;
+    readyState: number;
+    protocolVersion: string;
+    url: string;
+    supports: any;
+    upgradeReq: http.ServerRequest;
 
-        onopen: (event: {target: WebSocket}) => void;
-        onerror: (err: Error) => void;
-        onclose: (event: {wasClean: boolean; code: number; reason: string; target: WebSocket}) => void;
-        onmessage: (event: {data: any; type: string; target: WebSocket}) => void;
+    CONNECTING: number;
+    OPEN: number;
+    CLOSING: number;
+    CLOSED: number;
 
-        constructor(address: string, options?: {
-            protocol?: string;
-            agent?: http.Agent;
-            headers?: {[key: string]: string};
-            protocolVersion?: any;
-            host?: string;
-            origin?: string;
-            pfx?: any;
-            key?: any;
-            passphrase?: string;
-            cert?: any;
-            ca?: any[];
-            ciphers?: string;
-            rejectUnauthorized?: boolean;
-        });
+    onopen: (event: { target: WebSocket }) => void;
+    onerror: (err: Error) => void;
+    onclose: (event: { wasClean: boolean; code: number; reason: string; target: WebSocket }) => void;
+    onmessage: (event: { data: any; type: string; target: WebSocket }) => void;
 
-        close(code?: number, data?: any): void;
-        pause(): void;
-        resume(): void;
-        ping(data?: any, options?: {mask?: boolean; binary?: boolean}, dontFail?: boolean): void;
-        pong(data?: any, options?: {mask?: boolean; binary?: boolean}, dontFail?: boolean): void;
-        send(data: any, cb?: (err: Error) => void): void;
-        send(data: any, options: {mask?: boolean; binary?: boolean}, cb?: (err: Error) => void): void;
-        stream(options: {mask?: boolean; binary?: boolean}, cb?: (err: Error, final: boolean) => void): void;
-        stream(cb?: (err: Error, final: boolean) => void): void;
-        terminate(): void;
+    constructor(address: string, options?: {
+        protocol?: string;
+        agent?: http.Agent;
+        headers?: { [key: string]: string };
+        protocolVersion?: any;
+        host?: string;
+        origin?: string;
+        pfx?: any;
+        key?: any;
+        passphrase?: string;
+        cert?: any;
+        ca?: any[];
+        ciphers?: string;
+        rejectUnauthorized?: boolean;
+    });
 
-        // HTML5 WebSocket events
-        addEventListener(method: 'message', cb?: (event: {data: any; type: string; target: WebSocket}) => void): void;
-        addEventListener(method: 'close', cb?: (event: {wasClean: boolean; code: number;
-                                                        reason: string; target: WebSocket}) => void): void;
-        addEventListener(method: 'error', cb?: (err: Error) => void): void;
-        addEventListener(method: 'open', cb?: (event: {target: WebSocket}) => void): void;
-        addEventListener(method: string, listener?: () => void): void;
+    close(code?: number, data?: any): void;
+    pause(): void;
+    resume(): void;
+    ping(data?: any, options?: { mask?: boolean; binary?: boolean }, dontFail?: boolean): void;
+    pong(data?: any, options?: { mask?: boolean; binary?: boolean }, dontFail?: boolean): void;
+    send(data: any, cb?: (err: Error) => void): void;
+    send(data: any, options: { mask?: boolean; binary?: boolean }, cb?: (err: Error) => void): void;
+    stream(options: { mask?: boolean; binary?: boolean }, cb?: (err: Error, final: boolean) => void): void;
+    stream(cb?: (err: Error, final: boolean) => void): void;
+    terminate(): void;
+
+    // HTML5 WebSocket events
+    addEventListener(method: 'message', cb?: (event: { data: any; type: string; target: WebSocket }) => void): void;
+    addEventListener(method: 'close', cb?: (event: {
+        wasClean: boolean; code: number;
+        reason: string; target: WebSocket
+    }) => void): void;
+    addEventListener(method: 'error', cb?: (err: Error) => void): void;
+    addEventListener(method: 'open', cb?: (event: { target: WebSocket }) => void): void;
+    addEventListener(method: string, listener?: () => void): void;
+
+    // Events
+    on(event: 'error', cb: (err: Error) => void): this;
+    on(event: 'close', cb: (code: number, message: string) => void): this;
+    on(event: 'message', cb: (data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'open', cb: () => void): this;
+    on(event: string, listener: () => void): this;
+
+    addListener(event: 'error', cb: (err: Error) => void): this;
+    addListener(event: 'close', cb: (code: number, message: string) => void): this;
+    addListener(event: 'message', cb: (data: any, flags: { binary: boolean }) => void): this;
+    addListener(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
+    addListener(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
+    addListener(event: 'open', cb: () => void): this;
+    addListener(event: string, listener: () => void): this;
+}
+
+declare namespace WebSocket {
+    export interface IServerOptions {
+        host?: string;
+        port?: number;
+        server?: http.Server;
+        verifyClient?: {
+            (info: { origin: string; secure: boolean; req: http.ServerRequest }): boolean;
+            (info: { origin: string; secure: boolean; req: http.ServerRequest },
+                callback: (res: boolean) => void): void;
+        };
+        handleProtocols?: any;
+        path?: string;
+        noServer?: boolean;
+        disableHixie?: boolean;
+        clientTracking?: boolean;
+    }
+
+    export class Server extends events.EventEmitter {
+        options: IServerOptions;
+        path: string;
+        clients: WebSocket[];
+
+        constructor(options?: IServerOptions, callback?: Function);
+
+        close(): void;
+        handleUpgrade(request: http.ServerRequest, socket: net.Socket,
+            upgradeHead: Buffer, callback: (client: WebSocket) => void): void;
 
         // Events
         on(event: 'error', cb: (err: Error) => void): this;
-        on(event: 'close', cb: (code: number, message: string) => void): this;
-        on(event: 'message', cb: (data: any, flags: {binary: boolean}) => void): this;
-        on(event: 'ping', cb: (data: any, flags: {binary: boolean}) => void): this;
-        on(event: 'pong', cb: (data: any, flags: {binary: boolean}) => void): this;
-        on(event: 'open', cb: () => void): this;
+        on(event: 'headers', cb: (headers: string[]) => void): this;
+        on(event: 'connection', cb: (client: WebSocket) => void): this;
         on(event: string, listener: () => void): this;
 
         addListener(event: 'error', cb: (err: Error) => void): this;
-        addListener(event: 'close', cb: (code: number, message: string) => void): this;
-        addListener(event: 'message', cb: (data: any, flags: {binary: boolean}) => void): this;
-        addListener(event: 'ping', cb: (data: any, flags: {binary: boolean}) => void): this;
-        addListener(event: 'pong', cb: (data: any, flags: {binary: boolean}) => void): this;
-        addListener(event: 'open', cb: () => void): this;
+        addListener(event: 'headers', cb: (headers: string[]) => void): this;
+        addListener(event: 'connection', cb: (client: WebSocket) => void): this;
         addListener(event: string, listener: () => void): this;
     }
 
-    namespace WebSocket {
-        export interface IServerOptions {
-            host?: string;
-            port?: number;
-            server?: http.Server;
-            verifyClient?: {
-                (info: {origin: string; secure: boolean; req: http.ServerRequest}): boolean;
-                (info: {origin: string; secure: boolean; req: http.ServerRequest},
-                                                 callback: (res: boolean) => void): void;
-            };
-            handleProtocols?: any;
-            path?: string;
-            noServer?: boolean;
-            disableHixie?: boolean;
-            clientTracking?: boolean;
-        }
-
-        export class Server extends events.EventEmitter {
-            options: IServerOptions;
-            path: string;
-            clients: WebSocket[];
-
-            constructor(options?: IServerOptions, callback?: Function);
-
-            close(): void;
-            handleUpgrade(request: http.ServerRequest, socket: net.Socket,
-                          upgradeHead: Buffer, callback: (client: WebSocket) => void): void;
-
-            // Events
-            on(event: 'error', cb: (err: Error) => void): this;
-            on(event: 'headers', cb: (headers: string[]) => void): this;
-            on(event: 'connection', cb: (client: WebSocket) => void): this;
-            on(event: string, listener: () => void): this;
-
-            addListener(event: 'error', cb: (err: Error) => void): this;
-            addListener(event: 'headers', cb: (headers: string[]) => void): this;
-            addListener(event: 'connection', cb: (client: WebSocket) => void): this;
-            addListener(event: string, listener: () => void): this;
-        }
-
-        export function createServer(options?: IServerOptions,
-            connectionListener?: (client: WebSocket) => void): Server;
-        export function connect(address: string, openListener?: Function): void;
-        export function createConnection(address: string, openListener?: Function): void;
-    }
-
-    export = WebSocket;
+    export function createServer(options?: IServerOptions,
+        connectionListener?: (client: WebSocket) => void): Server;
+    export function connect(address: string, openListener?: Function): void;
+    export function createConnection(address: string, openListener?: Function): void;
 }
+
+export = WebSocket;
diff --git a/xlsx/xlsx.d.ts b/xlsx/xlsx.d.ts
index b761387681..e53c436ac5 100644
--- a/xlsx/xlsx.d.ts
+++ b/xlsx/xlsx.d.ts
@@ -3,134 +3,132 @@
 // Definitions by: themauveavenger <https://github.com/themauveavenger/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'xlsx' {
 
-    export function readFile(filename:string, opts?:IParsingOptions):IWorkBook;
-    export function read(data:any, opts?:IParsingOptions):IWorkBook;
-    export var utils:IUtils;
 
-    export interface IProperties {
-        LastAuthor?:string
-        Author?:string;
-        CreatedDate?:Date;
-        ModifiedDate?:Date
-        Application?:string;
-        AppVersion?:string;
-        Company?:string;
-        DocSecurity?:string;
-        Manager?:string;
-        HyperlinksChanged?: boolean;
-        SharedDoc?:boolean;
-        LinksUpToDate?:boolean;
-        ScaleCrop?:boolean;
-        Worksheets?:number;
-        SheetNames?:string[];
-    }
+declare export function readFile(filename: string, opts?: IParsingOptions): IWorkBook;
+declare export function read(data: any, opts?: IParsingOptions): IWorkBook;
+declare export var utils: IUtils;
 
-    export interface IParsingOptions {
-        cellFormula?:boolean;
-        cellHTML?:boolean;
-        cellNF?:boolean;
-        cellStyles?:boolean;
-        cellDates?:boolean;
-        sheetStubs?:boolean;
-        sheetRows?:number;
-        bookDeps?:boolean;
-        bookFiles?:boolean;
-        bookProps?:boolean;
-        bookSheets?:boolean;
-        bookVBA?:boolean;
-        password?:string;
+export interface IProperties {
+    LastAuthor?: string
+    Author?: string;
+    CreatedDate?: Date;
+    ModifiedDate?: Date
+    Application?: string;
+    AppVersion?: string;
+    Company?: string;
+    DocSecurity?: string;
+    Manager?: string;
+    HyperlinksChanged?: boolean;
+    SharedDoc?: boolean;
+    LinksUpToDate?: boolean;
+    ScaleCrop?: boolean;
+    Worksheets?: number;
+    SheetNames?: string[];
+}
 
-        /**
-         * Possible options: 'binary', 'base64', 'buffer', 'file'
-         */
-        type?:string;
-    }
-
-    export interface IWorkBook {
-        /**
-         * A dictionary of the worksheets in the workbook.
-         * Use SheetNames to reference these.
-         */
-        Sheets:{[sheet:string]:IWorkSheet};
-
-        /**
-         * ordered list of the sheet names in the workbook
-         */
-        SheetNames:string[];
-
-        /**
-         * an object storing the standard properties. wb.Custprops stores custom properties.
-         * Since the XLS standard properties deviate from the XLSX standard, XLS parsing stores core properties in both places.
-         */
-        Props:IProperties;
-    }
+export interface IParsingOptions {
+    cellFormula?: boolean;
+    cellHTML?: boolean;
+    cellNF?: boolean;
+    cellStyles?: boolean;
+    cellDates?: boolean;
+    sheetStubs?: boolean;
+    sheetRows?: number;
+    bookDeps?: boolean;
+    bookFiles?: boolean;
+    bookProps?: boolean;
+    bookSheets?: boolean;
+    bookVBA?: boolean;
+    password?: string;
 
     /**
-     * object representing the worksheet
+     * Possible options: 'binary', 'base64', 'buffer', 'file'
      */
-    export interface IWorkSheet {
-        [cell:string]:IWorkSheetCell;
-    }
-
-    export interface IWorkSheetCell {
-        /**
-         * The Excel Data Type of the cell.
-         * b Boolean, n Number, e error, s String, d Date
-         */
-        t: string;
-
-        /**
-         * The raw value of the cell.
-         */
-        v: string;
-
-        /**
-         * rich text encoding (if applicable)
-         */
-        r?: string;
-
-        /**
-         * HTML rendering of the rich text (if applicable)
-         */
-        h?: string;
-
-        /**
-         * formatted text (if applicable)
-         */
-        w?: string;
-
-        /**
-         * cell formula (if applicable)
-         */
-        f?: string;
-
-        /**
-         * comments associated with the cell **
-         */
-        c?: string;
-
-        /**
-         * number format string associated with the cell (if requested)
-         */
-        z?: string;
-
-        /**
-         * cell hyperlink object (.Target holds link, .tooltip is tooltip)
-         */
-        l?: string;
-
-        /**
-         * the style/theme of the cell (if applicable)
-         */
-        s?: string;
-    }
-
-    export interface IUtils {
-        sheet_to_json<T>(worksheet:IWorkSheet):T[];
-        sheet_to_csv(worksheet:IWorkSheet):any;
-        sheet_to_formulae(worksheet:IWorkSheet):any;
-    }
-
+    type?: string;
+}
+
+export interface IWorkBook {
+    /**
+     * A dictionary of the worksheets in the workbook.
+     * Use SheetNames to reference these.
+     */
+    Sheets: { [sheet: string]: IWorkSheet };
+
+    /**
+     * ordered list of the sheet names in the workbook
+     */
+    SheetNames: string[];
+
+    /**
+     * an object storing the standard properties. wb.Custprops stores custom properties.
+     * Since the XLS standard properties deviate from the XLSX standard, XLS parsing stores core properties in both places.
+     */
+    Props: IProperties;
+}
+
+/**
+ * object representing the worksheet
+ */
+export interface IWorkSheet {
+    [cell: string]: IWorkSheetCell;
+}
+
+export interface IWorkSheetCell {
+    /**
+     * The Excel Data Type of the cell.
+     * b Boolean, n Number, e error, s String, d Date
+     */
+    t: string;
+
+    /**
+     * The raw value of the cell.
+     */
+    v: string;
+
+    /**
+     * rich text encoding (if applicable)
+     */
+    r?: string;
+
+    /**
+     * HTML rendering of the rich text (if applicable)
+     */
+    h?: string;
+
+    /**
+     * formatted text (if applicable)
+     */
+    w?: string;
+
+    /**
+     * cell formula (if applicable)
+     */
+    f?: string;
+
+    /**
+     * comments associated with the cell **
+     */
+    c?: string;
+
+    /**
+     * number format string associated with the cell (if requested)
+     */
+    z?: string;
+
+    /**
+     * cell hyperlink object (.Target holds link, .tooltip is tooltip)
+     */
+    l?: string;
+
+    /**
+     * the style/theme of the cell (if applicable)
+     */
+    s?: string;
+}
+
+export interface IUtils {
+    sheet_to_json<T>(worksheet: IWorkSheet): T[];
+    sheet_to_csv(worksheet: IWorkSheet): any;
+    sheet_to_formulae(worksheet: IWorkSheet): any;
 }
diff --git a/xml-parser/xml-parser.d.ts b/xml-parser/xml-parser.d.ts
index 7622ba7e1a..36d2756b23 100644
--- a/xml-parser/xml-parser.d.ts
+++ b/xml-parser/xml-parser.d.ts
@@ -3,31 +3,30 @@
 // Definitions by: Matt Frantz <https://github.com/mhfrantz/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'xml-parser' {
 
-  function parse(xml: string): parse.Document;
 
-  namespace parse {
+declare function parse(xml: string): parse.Document;
+
+declare namespace parse {
     export interface Document {
-      declaration: Declaration;
-      root: Node;
+        declaration: Declaration;
+        root: Node;
     }
 
     export interface Declaration {
-      attributes: Attributes;
+        attributes: Attributes;
     }
 
     export interface Node {
-      name: string;
-      attributes: Attributes;
-      children: Node[];
-      content?: string;
+        name: string;
+        attributes: Attributes;
+        children: Node[];
+        content?: string;
     }
 
     export interface Attributes {
-      [name: string]: string;
+        [name: string]: string;
     }
-  }
-
-  export = parse;
 }
+
+export = parse;
diff --git a/xml2js/xml2js.d.ts b/xml2js/xml2js.d.ts
index 5fb4542d12..e9d4e12ad0 100644
--- a/xml2js/xml2js.d.ts
+++ b/xml2js/xml2js.d.ts
@@ -3,97 +3,96 @@
 // Definitions by: Michel Salib <https://github.com/michelsalib>, Jason McNeil <https://github.com/jasonrm>, Christopher Currens <https://github.com/ccurrens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'xml2js' {
 
-    export = xml2js;
 
-    namespace xml2js {
-        function parseString(xml: string, callback: (err: any, result: any) => void): void;
-        function parseString(xml: string, options: Options, callback: (err: any, result: any) => void): void;
+export = xml2js;
 
-        var defaults: {
-            '0.1': Options;
-            '0.2': OptionsV2;
-        }
+declare namespace xml2js {
+    function parseString(xml: string, callback: (err: any, result: any) => void): void;
+    function parseString(xml: string, options: Options, callback: (err: any, result: any) => void): void;
 
-        class Builder {
-            constructor(options?: BuilderOptions);
-            buildObject(rootObj: any): string;
-        }
+    var defaults: {
+        '0.1': Options;
+        '0.2': OptionsV2;
+    }
 
-        class Parser {
-            constructor(options?: Options);
-            processAsync(): any;
-            assignOrPush(obj: any, key: string, newValue: any): any;
-            reset(): any;
-            parseString(str: string , cb?: Function): void;
-        }
+    class Builder {
+        constructor(options?: BuilderOptions);
+        buildObject(rootObj: any): string;
+    }
 
-        interface RenderOptions {
-            indent?: string;
-            newline?: string;
-            pretty?: boolean;
-        }
+    class Parser {
+        constructor(options?: Options);
+        processAsync(): any;
+        assignOrPush(obj: any, key: string, newValue: any): any;
+        reset(): any;
+        parseString(str: string, cb?: Function): void;
+    }
 
-        interface XMLDeclarationOptions {
+    interface RenderOptions {
+        indent?: string;
+        newline?: string;
+        pretty?: boolean;
+    }
+
+    interface XMLDeclarationOptions {
+        encoding?: string;
+        standalone?: boolean;
+        version?: string;
+    }
+
+    interface BuilderOptions {
+        doctype?: any;
+        headless?: boolean;
+        indent?: string;
+        newline?: string;
+        pretty?: boolean;
+        renderOpts?: RenderOptions;
+        rootName?: string;
+        xmldec?: XMLDeclarationOptions;
+    }
+
+    interface Options {
+        async?: boolean;
+        attrkey?: string;
+        attrNameProcessors?: [(name: string) => string];
+        attrValueProcessors?: [(name: string) => string];
+        charkey?: string;
+        charsAsChildren?: boolean;
+        childkey?: string;
+        emptyTag?: any;
+        explicitArray?: boolean;
+        explicitCharkey?: boolean;
+        explicitChildren?: boolean;
+        explicitRoot?: boolean;
+        ignoreAttrs?: boolean;
+        mergeAttrs?: boolean;
+        normalize?: boolean;
+        normalizeTags?: boolean;
+        strict?: boolean;
+        tagNameProcessors?: [(name: string) => string];
+        trim?: boolean;
+        validator?: Function;
+        valueProcessors?: [(name: string) => string];
+        xmlns?: boolean;
+    }
+
+    interface OptionsV2 extends Options {
+        preserveChildrenOrder?: boolean;
+        rootName?: string;
+        xmldec?: {
+            version: string;
             encoding?: string;
             standalone?: boolean;
-            version?: string;
-        }
-
-        interface BuilderOptions {
-            doctype?: any;
-            headless?: boolean;
+        };
+        doctype?: any;
+        renderOpts?: {
+            pretty?: boolean;
             indent?: string;
             newline?: string;
-            pretty?: boolean;
-            renderOpts?: RenderOptions;
-            rootName?: string;
-            xmldec?: XMLDeclarationOptions;
-        }
-
-        interface Options {
-            async?: boolean;
-            attrkey?: string;
-            attrNameProcessors?: [(name: string) => string];
-            attrValueProcessors?: [(name: string) => string];
-            charkey?: string;
-            charsAsChildren?: boolean;
-            childkey?: string;
-            emptyTag?: any;
-            explicitArray?: boolean;
-            explicitCharkey?: boolean;
-            explicitChildren?: boolean;
-            explicitRoot?: boolean;
-            ignoreAttrs?: boolean;
-            mergeAttrs?: boolean;
-            normalize?: boolean;
-            normalizeTags?: boolean;
-            strict?: boolean;
-            tagNameProcessors?: [(name: string) => string];
-            trim?: boolean;
-            validator?: Function;
-            valueProcessors?: [(name: string) => string];
-            xmlns?: boolean;
-        }
-
-        interface OptionsV2 extends Options {
-            preserveChildrenOrder?: boolean;
-            rootName?: string;
-            xmldec?: {
-                version: string;
-                encoding?: string;
-                standalone?: boolean;
-            };
-            doctype?: any;
-            renderOpts?: {
-                pretty?: boolean;
-                indent?: string;
-                newline?: string;
-            };
-            headless?: boolean;
-            chunkSize?: number;
-            cdata?: boolean;
-        }
+        };
+        headless?: boolean;
+        chunkSize?: number;
+        cdata?: boolean;
     }
 }
diff --git a/xmlbuilder/xmlbuilder.d.ts b/xmlbuilder/xmlbuilder.d.ts
index 43200d017d..4367a7fb10 100644
--- a/xmlbuilder/xmlbuilder.d.ts
+++ b/xmlbuilder/xmlbuilder.d.ts
@@ -3,87 +3,86 @@
 // Definitions by: Wallymathieu <http://github.com/wallymathieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'xmlbuilder' {
-    export = xmlbuilder;
-    class XMLDocType {
-        clone(): XMLDocType;
-        element(name: string, value?: Object): XMLDocType;
-        attList(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
-        entity(name: string, value: any): XMLDocType;
-        pEntity(name: string, value: any): XMLDocType;
-        notation(name: string, value: any): XMLDocType;
-        cdata(value: string): XMLDocType;
-        comment(value: string): XMLDocType;
-        instruction(target: string, value: any): XMLDocType;
-        root(): XMLDocType;
-        document(): any;
-        toString(options?: Object, level?: Number): string;
 
-        ele(name: string, value?: Object): XMLDocType;
-        att(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
-        ent(name: string, value: any): XMLDocType;
-        pent(name: string, value: any): XMLDocType;
-        not(name: string, value: any): XMLDocType;
-        dat(value: string): XMLDocType;
-        com(value: string): XMLDocType;
-        ins(target: string, value: any): XMLDocType;
-        up(): XMLDocType;
-        doc(): any;
-    }
+export = xmlbuilder;
+declare class XMLDocType {
+    clone(): XMLDocType;
+    element(name: string, value?: Object): XMLDocType;
+    attList(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
+    entity(name: string, value: any): XMLDocType;
+    pEntity(name: string, value: any): XMLDocType;
+    notation(name: string, value: any): XMLDocType;
+    cdata(value: string): XMLDocType;
+    comment(value: string): XMLDocType;
+    instruction(target: string, value: any): XMLDocType;
+    root(): XMLDocType;
+    document(): any;
+    toString(options?: Object, level?: Number): string;
 
-    class XMLElementOrXMLNode {
-        // XMLElement:
-        clone(): XMLElementOrXMLNode;
-        attribute(name: any, value?: any): XMLElementOrXMLNode;
-        att(name: any, value?: any): XMLElementOrXMLNode;
-        removeAttribute(name: string): XMLElementOrXMLNode;
-        instruction(target: string, value: any): XMLElementOrXMLNode;
-        instruction(array: Array<any>): XMLElementOrXMLNode;
-        instruction(obj: Object): XMLElementOrXMLNode;
-        ins(target: string, value: any): XMLElementOrXMLNode;
-        ins(array: Array<any>): XMLElementOrXMLNode;
-        ins(obj: Object): XMLElementOrXMLNode;
-        a(name: any, value?: any): XMLElementOrXMLNode;
-        i(target: string, value: any): XMLElementOrXMLNode;
-        i(array: Array<any>): XMLElementOrXMLNode;
-        i(obj: Object): XMLElementOrXMLNode;
-        toString(options?:Object, level?:Number): string;
-        // XMLNode:
-        element(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        ele(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        insertBefore(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        insertAfter(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        remove(): XMLElementOrXMLNode;
-        node(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        text(value: string): XMLElementOrXMLNode;
-        cdata(value: string): XMLElementOrXMLNode;
-        comment(value: string): XMLElementOrXMLNode;
-        raw(value: string): XMLElementOrXMLNode;
-        declaration(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
-        doctype(pubID: string, sysID: string): XMLDocType;
-        up(): XMLElementOrXMLNode;
-        root(): XMLElementOrXMLNode;
-        document(): any;
-        end(options?: Object): string;
-        prev(): XMLElementOrXMLNode;
-        next(): XMLElementOrXMLNode;
-        nod(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        txt(value: string): XMLElementOrXMLNode;
-        dat(value: string): XMLElementOrXMLNode;
-        com(value: string): XMLElementOrXMLNode;
-        doc(): XMLElementOrXMLNode;
-        dec(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
-        dtd(pubID: string, sysID: string): XMLDocType;
-        e(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        n(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
-        t(value: string): XMLElementOrXMLNode;
-        d(value: string): XMLElementOrXMLNode;
-        c(value: string): XMLElementOrXMLNode;
-        r(value: string): XMLElementOrXMLNode;
-        u(): XMLElementOrXMLNode;
-    }
-
-    namespace xmlbuilder {
-        function create(name: string, xmldec?: Object, doctype?: any, options?: Object): XMLElementOrXMLNode;
-    }
+    ele(name: string, value?: Object): XMLDocType;
+    att(elementName: string, attributeName: string, attributeType: string, defaultValueType?: string, defaultValue?: any): XMLDocType;
+    ent(name: string, value: any): XMLDocType;
+    pent(name: string, value: any): XMLDocType;
+    not(name: string, value: any): XMLDocType;
+    dat(value: string): XMLDocType;
+    com(value: string): XMLDocType;
+    ins(target: string, value: any): XMLDocType;
+    up(): XMLDocType;
+    doc(): any;
+}
+
+declare class XMLElementOrXMLNode {
+    // XMLElement:
+    clone(): XMLElementOrXMLNode;
+    attribute(name: any, value?: any): XMLElementOrXMLNode;
+    att(name: any, value?: any): XMLElementOrXMLNode;
+    removeAttribute(name: string): XMLElementOrXMLNode;
+    instruction(target: string, value: any): XMLElementOrXMLNode;
+    instruction(array: Array<any>): XMLElementOrXMLNode;
+    instruction(obj: Object): XMLElementOrXMLNode;
+    ins(target: string, value: any): XMLElementOrXMLNode;
+    ins(array: Array<any>): XMLElementOrXMLNode;
+    ins(obj: Object): XMLElementOrXMLNode;
+    a(name: any, value?: any): XMLElementOrXMLNode;
+    i(target: string, value: any): XMLElementOrXMLNode;
+    i(array: Array<any>): XMLElementOrXMLNode;
+    i(obj: Object): XMLElementOrXMLNode;
+    toString(options?: Object, level?: Number): string;
+    // XMLNode:
+    element(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    ele(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    insertBefore(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    insertAfter(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    remove(): XMLElementOrXMLNode;
+    node(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    text(value: string): XMLElementOrXMLNode;
+    cdata(value: string): XMLElementOrXMLNode;
+    comment(value: string): XMLElementOrXMLNode;
+    raw(value: string): XMLElementOrXMLNode;
+    declaration(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
+    doctype(pubID: string, sysID: string): XMLDocType;
+    up(): XMLElementOrXMLNode;
+    root(): XMLElementOrXMLNode;
+    document(): any;
+    end(options?: Object): string;
+    prev(): XMLElementOrXMLNode;
+    next(): XMLElementOrXMLNode;
+    nod(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    txt(value: string): XMLElementOrXMLNode;
+    dat(value: string): XMLElementOrXMLNode;
+    com(value: string): XMLElementOrXMLNode;
+    doc(): XMLElementOrXMLNode;
+    dec(version: string, encoding: string, standalone: boolean): XMLElementOrXMLNode;
+    dtd(pubID: string, sysID: string): XMLDocType;
+    e(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    n(name: any, attributes?: Object, text?: any): XMLElementOrXMLNode;
+    t(value: string): XMLElementOrXMLNode;
+    d(value: string): XMLElementOrXMLNode;
+    c(value: string): XMLElementOrXMLNode;
+    r(value: string): XMLElementOrXMLNode;
+    u(): XMLElementOrXMLNode;
+}
+
+declare namespace xmlbuilder {
+    function create(name: string, xmldec?: Object, doctype?: any, options?: Object): XMLElementOrXMLNode;
 }
diff --git a/xmldom/xmldom.d.ts b/xmldom/xmldom.d.ts
index 25502d0806..dfbe34599c 100644
--- a/xmldom/xmldom.d.ts
+++ b/xmldom/xmldom.d.ts
@@ -3,44 +3,42 @@
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "xmldom" {
-  namespace xmldom {
+
+declare namespace xmldom {
     var DOMParser: DOMParserStatic;
     var XMLSerializer: XMLSerializerStatic;
 
     interface DOMParserStatic {
-      new(): DOMParser;
-      new(options: Options): DOMParser;
+        new (): DOMParser;
+        new (options: Options): DOMParser;
     }
 
     interface XMLSerializerStatic {
-      new(): XMLSerializer;
+        new (): XMLSerializer;
     }
 
     interface DOMParser {
-      parseFromString(xmlsource: string, mimeType?: string): Document;
+        parseFromString(xmlsource: string, mimeType?: string): Document;
     }
 
     interface XMLSerializer {
-      serializeToString(node: Node): string;
+        serializeToString(node: Node): string;
     }
 
     interface Options {
-      locator?: any;
-      errorHandler?: ErrorHandlerFunction|ErrorHandlerObject;
+        locator?: any;
+        errorHandler?: ErrorHandlerFunction | ErrorHandlerObject;
     }
 
     interface ErrorHandlerFunction {
-      (level: string, msg: any): any;
+        (level: string, msg: any): any;
     }
 
     interface ErrorHandlerObject {
-      warning?: (msg: any) => any;
-      error?: (msg: any) => any;
-      fatalError?: (msg: any) => any;
+        warning?: (msg: any) => any;
+        error?: (msg: any) => any;
+        fatalError?: (msg: any) => any;
     }
-  }
-
-  export = xmldom;
 }
 
+export = xmldom;
diff --git a/xmltojson/xmltojson.d.ts b/xmltojson/xmltojson.d.ts
index 0a18deb65d..97fa5f824a 100644
--- a/xmltojson/xmltojson.d.ts
+++ b/xmltojson/xmltojson.d.ts
@@ -3,32 +3,31 @@
 // Definitions by: Travis Crowe <https://github.com/traviscrowe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'xmltojson' {
 
-    export = xmltojson;
 
-    namespace xmltojson {
-        function grokType(sValue: any): any;
-        function parseString(xmlString: string, opt: Options): Object;
-        function parseXml(oXMLParent: Document, opt: Options): Object;
-        function xmlToString(xmlDoc: Document): string;
-        function stringToXml(xmlString: string): Document;
+export = xmltojson;
 
-        interface Options {
-            mergeCDATA?: boolean,
-            grokAttr?: boolean,
-            grokText?: boolean,
-            normalize?: boolean,
-            xmlns?: boolean,
-            namespaceKey?: string,
-            textKey?: string,
-            valueKey?: string,
-            attrKey?: string,
-            cdataKey?: string,
-            attrsAsObject?: boolean,
-            stripAttrPrefix?: boolean,
-            stripElemPrefix?: boolean,
-            childrenAsArray?: boolean
-        }
+declare namespace xmltojson {
+    function grokType(sValue: any): any;
+    function parseString(xmlString: string, opt: Options): Object;
+    function parseXml(oXMLParent: Document, opt: Options): Object;
+    function xmlToString(xmlDoc: Document): string;
+    function stringToXml(xmlString: string): Document;
+
+    interface Options {
+        mergeCDATA?: boolean,
+        grokAttr?: boolean,
+        grokText?: boolean,
+        normalize?: boolean,
+        xmlns?: boolean,
+        namespaceKey?: string,
+        textKey?: string,
+        valueKey?: string,
+        attrKey?: string,
+        cdataKey?: string,
+        attrsAsObject?: boolean,
+        stripAttrPrefix?: boolean,
+        stripElemPrefix?: boolean,
+        childrenAsArray?: boolean
     }
 }
diff --git a/xpath/xpath.d.ts b/xpath/xpath.d.ts
index 5f6b7d558f..3ade3e4798 100644
--- a/xpath/xpath.d.ts
+++ b/xpath/xpath.d.ts
@@ -5,39 +5,15 @@
 
 // Some documentation prose is copied from the XPath documentation at https://developer.mozilla.org.
 
-declare module 'xpath' {
 
-    // select1 can return any of: `Node`, `boolean`, `string`, `number`.
-    // select and selectWithResolver can return any of the above return types or `Array<Node>`.
-    // For this reason, their return types are `any`.
 
-    interface SelectFn {
-        /**
-         * Evaluate an XPath expression against a DOM node.  Returns the result as one of the following:
-         * * Array<Node>
-         * * Node
-         * * boolean
-         * * number
-         * * string
-         * @param xpathText
-         * @param contextNode
-         * @param single If true and the evaluation result is one or more Nodes, will return only the first Node instead of an Array<Node>
-         */
-        (xpathText: string, contextNode: Node, single?: boolean): any;
-    }
-
-    var select: SelectFn;
+// select1 can return any of: `Node`, `boolean`, `string`, `number`.
+// select and selectWithResolver can return any of the above return types or `Array<Node>`.
+// For this reason, their return types are `any`.
 
+interface SelectFn {
     /**
-     * Evaluate an xpath expression against a DOM node, returning the first result only.
-     * Equivalent to `select(xpathText, contextNode, true)`
-     * @param xpathText
-     * @param contextNode
-     */
-    function select1(xpathText: string, contextNode: Node): any;
-
-    /**
-     * Evaluate an XPath expression against a DOM node using a given namespace resolver.  Returns the result as one of the following:
+     * Evaluate an XPath expression against a DOM node.  Returns the result as one of the following:
      * * Array<Node>
      * * Node
      * * boolean
@@ -45,153 +21,176 @@ declare module 'xpath' {
      * * string
      * @param xpathText
      * @param contextNode
-     * @param resolver
      * @param single If true and the evaluation result is one or more Nodes, will return only the first Node instead of an Array<Node>
      */
-    function selectWithResolver(xpathText: string, contextNode: Node, resolver: XPathNSResolver, single?: boolean): any;
-
-    /**
-     * Evaluate an xpath expression against a DOM.
-     * @param xpathText xpath expression as a string.
-     * @param contextNode xpath expression is evaluated relative to this DOM node.
-     * @param resolver XML namespace resolver
-     * @param resultType
-     * @param result If non-null, xpath *may* reuse this XPathResult object instead of creating a new one.  However, it is not required to do so.
-     * @return XPathResult object containing the result of the expression.
-     */
-    function evaluate(xpathText: string, contextNode: Node, resolver: XPathNSResolver, resultType: number, result?: XPathResult): XPathResult;
-
-    /**
-     * Creates a `select` function that uses the given namespace prefix to URI mappings when evaluating queries.
-     * @param namespaceMappings an object mapping namespace prefixes to namespace URIs.  Each key is a prefix; each value is a URI.
-     * @return a function with the same signature as `xpath.select`
-     */
-    function useNamespaces(namespaceMappings: NamespaceMap): typeof select;
-    interface NamespaceMap {
-        [namespacePrefix: string]: string;
-    }
-
-    /**
-     * Compile an XPath expression into an XPathExpression which can be (repeatedly) evaluated against a DOM.
-     * @param xpathText XPath expression as a string
-     * @param namespaceURLMapper Namespace resolver
-     * @return compiled expression
-     */
-    function createExpression(xpathText: string, namespaceURLMapper: XPathNSResolver): XPathExpression;
-
-    /**
-     * Create an XPathNSResolver that resolves based on the information available in the context of a DOM node.
-     * @param node
-     */
-    function createNSResolver(node: Node): XPathNSResolver;
-
-    /**
-     * Result of evaluating an XPathExpression.
-     */
-    class XPathResult {
-        /**
-         * A result set containing whatever type naturally results from evaluation of the expression. Note that if the result is a node-set then UNORDERED_NODE_ITERATOR_TYPE is always the resulting type.
-         */
-        static ANY_TYPE: number;
-        /**
-         * A result containing a single number. This is useful for example, in an XPath expression using the count() function.
-         */
-        static NUMBER_TYPE: number;
-        /**
-         * A result containing a single string.
-         */
-        static STRING_TYPE: number;
-        /**
-         * A result containing a single boolean value. This is useful for example, in an XPath expression using the not() function.
-         */
-        static BOOLEAN_TYPE: number;
-        /**
-         * A result node-set containing all the nodes matching the expression. The nodes may not necessarily be in the same order that they appear in the document.
-         */
-        static UNORDERED_NODE_ITERATOR_TYPE: number;
-        /**
-         * A result node-set containing all the nodes matching the expression. The nodes in the result set are in the same order that they appear in the document.
-         */
-        static ORDERED_NODE_ITERATOR_TYPE: number;
-        /**
-         * A result node-set containing snapshots of all the nodes matching the expression. The nodes may not necessarily be in the same order that they appear in the document.
-         */
-        static UNORDERED_NODE_SNAPSHOT_TYPE: number;
-        /**
-         * A result node-set containing snapshots of all the nodes matching the expression. The nodes in the result set are in the same order that they appear in the document.
-         */
-        static ORDERED_NODE_SNAPSHOT_TYPE: number;
-        /**
-         * A result node-set containing any single node that matches the expression. The node is not necessarily the first node in the document that matches the expression.
-         */
-        static ANY_UNORDERED_NODE_TYPE: number;
-        /**
-         * A result node-set containing the first node in the document that matches the expression.
-         */
-        static FIRST_ORDERED_NODE_TYPE: number;
-
-        /**
-         * Type of this result.  It is one of the enumerated result types.
-         */
-        resultType: number;
-
-        /**
-         * Returns the next node in this result, if this result is one of the _ITERATOR_ result types.
-         */
-        iterateNext(): Node;
-
-        /**
-         * returns the result node for a given index, if this result is one of the _SNAPSHOT_ result types.
-         * @param index
-         */
-        snapshotItem(index: number): Node;
-
-        /**
-         * Number of nodes in this result, if this result is one of the _SNAPSHOT_ result types.
-         */
-        snapshotLength: number;
-
-        /**
-         * Value of this result, if it is a BOOLEAN_TYPE result.
-         */
-        booleanValue: boolean;
-        /**
-         * Value of this result, if it is a NUMBER_TYPE result.
-         */
-        numberValue: number;
-        /**
-         * Value of this result, if it is a STRING_TYPE result.
-         */
-        stringValue: string;
-
-        /**
-         * Value of this result, if it is a FIRST_ORDERED_NODE_TYPE result.
-         */
-        singleNodeValue: Node;
-    }
-
-    /**
-     * A compiled XPath expression, ready to be (repeatedly) evaluated against a DOM node.
-     */
-    interface XPathExpression {
-        /**
-         * evaluate this expression against a DOM node.
-         * @param contextNode
-         * @param resultType
-         * @param result
-         */
-        evaluate(contextNode: Node, resultType: number, result?: XPathResult): XPathResult;
-    }
-
-    /**
-     * Object that can resolve XML namespace prefixes to namespace URIs.
-     */
-    interface XPathNSResolver {
-        /**
-         * Given an XML namespace prefix, returns the corresponding XML namespace URI.
-         * @param prefix XML namespace prefix
-         * @return XML namespace URI
-         */
-        lookupNamespaceURI(prefix: string): string;
-    }
+    (xpathText: string, contextNode: Node, single?: boolean): any;
+}
+
+declare var select: SelectFn;
+
+/**
+ * Evaluate an xpath expression against a DOM node, returning the first result only.
+ * Equivalent to `select(xpathText, contextNode, true)`
+ * @param xpathText
+ * @param contextNode
+ */
+declare function select1(xpathText: string, contextNode: Node): any;
+
+/**
+ * Evaluate an XPath expression against a DOM node using a given namespace resolver.  Returns the result as one of the following:
+ * * Array<Node>
+ * * Node
+ * * boolean
+ * * number
+ * * string
+ * @param xpathText
+ * @param contextNode
+ * @param resolver
+ * @param single If true and the evaluation result is one or more Nodes, will return only the first Node instead of an Array<Node>
+ */
+declare function selectWithResolver(xpathText: string, contextNode: Node, resolver: XPathNSResolver, single?: boolean): any;
+
+/**
+ * Evaluate an xpath expression against a DOM.
+ * @param xpathText xpath expression as a string.
+ * @param contextNode xpath expression is evaluated relative to this DOM node.
+ * @param resolver XML namespace resolver
+ * @param resultType
+ * @param result If non-null, xpath *may* reuse this XPathResult object instead of creating a new one.  However, it is not required to do so.
+ * @return XPathResult object containing the result of the expression.
+ */
+declare function evaluate(xpathText: string, contextNode: Node, resolver: XPathNSResolver, resultType: number, result?: XPathResult): XPathResult;
+
+/**
+ * Creates a `select` function that uses the given namespace prefix to URI mappings when evaluating queries.
+ * @param namespaceMappings an object mapping namespace prefixes to namespace URIs.  Each key is a prefix; each value is a URI.
+ * @return a function with the same signature as `xpath.select`
+ */
+declare function useNamespaces(namespaceMappings: NamespaceMap): typeof select;
+interface NamespaceMap {
+    [namespacePrefix: string]: string;
+}
+
+/**
+ * Compile an XPath expression into an XPathExpression which can be (repeatedly) evaluated against a DOM.
+ * @param xpathText XPath expression as a string
+ * @param namespaceURLMapper Namespace resolver
+ * @return compiled expression
+ */
+declare function createExpression(xpathText: string, namespaceURLMapper: XPathNSResolver): XPathExpression;
+
+/**
+ * Create an XPathNSResolver that resolves based on the information available in the context of a DOM node.
+ * @param node
+ */
+declare function createNSResolver(node: Node): XPathNSResolver;
+
+/**
+ * Result of evaluating an XPathExpression.
+ */
+declare class XPathResult {
+    /**
+     * A result set containing whatever type naturally results from evaluation of the expression. Note that if the result is a node-set then UNORDERED_NODE_ITERATOR_TYPE is always the resulting type.
+     */
+    static ANY_TYPE: number;
+    /**
+     * A result containing a single number. This is useful for example, in an XPath expression using the count() function.
+     */
+    static NUMBER_TYPE: number;
+    /**
+     * A result containing a single string.
+     */
+    static STRING_TYPE: number;
+    /**
+     * A result containing a single boolean value. This is useful for example, in an XPath expression using the not() function.
+     */
+    static BOOLEAN_TYPE: number;
+    /**
+     * A result node-set containing all the nodes matching the expression. The nodes may not necessarily be in the same order that they appear in the document.
+     */
+    static UNORDERED_NODE_ITERATOR_TYPE: number;
+    /**
+     * A result node-set containing all the nodes matching the expression. The nodes in the result set are in the same order that they appear in the document.
+     */
+    static ORDERED_NODE_ITERATOR_TYPE: number;
+    /**
+     * A result node-set containing snapshots of all the nodes matching the expression. The nodes may not necessarily be in the same order that they appear in the document.
+     */
+    static UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    /**
+     * A result node-set containing snapshots of all the nodes matching the expression. The nodes in the result set are in the same order that they appear in the document.
+     */
+    static ORDERED_NODE_SNAPSHOT_TYPE: number;
+    /**
+     * A result node-set containing any single node that matches the expression. The node is not necessarily the first node in the document that matches the expression.
+     */
+    static ANY_UNORDERED_NODE_TYPE: number;
+    /**
+     * A result node-set containing the first node in the document that matches the expression.
+     */
+    static FIRST_ORDERED_NODE_TYPE: number;
+
+    /**
+     * Type of this result.  It is one of the enumerated result types.
+     */
+    resultType: number;
+
+    /**
+     * Returns the next node in this result, if this result is one of the _ITERATOR_ result types.
+     */
+    iterateNext(): Node;
+
+    /**
+     * returns the result node for a given index, if this result is one of the _SNAPSHOT_ result types.
+     * @param index
+     */
+    snapshotItem(index: number): Node;
+
+    /**
+     * Number of nodes in this result, if this result is one of the _SNAPSHOT_ result types.
+     */
+    snapshotLength: number;
+
+    /**
+     * Value of this result, if it is a BOOLEAN_TYPE result.
+     */
+    booleanValue: boolean;
+    /**
+     * Value of this result, if it is a NUMBER_TYPE result.
+     */
+    numberValue: number;
+    /**
+     * Value of this result, if it is a STRING_TYPE result.
+     */
+    stringValue: string;
+
+    /**
+     * Value of this result, if it is a FIRST_ORDERED_NODE_TYPE result.
+     */
+    singleNodeValue: Node;
+}
+
+/**
+ * A compiled XPath expression, ready to be (repeatedly) evaluated against a DOM node.
+ */
+interface XPathExpression {
+    /**
+     * evaluate this expression against a DOM node.
+     * @param contextNode
+     * @param resultType
+     * @param result
+     */
+    evaluate(contextNode: Node, resultType: number, result?: XPathResult): XPathResult;
+}
+
+/**
+ * Object that can resolve XML namespace prefixes to namespace URIs.
+ */
+interface XPathNSResolver {
+    /**
+     * Given an XML namespace prefix, returns the corresponding XML namespace URI.
+     * @param prefix XML namespace prefix
+     * @return XML namespace URI
+     */
+    lookupNamespaceURI(prefix: string): string;
 }
diff --git a/xregexp/xregexp.d.ts b/xregexp/xregexp.d.ts
index a44bd4634f..918c13e0b6 100644
--- a/xregexp/xregexp.d.ts
+++ b/xregexp/xregexp.d.ts
@@ -4,133 +4,132 @@
 //                 Johannes Fahrenkrug <https://github.com/jfahrenkrug>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'xregexp' {
 
-	function OuterXRegExp(pattern: string, flags?: string): RegExp;
-	function OuterXRegExp(pattern: RegExp): RegExp;
 
-	namespace OuterXRegExp {
-		// scopes: 'default', 'class', or 'all'
-		/*
-		 Native flags:
-		 g - global
-		 i - ignore case
-		 m - multiline anchors
-		 y - sticky (Firefox 3+)
-		 Additional XRegExp flags:
-		 n - explicit capture
-		 s - dot matches all (aka singleline)
-		 x - free-spacing and line comments (aka extended)
-		 */
-		interface TokenOpts {
-			scope?: string;
-			trigger?: () => boolean;
-			customFlags?: string;
-		}
+declare function OuterXRegExp(pattern: string, flags?: string): RegExp;
+declare function OuterXRegExp(pattern: RegExp): RegExp;
 
-		function XRegExp(pattern: string, flags?: string): RegExp;
-		function XRegExp(pattern: RegExp): RegExp;
+declare namespace OuterXRegExp {
+    // scopes: 'default', 'class', or 'all'
+    /*
+     Native flags:
+     g - global
+     i - ignore case
+     m - multiline anchors
+     y - sticky (Firefox 3+)
+     Additional XRegExp flags:
+     n - explicit capture
+     s - dot matches all (aka singleline)
+     x - free-spacing and line comments (aka extended)
+     */
+    interface TokenOpts {
+        scope?: string;
+        trigger?: () => boolean;
+        customFlags?: string;
+    }
 
-		/* Since xregexp 3.0.0 can be used either via
+    function XRegExp(pattern: string, flags?: string): RegExp;
+    function XRegExp(pattern: RegExp): RegExp;
 
-				import X = require('xregexp');
-				X();
+    /* Since xregexp 3.0.0 can be used either via
 
-			or via
+            import X = require('xregexp');
+            X();
 
-				import XRegExp = X.XRegExp;
-				XRegExp()
+        or via
 
-			I had to duplicate the function declarations. I could simply not
-			find another way to accomplish this with TypeScript.
-		*/
+            import XRegExp = X.XRegExp;
+            XRegExp()
 
-		// begin API definitions
-		function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
+        I had to duplicate the function declarations. I could simply not
+        find another way to accomplish this with TypeScript.
+    */
 
-		function build(pattern: string, subs: string[], flags?: string): RegExp;
-		function cache(pattern: string, flags?: string): RegExp;
-		function escape(str: string): string;
-		function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
-		function forEach(str: string, regex: RegExp, callback: (matchArr: RegExpExecArray, index: number, input: string, regexp: RegExp) => void): any;
-		function globalize(regex: RegExp): RegExp;
+    // begin API definitions
+    function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
 
-		function install(options: string): void;
-		function install(options: Object): void;
+    function build(pattern: string, subs: string[], flags?: string): RegExp;
+    function cache(pattern: string, flags?: string): RegExp;
+    function escape(str: string): string;
+    function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
+    function forEach(str: string, regex: RegExp, callback: (matchArr: RegExpExecArray, index: number, input: string, regexp: RegExp) => void): any;
+    function globalize(regex: RegExp): RegExp;
 
-		function isInstalled(feature: string): boolean;
-		function isRegExp(value: any): boolean;
-		function match(str: string, regex: RegExp, scope: string): any;
-		function match(str: string, regex: RegExp, scope: "one"): string;
-		function match(str: string, regex: RegExp, scope: "all"): string[];
-		function match(str: string, regex: RegExp): string[];
-		function matchChain(str: string, chain: RegExp[]): string[];
-		function matchChain(str: string, chain: { regex: RegExp; backref: string }[]): string[];
-		function matchChain(str: string, chain: { regex: RegExp; backref: number }[]): string[];
-		function matchRecursive(str: string, left: string, right: string, flags?: string, options?: Object): string[];
+    function install(options: string): void;
+    function install(options: Object): void;
 
-		function replace(str: string, search: string, replacement: string, scope?: string): string;
-		function replace(str: string, search: string, replacement: Function, scope?: string): string;
-		function replace(str: string, search: RegExp, replacement: string, scope?: string): string;
-		function replace(str: string, search: RegExp, replacement: Function, scope?: string): string;
-		function replaceEach(str: string, replacements: Array<RegExp|string>[]): string;
+    function isInstalled(feature: string): boolean;
+    function isRegExp(value: any): boolean;
+    function match(str: string, regex: RegExp, scope: string): any;
+    function match(str: string, regex: RegExp, scope: "one"): string;
+    function match(str: string, regex: RegExp, scope: "all"): string[];
+    function match(str: string, regex: RegExp): string[];
+    function matchChain(str: string, chain: RegExp[]): string[];
+    function matchChain(str: string, chain: { regex: RegExp; backref: string }[]): string[];
+    function matchChain(str: string, chain: { regex: RegExp; backref: number }[]): string[];
+    function matchRecursive(str: string, left: string, right: string, flags?: string, options?: Object): string[];
 
-		function split(str: string, separator: string, limit?: number): string[];
-		function split(str: string, separator: RegExp, limit?: number): string[];
+    function replace(str: string, search: string, replacement: string, scope?: string): string;
+    function replace(str: string, search: string, replacement: Function, scope?: string): string;
+    function replace(str: string, search: RegExp, replacement: string, scope?: string): string;
+    function replace(str: string, search: RegExp, replacement: Function, scope?: string): string;
+    function replaceEach(str: string, replacements: Array<RegExp | string>[]): string;
 
-		function test(str: string, regex: RegExp, pos?: number, sticky?: boolean): boolean;
+    function split(str: string, separator: string, limit?: number): string[];
+    function split(str: string, separator: RegExp, limit?: number): string[];
 
-		function uninstall(options: Object): void;
-		function uninstall(options: string): void;
+    function test(str: string, regex: RegExp, pos?: number, sticky?: boolean): boolean;
 
-		function union(patterns: string[], flags?: string): RegExp;
-		var version: string;
-		// end API definitions
+    function uninstall(options: Object): void;
+    function uninstall(options: string): void;
 
-		namespace XRegExp {
-			// begin API definitions
-			function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
+    function union(patterns: string[], flags?: string): RegExp;
+    var version: string;
+    // end API definitions
 
-			function build(pattern: string, subs: string[], flags?: string): RegExp;
-			function cache(pattern: string, flags?: string): RegExp;
-			function escape(str: string): string;
-			function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
-			function forEach(str: string, regex: RegExp, callback: (matchArr: RegExpExecArray, index: number, input: string, regexp: RegExp) => void): any;
-			function globalize(regex: RegExp): RegExp;
+    namespace XRegExp {
+        // begin API definitions
+        function addToken(regex: RegExp, handler: (matchArr: RegExpExecArray, scope: string) => string, options?: TokenOpts): void;
 
-			function install(options: string): void;
-			function install(options: Object): void;
+        function build(pattern: string, subs: string[], flags?: string): RegExp;
+        function cache(pattern: string, flags?: string): RegExp;
+        function escape(str: string): string;
+        function exec(str: string, regex: RegExp, pos?: number, sticky?: boolean): RegExpExecArray;
+        function forEach(str: string, regex: RegExp, callback: (matchArr: RegExpExecArray, index: number, input: string, regexp: RegExp) => void): any;
+        function globalize(regex: RegExp): RegExp;
 
-			function isInstalled(feature: string): boolean;
-			function isRegExp(value: any): boolean;
-			function match(str: string, regex: RegExp, scope: string): any;
-			function match(str: string, regex: RegExp, scope: "one"): string;
-			function match(str: string, regex: RegExp, scope: "all"): string[];
-			function match(str: string, regex: RegExp): string[];
-			function matchChain(str: string, chain: RegExp[]): string[];
-			function matchChain(str: string, chain: { regex: RegExp; backref: string }[]): string[];
-			function matchChain(str: string, chain: { regex: RegExp; backref: number }[]): string[];
-			function matchRecursive(str: string, left: string, right: string, flags?: string, options?: Object): string[];
+        function install(options: string): void;
+        function install(options: Object): void;
 
-			function replace(str: string, search: string, replacement: string, scope?: string): string;
-			function replace(str: string, search: string, replacement: Function, scope?: string): string;
-			function replace(str: string, search: RegExp, replacement: string, scope?: string): string;
-			function replace(str: string, search: RegExp, replacement: Function, scope?: string): string;
-			function replaceEach(str: string, replacements: Array<RegExp|string>[]): string;
+        function isInstalled(feature: string): boolean;
+        function isRegExp(value: any): boolean;
+        function match(str: string, regex: RegExp, scope: string): any;
+        function match(str: string, regex: RegExp, scope: "one"): string;
+        function match(str: string, regex: RegExp, scope: "all"): string[];
+        function match(str: string, regex: RegExp): string[];
+        function matchChain(str: string, chain: RegExp[]): string[];
+        function matchChain(str: string, chain: { regex: RegExp; backref: string }[]): string[];
+        function matchChain(str: string, chain: { regex: RegExp; backref: number }[]): string[];
+        function matchRecursive(str: string, left: string, right: string, flags?: string, options?: Object): string[];
 
-			function split(str: string, separator: string, limit?: number): string[];
-			function split(str: string, separator: RegExp, limit?: number): string[];
+        function replace(str: string, search: string, replacement: string, scope?: string): string;
+        function replace(str: string, search: string, replacement: Function, scope?: string): string;
+        function replace(str: string, search: RegExp, replacement: string, scope?: string): string;
+        function replace(str: string, search: RegExp, replacement: Function, scope?: string): string;
+        function replaceEach(str: string, replacements: Array<RegExp | string>[]): string;
 
-			function test(str: string, regex: RegExp, pos?: number, sticky?: boolean): boolean;
+        function split(str: string, separator: string, limit?: number): string[];
+        function split(str: string, separator: RegExp, limit?: number): string[];
 
-			function uninstall(options: Object): void;
-			function uninstall(options: string): void;
+        function test(str: string, regex: RegExp, pos?: number, sticky?: boolean): boolean;
 
-			function union(patterns: string[], flags?: string): RegExp;
-			var version: string;
-			// end API definitions
-		}
-	}
+        function uninstall(options: Object): void;
+        function uninstall(options: string): void;
 
-	export = OuterXRegExp;
+        function union(patterns: string[], flags?: string): RegExp;
+        var version: string;
+        // end API definitions
+    }
 }
+
+export = OuterXRegExp;
diff --git a/yargs/yargs.d.ts b/yargs/yargs.d.ts
index 4e6ef109ec..1182a8173f 100644
--- a/yargs/yargs.d.ts
+++ b/yargs/yargs.d.ts
@@ -3,164 +3,163 @@
 // Definitions by: Martin Poelstra <https://github.com/poelstra>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "yargs" {
 
-	namespace yargs {
-		interface Argv {
-			argv: any;
-			(...args: any[]): any;
-			parse(...args: any[]): any;
 
-			reset(): Argv;
+declare namespace yargs {
+    interface Argv {
+        argv: any;
+        (...args: any[]): any;
+        parse(...args: any[]): any;
 
-			locale(): string;
-			locale(loc:string): Argv;
+        reset(): Argv;
 
-			detectLocale(detect:boolean): Argv;
+        locale(): string;
+        locale(loc: string): Argv;
 
-			alias(shortName: string, longName: string): Argv;
-			alias(aliases: { [shortName: string]: string }): Argv;
-			alias(aliases: { [shortName: string]: string[] }): Argv;
-			
-			array(key: string): Argv;
-			array(keys: string[]): Argv;
+        detectLocale(detect: boolean): Argv;
 
-			default(key: string, value: any): Argv;
-			default(defaults: { [key: string]: any}): Argv;
+        alias(shortName: string, longName: string): Argv;
+        alias(aliases: { [shortName: string]: string }): Argv;
+        alias(aliases: { [shortName: string]: string[] }): Argv;
 
-			demand(key: string, msg: string): Argv;
-			demand(key: string, required?: boolean): Argv;
-			demand(keys: string[], msg: string): Argv;
-			demand(keys: string[], required?: boolean): Argv;
-			demand(positionals: number, required?: boolean): Argv;
-			demand(positionals: number, msg: string): Argv;
+        array(key: string): Argv;
+        array(keys: string[]): Argv;
 
-			require(key: string, msg: string): Argv;
-			require(key: string, required: boolean): Argv;
-			require(keys: number[], msg: string): Argv;
-			require(keys: number[], required: boolean): Argv;
-			require(positionals: number, required: boolean): Argv;
-			require(positionals: number, msg: string): Argv;
+        default(key: string, value: any): Argv;
+        default(defaults: { [key: string]: any }): Argv;
 
-			required(key: string, msg: string): Argv;
-			required(key: string, required: boolean): Argv;
-			required(keys: number[], msg: string): Argv;
-			required(keys: number[], required: boolean): Argv;
-			required(positionals: number, required: boolean): Argv;
-			required(positionals: number, msg: string): Argv;
+        demand(key: string, msg: string): Argv;
+        demand(key: string, required?: boolean): Argv;
+        demand(keys: string[], msg: string): Argv;
+        demand(keys: string[], required?: boolean): Argv;
+        demand(positionals: number, required?: boolean): Argv;
+        demand(positionals: number, msg: string): Argv;
 
-			requiresArg(key: string): Argv;
-			requiresArg(keys: string[]): Argv;
+        require(key: string, msg: string): Argv;
+        require(key: string, required: boolean): Argv;
+        require(keys: number[], msg: string): Argv;
+        require(keys: number[], required: boolean): Argv;
+        require(positionals: number, required: boolean): Argv;
+        require(positionals: number, msg: string): Argv;
 
-			describe(key: string, description: string): Argv;
-			describe(descriptions: { [key: string]: string }): Argv;
+        required(key: string, msg: string): Argv;
+        required(key: string, required: boolean): Argv;
+        required(keys: number[], msg: string): Argv;
+        required(keys: number[], required: boolean): Argv;
+        required(positionals: number, required: boolean): Argv;
+        required(positionals: number, msg: string): Argv;
 
-			option(key: string, options: Options): Argv;
-			option(options: { [key: string]: Options }): Argv;
-			options(key: string, options: Options): Argv;
-			options(options: { [key: string]: Options }): Argv;
+        requiresArg(key: string): Argv;
+        requiresArg(keys: string[]): Argv;
 
-			usage(message: string, options?: { [key: string]: Options }): Argv;
-			usage(options?: { [key: string]: Options }): Argv;
+        describe(key: string, description: string): Argv;
+        describe(descriptions: { [key: string]: string }): Argv;
 
-			command(command: string, description: string): Argv;
-			command(command: string, description: string, fn: (args: Argv) => void): Argv;
+        option(key: string, options: Options): Argv;
+        option(options: { [key: string]: Options }): Argv;
+        options(key: string, options: Options): Argv;
+        options(options: { [key: string]: Options }): Argv;
 
-			completion(cmd: string, fn?: SyncCompletionFunction): Argv;
-			completion(cmd: string, description?: string, fn?: SyncCompletionFunction): Argv;
-			completion(cmd: string, fn?: AsyncCompletionFunction): Argv;
-			completion(cmd: string, description?: string, fn?: AsyncCompletionFunction): Argv;
+        usage(message: string, options?: { [key: string]: Options }): Argv;
+        usage(options?: { [key: string]: Options }): Argv;
 
-			example(command: string, description: string): Argv;
+        command(command: string, description: string): Argv;
+        command(command: string, description: string, fn: (args: Argv) => void): Argv;
 
-			check(func: (argv: any, aliases: { [alias: string]: string }) => any): Argv;
+        completion(cmd: string, fn?: SyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, fn?: SyncCompletionFunction): Argv;
+        completion(cmd: string, fn?: AsyncCompletionFunction): Argv;
+        completion(cmd: string, description?: string, fn?: AsyncCompletionFunction): Argv;
 
-			boolean(key: string): Argv;
-			boolean(keys: string[]): Argv;
+        example(command: string, description: string): Argv;
 
-			string(key: string): Argv;
-			string(keys: string[]): Argv;
+        check(func: (argv: any, aliases: { [alias: string]: string }) => any): Argv;
 
-			choices(choices: Object): Argv;
-			choices(key: string, values:any[]): Argv;
+        boolean(key: string): Argv;
+        boolean(keys: string[]): Argv;
 
-			config(key: string): Argv;
-			config(keys: string[]): Argv;
+        string(key: string): Argv;
+        string(keys: string[]): Argv;
 
-			wrap(columns: number): Argv;
+        choices(choices: Object): Argv;
+        choices(key: string, values: any[]): Argv;
 
-			strict(): Argv;
+        config(key: string): Argv;
+        config(keys: string[]): Argv;
 
-			help(): string;
-			help(option: string, description?: string): Argv;
-			
-			env(prefix?: string): Argv;
-			env(enable: boolean): Argv;
+        wrap(columns: number): Argv;
 
-			epilog(msg: string): Argv;
-			epilogue(msg: string): Argv;
+        strict(): Argv;
 
-			version(version: string, option?: string, description?: string): Argv;
-			version(version: () => string, option?: string, description?: string): Argv;
+        help(): string;
+        help(option: string, description?: string): Argv;
 
-			showHelpOnFail(enable: boolean, message?: string): Argv;
+        env(prefix?: string): Argv;
+        env(enable: boolean): Argv;
 
-			showHelp(func?: (message: string) => any): Argv;
+        epilog(msg: string): Argv;
+        epilogue(msg: string): Argv;
 
-			exitProcess(enabled:boolean): Argv;
-			
-			global(key: string): Argv;
-			global(keys: string[]): Argv;
-			
-			group(key: string, groupName: string): Argv;
-			group(keys: string[], groupName: string): Argv;
-			
-			nargs(key: string, count: number): Argv;
-			nargs(nargs: { [key: string]: number }): Argv;
+        version(version: string, option?: string, description?: string): Argv;
+        version(version: () => string, option?: string, description?: string): Argv;
 
-			/* Undocumented */
+        showHelpOnFail(enable: boolean, message?: string): Argv;
 
-			normalize(key: string): Argv;
-			normalize(keys: string[]): Argv;
+        showHelp(func?: (message: string) => any): Argv;
 
-			implies(key: string, value: string): Argv;
-			implies(implies: { [key: string]: string }): Argv;
+        exitProcess(enabled: boolean): Argv;
 
-			count(key: string): Argv;
-			count(keys: string[]): Argv;
+        global(key: string): Argv;
+        global(keys: string[]): Argv;
 
-			fail(func: (msg: string) => any): void;
-		}
+        group(key: string, groupName: string): Argv;
+        group(keys: string[], groupName: string): Argv;
 
-		interface Options {
-			type?: string;
-			group?: string;
-			alias?: any;
-			demand?: any;
-			required?: any;
-			require?: any;
-			default?: any;
-			defaultDescription?: string;
-			boolean?: boolean;
-			string?: boolean;
-			count?: boolean;
-			describe?: any;
-			description?: any;
-			desc?: any;
-			requiresArg?: any;
-			choices?:string[];
-			global?: boolean;
-			array?: boolean;
-			config?: boolean;
-			number?: boolean;
-			normalize?: boolean;
-			nargs?: number;
-		}
+        nargs(key: string, count: number): Argv;
+        nargs(nargs: { [key: string]: number }): Argv;
 
-		type SyncCompletionFunction = (current: string, argv: any) => string[];
-		type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
-	}
+        /* Undocumented */
 
-	var yargs: yargs.Argv;
-	export = yargs;
+        normalize(key: string): Argv;
+        normalize(keys: string[]): Argv;
+
+        implies(key: string, value: string): Argv;
+        implies(implies: { [key: string]: string }): Argv;
+
+        count(key: string): Argv;
+        count(keys: string[]): Argv;
+
+        fail(func: (msg: string) => any): void;
+    }
+
+    interface Options {
+        type?: string;
+        group?: string;
+        alias?: any;
+        demand?: any;
+        required?: any;
+        require?: any;
+        default?: any;
+        defaultDescription?: string;
+        boolean?: boolean;
+        string?: boolean;
+        count?: boolean;
+        describe?: any;
+        description?: any;
+        desc?: any;
+        requiresArg?: any;
+        choices?: string[];
+        global?: boolean;
+        array?: boolean;
+        config?: boolean;
+        number?: boolean;
+        normalize?: boolean;
+        nargs?: number;
+    }
+
+    type SyncCompletionFunction = (current: string, argv: any) => string[];
+    type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
 }
+
+declare var yargs: yargs.Argv;
+export = yargs;
diff --git a/yosay/yosay.d.ts b/yosay/yosay.d.ts
index 65bde04b0f..71698efe50 100644
--- a/yosay/yosay.d.ts
+++ b/yosay/yosay.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Kentaro Okuno <http://github.com/armorik83>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'yosay' {
-  function yosay(message?: string, options?: {maxLength: number}): string;
-  export = yosay;
-}
\ No newline at end of file
+
+declare function yosay(message?: string, options?: { maxLength: number }): string;
+export = yosay;