From c6d54d6ae6787bb94f15b0ac0667326d6ce8d98c Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 30 Oct 2015 13:22:23 -0700
Subject: [PATCH] Simplify verification of emit file paths using utility to
 iterate over each emit file This also makes sure we dont emit --out or
 --outFile if there are no files that can go in that file(non module and non
 declaration files)

---
 src/compiler/program.ts                       | 47 +++++++------------
 src/compiler/utilities.ts                     | 23 +++++----
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...athModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...athModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...lutePathModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...lutePathModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...ePathModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...ePathModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...athModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...athModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...tivePathModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  8 +---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...tivePathModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  8 +---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...ePathModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...ePathModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...UrlModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...UrlModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...prootUrlModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...prootUrlModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...otUrlModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...otUrlModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...UrlModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...UrlModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  8 +---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...erootUrlModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...erootUrlModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...otUrlModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...otUrlModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  0
 ...outModuleMultifolderSpecifyOutputFile.json |  4 +-
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  0
 ...outModuleMultifolderSpecifyOutputFile.json |  4 +-
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  0
 .../amd/outModuleSimpleSpecifyOutputFile.json |  4 +-
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  0
 .../outModuleSimpleSpecifyOutputFile.json     |  4 +-
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  0
 .../outModuleSubfolderSpecifyOutputFile.json  |  4 +-
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  0
 .../outModuleSubfolderSpecifyOutputFile.json  |  4 +-
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...athModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...athModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...lutePathModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...lutePathModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...ePathModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...ePathModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...athModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...athModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...tivePathModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...tivePathModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...ePathModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...ePathModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...mapModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...mapModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...ourcemapModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...ourcemapModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...cemapModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...cemapModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...UrlModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...UrlModuleMultifolderSpecifyOutputFile.json |  5 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...erootUrlModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...erootUrlModuleSimpleSpecifyOutputFile.json |  5 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  6 ---
 .../amd/bin/test.d.ts                         |  0
 .../amd/bin/test.js                           |  1 -
 .../amd/bin/test.js.map                       |  1 -
 ...otUrlModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 .../node/bin/test.d.ts                        |  0
 .../node/bin/test.js                          |  1 -
 .../node/bin/test.js.map                      |  1 -
 ...otUrlModuleSubfolderSpecifyOutputFile.json |  5 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  6 ---
 260 files changed, 96 insertions(+), 646 deletions(-)
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
 delete mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index b8fbe557101..d1e858680c5 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1258,46 +1258,31 @@ namespace ts {
 
             if (!options.noEmit) {
                 let emitHost = getEmitHost();
-                let emitFilesSeen: Map<SourceFile[]> = {};
+                let emitFilesSeen: Map<boolean> = {};
+                forEachExpectedEmitFile(emitHost, (emitFileNames, sourceFiles, isBundledEmit) => {
+                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen);
+                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen);
+                });
+            }
 
-                // Build map of files seen
-                for (let file of files) {
-                    let { jsFilePath, declarationFilePath } = getEmitFileNames(file, emitHost);
-                    if (jsFilePath) {
-                        let filesEmittingJsFilePath = lookUp(emitFilesSeen, jsFilePath);
-                        if (!filesEmittingJsFilePath) {
-                            emitFilesSeen[jsFilePath] = [file];
-                            if (declarationFilePath) {
-                                emitFilesSeen[declarationFilePath] = [file];
-                            }
-                        }
-                        else {
-                            filesEmittingJsFilePath.push(file);
-                        }
-                    }
-                }
-
-                // Verify that all the emit files are unique and dont overwrite input files
-                forEachKey(emitFilesSeen, emitFilePath => {
+            // Verify that all the emit files are unique and dont overwrite input files
+            function verifyEmitFilePath(emitFilePath: string, emitFilesSeen: Map<boolean>) {
+                if (emitFilePath) {
                     // Report error if the output overwrites input file
                     if (hasFile(files, emitFilePath)) {
                         createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
                     }
 
-                    // Report error if multiple files write into same file (except if specified by --out or --outFile)
-                    if (emitFilePath !== (options.outFile || options.out)) {
-                        // Not --out or --outFile emit, There should be single file emitting to this file
-                        if (emitFilesSeen[emitFilePath].length > 1) {
-                            createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
-                        }
+                    // Report error if multiple files write into same file
+                    let filesEmittingJsFilePath = lookUp(emitFilesSeen, emitFilePath);
+                    if (filesEmittingJsFilePath) {
+                        // Already seen the same emit file - report error
+                        createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
                     }
                     else {
-                        // --out or --outFile, error if there exist file emitting to single file colliding with --out
-                        if (forEach(emitFilesSeen[emitFilePath], sourceFile => shouldEmitToOwnFile(sourceFile, options))) {
-                            createEmitBlockingDiagnostics(emitFilePath, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
-                        }
+                        emitFilesSeen[emitFilePath] = true;
                     }
-                });
+                }
             }
         }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 7440a6b5481..0b22657a694 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1826,8 +1826,6 @@ namespace ts {
         };
     }
 
-
-
     function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) {
         return options.sourceMap ? jsFilePath + ".map" : undefined;
     }
@@ -1841,30 +1839,37 @@ namespace ts {
         targetSourceFile?: SourceFile) {
         let options = host.getCompilerOptions();
         if (targetSourceFile === undefined) {
+            // Emit on each source file
             forEach(host.getSourceFiles(), sourceFile => {
                 if (shouldEmitToOwnFile(sourceFile, options)) {
-                    action(getEmitFileNames(sourceFile, host), [sourceFile], /*isBundledEmit*/false);
+                    onSingleFileEmit(host, sourceFile);
                 }
             });
-
             if (options.outFile || options.out) {
-                action(getBundledEmitFileNames(options), getBundledEmitSourceFiles(host), /*isBundledEmit*/true);
+                onBundledEmit(host);
             }
         }
         else {
             // targetSourceFile is specified (e.g calling emitter from language service or calling getSemanticDiagnostic from language service)
             if (shouldEmitToOwnFile(targetSourceFile, options)) {
-                action(getEmitFileNames(targetSourceFile, host), [targetSourceFile], /*isBundledEmit*/false);
+                onSingleFileEmit(host, targetSourceFile);
             }
             else if (!isDeclarationFile(targetSourceFile) &&
                 (options.outFile || options.out)) {
-                action(getBundledEmitFileNames(options), getBundledEmitSourceFiles(host), /*isBundledEmit*/true);
+                onBundledEmit(host);
             }
         }
 
-        function getBundledEmitSourceFiles(host: EmitHost): SourceFile[] {
-            return filter(host.getSourceFiles(),
+        function onSingleFileEmit(host: EmitHost, sourceFile: SourceFile) {
+            action(getEmitFileNames(sourceFile, host), [sourceFile], /*isBundledEmit*/false);
+        }
+
+        function onBundledEmit(host: EmitHost) {
+            let bundledSources = filter(host.getSourceFiles(),
                 sourceFile => !shouldEmitToOwnFile(sourceFile, host.getCompilerOptions()) && !isDeclarationFile(sourceFile));
+            if (bundledSources.length) {
+                action(getBundledEmitFileNames(options), bundledSources, /*isBundledEmit*/true);
+            }
         }
     }
 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 18e06e5bc50..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 588d2404ef8..edb521c5e2f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -25,9 +25,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index da94013dea3..4b883a84e70 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -567,10 +567,4 @@ sourceFile:../../test.ts
 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 18e06e5bc50..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 588d2404ef8..edb521c5e2f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -25,9 +25,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index f348cfad93c..5ab3146b099 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -611,10 +611,4 @@ sourceFile:../../test.ts
 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index f6e3eb542f4..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 971d1a2aaab..c3141a197cd 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 759b9dab302..834a5c3a112 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:../test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index f6e3eb542f4..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 971d1a2aaab..c3141a197cd 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 75228e5ea64..668c24e25c5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:../test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 7ff280253f1..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 86f3cf5c9a9..7521c803c2d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 18b397608e4..a8488d8a134 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:../test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 7ff280253f1..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 86f3cf5c9a9..7521c803c2d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 97c6b8a85e4..f227d9809ad 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:../test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: /tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index f359cef4be2..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 3a1983f88d9..195e9975ace 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -24,9 +24,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index c2eacec3bdc..12d96900c84 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -567,10 +567,4 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index f359cef4be2..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 3a1983f88d9..195e9975ace 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -24,9 +24,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 1d6a282976d..567b51cfff5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -611,10 +611,4 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 58e831a041d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index 0dfc88c1aa5..202344863d7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 410dc94963f..76375ce0d0c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:../outputdir_module_simple/test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=../mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 58e831a041d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index 0dfc88c1aa5..202344863d7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 0af20dc5ef9..aff5583a5e9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:../outputdir_module_simple/test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=../mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 58e831a041d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 0eb8315ff9b..88ce99fdac8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index fe747e98d9c..46af4847490 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:../outputdir_module_subfolder/test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=../mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 58e831a041d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 0eb8315ff9b..88ce99fdac8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 8f609cc28d9..48f639a7ee2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:../outputdir_module_subfolder/test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=../mapFiles/test.js.map===================================================================
-JsFile: test.js
-mapUrl: ../../mapFiles/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
index de091e6dd28..af446483014 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -24,9 +24,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 1fce6af3084..f07b7d9212d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -567,10 +567,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
index de091e6dd28..af446483014 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -24,9 +24,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index aaf57c9d055..e3d905204b2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -611,10 +611,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
index f0c01727957..133927f3ad0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 7c3fae48716..7df7c4142e8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
index f0c01727957..133927f3ad0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 804e4408446..ff16dbdb8d6 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 00ba79cee26..232d1814bcc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 894bcf6cef4..d2d74c7219d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 00ba79cee26..232d1814bcc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 9a7f754c534..acf02348d67 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 713487cc8d0..597f77fc2dc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -25,9 +25,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index deb74d2ae36..e8aa1436d98 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -567,10 +567,4 @@ sourceFile:outputdir_module_multifolder/test.ts
 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 713487cc8d0..597f77fc2dc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -25,9 +25,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 5f476cfb8ed..a8f4f3bf238 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -611,10 +611,4 @@ sourceFile:outputdir_module_multifolder/test.ts
 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index 53aa4866a41..9cf2fd285ff 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 8b526ff5859..06f3e02521d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index 53aa4866a41..9cf2fd285ff 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index ff984bf74ee..2843c88faf5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 46ba3b14114..d0e80b6b6a5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 67e50350919..89ea048e268 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 52f1b822100..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 46ba3b14114..d0e80b6b6a5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index c5bce1a19d5..bf0333f3d12 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map===================================================================
-JsFile: test.js
-mapUrl: http://www.typescriptlang.org/test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
index 66eced5cc01..e15d413b281 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
@@ -19,8 +19,6 @@
         "../outputdir_module_multifolder_ref/m2.js",
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js",
-        "test.d.ts",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
index 66eced5cc01..e15d413b281 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
@@ -19,8 +19,6 @@
         "../outputdir_module_multifolder_ref/m2.js",
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js",
-        "test.d.ts",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
index 166aaa982e7..a3679b915f8 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
@@ -16,8 +16,6 @@
         "m1.js",
         "m1.d.ts",
         "test.js",
-        "test.d.ts",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
index 166aaa982e7..a3679b915f8 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
@@ -16,8 +16,6 @@
         "m1.js",
         "m1.d.ts",
         "test.js",
-        "test.d.ts",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
index f11b95edde9..688c076c865 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
@@ -16,8 +16,6 @@
         "ref/m1.js",
         "ref/m1.d.ts",
         "test.js",
-        "test.d.ts",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
index f11b95edde9..688c076c865 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
@@ -16,8 +16,6 @@
         "ref/m1.js",
         "ref/m1.d.ts",
         "test.js",
-        "test.d.ts",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index e53f2e0a755..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index d68d0afc199..56492a3252a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -25,9 +25,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index e1bca270ba0..11b024ba134 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -567,10 +567,4 @@ sourceFile:outputdir_module_multifolder/test.ts
 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index e53f2e0a755..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index d68d0afc199..56492a3252a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -25,9 +25,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 63e22ab64ba..9072b5c7129 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -611,10 +611,4 @@ sourceFile:outputdir_module_multifolder/test.ts
 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_multifolder/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index 42e5a82e74b..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 914b6e2d792..9835726464e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 0fc6cd6eb2a..0ff03b640b1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 42e5a82e74b..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 914b6e2d792..9835726464e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 08491d50151..55790d25272 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_simple/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index 279042a1a0f..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index ba9d94f2b0c..538fb7495af 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 5e87f2ef555..990b84fd4fd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 279042a1a0f..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index ba9d94f2b0c..538fb7495af 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -21,9 +21,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 67fc9030f41..757d17973af 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: /tests/cases/projects/outputdir_module_subfolder/src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index 512eba0e11a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index dafceda24d0..e1472a1786b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -24,9 +24,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 9c817da60e9..77e69f98790 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -567,10 +567,4 @@ sourceFile:outputdir_module_multifolder/test.ts
 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 512eba0e11a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index dafceda24d0..e1472a1786b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -24,9 +24,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index e34bffc6f61..095d4b65fdf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -611,10 +611,4 @@ sourceFile:outputdir_module_multifolder/test.ts
 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index 512eba0e11a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index 7d87bfe98f2..0f8e4b93f8d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index c259bb45210..b4f6ed8c488 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 512eba0e11a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index 7d87bfe98f2..0f8e4b93f8d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 65bea50d84f..82c62b23d3c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index 512eba0e11a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 9a897de7334..4ed1c562e57 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 7be1fe1fb8f..a483e0ff9fc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index 512eba0e11a..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 9a897de7334..4ed1c562e57 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 5a3d45c1960..4e25047bafc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: ../src/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
index 3d2df95ad66..fd04b157142 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -23,9 +23,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 74ecef44103..383a66a6e2f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -567,10 +567,4 @@ sourceFile:test.ts
 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
index 3d2df95ad66..fd04b157142 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -23,9 +23,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
index f8d10678ca0..0036386e6c4 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -611,10 +611,4 @@ sourceFile:test.ts
 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
index 9ff29662d40..9d5469d80b7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -19,9 +19,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
index a1646bc14e5..b461163a8b8 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
index 9ff29662d40..9d5469d80b7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -19,9 +19,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
index 4ff8b4fa8c7..d5247e7eeb0 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
index 9d200ef685d..066dba33e1d 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -19,9 +19,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
index d0abf20190f..b6ddd879bc1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index c1e0281a2ab..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
index 9d200ef685d..066dba33e1d 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -19,9 +19,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 205f70497ad..3319b4e31f9 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: 
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index dd54871f563..7595c86418c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -24,9 +24,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 86764c6d57a..0fa4d7bfa36 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -567,10 +567,4 @@ sourceFile:outputdir_module_multifolder/test.ts
 7 >Emitted(15, 27) Source(14, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index dd54871f563..7595c86418c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -24,9 +24,6 @@
         "../outputdir_module_multifolder_ref/m2.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index eb2dff17042..625e81c4738 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -611,10 +611,4 @@ sourceFile:outputdir_module_multifolder/test.ts
 6 >Emitted(16, 22) Source(14, 25) + SourceIndex(0)
 7 >Emitted(16, 23) Source(14, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index ecfa616be4c..6180a2c53c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 3e447368494..15f5ae4bc93 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index ecfa616be4c..6180a2c53c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 4d3c5799e27..75f6eb83940 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index fedae846317..01fd790d6d4 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 54c26748c78..880d55412f8 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -369,10 +369,4 @@ sourceFile:test.ts
 7 >Emitted(14, 27) Source(12, 26) + SourceIndex(0)
 ---
 >>>});
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
deleted file mode 100644
index 6f3fefb9498..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
deleted file mode 100644
index d3e851981ec..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":[],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index fedae846317..01fd790d6d4 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -20,9 +20,6 @@
         "ref/m1.d.ts",
         "test.js.map",
         "test.js",
-        "test.d.ts",
-        "bin/test.js.map",
-        "bin/test.js",
-        "bin/test.d.ts"
+        "test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index cf41966a818..7fc9e0c1f60 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -390,10 +390,4 @@ sourceFile:test.ts
 6 >Emitted(14, 22) Source(12, 25) + SourceIndex(0)
 7 >Emitted(14, 23) Source(12, 26) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=test.js.map===================================================================
-JsFile: test.js
-mapUrl: test.js.map
-sourceRoot: http://typescript.codeplex.com/
-sources: 
-===================================================================
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file