diff --git a/enhanced-resolve/enhanced-resolve-tests.ts b/enhanced-resolve/enhanced-resolve-tests.ts
new file mode 100644
index 0000000000..6588bb125b
--- /dev/null
+++ b/enhanced-resolve/enhanced-resolve-tests.ts
@@ -0,0 +1,42 @@
+import resolve = require('enhanced-resolve');
+import { Context } from 'enhanced-resolve/lib/concord';
+import { ResolveResult } from 'enhanced-resolve/lib/common-types'
+import Resolver = require('enhanced-resolve/lib/Resolver')
+
+resolve('lib', 'string', function (err) { });
+
+let context: Context = {
+    referrer: 'hi'
+};
+
+resolve(context, 'path', 'string', function () { });
+
+let resolver: Resolver
+resolver = resolve.ResolverFactory.createResolver({
+    extensions: ['.js'],
+    fileSystem: {}
+});
+
+const nfs = new resolve.NodeJsInputFileSystem();
+
+const snfs = new resolve.SyncNodeJsInputFileSystem();
+
+const cfs = new resolve.CachedInputFileSystem(nfs, 4);
+const cfs2 = new resolve.CachedInputFileSystem(snfs, 4);
+
+let result: ResolveResult
+
+result = resolve.sync(context, 'path', 'string');
+result = resolve.sync('path', 'string');
+
+resolve.context('lib', 'string', function (err) { });
+resolve.context(context, 'path', 'string', function () { });
+
+result = resolve.context.sync(context, 'path', 'string');
+result = resolve.context.sync('path', 'string');
+
+resolve.create('lib', 'string', function (err) { });
+resolve.create(context, 'path', 'string', function () { });
+
+result = resolve.create.sync(context, 'path', 'string');
+result = resolve.create.sync('path', 'string');
diff --git a/enhanced-resolve/index.d.ts b/enhanced-resolve/index.d.ts
new file mode 100644
index 0000000000..142e644bd1
--- /dev/null
+++ b/enhanced-resolve/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for enhanced-resolve v2.3.0
+// Project: http://github.com/webpack/enhanced-resolve.git
+// Definitions by: e-cloud <https://github.com/e-cloud>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="tapable" />
+
+import fs = require('fs');
+import {
+    ResolveResult,
+    LoggingCallbackWrapper,
+    ErrorCallback,
+    CommonFileSystemMethod,
+    BaseFileSystem,
+    ResolverRequest
+} from './lib/common-types';
+import { Context } from './lib/concord';
+import Resolver = require('./lib/Resolver');
+
+declare namespace Resolve {
+    function sync(path: string, request: string): ResolveResult;
+    function sync(context: Context, path: string, request: string): ResolveResult;
+
+    function context(path: string, request: string, callback: LoggingCallbackWrapper): void;
+    function context(context: Context, path: string, request: string, callback: LoggingCallbackWrapper): void;
+
+    namespace context {
+        function sync(path: string, request: string): ResolveResult;
+        function sync(context: Context, path: string, request: string): ResolveResult;
+    }
+
+    function loader(path: string, request: string, callback: LoggingCallbackWrapper): void;
+    function loader(context: Context, path: string, request: string, callback: LoggingCallbackWrapper): void;
+
+    namespace context {
+        function sync(path: string, request: string): ResolveResult;
+        function sync(context: Context, path: string, request: string): ResolveResult;
+    }
+
+    function create(path: string, request: string, callback: LoggingCallbackWrapper): void;
+    function create(context: Context, path: string, request: string, callback: LoggingCallbackWrapper): void;
+
+    export namespace create {
+        function sync(path: string, request: string): ResolveResult;
+        function sync(context: Context, path: string, request: string): ResolveResult;
+    }
+
+    export namespace ResolverFactory {
+        interface ResolverOption {
+            modules?: string[];
+            descriptionFiles?: string[];
+            plugins?: any[];
+            mainFields?: string[];
+            aliasFields?: string[];
+            mainFiles?: string[];
+            extensions: string[];
+            enforceExtension?: boolean;
+            moduleExtensions?: string[];
+            enforceModuleExtension?: boolean;
+            alias?: AliasItem[] | {};
+            symlinks?: string[] | boolean;
+            resolveToContext?: boolean;
+            unsafeCache?: boolean | {};
+            cachePredicate?: (val: ResolverRequest) => boolean;
+            fileSystem: any;
+            resolver?: Resolver;
+        }
+        interface AliasItem {
+            name: string;
+            alias: string;
+            onlyModule: boolean;
+        }
+        function createResolver(options: ResolverOption): Resolver;
+    }
+
+    class NodeJsInputFileSystem {
+        readdir(path: string, callback: (err: Error, files: string[]) => void): void;
+
+        isSync(): boolean;
+
+        stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: fs.Stats) => any): void;
+
+        readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+        readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void;
+
+        readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void;
+    }
+
+    class SyncNodeJsInputFileSystem {
+        isSync(): boolean;
+
+        stat: CommonFileSystemMethod;
+        readdir: CommonFileSystemMethod;
+        readFile(path: string, encoding?: string, callback?: (err: NodeJS.ErrnoException, result: Buffer) => void): void;
+        readFile(path: string, callback?: (err: NodeJS.ErrnoException, result: Buffer) => void): void;
+        readlink: CommonFileSystemMethod;
+    }
+
+    class CachedInputFileSystem {
+        fileSystem: BaseFileSystem;
+        _statStorage: Storage;
+        _readdirStorage: Storage;
+        _readFileStorage: Storage;
+        _readJsonStorage: Storage;
+        _readlinkStorage: Storage;
+        _stat: CommonFileSystemMethod;
+        _readdir: CommonFileSystemMethod;
+        _readFile: CommonFileSystemMethod;
+        _readJson: CommonFileSystemMethod;
+        _readlink: CommonFileSystemMethod;
+
+        constructor(fileSystem: BaseFileSystem, duration: number);
+
+        isSync(): boolean;
+
+        stat(path: string, callback: ErrorCallback): void;
+
+        readdir(path: string, callback: ErrorCallback): void;
+
+        readFile(path: string, callback: ErrorCallback): void;
+
+        readJson(path: string, callback: ErrorCallback): void;
+
+        readlink(path: string, callback: ErrorCallback): void;
+
+        purge(what?: string | string[]): void;
+    }
+}
+
+declare function Resolve(path: string, request: string, callback: LoggingCallbackWrapper): void;
+declare function Resolve(context: Context, path: string, request: string, callback: LoggingCallbackWrapper): void;
+
+export = Resolve;
diff --git a/enhanced-resolve/lib/AliasFieldPlugin.d.ts b/enhanced-resolve/lib/AliasFieldPlugin.d.ts
new file mode 100644
index 0000000000..d49ba745b8
--- /dev/null
+++ b/enhanced-resolve/lib/AliasFieldPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class AliasFieldPlugin {
+    source: string;
+    field: string;
+    target: string;
+
+    constructor(source: string, field: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = AliasFieldPlugin;
diff --git a/enhanced-resolve/lib/AliasPlugin.d.ts b/enhanced-resolve/lib/AliasPlugin.d.ts
new file mode 100644
index 0000000000..4d9635f1c5
--- /dev/null
+++ b/enhanced-resolve/lib/AliasPlugin.d.ts
@@ -0,0 +1,17 @@
+import Resolver = require('./Resolver');
+import Resolve  = require('../');
+
+declare class AliasPlugin {
+    source: string;
+    options: Resolve.ResolverFactory.AliasItem;
+    target: string;
+    name: string;
+    alias: string;
+    onlyModule: boolean;
+
+    constructor(source: string, options: Resolve.ResolverFactory.AliasItem, target: string);
+
+    apply(resolver: Resolver): void;
+}
+
+export = AliasPlugin;
diff --git a/enhanced-resolve/lib/AppendPlugin.d.ts b/enhanced-resolve/lib/AppendPlugin.d.ts
new file mode 100644
index 0000000000..7a5f7e1a62
--- /dev/null
+++ b/enhanced-resolve/lib/AppendPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class AppendPlugin {
+    source: string;
+    appending: string;
+    target: string;
+
+    constructor(source: string, appending: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = AppendPlugin;
diff --git a/enhanced-resolve/lib/CloneBasenamePlugin.d.ts b/enhanced-resolve/lib/CloneBasenamePlugin.d.ts
new file mode 100644
index 0000000000..8a4483902e
--- /dev/null
+++ b/enhanced-resolve/lib/CloneBasenamePlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class CloneBasenamePlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = CloneBasenamePlugin;
diff --git a/enhanced-resolve/lib/ConcordExtensionsPlugin.d.ts b/enhanced-resolve/lib/ConcordExtensionsPlugin.d.ts
new file mode 100644
index 0000000000..89d0880350
--- /dev/null
+++ b/enhanced-resolve/lib/ConcordExtensionsPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class ConcordExtensionsPlugin {
+    source: string;
+    options: {};
+    target: string;
+
+    constructor(source: string, options: {}, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ConcordExtensionsPlugin;
diff --git a/enhanced-resolve/lib/ConcordMainPlugin.d.ts b/enhanced-resolve/lib/ConcordMainPlugin.d.ts
new file mode 100644
index 0000000000..9d2fdf3d44
--- /dev/null
+++ b/enhanced-resolve/lib/ConcordMainPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class ConcordMainPlugin {
+    source: string;
+    options: {};
+    target: string;
+
+    constructor(source: string, options: {}, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ConcordMainPlugin;
diff --git a/enhanced-resolve/lib/ConcordModulesPlugin.d.ts b/enhanced-resolve/lib/ConcordModulesPlugin.d.ts
new file mode 100644
index 0000000000..3afbd32a9c
--- /dev/null
+++ b/enhanced-resolve/lib/ConcordModulesPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class ConcordModulesPlugin {
+    source: string;
+    options: {};
+    target: string;
+
+    constructor(source: string, options: {}, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ConcordModulesPlugin;
diff --git a/enhanced-resolve/lib/DescriptionFilePlugin.d.ts b/enhanced-resolve/lib/DescriptionFilePlugin.d.ts
new file mode 100644
index 0000000000..f9f560de46
--- /dev/null
+++ b/enhanced-resolve/lib/DescriptionFilePlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class DescriptionFilePlugin {
+    source: string;
+    target: string;
+    filenames: string[];
+
+    constructor(source: string, filenames: string[] | string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = DescriptionFilePlugin;
diff --git a/enhanced-resolve/lib/DescriptionFileUtils.d.ts b/enhanced-resolve/lib/DescriptionFileUtils.d.ts
new file mode 100644
index 0000000000..db7cd77723
--- /dev/null
+++ b/enhanced-resolve/lib/DescriptionFileUtils.d.ts
@@ -0,0 +1,8 @@
+import Resolver = require('./Resolver');
+declare function loadDescriptionFile(
+    resolver: Resolver, directory: string, filenames: string[],
+    callback: (...args: any[]) => any
+): void;
+declare function getField(content: any, field: string): any;
+declare function cdUp(directory: string): string | null;
+export { loadDescriptionFile, getField, cdUp };
diff --git a/enhanced-resolve/lib/DirectoryExistsPlugin.d.ts b/enhanced-resolve/lib/DirectoryExistsPlugin.d.ts
new file mode 100644
index 0000000000..d4483985ab
--- /dev/null
+++ b/enhanced-resolve/lib/DirectoryExistsPlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class DirectoryExistsPlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = DirectoryExistsPlugin;
diff --git a/enhanced-resolve/lib/FileExistsPlugin.d.ts b/enhanced-resolve/lib/FileExistsPlugin.d.ts
new file mode 100644
index 0000000000..061a8475c2
--- /dev/null
+++ b/enhanced-resolve/lib/FileExistsPlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class FileExistsPlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = FileExistsPlugin;
diff --git a/enhanced-resolve/lib/FileKindPlugin.d.ts b/enhanced-resolve/lib/FileKindPlugin.d.ts
new file mode 100644
index 0000000000..86c0e68543
--- /dev/null
+++ b/enhanced-resolve/lib/FileKindPlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class FileKindPlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = FileKindPlugin;
diff --git a/enhanced-resolve/lib/JoinRequestPlugin.d.ts b/enhanced-resolve/lib/JoinRequestPlugin.d.ts
new file mode 100644
index 0000000000..66238fddb9
--- /dev/null
+++ b/enhanced-resolve/lib/JoinRequestPlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class JoinRequestPlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = JoinRequestPlugin;
diff --git a/enhanced-resolve/lib/LogInfoPlugin.d.ts b/enhanced-resolve/lib/LogInfoPlugin.d.ts
new file mode 100644
index 0000000000..26dcecac87
--- /dev/null
+++ b/enhanced-resolve/lib/LogInfoPlugin.d.ts
@@ -0,0 +1,9 @@
+import Resolver = require('./Resolver');
+declare class LogInfoPlugin {
+    source: string;
+
+    constructor(source: string);
+
+    apply(resolver: Resolver): void;
+}
+export = LogInfoPlugin;
diff --git a/enhanced-resolve/lib/MainFieldPlugin.d.ts b/enhanced-resolve/lib/MainFieldPlugin.d.ts
new file mode 100644
index 0000000000..8a8882d6f0
--- /dev/null
+++ b/enhanced-resolve/lib/MainFieldPlugin.d.ts
@@ -0,0 +1,19 @@
+import Resolver = require('./Resolver');
+declare class MainFieldPlugin {
+    source: string;
+    options: {
+        name: string;
+        forceRelative: boolean;
+    };
+    target: string;
+
+    constructor(
+        source: string, options: {
+            name: string;
+            forceRelative: boolean;
+        }, target: string
+    );
+
+    apply(resolver: Resolver): void;
+}
+export = MainFieldPlugin;
diff --git a/enhanced-resolve/lib/ModuleAppendPlugin.d.ts b/enhanced-resolve/lib/ModuleAppendPlugin.d.ts
new file mode 100644
index 0000000000..3380d33622
--- /dev/null
+++ b/enhanced-resolve/lib/ModuleAppendPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class ModuleAppendPlugin {
+    source: string;
+    appending: string;
+    target: string;
+
+    constructor(source: string, appending: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ModuleAppendPlugin;
diff --git a/enhanced-resolve/lib/ModuleKindPlugin.d.ts b/enhanced-resolve/lib/ModuleKindPlugin.d.ts
new file mode 100644
index 0000000000..a4b945a09d
--- /dev/null
+++ b/enhanced-resolve/lib/ModuleKindPlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class ModuleKindPlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ModuleKindPlugin;
diff --git a/enhanced-resolve/lib/ModulesInHierachicDirectoriesPlugin.d.ts b/enhanced-resolve/lib/ModulesInHierachicDirectoriesPlugin.d.ts
new file mode 100644
index 0000000000..d744870022
--- /dev/null
+++ b/enhanced-resolve/lib/ModulesInHierachicDirectoriesPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class ModulesInHierachicDirectoriesPlugin {
+    source: string;
+    target: string;
+    directories: string[];
+
+    constructor(source: string, directories: string[], target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ModulesInHierachicDirectoriesPlugin;
diff --git a/enhanced-resolve/lib/ModulesInRootPlugin.d.ts b/enhanced-resolve/lib/ModulesInRootPlugin.d.ts
new file mode 100644
index 0000000000..87654ce919
--- /dev/null
+++ b/enhanced-resolve/lib/ModulesInRootPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class ModulesInRootPlugin {
+    source: string;
+    path: string;
+    target: string;
+
+    constructor(source: string, path: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ModulesInRootPlugin;
diff --git a/enhanced-resolve/lib/NextPlugin.d.ts b/enhanced-resolve/lib/NextPlugin.d.ts
new file mode 100644
index 0000000000..7ffbefa643
--- /dev/null
+++ b/enhanced-resolve/lib/NextPlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class NextPlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = NextPlugin;
diff --git a/enhanced-resolve/lib/ParsePlugin.d.ts b/enhanced-resolve/lib/ParsePlugin.d.ts
new file mode 100644
index 0000000000..933d6d50ff
--- /dev/null
+++ b/enhanced-resolve/lib/ParsePlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class ParsePlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ParsePlugin;
diff --git a/enhanced-resolve/lib/Resolver.d.ts b/enhanced-resolve/lib/Resolver.d.ts
new file mode 100644
index 0000000000..4d2f3ee477
--- /dev/null
+++ b/enhanced-resolve/lib/Resolver.d.ts
@@ -0,0 +1,26 @@
+/// <reference types="tapable" />
+import Tapable = require('tapable');
+import { ResolveParseResult, ResolverRequest, LoggingCallbackWrapper, BaseFileSystem } from './common-types';
+import { Context } from './concord';
+declare class Resolver extends Tapable {
+    fileSystem: BaseFileSystem;
+
+    constructor(fileSystem: BaseFileSystem);
+
+    resolveSync(context: Context, path: string, request: string): null;
+
+    resolve(context: Context, path: string, request: string, callback: LoggingCallbackWrapper): any;
+
+    doResolve(type: string, request: ResolverRequest, message: string | null, callback: LoggingCallbackWrapper): any;
+
+    parse(identifier: string): ResolveParseResult | null;
+
+    isModule(path: string): boolean;
+
+    isDirectory(path: string): boolean;
+
+    join(path: string, request: string): string;
+
+    normalize(path: string): string;
+}
+export = Resolver;
diff --git a/enhanced-resolve/lib/ResultPlugin.d.ts b/enhanced-resolve/lib/ResultPlugin.d.ts
new file mode 100644
index 0000000000..47e5b2324a
--- /dev/null
+++ b/enhanced-resolve/lib/ResultPlugin.d.ts
@@ -0,0 +1,9 @@
+import Resolver = require('./Resolver');
+declare class ResultPlugin {
+    source: string;
+
+    constructor(source: string);
+
+    apply(resolver: Resolver): void;
+}
+export = ResultPlugin;
diff --git a/enhanced-resolve/lib/Storage.d.ts b/enhanced-resolve/lib/Storage.d.ts
new file mode 100644
index 0000000000..4260b42ee7
--- /dev/null
+++ b/enhanced-resolve/lib/Storage.d.ts
@@ -0,0 +1,34 @@
+/// <reference types="node" />
+import { CommonFileSystemMethod } from './common-types';
+
+declare class Storage {
+    duration: number;
+    running: {
+        [name: string]: ((...args: any[]) => any)[]
+    };
+    data: {
+        [name: string]: any[]
+    };
+    levels: string[][];
+    count: number;
+    interval: NodeJS.Timer | null;
+    needTickCheck: boolean;
+    nextTick: number | null;
+    passive: boolean;
+
+    constructor(duration: number);
+
+    ensureTick(): void;
+
+    finished(name: string): void;
+
+    provide(name: string, provider: CommonFileSystemMethod, callback: (...args: any[]) => any): any;
+
+    tick(): true | undefined;
+
+    checkTicks(): void;
+
+    purge(what?: string | string[]): void;
+}
+
+export default Storage;
diff --git a/enhanced-resolve/lib/SymlinkPlugin.d.ts b/enhanced-resolve/lib/SymlinkPlugin.d.ts
new file mode 100644
index 0000000000..e5f500637b
--- /dev/null
+++ b/enhanced-resolve/lib/SymlinkPlugin.d.ts
@@ -0,0 +1,10 @@
+import Resolver = require('./Resolver');
+declare class SymlinkPlugin {
+    source: string;
+    target: string;
+
+    constructor(source: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = SymlinkPlugin;
diff --git a/enhanced-resolve/lib/TryNextPlugin.d.ts b/enhanced-resolve/lib/TryNextPlugin.d.ts
new file mode 100644
index 0000000000..eeb4d1e795
--- /dev/null
+++ b/enhanced-resolve/lib/TryNextPlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class TryNextPlugin {
+    source: string;
+    message: string | null;
+    target: string;
+
+    constructor(source: string, message: string | null, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = TryNextPlugin;
diff --git a/enhanced-resolve/lib/UnsafeCachePlugin.d.ts b/enhanced-resolve/lib/UnsafeCachePlugin.d.ts
new file mode 100644
index 0000000000..8b8c8f5f09
--- /dev/null
+++ b/enhanced-resolve/lib/UnsafeCachePlugin.d.ts
@@ -0,0 +1,13 @@
+import Resolver = require('./Resolver');
+import { ResolverRequest } from './common-types';
+declare class UnsafeCachePlugin {
+    source: string;
+    filterPredicate: (str: ResolverRequest) => boolean;
+    cache: {};
+    target: string;
+
+    constructor(source: string, filterPredicate: (str: ResolverRequest) => boolean, cache: {}, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = UnsafeCachePlugin;
diff --git a/enhanced-resolve/lib/UseFilePlugin.d.ts b/enhanced-resolve/lib/UseFilePlugin.d.ts
new file mode 100644
index 0000000000..c7d23c7b8d
--- /dev/null
+++ b/enhanced-resolve/lib/UseFilePlugin.d.ts
@@ -0,0 +1,11 @@
+import Resolver = require('./Resolver');
+declare class UseFilePlugin {
+    source: string;
+    filename: string;
+    target: string;
+
+    constructor(source: string, filename: string, target: string);
+
+    apply(resolver: Resolver): void;
+}
+export = UseFilePlugin;
diff --git a/enhanced-resolve/lib/common-types.d.ts b/enhanced-resolve/lib/common-types.d.ts
new file mode 100644
index 0000000000..30c39d1210
--- /dev/null
+++ b/enhanced-resolve/lib/common-types.d.ts
@@ -0,0 +1,63 @@
+import { Context } from './concord';
+
+export interface ResolveError extends Error {
+    details: string;
+    missing: string[];
+    recursion: boolean;
+}
+
+export interface ResolveParseResult {
+    request: string;
+    query: string;
+    module: boolean;
+    directory: boolean;
+    file: boolean;
+}
+
+export interface ResolveResult {
+    path: boolean | string;
+    query: string;
+}
+
+export interface ResolverRequest {
+    request: string;
+    relativePath?: string;
+    descriptionFileData?: any;
+    descriptionFileRoot?: string;
+    descriptionFilePath?: string;
+    context: Context;
+    path: string;
+    query?: string;
+    directory?: boolean;
+    module?: boolean;
+}
+
+export interface LoggingCallbackTools {
+    log?(msg: string): void;
+    stack?: string[];
+    missing?: string[] | {
+        push: (item: string) => void;
+    };
+}
+
+export interface LoggingCallbackWrapper extends LoggingCallbackTools {
+    (err?: Error | null, ...args: any[]): any;
+}
+
+export interface ErrorCallback {
+    (err: Error | null, ...args: any[]): any;
+}
+
+export interface CommonFileSystemMethod {
+    (name: string, callback: (err: Error | null, ...args: any[]) => void): void;
+}
+
+export interface BaseFileSystem {
+    stat: CommonFileSystemMethod;
+    readdir?: CommonFileSystemMethod;
+    readFile?(path: string, encoding: string, callback: ErrorCallback): void;
+    readFile?(path: string, callback: ErrorCallback): void;
+    readJson?: CommonFileSystemMethod;
+    readlink?: CommonFileSystemMethod;
+    isSync: () => boolean;
+}
diff --git a/enhanced-resolve/lib/concord.d.ts b/enhanced-resolve/lib/concord.d.ts
new file mode 100644
index 0000000000..d11f1047df
--- /dev/null
+++ b/enhanced-resolve/lib/concord.d.ts
@@ -0,0 +1,38 @@
+export interface Type {
+    type: string | null | undefined;
+    features: string[];
+}
+
+export interface Context {
+    supportedResourceTypes?: string[];
+    environments?: string[];
+    referrer: string;
+}
+
+declare function parseType(type: string): Type;
+declare function isTypeMatched(baseType: string | Type, testedType: string | Type): boolean;
+declare function isResourceTypeSupported(context: Context, type: string): boolean | undefined;
+declare function isEnvironment(context: Context, env: string | Type): boolean | undefined;
+declare function isGlobMatched(glob: string, relativePath: string): boolean;
+declare function isConditionMatched(context: Context, condition: string): boolean;
+declare function isKeyMatched(context: Context, key: string): string | boolean;
+declare function getField(context: Context, configuration: any, field: string): undefined;
+declare function getMain(context: Context, configuration: any): undefined;
+declare function getExtensions(context: Context, configuration: any): undefined;
+declare function matchModule(context: Context, configuration: any, request: string): any;
+declare function matchType(context: Context, configuration: any, relativePath: string): undefined;
+
+export {
+    parseType,
+    isTypeMatched,
+    isResourceTypeSupported,
+    isEnvironment,
+    isGlobMatched,
+    isConditionMatched,
+    isKeyMatched,
+    getField,
+    getMain,
+    getExtensions,
+    matchModule,
+    matchType
+};
diff --git a/enhanced-resolve/lib/getPaths.d.ts b/enhanced-resolve/lib/getPaths.d.ts
new file mode 100644
index 0000000000..abc2754510
--- /dev/null
+++ b/enhanced-resolve/lib/getPaths.d.ts
@@ -0,0 +1,5 @@
+export default function getPaths(path: string): {
+    paths: string[];
+    seqments: string[];
+};
+export declare function basename(path: string): string | null;
diff --git a/enhanced-resolve/lib/globToRegExp.d.ts b/enhanced-resolve/lib/globToRegExp.d.ts
new file mode 100644
index 0000000000..8fc134e6a8
--- /dev/null
+++ b/enhanced-resolve/lib/globToRegExp.d.ts
@@ -0,0 +1,2 @@
+declare function globToRegExp(glob: string): RegExp;
+export { globToRegExp };
diff --git a/enhanced-resolve/lib/lib-tests.ts b/enhanced-resolve/lib/lib-tests.ts
new file mode 100644
index 0000000000..a41e5d9aeb
--- /dev/null
+++ b/enhanced-resolve/lib/lib-tests.ts
@@ -0,0 +1,149 @@
+import AliasFieldPlugin = require('enhanced-resolve/lib/AliasFieldPlugin');
+
+import AliasPlugin = require('enhanced-resolve/lib/AliasPlugin');
+
+import AppendPlugin = require('enhanced-resolve/lib/AppendPlugin');
+
+import CloneBasenamePlugin = require('enhanced-resolve/lib/CloneBasenamePlugin');
+
+import ConcordExtensionsPlugin = require('enhanced-resolve/lib/ConcordExtensionsPlugin');
+
+import ConcordMainPlugin = require('enhanced-resolve/lib/ConcordMainPlugin');
+
+import ConcordModulesPlugin = require('enhanced-resolve/lib/ConcordModulesPlugin');
+
+import DescriptionFilePlugin = require('enhanced-resolve/lib/DescriptionFilePlugin');
+
+import DescriptionFileUtils = require('enhanced-resolve/lib/DescriptionFileUtils');
+
+import DirectoryExistsPlugin = require('enhanced-resolve/lib/DirectoryExistsPlugin');
+
+import FileExistsPlugin = require('enhanced-resolve/lib/FileExistsPlugin');
+
+import FileKindPlugin = require('enhanced-resolve/lib/FileKindPlugin');
+
+import getPaths, { basename } from 'enhanced-resolve/lib/getPaths';
+
+import { globToRegExp } from 'enhanced-resolve/lib/globToRegExp';
+
+import JoinRequestPlugin = require('enhanced-resolve/lib/JoinRequestPlugin');
+
+import LogInfoPlugin = require('enhanced-resolve/lib/LogInfoPlugin');
+
+import MainFieldPlugin = require('enhanced-resolve/lib/MainFieldPlugin');
+
+import ModuleAppendPlugin = require('enhanced-resolve/lib/ModuleAppendPlugin');
+
+import ModuleKindPlugin = require('enhanced-resolve/lib/ModuleKindPlugin');
+
+import ModulesInHierachicDirectoriesPlugin = require('enhanced-resolve/lib/ModulesInHierachicDirectoriesPlugin');
+
+import ModulesInRootPlugin = require('enhanced-resolve/lib/ModulesInRootPlugin');
+
+import NextPlugin = require('enhanced-resolve/lib/NextPlugin');
+
+import ParsePlugin = require('enhanced-resolve/lib/ParsePlugin');
+
+import Resolver = require('enhanced-resolve/lib/Resolver');
+
+import ResultPlugin = require('enhanced-resolve/lib/ResultPlugin');
+
+import Storage from 'enhanced-resolve/lib/Storage'
+
+import SymlinkPlugin = require('enhanced-resolve/lib/SymlinkPlugin');
+
+import TryNextPlugin = require('enhanced-resolve/lib/TryNextPlugin');
+
+import UnsafeCachePlugin = require('enhanced-resolve/lib/UnsafeCachePlugin');
+
+import UseFilePlugin = require('enhanced-resolve/lib/UseFilePlugin');
+
+import resolve = require('../');
+
+import { BaseFileSystem } from 'enhanced-resolve/lib/common-types'
+
+const aplugin = new AliasFieldPlugin('a', 'b', 'c');
+
+const aplugin2 = new AliasPlugin('a', {
+    onlyModule: false,
+    name: 'a',
+    alias: 'b'
+}, 'string')
+
+const aplugin3 = new AppendPlugin('a', 'b', 'c');
+
+const cplugin = new CloneBasenamePlugin('a', 'c');
+
+const cplugin2 = new ConcordExtensionsPlugin('a', {
+    any: 'string',
+    right: false
+}, 'b');
+
+const cplugin3 = new ConcordMainPlugin('string', {
+    any: 'string',
+    right: false
+}, 'string');
+
+const cplugin4 = new ConcordModulesPlugin('string', {
+    any: 'string',
+    right: false
+}, 'string');
+
+const dplugin = new DescriptionFilePlugin('string', 'string', 'string');
+
+DescriptionFileUtils.cdUp('./lib');
+DescriptionFileUtils.getField({}, 'hi');
+DescriptionFileUtils.loadDescriptionFile(resolve.ResolverFactory.createResolver({
+    extensions: [''],
+    fileSystem: {}
+}), './lib', ['file'], function () { });
+
+const dplugin1 = new DirectoryExistsPlugin('string', 'string');
+
+const fplugin = new FileExistsPlugin('string', 's');
+
+const fplugin2 = new FileKindPlugin('string', 's');
+
+getPaths('./lib');
+
+basename('./lib');
+
+globToRegExp('lib/**');
+
+const jplugin = new JoinRequestPlugin('string', 's');
+
+const lplugin = new LogInfoPlugin('string');
+
+const mplugin = new MainFieldPlugin('string', {
+    name: 'hi',
+    forceRelative: false
+}, 's');
+
+const mplugin2 = new ModuleAppendPlugin('string', 'ap', 's');
+
+const mplugin3 = new ModuleKindPlugin('string', 's');
+
+const mplugin4 = new ModulesInHierachicDirectoriesPlugin('string', ['arr'], 's');
+
+const mplugin5 = new ModulesInRootPlugin('string', 'ap', 's');
+
+const nplugin = new NextPlugin('string', 'ap');
+
+const pplugin = new ParsePlugin('string', 'ap');
+
+const resolver = new Resolver({} as BaseFileSystem);
+
+const rplugin = new ResultPlugin('string');
+
+const splugin = new SymlinkPlugin('string', 's');
+
+const tplugin = new TryNextPlugin('string', 'ap', 's');
+
+const uplugin = new UnsafeCachePlugin('string', function (e) { return false }, {
+    hi: 'string',
+    hello: true
+}, 's');
+
+const uplugin2 = new UseFilePlugin('string', 'ap', 's');
+
+const s = new Storage(4);
diff --git a/enhanced-resolve/tsconfig.json b/enhanced-resolve/tsconfig.json
new file mode 100644
index 0000000000..96a70f3bf2
--- /dev/null
+++ b/enhanced-resolve/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": [
+    "index.d.ts",
+    "enhanced-resolve-tests.ts",
+    "lib/*.ts"
+  ]
+}