diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.js b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
new file mode 100644
index 00000000000..b9390ddc239
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
@@ -0,0 +1,6 @@
+define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) {
+    "use strict";
+    exports.useGlo_m4_x4 = glo_m4.x;
+    exports.useGlo_m4_d4 = glo_m4.d;
+    exports.useGlo_m4_f4 = glo_m4.foo();
+});
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
new file mode 100644
index 00000000000..d9219f20148
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
@@ -0,0 +1,5 @@
+"use strict";
+var glo_m4 = require("glo_m4");
+exports.useGlo_m4_x4 = glo_m4.x;
+exports.useGlo_m4_d4 = glo_m4.d;
+exports.useGlo_m4_f4 = glo_m4.foo();
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
new file mode 100644
index 00000000000..a5da0ab9314
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
@@ -0,0 +1,9 @@
+define(["require", "exports", "private_m4"], function (require, exports, private_m4) {
+    "use strict";
+    var usePrivate_m4_m1;
+    (function (usePrivate_m4_m1) {
+        var x3 = private_m4.x;
+        var d3 = private_m4.d;
+        var f3 = private_m4.foo();
+    })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
+});
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
new file mode 100644
index 00000000000..3cc7f82feb7
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
@@ -0,0 +1,9 @@
+"use strict";
+// only used privately no need to emit
+var private_m4 = require("private_m4");
+var usePrivate_m4_m1;
+(function (usePrivate_m4_m1) {
+    var x3 = private_m4.x;
+    var d3 = private_m4.d;
+    var f3 = private_m4.foo();
+})(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
new file mode 100644
index 00000000000..7485d0fb229
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
@@ -0,0 +1,4 @@
+define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) {
+    "use strict";
+    exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
+});
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
new file mode 100644
index 00000000000..095acfb7fc9
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
@@ -0,0 +1,3 @@
+"use strict";
+var fncOnly_m4 = require("fncOnly_m4");
+exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
new file mode 100644
index 00000000000..db9e68fbed9
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
@@ -0,0 +1,9 @@
+define(["require", "exports", "m5"], function (require, exports, m5) {
+    "use strict";
+    exports.d = m5.foo2();
+    exports.x = m5.foo2;
+    function n() {
+        return m5.foo2();
+    }
+    exports.n = n;
+});
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
new file mode 100644
index 00000000000..2bde79432f7
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
@@ -0,0 +1,9 @@
+"use strict";
+// Do not emit unused import
+var m5 = require("m5");
+exports.d = m5.foo2();
+exports.x = m5.foo2;
+function n() {
+    return m5.foo2();
+}
+exports.n = n;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
new file mode 100644
index 00000000000..0ec3a0d8331
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
@@ -0,0 +1,18 @@
+define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) {
+    "use strict";
+    exports.x4 = m4.x;
+    exports.d4 = m4.d;
+    exports.f4 = m4.foo();
+    var m1;
+    (function (m1) {
+        m1.x2 = m4.x;
+        m1.d2 = m4.d;
+        m1.f2 = m4.foo();
+        var x3 = m4.x;
+        var d3 = m4.d;
+        var f3 = m4.foo();
+    })(m1 = exports.m1 || (exports.m1 = {}));
+    exports.useMultiImport_m4_x4 = multiImport_m4.x;
+    exports.useMultiImport_m4_d4 = multiImport_m4.d;
+    exports.useMultiImport_m4_f4 = multiImport_m4.foo();
+});
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
new file mode 100644
index 00000000000..64b9438d96e
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
@@ -0,0 +1,19 @@
+"use strict";
+var m4 = require("m4"); // Emit used
+exports.x4 = m4.x;
+exports.d4 = m4.d;
+exports.f4 = m4.foo();
+var m1;
+(function (m1) {
+    m1.x2 = m4.x;
+    m1.d2 = m4.d;
+    m1.f2 = m4.foo();
+    var x3 = m4.x;
+    var d3 = m4.d;
+    var f3 = m4.foo();
+})(m1 = exports.m1 || (exports.m1 = {}));
+// Do not emit multiple used import statements
+var multiImport_m4 = require("m4"); // Emit used
+exports.useMultiImport_m4_x4 = multiImport_m4.x;
+exports.useMultiImport_m4_d4 = multiImport_m4.d;
+exports.useMultiImport_m4_f4 = multiImport_m4.foo();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
new file mode 100644
index 00000000000..9e8ba0f7ade
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
@@ -0,0 +1,7 @@
+define(["require", "exports", "m4"], function (require, exports, m4) {
+    "use strict";
+    function foo2() {
+        return new m4.d();
+    }
+    exports.foo2 = foo2;
+});
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
new file mode 100644
index 00000000000..a7e34c60fe3
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
@@ -0,0 +1,6 @@
+"use strict";
+var m4 = require("m4"); // Emit used
+function foo2() {
+    return new m4.d();
+}
+exports.foo2 = foo2;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
new file mode 100644
index 00000000000..634a988c1b8
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
@@ -0,0 +1,15 @@
+define(["require", "exports", "m4"], function (require, exports, m4) {
+    "use strict";
+    exports.x4 = m4.x;
+    exports.d4 = m4.d;
+    exports.f4 = m4.foo();
+    var m1;
+    (function (m1) {
+        m1.x2 = m4.x;
+        m1.d2 = m4.d;
+        m1.f2 = m4.foo();
+        var x3 = m4.x;
+        var d3 = m4.d;
+        var f3 = m4.foo();
+    })(m1 = exports.m1 || (exports.m1 = {}));
+});
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
new file mode 100644
index 00000000000..40df471507c
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
@@ -0,0 +1,14 @@
+"use strict";
+var m4 = require("m4"); // Emit used
+exports.x4 = m4.x;
+exports.d4 = m4.d;
+exports.f4 = m4.foo();
+var m1;
+(function (m1) {
+    m1.x2 = m4.x;
+    m1.d2 = m4.d;
+    m1.f2 = m4.foo();
+    var x3 = m4.x;
+    var d3 = m4.d;
+    var f3 = m4.foo();
+})(m1 = exports.m1 || (exports.m1 = {}));
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..9b6af66589a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..df062274b3e
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..18eee0fd4df
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..9b6af66589a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..df062274b3e
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..18eee0fd4df
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..9b6af66589a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..df062274b3e
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..18eee0fd4df
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..9b6af66589a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..df062274b3e
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..18eee0fd4df
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
new file mode 100644
index 00000000000..a8619f88260
--- /dev/null
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
@@ -0,0 +1,5 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    function hello() { }
+    exports.hello = hello;
+});
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
new file mode 100644
index 00000000000..182e381bcde
--- /dev/null
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
@@ -0,0 +1,3 @@
+"use strict";
+function hello() { }
+exports.hello = hello;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js
new file mode 100644
index 00000000000..57200235601
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js
@@ -0,0 +1,12 @@
+/// <reference path='ref/m1.ts'/>
+/// <reference path='ref/m2.ts'/>
+var a1 = 10;
+var c1 = (function () {
+    function c1() {
+    }
+    return c1;
+})();
+var instance1 = new c1();
+function f1() {
+    return instance1;
+}
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js
new file mode 100644
index 00000000000..57200235601
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js
@@ -0,0 +1,12 @@
+/// <reference path='ref/m1.ts'/>
+/// <reference path='ref/m2.ts'/>
+var a1 = 10;
+var c1 = (function () {
+    function c1() {
+    }
+    return c1;
+})();
+var instance1 = new c1();
+function f1() {
+    return instance1;
+}
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
new file mode 100644
index 00000000000..57200235601
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -0,0 +1,12 @@
+/// <reference path='ref/m1.ts'/>
+/// <reference path='ref/m2.ts'/>
+var a1 = 10;
+var c1 = (function () {
+    function c1() {
+    }
+    return c1;
+})();
+var instance1 = new c1();
+function f1() {
+    return instance1;
+}
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
new file mode 100644
index 00000000000..57200235601
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -0,0 +1,12 @@
+/// <reference path='ref/m1.ts'/>
+/// <reference path='ref/m2.ts'/>
+var a1 = 10;
+var c1 = (function () {
+    function c1() {
+    }
+    return c1;
+})();
+var instance1 = new c1();
+function f1() {
+    return instance1;
+}
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
new file mode 100644
index 00000000000..67db806ee95
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
@@ -0,0 +1,15 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
new file mode 100644
index 00000000000..818f4c9dd06
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
@@ -0,0 +1,13 @@
+"use strict";
+exports.m2_a1 = 10;
+var m2_c1 = (function () {
+    function m2_c1() {
+    }
+    return m2_c1;
+})();
+exports.m2_c1 = m2_c1;
+exports.m2_instance1 = new m2_c1();
+function m2_f1() {
+    return exports.m2_instance1;
+}
+exports.m2_f1 = m2_f1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
new file mode 100644
index 00000000000..67db806ee95
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -0,0 +1,15 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    exports.m2_a1 = 10;
+    var m2_c1 = (function () {
+        function m2_c1() {
+        }
+        return m2_c1;
+    })();
+    exports.m2_c1 = m2_c1;
+    exports.m2_instance1 = new m2_c1();
+    function m2_f1() {
+        return exports.m2_instance1;
+    }
+    exports.m2_f1 = m2_f1;
+});
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
new file mode 100644
index 00000000000..818f4c9dd06
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -0,0 +1,13 @@
+"use strict";
+exports.m2_a1 = 10;
+var m2_c1 = (function () {
+    function m2_c1() {
+    }
+    return m2_c1;
+})();
+exports.m2_c1 = m2_c1;
+exports.m2_instance1 = new m2_c1();
+function m2_f1() {
+    return exports.m2_instance1;
+}
+exports.m2_f1 = m2_f1;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
new file mode 100644
index 00000000000..bc5eaec25e0
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
@@ -0,0 +1,16 @@
+define(["require", "exports", "m1"], function (require, exports, m1) {
+    "use strict";
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
new file mode 100644
index 00000000000..147125b61c1
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
@@ -0,0 +1,15 @@
+"use strict";
+var m1 = require("m1");
+exports.a1 = 10;
+var c1 = (function () {
+    function c1() {
+    }
+    return c1;
+})();
+exports.c1 = c1;
+exports.instance1 = new c1();
+function f1() {
+    return exports.instance1;
+}
+exports.f1 = f1;
+exports.a2 = m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
new file mode 100644
index 00000000000..bc5eaec25e0
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -0,0 +1,16 @@
+define(["require", "exports", "m1"], function (require, exports, m1) {
+    "use strict";
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
new file mode 100644
index 00000000000..147125b61c1
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -0,0 +1,15 @@
+"use strict";
+var m1 = require("m1");
+exports.a1 = 10;
+var c1 = (function () {
+    function c1() {
+    }
+    return c1;
+})();
+exports.c1 = c1;
+exports.instance1 = new c1();
+function f1() {
+    return exports.instance1;
+}
+exports.f1 = f1;
+exports.a2 = m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
new file mode 100644
index 00000000000..fca6f6bc913
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
@@ -0,0 +1,16 @@
+define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+    "use strict";
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
new file mode 100644
index 00000000000..e4389a9467b
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
@@ -0,0 +1,15 @@
+"use strict";
+var m1 = require("ref/m1");
+exports.a1 = 10;
+var c1 = (function () {
+    function c1() {
+    }
+    return c1;
+})();
+exports.c1 = c1;
+exports.instance1 = new c1();
+function f1() {
+    return exports.instance1;
+}
+exports.f1 = f1;
+exports.a2 = m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
new file mode 100644
index 00000000000..fca6f6bc913
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -0,0 +1,16 @@
+define(["require", "exports", "ref/m1"], function (require, exports, m1) {
+    "use strict";
+    exports.a1 = 10;
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    exports.c1 = c1;
+    exports.instance1 = new c1();
+    function f1() {
+        return exports.instance1;
+    }
+    exports.f1 = f1;
+    exports.a2 = m1.m1_c1;
+});
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
new file mode 100644
index 00000000000..e4389a9467b
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -0,0 +1,15 @@
+"use strict";
+var m1 = require("ref/m1");
+exports.a1 = 10;
+var c1 = (function () {
+    function c1() {
+    }
+    return c1;
+})();
+exports.c1 = c1;
+exports.instance1 = new c1();
+function f1() {
+    return exports.instance1;
+}
+exports.f1 = f1;
+exports.a2 = m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..9b6af66589a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..df062274b3e
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..18eee0fd4df
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..9b6af66589a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..df062274b3e
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..18eee0fd4df
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..9b6af66589a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..df062274b3e
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..18eee0fd4df
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
new file mode 100644
index 00000000000..c09a3c0c32a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.d.ts
@@ -0,0 +1,6 @@
+export declare var m2_a1: number;
+export declare class m2_c1 {
+    m2_c1_p1: number;
+}
+export declare var m2_instance1: m2_c1;
+export declare function m2_f1(): m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
new file mode 100644
index 00000000000..c3a64f5b6eb
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.d.ts
@@ -0,0 +1,20 @@
+declare var m1_a1: number;
+declare class m1_c1 {
+    m1_c1_p1: number;
+}
+declare var m1_instance1: m1_c1;
+declare function m1_f1(): m1_c1;
+declare module "ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare var a1: number;
+declare class c1 {
+    p1: number;
+}
+declare var instance1: c1;
+declare function f1(): c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..9b6af66589a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,28 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "../outputdir_module_multifolder_ref/m2" {
+    export var m2_a1: number;
+    export class m2_c1 {
+        m2_c1_p1: number;
+    }
+    export var m2_instance1: m2_c1;
+    export function m2_f1(): m2_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    import m2 = require("../outputdir_module_multifolder_ref/m2");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+    export var a3: typeof m2.m2_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..df062274b3e
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
new file mode 100644
index 00000000000..4a53b24b156
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.d.ts
@@ -0,0 +1,6 @@
+export declare var m1_a1: number;
+export declare class m1_c1 {
+    m1_c1_p1: number;
+}
+export declare var m1_instance1: m1_c1;
+export declare function m1_f1(): m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
new file mode 100644
index 00000000000..18eee0fd4df
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
@@ -0,0 +1,18 @@
+declare module "ref/m1" {
+    export var m1_a1: number;
+    export class m1_c1 {
+        m1_c1_p1: number;
+    }
+    export var m1_instance1: m1_c1;
+    export function m1_f1(): m1_c1;
+}
+declare module "test" {
+    import m1 = require("ref/m1");
+    export var a1: number;
+    export class c1 {
+        p1: number;
+    }
+    export var instance1: c1;
+    export function f1(): c1;
+    export var a2: typeof m1.m1_c1;
+}
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js
new file mode 100644
index 00000000000..3053eb35cb4
--- /dev/null
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js
@@ -0,0 +1,3 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+});
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js
new file mode 100644
index 00000000000..0c14aab22f7
--- /dev/null
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js
@@ -0,0 +1 @@
+"use strict";